From c5b144dd81b00920ee1b220e943eda520b1a746b Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 18:41:40 +0900 Subject: [PATCH] =?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