diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.anim new file mode 100644 index 00000000..584cc7d8 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.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: Brother_pink_Glideing_Cancel + serializedVersion: 6 + 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: 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/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.anim.meta b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.anim.meta new file mode 100644 index 00000000..1e4587ee --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Glideing_Cancel.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a42ed44031161dc40b5cf47c20bbf47f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Gliding.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Gliding.anim index cebfe52c..c715b61d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Gliding.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_Gliding.anim @@ -330,7 +330,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 1, y: 0.98803, z: 1} + value: {x: 1, y: 0.9714904, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1973,7 +1973,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.98803 + value: 0.9714904 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_MiniGame.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_MiniGame.controller index 5c96626c..8afaadab 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_MiniGame.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_MiniGame.controller @@ -127,6 +127,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -665868057662993782} m_Position: {x: 390, y: 340, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3496801082157817351} + m_Position: {x: 425, y: 405, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -137,6 +140,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 5560102518252338052} +--- !u!1102 &3496801082157817351 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brother_pink_Glideing_Cancel + 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: a42ed44031161dc40b5cf47c20bbf47f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &5560102518252338052 AnimatorState: serializedVersion: 6 diff --git a/popcorn/Assets/MyGame/Resource/Animation/minigame_bee.anim b/popcorn/Assets/MyGame/Resource/Animation/minigame_bee.anim index 617cb183..5cdfa870 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/minigame_bee.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/minigame_bee.anim @@ -192,7 +192,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.0328, y: 0.34, z: -43.01684} + value: {x: 1.0328, y: 0.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -201,7 +201,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0.969, y: 0.34, z: -43.01684} + value: {x: 0.969, y: 0.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -210,7 +210,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 1.0328, y: 0.34, z: -43.01684} + value: {x: 1.0328, y: 0.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -219,7 +219,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0.969, y: 0.34, z: -43.01684} + value: {x: 0.969, y: 0.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -228,7 +228,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 1.0328, y: 0.34, z: -43.01684} + value: {x: 1.0328, y: 0.34, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -244,7 +244,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.5126, y: 0.412, z: -43.01684} + value: {x: 0.5126, y: 0.412, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -253,7 +253,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0.57, y: 0.412, z: -43.01684} + value: {x: 0.57, y: 0.412, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -262,7 +262,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0.5126, y: 0.412, z: -43.01684} + value: {x: 0.5126, y: 0.412, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -271,7 +271,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0.57, y: 0.412, z: -43.01684} + value: {x: 0.57, y: 0.412, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -280,7 +280,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.5126, y: 0.412, z: -43.01684} + value: {x: 0.5126, y: 0.412, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -513,7 +513,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -639,7 +639,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -648,7 +648,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -657,7 +657,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -666,7 +666,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -675,7 +675,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1134,7 +1134,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1143,7 +1143,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1152,7 +1152,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1161,7 +1161,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1170,7 +1170,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -43.01684 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle_Bee 1x1.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle_Bee 1x1.prefab index 942a1f81..e6bd65e9 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle_Bee 1x1.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle_Bee 1x1.prefab @@ -212,7 +212,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 --- !u!1 &5639538910414099634 GameObject: m_ObjectHideFlags: 0