diff --git a/Assets/Resources/Games/loveLab.prefab b/Assets/Resources/Games/loveLab.prefab index 2116aa277..57a6be62c 100644 --- a/Assets/Resources/Games/loveLab.prefab +++ b/Assets/Resources/Games/loveLab.prefab @@ -502,10 +502,10 @@ Transform: - {fileID: 158041266922703769} - {fileID: 3903276360714043343} - {fileID: 7826985892732635723} + - {fileID: 4674094147555684652} - {fileID: 2154422577168644224} - {fileID: 7132799052978497352} - {fileID: 421863077599475299} - - {fileID: 4674094147555684652} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2824,7 +2824,7 @@ Transform: - {fileID: 8380959935094053506} - {fileID: 6921272146124063076} m_Father: {fileID: 878409105178889012} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2071272534245185769 Animator: @@ -3048,7 +3048,7 @@ Transform: - {fileID: 9158456448347328387} - {fileID: 4345889365010825124} m_Father: {fileID: 878409105178889012} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4056063042128174322 Animator: @@ -3330,7 +3330,7 @@ Transform: - {fileID: 3368113456851434604} - {fileID: 7766427145776930279} m_Father: {fileID: 878409105178889012} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6043310135498338089 Animator: @@ -5150,7 +5150,7 @@ Transform: - {fileID: 9023725056155168413} - {fileID: 4908437287645588744} m_Father: {fileID: 878409105178889012} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7144185182759799523 Animator: diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlLeftFace.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlLeftFace.anim index 970138b31..2195b1d54 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlLeftFace.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlLeftFace.anim @@ -14,7 +14,23 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.004, y: -0.045, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Shading m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -25,6 +41,13 @@ AnimationClip: path: HeadSprite classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -876980906, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3} + attribute: m_Sprite + path: Shading + classID: 212 + script: {fileID: 0} m_SampleRate: 30 m_WrapMode: 0 m_Bounds: @@ -32,6 +55,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 340712887 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2564294673 attribute: 0 @@ -39,8 +69,16 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 340712887 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -976223148, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3} + - {fileID: -876980906, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -61,7 +99,64 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.004 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Shading + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.045 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Shading + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Shading + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyFaceIdle.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyFaceIdle.anim index 6ea064267..adf3eb408 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyFaceIdle.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyFaceIdle.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.092413925, y: 0.04502279, z: 0} + value: {x: -0.092413925, y: 0.041, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -32,7 +32,26 @@ AnimationClip: m_RotationOrder: 4 path: Shading m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shading + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -62,6 +81,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 340712887 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2564294673 attribute: 0 @@ -124,7 +150,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.04502279 + value: 0.041 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -157,6 +183,25 @@ AnimationClip: path: Shading classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shading + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0