From 5dc4ed0b6928dce6c2ee9908119c7ead4b4bbc91 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 4 Aug 2021 18:10:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E7=9F=A2?= =?UTF-8?q?=E5=8D=B0=E8=AA=BF=E6=95=B4=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/recipe/ui_button_Arrow_right.png | Bin 0 -> 1556 bytes .../recipe/ui_button_Arrow_right.png.meta | 92 ++++++++++++++++++ .../MyGame/Scenes/recipe/RecipeChoice.unity | 34 ++++--- 3 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow_right.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow_right.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow_right.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbdc113fe19e27804c05773c107b7000566c9d6 GIT binary patch literal 1556 zcmV+v2J88WP)Bq)eOZ4RiQ3bj3mAE85RD~09P8A$T zq#g=+L|`0ahZkTh!H9o-b1~}*UqdhcRk#K6*Rmq_?Fm zU6 z=KuNYz4RZBNCG^BfwinX@#>L1Q6`Ey&^Ccz}p2oHQb=V=<9o1PJI7#m=1xB zVJxtiunjn(J@~?b0ZWrnHk0QMP^}AsaoLVw6aw!Hc`d)eNZ3y%FGQ$}bQWS6WXzVd z){Wr>Ui|Pmau_m+z^(%H7p?-Xr$C9EJ2OJwesjO*^d*3v>xHhRUTf@lY(EV~fv!)o zU>tQ7Fb_tQh(RzSbktSAJQ$}wecmV-=Q|BX+km;QC(lQy#|?t|m_Iktl zLP;eSfK|s}m4V&-du=w=v=z4YIB!kEj=_R{ao-MM@7&EbdAG{{tSbG{HVt%MrCgzv-p^0E0Kt ztLR;{-xfEh4D?niS4et&lf$C@;5;zEqF#BfMNkCRTW-4qLAFgj%#+5=-xJPy7$N20 zAbm936wl-eFdB*#{(drUsc_hl2~e-s=2F7odX(KFTZOV7HU{2JI0j5JL12(RzjJq! z%0M4ns8iG{>Q-YYfm2#o+kv&P3%4_5_SQpTaA79U=oM`S#st7-+v+8{N?QQRGl5xf zp$v3(89=8yYJR$f#o)sHs@E$Tf+Da!xB&J>$K6^tY0In_Jj`s8d{NbRVyAfOat2rf zi(mijt(7KN)awd(RuEhB)~2nW=U2&3zpOUB2GbSFKp$KHI^ND_Ddr$j%Z`o1 z=8H85t_Mw>7TU&Ek*sYr6$#YqOuNo82ZrTLty(fpTZ)$k*!qSl?6gdR3-ucBC{^;r ztu+joI8{f140iuKSN3>tVTGm4eq|6hOuvDV%;eOZFX8{UjpbvPpT&kip|Ea z6TAO<&972#(!pSPF%ZFGrzOY)R!=?5yxi`+YjFna*o}4#DdAo!TR0dF z{fM=MK?e-xA>e1&Y2h44cM6P7FmDTQ7Ii|a{~P;PfB^sj@5lxIRM$cP0000 Date: Wed, 4 Aug 2021 18:41:40 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Main=E3=82=B3=E3=83=BC=E3=83=B3=E6=BC=94?= =?UTF-8?q?=E5=87=BA=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/CornBurn.anim | 145 ++++++++++++++++-- .../MyGame/Resource/Animation/corn.controller | 65 +------- .../Effect/EffectPrefabs/pt_Corn.prefab | 2 +- .../Effect/EffectPrefabs/pt_Popcorn.prefab | 2 +- .../EffectPrefabs/pt_Popcorn_strike.prefab | 2 +- .../Cooking/Prefabs/effect_burnt.prefab | 2 +- 6 files changed, 142 insertions(+), 76 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim index 7a909d7c..e0185975 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim @@ -14,7 +14,59 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 13.069473, z: 0} + outSlope: {x: 0, y: 13.069473, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.32314852, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0, y: 0.69589746, 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.28333333 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: -11.486645, z: 0} + outSlope: {x: 0, y: 2.7257328, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.3198897, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.7015269, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0.1393559, 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.10361791, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: -3.9030392, z: 0} + outSlope: {x: 0, y: 7.3384047, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.61223245, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.7716861, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: RotationResolver/AnimePivot m_ScaleCurves: - curve: serializedVersion: 2 @@ -29,7 +81,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.11922174, y: 0.10219006, z: 0.33333334} - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: {x: 1.2562993, y: 1.2562993, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -38,7 +90,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.05 + time: 0.06666667 value: {x: 0.9283737, y: 0.9283737, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -47,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.1 + time: 0.13333334 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -67,14 +119,28 @@ 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: 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.1 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -103,7 +169,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.11922174 - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: 1.2562993 inSlope: 0 outSlope: 0 @@ -112,7 +178,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 0.9283737 inSlope: 0 outSlope: 0 @@ -121,7 +187,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -149,7 +215,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.10219006 - serializedVersion: 3 - time: 0.016666668 + time: 0.033333335 value: 1.2562993 inSlope: 0 outSlope: 0 @@ -158,7 +224,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 0.9283737 inSlope: 0 outSlope: 0 @@ -167,7 +233,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.13333334 value: 1 inSlope: 0 outSlope: 0 @@ -182,6 +248,61 @@ AnimationClip: path: RotationResolver/AnimePivot classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 13.069473 + outSlope: 13.069473 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.32314852 + - serializedVersion: 3 + time: 0.13333334 + value: 0.69589746 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.28333333 + value: 0 + inSlope: -11.486645 + outSlope: 2.7257328 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.3198897 + outWeight: 0.7015269 + - serializedVersion: 3 + time: 0.4 + value: 0.1393559 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.10361791 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: -3.9030392 + outSlope: 7.3384047 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.61223245 + outWeight: 0.7716861 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: RotationResolver/AnimePivot + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/corn.controller b/popcorn/Assets/MyGame/Resource/Animation/corn.controller index 5631b85b..e6f8618f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/corn.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/corn.controller @@ -1,31 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-6748263542651040243 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CornJump - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f278d54e955c6364b8c04f96cbf49986, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-6451913813719917424 AnimatorState: serializedVersion: 5 @@ -107,48 +81,20 @@ AnimatorStateMachine: m_Position: {x: 270, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: 6341160211334192665} - m_Position: {x: 380, y: 120, z: 0} + m_Position: {x: 430, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 7193984417312256253} - m_Position: {x: 270, y: 230, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6748263542651040243} - m_Position: {x: 305, y: 295, z: 0} + m_Position: {x: 190, y: 170, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 40, y: -60, z: 0} + m_EntryPosition: {x: 40, y: 40, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -6451913813719917424} ---- !u!1101 &3570958320764608268 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: CornBurn - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7193984417312256253} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.3181818 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &5154816746081122088 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -184,8 +130,7 @@ AnimatorState: m_Name: CornGrow m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 3570958320764608268} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab index ce32c22a..b0a05811 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab @@ -116,7 +116,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.15 + scalar: 0.2 minScalar: 5 maxCurve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab index 2a0fc153..806e07cc 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab @@ -4928,7 +4928,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.15 + scalar: 0.2 minScalar: 5 maxCurve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab index fe60c030..15c4883d 100644 --- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab +++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab @@ -9786,7 +9786,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.15 + scalar: 0.2 minScalar: 5 maxCurve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab index 8133af98..7952aacf 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab @@ -4815,7 +4815,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 59 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 From ef2e9857b915bb2366087677b247da40e09fe8f6 Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 20:12:33 +0900 Subject: [PATCH 3/4] =?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 From 02d9a2292f18268052b1c182f469344a39039756 Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 22:52:51 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E6=BC=94?= =?UTF-8?q?=E5=87=BA=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