diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_fertilizer.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_fertilizer.anim index 0369812e..019363c3 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_fertilizer.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_Blue_fertilizer.anim @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.18195525} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0, z: -1.1087866} + value: {x: 0, y: 0, z: -15.386786} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,9 +37,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 0, z: 3.1643763} - inSlope: {x: 0, y: 0, z: 30.766464} - outSlope: {x: 0, y: 0, z: 30.766464} + value: {x: 0, y: 0, z: 64.669624} + 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} @@ -47,8 +47,8 @@ AnimationClip: - serializedVersion: 3 time: 0.5 value: {x: 0, y: 0, z: 9.146701} - inSlope: {x: 0, y: 0, z: 44.86743} - outSlope: {x: 0, y: 0, z: 44.86743} + 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} @@ -106,8 +106,8 @@ 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.21666667 - value: {x: 0, y: 0, z: -10.214099} + time: 0.26666668 + value: {x: 0, y: 0, z: -5.258685} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,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.26666668 + time: 0.36666667 value: {x: 0, y: 0, z: -13.884112} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -123,33 +123,6 @@ AnimationClip: 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: 0.33333334 - value: {x: 0, y: 0, z: -10.473643} - 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: 0.41666666 - value: {x: 0, y: 0, z: -11.394061} - 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: 0.5 - value: {x: 0, y: 0, z: -10.588} - inSlope: {x: 0, y: 0, z: 12.896972} - outSlope: {x: 0, y: 0, z: 12.896972} - 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: 0.6666667 value: {x: 0, y: 0, z: 0} @@ -379,6 +352,49 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: {x: -0.94, y: -0.21, 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: 0.25 + value: {x: -1.1169266, y: -0.2982616, 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: 0.5 + value: {x: -1.1169266, y: -0.2982616, 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: 0.6666667 + value: {x: -0.94, y: -0.21, 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 + path: AnimationPivot_Blue/Blue/wing/left m_ScaleCurves: - curve: serializedVersion: 2 @@ -614,6 +630,43 @@ AnimationClip: path: AnimationPivot_Blue/Blue/eye _smile classID: 1 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 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + 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_IsActive + path: ef_throw + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -629,6 +682,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2452488154 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2452488154 attribute: 4 @@ -699,6 +759,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1629881441 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3324904431 attribute: 1 @@ -992,7 +1059,7 @@ AnimationClip: outWeight: 0.18195525 - serializedVersion: 3 time: 0.16666667 - value: -1.1087866 + value: -15.386786 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1001,9 +1068,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 3.1643763 - inSlope: 30.766464 - outSlope: 30.766464 + value: 64.669624 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1011,8 +1078,8 @@ AnimationClip: - serializedVersion: 3 time: 0.5 value: 9.146701 - inSlope: 44.86743 - outSlope: 44.86743 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1297,8 +1364,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: -10.214099 + time: 0.26666668 + value: -5.258685 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1306,7 +1373,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.26666668 + time: 0.36666667 value: -13.884112 inSlope: 0 outSlope: 0 @@ -1314,33 +1381,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: -10.473643 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: -11.394061 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -10.588 - inSlope: 12.896972 - outSlope: 12.896972 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -1865,6 +1905,154 @@ AnimationClip: path: shadow classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: -0.94 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -1.1169266 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -1.1169266 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.94 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/wing/left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: -0.21 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.2982616 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.2982616 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.21 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/wing/left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/wing/left + 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 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + 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_IsActive + path: ef_throw + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1873,7 +2061,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue + path: AnimationPivot_Blue/Blue/wing/left classID: 4 script: {fileID: 0} - curve: @@ -1883,7 +2071,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue + path: AnimationPivot_Blue/Blue/wing/left classID: 4 script: {fileID: 0} - curve: @@ -1893,7 +2081,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue + path: AnimationPivot_Blue/Blue/wing/left classID: 4 script: {fileID: 0} - curve: @@ -1933,7 +2121,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/wing/left + path: AnimationPivot_Blue/Blue/leg/front classID: 4 script: {fileID: 0} - curve: @@ -1943,7 +2131,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/wing/left + path: AnimationPivot_Blue/Blue/leg/front classID: 4 script: {fileID: 0} - curve: @@ -1953,7 +2141,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/wing/left + path: AnimationPivot_Blue/Blue/leg/front classID: 4 script: {fileID: 0} - curve: @@ -1993,7 +2181,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: AnimationPivot_Blue/Blue/leg/front + path: AnimationPivot_Blue classID: 4 script: {fileID: 0} - curve: @@ -2003,7 +2191,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: AnimationPivot_Blue/Blue/leg/front + path: AnimationPivot_Blue classID: 4 script: {fileID: 0} - curve: @@ -2013,7 +2201,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: AnimationPivot_Blue/Blue/leg/front + path: AnimationPivot_Blue classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_fertilizer.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_fertilizer.anim index c8ce2b10..5e4d6ffa 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_fertilizer.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_pink_fertilizer.anim @@ -107,27 +107,27 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 0, z: 3.1643763} - inSlope: {x: 0, y: 0, z: 30.766464} - outSlope: {x: 0, y: 0, z: 30.766464} + value: {x: 0, y: 0, z: 64.41093} + 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: 0.5 - value: {x: 0, y: 0, z: 9.146701} - inSlope: {x: 0, y: 0, z: 44.86743} - outSlope: {x: 0, y: 0, z: 44.86743} + value: {x: 0, y: 0, z: 20.611576} + 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: 0.6666667 - value: {x: 0, y: 0, z: 29.518734} - inSlope: {x: 0, y: 0, z: 218.86494} - outSlope: {x: 0, y: 0, z: 218.86494} + value: {x: 0, y: 0, z: 32.481632} + inSlope: {x: 0, y: 0, z: 174.18657} + outSlope: {x: 0, y: 0, z: 174.18657} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -177,16 +177,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.07200481} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0, z: -17.372608} - 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: 0.21666667 - value: {x: 0, y: 0, z: -10.214099} + value: {x: 0, y: 0, z: -15.785815} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -195,7 +186,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.26666668 - value: {x: 0, y: 0, z: -14.808337} + value: {x: 0, y: 0, z: -5.258685} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -203,32 +194,14 @@ 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.33333334 - value: {x: 0, y: 0, z: -10.473643} + time: 0.36666667 + value: {x: 0, y: 0, z: -13.884112} 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: 0.41666666 - value: {x: 0, y: 0, z: -11.394061} - 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: 0.5 - value: {x: 0, y: 0, z: -10.588} - inSlope: {x: 0, y: 0, z: 12.896972} - outSlope: {x: 0, y: 0, z: 12.896972} - 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: 0.6666667 value: {x: 0, y: 0, z: 0} @@ -394,15 +367,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: -0.75544065, y: -0.12599993, z: 0} - inSlope: {x: -0.6245556, y: 0.39811364, z: 0} - outSlope: {x: -0.6245556, y: 0.39811364, 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.8226673, y: 0.46729597, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: -0.8136566, y: -0.09, z: 0} + value: {x: -0.75544065, y: -0.12599993, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -6.1890774, y: -3.8011959, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.35021427, y: 0.4779434, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: -0.97, y: -0.27, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -411,9 +393,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: -0.78269655, y: -0.09, z: 0} - inSlope: {x: 0.2073133, y: 0, z: 0} - outSlope: {x: 0.2073133, y: 0, z: 0} + value: {x: -0.97, y: -0.27, 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} @@ -421,11 +403,11 @@ AnimationClip: - serializedVersion: 3 time: 0.6666667 value: {x: -0.71, y: -0.12599993, z: 0} - inSlope: {x: 1.1296604, y: -0.47093207, z: 0} - outSlope: {x: 1.1296604, y: -0.47093207, z: 0} + inSlope: {x: 4.467796, y: 1.5995449, z: 0} + outSlope: {x: 4.467796, y: 1.5995449, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.26329133, y: 0.26566562, z: 0.33333334} + inWeight: {x: 0.3214037, y: 0.55131584, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -657,6 +639,43 @@ AnimationClip: path: AnimationPivot_pink/pink/eye _smile classID: 1 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 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + 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_IsActive + path: ef_throw + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -749,6 +768,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1629881441 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1461620254 attribute: 1 @@ -1043,18 +1069,18 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 3.1643763 - inSlope: 30.766464 - outSlope: 30.766464 + value: 64.41093 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 9.146701 - inSlope: 44.86743 - outSlope: 44.86743 + value: 20.611576 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1486,16 +1512,7 @@ AnimationClip: outWeight: 0.07200481 - serializedVersion: 3 time: 0.16666667 - value: -17.372608 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: -10.214099 + value: -15.785815 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1504,7 +1521,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 - value: -14.808337 + value: -5.258685 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1512,32 +1529,14 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: -10.473643 + time: 0.36666667 + value: -13.884112 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: -11.394061 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -10.588 - inSlope: 12.896972 - outSlope: 12.896972 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -1930,15 +1929,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -0.75544065 - inSlope: -0.6245556 - outSlope: -0.6245556 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.8226673 - serializedVersion: 3 time: 0.16666667 - value: -0.8136566 + value: -0.75544065 + inSlope: 0 + outSlope: -6.1890774 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.35021427 + - serializedVersion: 3 + time: 0.25 + value: -0.97 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1947,9 +1955,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -0.78269655 - inSlope: 0.2073133 - outSlope: 0.2073133 + value: -0.97 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1957,11 +1965,11 @@ AnimationClip: - serializedVersion: 3 time: 0.6666667 value: -0.71 - inSlope: 1.1296604 - outSlope: 1.1296604 + inSlope: 4.467796 + outSlope: 4.467796 tangentMode: 0 weightedMode: 0 - inWeight: 0.26329133 + inWeight: 0.3214037 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -1976,15 +1984,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -0.12599993 - inSlope: 0.39811364 - outSlope: 0.39811364 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.46729597 - serializedVersion: 3 time: 0.16666667 - value: -0.09 + value: -0.12599993 + inSlope: 0 + outSlope: -3.8011959 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.4779434 + - serializedVersion: 3 + time: 0.25 + value: -0.27 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1993,7 +2010,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -0.09 + value: -0.27 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2003,11 +2020,11 @@ AnimationClip: - serializedVersion: 3 time: 0.6666667 value: -0.12599993 - inSlope: -0.47093207 - outSlope: -0.47093207 + inSlope: 1.5995449 + outSlope: 1.5995449 tangentMode: 0 weightedMode: 0 - inWeight: 0.26566562 + inWeight: 0.55131584 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -2028,6 +2045,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2035,6 +2070,43 @@ AnimationClip: path: AnimationPivot_pink/pink/wing/left 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 + - serializedVersion: 3 + time: 0.21666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + 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_IsActive + path: ef_throw + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png b/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png new file mode 100644 index 00000000..3d9daa55 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png differ diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png.meta b/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png.meta new file mode 100644 index 00000000..70253b49 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectTexture/ef_throw.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5815c41b5a8cb4c69bdfc3844b51f439 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index ffa06ed2..501dda9b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -3534,6 +3534,87 @@ Transform: m_Father: {fileID: 7854448233733155803} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1121348041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1121348042} + - component: {fileID: 1121348043} + m_Layer: 0 + m_Name: ef_throw + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1121348042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121348041} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.34, y: 0.92, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7854448233124094804} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1121348043 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121348041} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 5815c41b5a8cb4c69bdfc3844b51f439, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.12, y: 1.14} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1139508045 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3190375339094523666, guid: 0949d70c1a73342ca8955c7f59c04fe0, @@ -3705,6 +3786,7 @@ Transform: m_Children: - {fileID: 1455855156} - {fileID: 640256890} + - {fileID: 1452091998} - {fileID: 1795496554} m_Father: {fileID: 2040636316} m_RootOrder: 1 @@ -4255,6 +4337,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1452091997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1452091998} + - component: {fileID: 1452091999} + m_Layer: 0 + m_Name: ef_throw + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1452091998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452091997} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: -1.38, y: 0.92, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1194872049} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1452091999 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452091997} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 5815c41b5a8cb4c69bdfc3844b51f439, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.12, y: 1.14} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1455855155 GameObject: m_ObjectHideFlags: 0 @@ -5332,7 +5495,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1194872049} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -146, y: 40, z: 0} --- !u!199 &1795496555 ParticleSystemRenderer: @@ -16971,6 +17134,7 @@ Transform: - {fileID: 7854448232574702555} - {fileID: 7854448233515474771} - {fileID: 1817670108} + - {fileID: 1121348042} m_Father: {fileID: 2040636316} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}