diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim index e5b8a96c..19da4e71 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_FallDown.anim @@ -70,7 +70,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2833333 + time: 1 value: {x: 0, y: 0, z: -19.897736} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -95,7 +95,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.691212} - serializedVersion: 3 - time: 1.6666666 + time: 0.98333335 value: {x: 0, y: 0, z: -19.336334} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -165,14 +165,14 @@ AnimationClip: time: 0.53333336 value: {x: 1.3457108, y: -1.2956285, z: 0} inSlope: {x: 4.6796384, y: 0.6901133, z: 0} - outSlope: {x: 0, y: 0.6901133, z: 0} + outSlope: {x: 0, y: 4.9674244, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.45025653, y: 0.27362296, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.34686986, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.30549812, z: 0.33333334} - serializedVersion: 3 - time: 0.73333335 - value: {x: 1.3457108, y: -0.7121545, z: 0} + time: 0.78333336 + value: {x: 1.3457108, y: -0.6538049, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -180,7 +180,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.9166667 + time: 1 value: {x: 1.3457108, y: -1.2956285, z: 0} inSlope: {x: 0, y: -7.207347, z: 0} outSlope: {x: 0, y: 3.3245983, z: 0} @@ -188,51 +188,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.3571108, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.6611337, z: 0.33333334} - - serializedVersion: 3 - time: 1.1166667 - value: {x: 1.3457108, y: -0.9585297, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.3166667 - value: {x: 1.3457108, y: -1.2956285, z: 0} - inSlope: {x: 0, y: -3.7606313, z: 0} - outSlope: {x: 0, y: 3.0077975, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.4563444, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.6939897, z: 0.33333334} - - serializedVersion: 3 - time: 1.4666667 - value: {x: 1.3457108, y: -1.0983431, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.6333333 - value: {x: 1.3457108, y: -1.2956285, z: 0} - inSlope: {x: 0, y: -2.3859308, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 1, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.65 - value: {x: 1.3457108, y: -1.2956285, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -828,7 +783,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.6666666 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -931,15 +886,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.45025653 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.65 - value: 1.3457108 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -963,14 +909,14 @@ AnimationClip: time: 0.53333336 value: -1.2956285 inSlope: 0.6901133 - outSlope: 0.6901133 - tangentMode: 0 + outSlope: 4.9674244 + tangentMode: 1 weightedMode: 0 inWeight: 0.27362296 - outWeight: 0.34686986 + outWeight: 0.30549812 - serializedVersion: 3 - time: 0.73333335 - value: -0.7121545 + time: 0.78333336 + value: -0.6538049 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -978,7 +924,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 1 value: -1.2956285 inSlope: -7.207347 outSlope: 3.3245983 @@ -986,42 +932,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.3571108 outWeight: 0.6611337 - - serializedVersion: 3 - time: 1.1166667 - value: -0.9585297 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3166667 - value: -1.2956285 - inSlope: -3.7606313 - outSlope: 3.0077975 - tangentMode: 1 - weightedMode: 0 - inWeight: 0.4563444 - outWeight: 0.6939897 - - serializedVersion: 3 - time: 1.4666667 - value: -1.0983431 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6333333 - value: -1.2956285 - inSlope: -2.3859308 - outSlope: 0 - tangentMode: 1 - weightedMode: 0 - inWeight: 1 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1335,7 +1245,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2833333 + time: 1 value: -19.897736 inSlope: 0 outSlope: 0 @@ -1477,7 +1387,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.691212 - serializedVersion: 3 - time: 1.6666666 + time: 0.98333335 value: -19.336334 inSlope: 0 outSlope: 0 @@ -2006,7 +1916,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -2016,7 +1926,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -2026,7 +1936,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink/pink/wing/right_b + path: AnimationPivot_pink classID: 4 script: {fileID: 0} - curve: @@ -2096,7 +2006,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink/pink/wing/right_b_back + path: AnimationPivot_pink/pink/wing/right_b classID: 4 script: {fileID: 0} - curve: @@ -2106,7 +2016,17 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink/pink/wing/right_b_back + path: AnimationPivot_pink/pink/wing/right_b + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: AnimationPivot_pink/pink/wing/right_b classID: 4 script: {fileID: 0} - curve: @@ -2119,16 +2039,6 @@ AnimationClip: path: AnimationPivot_pink/pink/wing/right_b_back classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimationPivot_pink - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -2136,7 +2046,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/wing/right_b_back classID: 4 script: {fileID: 0} - curve: @@ -2146,7 +2056,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_pink + path: AnimationPivot_pink/pink/wing/right_b_back classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0