diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim b/BlueWater/Assets/07.Animation/Bubble/Bubble.anim index 47ef4b28c..bbaaeb967 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble.anim @@ -17,26 +17,69 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 94f2eb54ddc3c68408d22553675343f2, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: c672346bc812745489788af6728c96de, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 6e3418e8d73ff7a4ea2b717aefcae586, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 6d201570a1b365a40b701bd4d8e8d429, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 4edab28bafc264944892a8c0367e83dd, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: 2ed0dd2070ce2eb45b924fbc73a1f398, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: df5dcfe80569c0044889902c7f5030c6, type: 3} + - time: 0.8666667 + value: {fileID: 21300000, guid: 51f064b1076251d4090dce4f2323b365, type: 3} + - time: 1 + value: {fileID: 21300000, guid: d097eef4a9a9e9c4daadd88be040e6fd, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 94f2eb54ddc3c68408d22553675343f2, type: 3} + - {fileID: 21300000, guid: c672346bc812745489788af6728c96de, type: 3} + - {fileID: 21300000, guid: 6e3418e8d73ff7a4ea2b717aefcae586, type: 3} + - {fileID: 21300000, guid: 6d201570a1b365a40b701bd4d8e8d429, type: 3} + - {fileID: 21300000, guid: 4edab28bafc264944892a8c0367e83dd, type: 3} + - {fileID: 21300000, guid: 2ed0dd2070ce2eb45b924fbc73a1f398, type: 3} + - {fileID: 21300000, guid: df5dcfe80569c0044889902c7f5030c6, type: 3} + - {fileID: 21300000, guid: 51f064b1076251d4090dce4f2323b365, type: 3} + - {fileID: 21300000, guid: d097eef4a9a9e9c4daadd88be040e6fd, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 1.0166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller b/BlueWater/Assets/07.Animation/Bubble/Bubble.controller index c1b77e519..9c193b8c3 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble.controller @@ -9,4 +9,64 @@ AnimatorController: m_Name: Bubble serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5535709297553694934} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &5001898134281532039 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bubble + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 06a539f044a76334996155220a68d755, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &5535709297553694934 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5001898134281532039} + m_Position: {x: 380, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5001898134281532039} diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab b/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab index 77dea3112..99ef2a323 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab @@ -100,7 +100,7 @@ Animator: m_Controller: {fileID: 9100000, guid: 229c6fa25751d1646a44fd80ba87638c, type: 2} m_CullingMode: 0 m_UpdateMode: 0 - m_ApplyRootMotion: 0 + m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 m_AnimatePhysics: 0