From 02d9a2292f18268052b1c182f469344a39039756 Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 22:52:51 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/CornBurn.anim | 63 +++++++++++++++++++ .../MyGame/Resource/Animation/CornGrow.anim | 63 +++++++++++++++++++ .../MyGame/Scenes/Cooking/Prefabs/corn.prefab | 2 +- 3 files changed, 127 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim index c04c11b6..1b533169 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim @@ -215,6 +215,34 @@ AnimationClip: path: RotationResolver/AnimePivot/Image_corn classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.17 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.25 + 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_Radius + path: + classID: 58 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -265,6 +293,13 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1984117138 + script: {fileID: 0} + typeID: 58 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -537,6 +572,34 @@ AnimationClip: path: RotationResolver/AnimePivot/Image_corn classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.17 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.25 + 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_Radius + path: + classID: 58 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index 69e733d1..822d5e4e 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -214,6 +214,34 @@ AnimationClip: path: pt_burst classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.17 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.25 + 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_Radius + path: + classID: 58 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -257,6 +285,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1984117138 + script: {fileID: 0} + typeID: 58 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -555,6 +590,34 @@ AnimationClip: path: pt_burst classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.17 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.25 + 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_Radius + path: + classID: 58 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index a8dfa32e..23c27042 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -114,7 +114,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.2 + m_Radius: 0.17 --- !u!1 &3431194784518736845 GameObject: m_ObjectHideFlags: 0