diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim b/BlueWater/Assets/07.Animation/Bubble/Bubble.anim deleted file mode 100644 index bbaaeb967..000000000 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim +++ /dev/null @@ -1,96 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Bubble - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - 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: - - 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.0166667 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller b/BlueWater/Assets/07.Animation/Bubble/Bubble.controller deleted file mode 100644 index 9c193b8c3..000000000 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Bubble - serializedVersion: 5 - m_AnimatorParameters: [] - 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/Bubble01.anim b/BlueWater/Assets/07.Animation/Bubble/Bubble01.anim new file mode 100644 index 000000000..e67e183c0 --- /dev/null +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bubble01 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim.meta b/BlueWater/Assets/07.Animation/Bubble/Bubble01.anim.meta similarity index 79% rename from BlueWater/Assets/07.Animation/Bubble/Bubble.anim.meta rename to BlueWater/Assets/07.Animation/Bubble/Bubble01.anim.meta index 695d1c41b..a05b1b859 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.anim.meta +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06a539f044a76334996155220a68d755 +guid: eca07f80d936762419ea7b77af7e6614 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble01.controller b/BlueWater/Assets/07.Animation/Bubble/Bubble01.controller new file mode 100644 index 000000000..d6ac8044c --- /dev/null +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bubble01 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller.meta b/BlueWater/Assets/07.Animation/Bubble/Bubble01.controller.meta similarity index 79% rename from BlueWater/Assets/07.Animation/Bubble/Bubble.controller.meta rename to BlueWater/Assets/07.Animation/Bubble/Bubble01.controller.meta index 0caa35ae1..f59eecde9 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.controller.meta +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 229c6fa25751d1646a44fd80ba87638c +guid: 6c0a8fef6671701489911159fe312ffa NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab b/BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab similarity index 84% rename from BlueWater/Assets/07.Animation/Bubble/Bubble.prefab rename to BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab index 99ef2a323..b1513fdfe 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &9004117787044443361 +--- !u!1 &105377617171589796 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,23 +8,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9013145838182339024} - - component: {fileID: 1003389961499284730} - - component: {fileID: 5087274153851490673} + - component: {fileID: 2732052558576226404} + - component: {fileID: 532836263624283776} + - component: {fileID: 3397493426569375419} m_Layer: 0 - m_Name: Bubble + m_Name: Bubble01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9013145838182339024 +--- !u!4 &2732052558576226404 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9004117787044443361} + m_GameObject: {fileID: 105377617171589796} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -33,13 +33,13 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1003389961499284730 +--- !u!212 &532836263624283776 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9004117787044443361} + m_GameObject: {fileID: 105377617171589796} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -87,17 +87,17 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &5087274153851490673 +--- !u!95 &3397493426569375419 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9004117787044443361} + m_GameObject: {fileID: 105377617171589796} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 229c6fa25751d1646a44fd80ba87638c, type: 2} + m_Controller: {fileID: 9100000, guid: 6c0a8fef6671701489911159fe312ffa, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 1 diff --git a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab.meta b/BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab.meta similarity index 74% rename from BlueWater/Assets/07.Animation/Bubble/Bubble.prefab.meta rename to BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab.meta index 8f9237584..7ba7eb093 100644 --- a/BlueWater/Assets/07.Animation/Bubble/Bubble.prefab.meta +++ b/BlueWater/Assets/07.Animation/Bubble/Bubble01.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 524e7c96df8a7fa4b9b6ea535c6a5c2c +guid: b1221fd9a79237c4c9766e4a30cb7f0b PrefabImporter: externalObjects: {} userData: