diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index 7883398e..5222de7d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -21,15 +21,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 24.972157, z: 0} - outSlope: {x: 0, y: 24.972157, z: 0} + inSlope: {x: 0, y: 40.16459, z: 0} + outSlope: {x: 0, y: 40.16459, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.13424635, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.1819239, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: 0.663, z: 0} + time: 0.1 + value: {x: 0, y: 1.5537423, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,17 +37,17 @@ 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.13333334 + time: 0.2 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: -23.937048, z: 0} + inSlope: {x: 0, y: -43.64947, z: 0} outSlope: {x: 0, y: 5.547481, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.13733178, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.16054735, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.5339, z: 0.33333334} - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0.14661232, z: 0} + time: 0.28333333 + value: {x: 0, y: 0.19095436, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.10361791, 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: 0} inSlope: {x: 0, y: -5.349448, z: 0} outSlope: {x: 0, y: -28.626318, z: 0} @@ -82,7 +82,7 @@ AnimationClip: outWeight: {x: 0.11922174, y: 0.10219006, z: 0.33333334} - serializedVersion: 3 time: 0.016666668 - value: {x: 1.2562993, y: 1.2562993, z: 1} + value: {x: 1.4979239, y: 1.4979239, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -140,7 +140,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.26666668 + m_StopTime: 0.36666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -170,7 +170,7 @@ AnimationClip: outWeight: 0.11922174 - serializedVersion: 3 time: 0.016666668 - value: 1.2562993 + value: 1.4979239 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -216,7 +216,7 @@ AnimationClip: outWeight: 0.10219006 - serializedVersion: 3 time: 0.016666668 - value: 1.2562993 + value: 1.4979239 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -254,15 +254,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 24.972157 - outSlope: 24.972157 + inSlope: 40.16459 + outSlope: 40.16459 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.13424635 + outWeight: 0.1819239 - serializedVersion: 3 - time: 0.06666667 - value: 0.663 + time: 0.1 + value: 1.5537423 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -270,17 +270,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.2 value: 0 - inSlope: -23.937048 + inSlope: -43.64947 outSlope: 5.547481 tangentMode: 1 weightedMode: 0 - inWeight: 0.13733178 + inWeight: 0.16054735 outWeight: 0.5339 - serializedVersion: 3 - time: 0.2 - value: 0.14661232 + time: 0.28333333 + value: 0.19095436 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -288,7 +288,7 @@ AnimationClip: inWeight: 0.10361791 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.26666668 + time: 0.36666667 value: 0 inSlope: -5.349448 outSlope: -28.626318 diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim b/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim index 6bc898c9..b0781a17 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim @@ -13,59 +13,7 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -450.5309} - outSlope: {x: 0, y: 0, z: -450.5309} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.1992241} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0, y: 0, z: -5.215543} - 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.06666667 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 302.7262} - outSlope: {x: 0, y: 0, z: 188.96901} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.23823436} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.95515746} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0, z: 3.144164} - 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.15 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -191.76634} - outSlope: {x: 0, y: 0, z: -191.76634} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.8283887} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: AnimePivot + m_EulerCurves: [] m_PositionCurves: - curve: serializedVersion: 2 @@ -145,13 +93,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3773036399 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -293,202 +234,7 @@ AnimationClip: path: AnimePivot classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - 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: localEulerAnglesRaw.x - path: AnimePivot - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - 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: localEulerAnglesRaw.y - path: AnimePivot - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: -450.5309 - outSlope: -450.5309 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.1992241 - - serializedVersion: 3 - time: 0.033333335 - value: -5.215543 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: 302.7262 - outSlope: 188.96901 - tangentMode: 1 - weightedMode: 0 - inWeight: 0.23823436 - outWeight: 0.95515746 - - serializedVersion: 3 - time: 0.1 - value: 3.144164 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: -191.76634 - outSlope: -191.76634 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.8283887 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: AnimePivot - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: AnimePivot - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: AnimePivot - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: AnimePivot - classID: 4 - script: {fileID: 0} + m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/PanFuriGame.unity b/popcorn/Assets/MyGame/Scenes/Main/PanFuriGame.unity index cac15a3c..d035bfe8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/PanFuriGame.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/PanFuriGame.unity @@ -1331,12 +1331,12 @@ PrefabInstance: - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 1.2 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} @@ -1503,6 +1503,11 @@ PrefabInstance: propertyPath: m_AngularDrag value: 1 objectReference: {fileID: 0} + - target: {fileID: 3109952141014243082, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3253726348934161269, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LinearDrag diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab index 6e7a7d5d..1ac2b349 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab @@ -29,7 +29,7 @@ Transform: m_GameObject: {fileID: 1324329073609281157} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.616, y: 0.616, z: 0.616} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_Children: - {fileID: 3310446858927984796} m_Father: {fileID: 0}