From ef2e9857b915bb2366087677b247da40e09fe8f6 Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 20:12:33 +0900 Subject: [PATCH] =?UTF-8?q?Cooking=20corn=E6=BC=94=E5=87=BA=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/CornBurn.anim | 236 +++++++++++++++++- .../MyGame/Resource/Animation/CornGrow.anim | 144 +++++------ .../MyGame/Scenes/Cooking/Prefabs/corn.prefab | 6 +- .../Cooking/Prefabs/effect_burnt.prefab | 16 +- 4 files changed, 318 insertions(+), 84 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim index e0185975..c04c11b6 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim @@ -111,7 +111,110 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: RotationResolver/AnimePivot - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.b + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -134,6 +237,34 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -303,6 +434,109 @@ AnimationClip: path: RotationResolver/AnimePivot classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4811321 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1 + 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_Color.b + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + 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 1f95e44a..69e733d1 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -21,24 +21,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 40.792694, z: 0} - outSlope: {x: 0, y: 40.792694, z: 0} + inSlope: {x: 0, y: 53.98581, z: 0} + outSlope: {x: 0, y: 53.98581, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.16102456, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.16982037, z: 0.33333334} - serializedVersion: 3 - time: 0.083333336 - value: {x: 0, y: 1.59487, z: 0} - inSlope: {x: 0, y: 6.500806, z: 0} - outSlope: {x: 0, y: 6.500806, z: 0} + time: 0.06666667 + value: {x: 0, y: 1.6081347, z: 0} + inSlope: {x: 0, y: 8.7842655, z: 0} + outSlope: {x: 0, y: 8.7842655, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.6828371, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.4905389, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.29422888, z: 0.33333334} - serializedVersion: 3 time: 0.18333334 - value: {x: 0, y: 1.8051504, z: 0} + value: {x: 0, y: 1.9818014, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,7 +46,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.28333333 + time: 0.3 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: -35.268112, z: 0} outSlope: {x: 0, y: 7.016232, z: 0} @@ -55,7 +55,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.11653007, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.4663927, z: 0.33333334} - serializedVersion: 3 - time: 0.4 + time: 0.41666666 value: {x: 0, y: 0.2941258, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -64,7 +64,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.5 + time: 0.51666665 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: -7.9365587, z: 0} outSlope: {x: 0, y: 7.3384047, z: 0} @@ -91,7 +91,7 @@ AnimationClip: outWeight: {x: 0.12765956, y: 0.25531915, z: 0.33333334} - serializedVersion: 3 time: 0.05 - value: {x: 1.5300072, y: 1.5300072, z: 1} + value: {x: 1.6130672, y: 1.6130672, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -99,7 +99,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.11666667 + time: 0.13333334 value: {x: 1.2178866, y: 1.2178866, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -108,7 +108,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.18333334 + time: 0.21666667 value: {x: 1.3355874, y: 1.3355874, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -117,17 +117,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.28333333 - value: {x: 1, y: 1, z: 1} - inSlope: {x: -8.902075, y: -8.902075, z: 0} - outSlope: {x: 2.8993492, y: 3.0516102, z: 0} + time: 0.3 + value: {x: 1.1493454, y: 1.1493454, z: 1} + inSlope: {x: -5.4249315, y: -5.7237077, z: 0} + outSlope: {x: 2.5944061, y: 2.7197673, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.43961123, y: 0.43961123, z: 0.33333334} - outWeight: {x: 0.36418316, y: 0.39887562, z: 0.33333334} + inWeight: {x: 0.19987461, y: 0.21942899, z: 0.33333334} + outWeight: {x: 0.32937226, y: 0.1243904, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 1.119471, y: 1.119471, z: 1} + time: 0.41666666 + value: {x: 1.2537353, y: 1.2537353, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -135,13 +135,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.5 - value: {x: 1, y: 1, z: 1} - inSlope: {x: -3.1195889, y: -3.4568431, z: 0} + time: 0.51666665 + value: {x: 1.1493454, y: 1.1493454, z: 1} + inSlope: {x: -2.931119, y: -2.881517, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.44659588, y: 0.4263586, z: 0.33333334} + inWeight: {x: 0.37723514, y: 0.14862539, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -263,7 +263,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -293,7 +293,7 @@ AnimationClip: outWeight: 0.12765956 - serializedVersion: 3 time: 0.05 - value: 1.5300072 + value: 1.6130672 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -301,7 +301,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.13333334 value: 1.2178866 inSlope: 0 outSlope: 0 @@ -310,7 +310,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.18333334 + time: 0.21666667 value: 1.3355874 inSlope: 0 outSlope: 0 @@ -319,17 +319,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 - inSlope: -8.902075 - outSlope: 2.8993492 + time: 0.3 + value: 1.1493454 + inSlope: -5.4249315 + outSlope: 2.5944061 tangentMode: 1 weightedMode: 0 - inWeight: 0.43961123 - outWeight: 0.36418316 + inWeight: 0.19987461 + outWeight: 0.32937226 - serializedVersion: 3 - time: 0.4 - value: 1.119471 + time: 0.41666666 + value: 1.2537353 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -337,13 +337,13 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: -3.1195889 + time: 0.51666665 + value: 1.1493454 + inSlope: -2.931119 outSlope: 0 tangentMode: 1 weightedMode: 0 - inWeight: 0.44659588 + inWeight: 0.37723514 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -366,7 +366,7 @@ AnimationClip: outWeight: 0.25531915 - serializedVersion: 3 time: 0.05 - value: 1.5300072 + value: 1.6130672 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -374,7 +374,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.13333334 value: 1.2178866 inSlope: 0 outSlope: 0 @@ -383,7 +383,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.18333334 + time: 0.21666667 value: 1.3355874 inSlope: 0 outSlope: 0 @@ -392,17 +392,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 - inSlope: -8.902075 - outSlope: 3.0516102 + time: 0.3 + value: 1.1493454 + inSlope: -5.7237077 + outSlope: 2.7197673 tangentMode: 1 weightedMode: 0 - inWeight: 0.43961123 - outWeight: 0.39887562 + inWeight: 0.21942899 + outWeight: 0.1243904 - serializedVersion: 3 - time: 0.4 - value: 1.119471 + time: 0.41666666 + value: 1.2537353 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -410,13 +410,13 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: -3.4568431 + time: 0.51666665 + value: 1.1493454 + inSlope: -2.881517 outSlope: 0 tangentMode: 1 weightedMode: 0 - inWeight: 0.4263586 + inWeight: 0.14862539 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -431,24 +431,24 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 40.792694 - outSlope: 40.792694 + inSlope: 53.98581 + outSlope: 53.98581 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.16102456 + outWeight: 0.16982037 - serializedVersion: 3 - time: 0.083333336 - value: 1.59487 - inSlope: 6.500806 - outSlope: 6.500806 + time: 0.06666667 + value: 1.6081347 + inSlope: 8.7842655 + outSlope: 8.7842655 tangentMode: 0 weightedMode: 0 - inWeight: 0.6828371 - outWeight: 0.33333334 + inWeight: 0.4905389 + outWeight: 0.29422888 - serializedVersion: 3 time: 0.18333334 - value: 1.8051504 + value: 1.9818014 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -456,7 +456,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 + time: 0.3 value: 0 inSlope: -35.268112 outSlope: 7.016232 @@ -465,7 +465,7 @@ AnimationClip: inWeight: 0.11653007 outWeight: 0.4663927 - serializedVersion: 3 - time: 0.4 + time: 0.41666666 value: 0.2941258 inSlope: 0 outSlope: 0 @@ -474,7 +474,7 @@ AnimationClip: inWeight: 0.10361791 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.51666665 value: 0 inSlope: -7.9365587 outSlope: 7.3384047 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index f620de97..a8dfa32e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -560,8 +560,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.1 - minScalar: 0.03 + scalar: 0.12 + minScalar: 0.05 maxCurve: serializedVersion: 2 m_Curve: @@ -9894,7 +9894,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 23 + m_SortingOrder: 30 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab index 7952aacf..d917698b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab @@ -116,7 +116,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.3 - minScalar: 0.8 + minScalar: 0.6 maxCurve: serializedVersion: 2 m_Curve: @@ -168,8 +168,8 @@ ParticleSystem: startSpeed: serializedVersion: 2 minMaxState: 3 - scalar: 15 - minScalar: 10 + scalar: 1 + minScalar: 0.2 maxCurve: serializedVersion: 2 m_Curve: @@ -284,7 +284,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.6 + scalar: 1 minScalar: 0.5 maxCurve: serializedVersion: 2 @@ -606,7 +606,7 @@ ParticleSystem: gravityModifier: serializedVersion: 2 minMaxState: 0 - scalar: 0 + scalar: -0.3 minScalar: 0 maxCurve: serializedVersion: 2 @@ -746,7 +746,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 0.3 + value: 0.1 mode: 0 spread: 0 speed: @@ -2426,7 +2426,7 @@ ParticleSystem: m_Bits: 4294967295 influenceList: [] ClampVelocityModule: - enabled: 1 + enabled: 0 x: serializedVersion: 2 minMaxState: 0 @@ -2589,7 +2589,7 @@ ParticleSystem: magnitude: serializedVersion: 2 minMaxState: 1 - scalar: 1 + scalar: 1.0987246 minScalar: 1 maxCurve: serializedVersion: 2