From 5d6d97d3f4ac28e9bbdb2705a27ba5894094f536 Mon Sep 17 00:00:00 2001 From: hirokei Date: Mon, 2 Aug 2021 12:02:40 +0900 Subject: [PATCH] =?UTF-8?q?main=20Corn=E9=83=A8=E5=88=86=E3=82=A2=E3=83=8B?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/CornGrow.anim | 377 +++++++++++++++--- .../MyGame/Resource/Animation/CornWait.anim | 77 ++-- .../MyGame/Resource/Animation/corn.controller | 10 +- .../MyGame/Scenes/Cooking/Prefabs/corn.prefab | 2 +- 4 files changed, 348 insertions(+), 118 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index 8c568e64..ba61b986 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -13,7 +13,32 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: -6887.838} + outSlope: {x: 0, y: 0, z: -6887.838} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.20832548} + - serializedVersion: 3 + time: 0.15 + value: {x: 0, y: 0, z: -360} + 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: RotationResolver/AnimePivot m_PositionCurves: - curve: serializedVersion: 2 @@ -21,15 +46,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 40.16459, z: 0} - outSlope: {x: 0, y: 40.16459, z: 0} + inSlope: {x: 0, y: 40.792694, z: 0} + outSlope: {x: 0, y: 40.792694, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.1819239, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.16102456, z: 0.33333334} - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 1.5537423, z: 0} + time: 0.06666667 + value: {x: 0, y: 1.479493, z: 0} + inSlope: {x: 0, y: 5.5412793, z: 0} + outSlope: {x: 0, y: 5.5412793, 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: 1.687291, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,17 +71,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.2 + time: 0.23333333 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: -43.64947, z: 0} - outSlope: {x: 0, y: 5.547481, z: 0} + inSlope: {x: 0, y: -49.002995, z: 0} + outSlope: {x: 0, y: 8.251561, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.16054735, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.5339, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.09251236, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.5974194, z: 0.33333334} - serializedVersion: 3 - time: 0.28333333 - value: {x: 0, y: 0.19095436, z: 0} + time: 0.31666666 + value: {x: 0, y: 0.31563392, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,14 +89,14 @@ 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.36666667 + time: 0.4 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: -5.349448, z: 0} - outSlope: {x: 0, y: -28.626318, z: 0} + inSlope: {x: 0, y: -8.744999, z: 0} + outSlope: {x: 0, y: 7.3384047, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.4928138, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.6019152, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.7716861, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -74,15 +108,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 1, y: 1, z: 1} - inSlope: {x: 43.6482, y: 46.302402, z: 0} - outSlope: {x: 43.6482, y: 46.302402, z: 0} + inSlope: {x: 96.83262, y: 104.89998, z: 0} + outSlope: {x: 96.83262, y: 104.89998, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.11922174, y: 0.10219006, z: 0.33333334} + outWeight: {x: 0.3468221, y: 0.14891572, z: 0.33333334} - serializedVersion: 3 time: 0.016666668 - value: {x: 1.4979239, y: 1.4979239, z: 1} + value: {x: 1.57289, y: 1.57289, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,8 +124,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.05 - value: {x: 0.9283737, y: 0.9283737, z: 1} + time: 0.083333336 + value: {x: 1.2398202, y: 1.2398202, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -99,14 +133,41 @@ 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.1 + time: 0.15 + value: {x: 1.4093832, y: 1.4093832, z: 1} + 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.23333333 value: {x: 1, y: 1, z: 1} + inSlope: {x: -8.902075, y: -8.902075, z: 0} + outSlope: {x: 5.781601, y: 5.7536244, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.43961123, y: 0.43961123, z: 0.33333334} + outWeight: {x: 0.71669334, y: 0.70017487, z: 0.33333334} + - serializedVersion: 3 + time: 0.31666666 + value: {x: 1.1678665, y: 1.1678665, z: 1} 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.4 + value: {x: 1, y: 1, z: 1} + inSlope: {x: -5.583303, y: -5.3617096, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.63907975, y: 0.62256086, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -119,14 +180,35 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 2384535579 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2384535579 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2384535579 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.36666667 + m_StopTime: 0.4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -148,15 +230,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: 43.6482 - outSlope: 43.6482 + inSlope: 96.83262 + outSlope: 96.83262 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.11922174 + outWeight: 0.3468221 - serializedVersion: 3 time: 0.016666668 - value: 1.4979239 + value: 1.57289 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -164,8 +246,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 - value: 0.9283737 + time: 0.083333336 + value: 1.2398202 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -173,14 +255,41 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.15 + value: 1.4093832 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 value: 1 + inSlope: -8.902075 + outSlope: 5.781601 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.43961123 + outWeight: 0.71669334 + - serializedVersion: 3 + time: 0.31666666 + value: 1.1678665 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4 + value: 1 + inSlope: -5.583303 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.63907975 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -194,15 +303,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: 46.302402 - outSlope: 46.302402 + inSlope: 104.89998 + outSlope: 104.89998 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.10219006 + outWeight: 0.14891572 - serializedVersion: 3 time: 0.016666668 - value: 1.4979239 + value: 1.57289 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -210,8 +319,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 - value: 0.9283737 + time: 0.083333336 + value: 1.2398202 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -219,14 +328,41 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.15 + value: 1.4093832 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 value: 1 + inSlope: -8.902075 + outSlope: 5.7536244 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.43961123 + outWeight: 0.70017487 + - serializedVersion: 3 + time: 0.31666666 + value: 1.1678665 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4 + value: 1 + inSlope: -5.3617096 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.62256086 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -240,15 +376,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 40.16459 - outSlope: 40.16459 + inSlope: 40.792694 + outSlope: 40.792694 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.1819239 + outWeight: 0.16102456 - serializedVersion: 3 - time: 0.1 - value: 1.5537423 + time: 0.06666667 + value: 1.479493 + inSlope: 5.5412793 + outSlope: 5.5412793 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.15 + value: 1.687291 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -256,17 +401,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.23333333 value: 0 - inSlope: -43.64947 - outSlope: 5.547481 + inSlope: -49.002995 + outSlope: 8.251561 tangentMode: 1 weightedMode: 0 - inWeight: 0.16054735 - outWeight: 0.5339 + inWeight: 0.09251236 + outWeight: 0.5974194 - serializedVersion: 3 - time: 0.28333333 - value: 0.19095436 + time: 0.31666666 + value: 0.31563392 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -274,14 +419,14 @@ AnimationClip: inWeight: 0.10361791 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 + time: 0.4 value: 0 - inSlope: -5.349448 - outSlope: -28.626318 + inSlope: -8.744999 + outSlope: 7.3384047 tangentMode: 1 weightedMode: 0 - inWeight: 0.4928138 - outWeight: 0.33333334 + inWeight: 0.6019152 + outWeight: 0.7716861 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -289,7 +434,121 @@ AnimationClip: path: RotationResolver/AnimePivot classID: 4 script: {fileID: 0} - m_EulerEditorCurves: [] + - 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.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: RotationResolver/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.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: RotationResolver/AnimePivot + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: -6887.838 + outSlope: -6887.838 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.20832548 + - serializedVersion: 3 + time: 0.15 + value: -360 + 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.z + path: RotationResolver/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: RotationResolver/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: RotationResolver/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: RotationResolver/AnimePivot + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim b/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim index 0b29afe6..7a9882e4 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornWait.anim @@ -40,14 +40,14 @@ AnimationClip: time: 0.06666667 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: -4.309979, z: 0} - outSlope: {x: 0, y: 1.5750875, z: 0} + outSlope: {x: 0, y: 2.1619804, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.21979785, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.45532244, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.32437387, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0, y: 0.023544494, z: 0} + value: {x: 0, y: 0.030356118, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,22 +55,13 @@ 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.11666667 - value: {x: 0, y: 0.021258056, z: 0} - inSlope: {x: 0, y: -0.28426096, z: 0} - outSlope: {x: 0, y: -0.28426096, 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 + time: 0.13333334 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: -1.0307763, z: 0} - outSlope: {x: 0, y: -1.0307763, z: 0} + inSlope: {x: 0, y: -2.0434616, z: 0} + outSlope: {x: 0, y: -2.0434616, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.3295644, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.28934035, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -85,14 +76,21 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] + genericBindings: + - serializedVersion: 2 + path: 2384535579 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.15 + m_StopTime: 0.13333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -120,15 +118,6 @@ AnimationClip: 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 @@ -139,25 +128,7 @@ AnimationClip: 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.11666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.13333334 value: 0 inSlope: 0 outSlope: 0 @@ -197,14 +168,14 @@ AnimationClip: time: 0.06666667 value: 0 inSlope: -4.309979 - outSlope: 1.5750875 + outSlope: 2.1619804 tangentMode: 1 weightedMode: 0 inWeight: 0.21979785 - outWeight: 0.45532244 + outWeight: 0.32437387 - serializedVersion: 3 time: 0.1 - value: 0.023544494 + value: 0.030356118 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -212,13 +183,13 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.15 + time: 0.13333334 value: 0 - inSlope: -1.0307763 - outSlope: -1.0307763 + inSlope: -2.0434616 + outSlope: -2.0434616 tangentMode: 0 weightedMode: 0 - inWeight: 0.3295644 + inWeight: 0.28934035 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/corn.controller b/popcorn/Assets/MyGame/Resource/Animation/corn.controller index e1a7e8db..5631b85b 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/corn.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/corn.controller @@ -67,19 +67,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: CornBurn m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: WaitOffset m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -144,7 +144,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.3181818 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -169,7 +169,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index 7dc6f4a2..cbe8cbd0 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -90,7 +90,7 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 3.8 + m_LinearDrag: 5 m_AngularDrag: 2 m_GravityScale: 0 m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2}