From c5b144dd81b00920ee1b220e943eda520b1a746b Mon Sep 17 00:00:00 2001 From: hirokei Date: Wed, 4 Aug 2021 18:41:40 +0900 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 From 42cacfdd795216dad4b6c5cf9b9a114da7d5b47c Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 5 Aug 2021 09:20:09 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E3=82=B3=E3=82=A4=E3=83=B3=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/Icon_Coin.controller | 92 ++++++++- .../MyGame/Scenes/CornField/CornField.unity | 31 +++ .../Scenes/CornField/Scripts/CornField.cs | 3 +- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 36 ++++ .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 176 ------------------ .../Scenes/Main/Scripts/KitchenManager.cs | 2 + .../MyGame/Scenes/marketing/Scripts.meta | 8 + .../MyGame/Scenes/marketing/Scripts/Market.cs | 25 +++ .../Scenes/marketing/Scripts/Market.cs.meta | 11 ++ .../MyGame/Scenes/marketing/marketing.unity | 111 +++++++++-- .../MyGame/Scenes/shopping/Scripts.meta | 8 + .../Scenes/shopping/Scripts/Shopping.cs | 13 ++ .../Scenes/shopping/Scripts/Shopping.cs.meta | 11 ++ .../MyGame/Scenes/shopping/shopping.unity | 63 ++++++- popcorn/Assets/MyGame/Scripts/CoinManager.cs | 41 ++-- 15 files changed, 409 insertions(+), 222 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller b/popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller index dc3fe979..c6959d1a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller @@ -11,7 +11,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4475377242917876395} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4433783371595394980} + m_Position: {x: 240, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +24,29 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 4475377242917876395} + m_DefaultState: {fileID: 4433783371595394980} +--- !u!1101 &-3628628858844245727 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -30,7 +55,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Icon_Coin serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Add + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +75,58 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1600421813888881856 +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: Add + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4475377242917876395} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4433783371595394980 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wait + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1600421813888881856} + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &4475377242917876395 AnimatorState: serializedVersion: 5 @@ -54,7 +137,8 @@ AnimatorState: m_Name: EffectCoin m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3628628858844245727} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 619eaec5..0c11b7c2 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -768,6 +768,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!114 &387414333 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &395704523 GameObject: m_ObjectHideFlags: 0 @@ -1403,6 +1415,7 @@ GameObject: - component: {fileID: 715847676} - component: {fileID: 715847675} - component: {fileID: 715847677} + - component: {fileID: 715847678} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -1460,6 +1473,24 @@ MonoBehaviour: content: {fileID: 2122087243} menuButton: {fileID: 1992043646} closeButton: {fileID: 1133743353} +--- !u!114 &715847678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715847674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 0} + coinCountText: {fileID: 387414333} + coinAnimator: {fileID: 0} + coinPrefab: {fileID: 0} + duration: 0.5 + rootTransform: {fileID: 0} --- !u!114 &730756546 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689, diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index d1319d9a..10a4e60b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -41,8 +41,7 @@ public class CornField : MonoBehaviour // データ var gameData = GameDataManager.GameData; - gameData.coin = 1000 + Random.Range(0, 1000); - // Debug.Log(gameData.coin); + CoinManager.Instance.ChangeCoin(gameData.coin); // 解放済みの畑 gameData.PlantLineTypes = new List<(PlantLineType type, CornFieldRank level)>() { diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 4c20da9b..7461d1d8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1064,6 +1064,7 @@ GameObject: m_Component: - component: {fileID: 1870432534} - component: {fileID: 1870432533} + - component: {fileID: 1870432535} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -1098,6 +1099,24 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1870432535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870432532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 0} + coinCountText: {fileID: 3664916832445709977} + coinAnimator: {fileID: 0} + coinPrefab: {fileID: 0} + duration: 0.5 + rootTransform: {fileID: 0} --- !u!1001 &1914907653 PrefabInstance: m_ObjectHideFlags: 0 @@ -1821,6 +1840,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!114 &3664916832445709977 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 3664916832445709976} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3665723643790057849 PrefabInstance: m_ObjectHideFlags: 0 @@ -1828,6 +1859,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1187654216} m_Modifications: + - target: {fileID: 3072131335653526340, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 24ea323f..ecda0373 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1021,7 +1021,6 @@ RectTransform: - {fileID: 320398124} - {fileID: 130281750} - {fileID: 7545339558603919741} - - {fileID: 1174152334443072208} m_Father: {fileID: 3664916832564167477} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1672,178 +1671,3 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7021272912307370562 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3664916832844628215} - m_Modifications: - - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 445 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396421809467539, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_Name - value: EarnedCoins - objectReference: {fileID: 0} - - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, type: 3} ---- !u!224 &1174152334443072208 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, - type: 3} - m_PrefabInstance: {fileID: 7021272912307370562} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index a8f77db6..947462b3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -17,5 +17,7 @@ public class KitchenManager : MonoBehaviour TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe); }); + var gameData = GameDataManager.GameData; + CoinManager.Instance.ChangeCoin(gameData.coin); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta new file mode 100644 index 00000000..6b8c8b85 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae377568aff6d4d839ee5c4428c2d2ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs new file mode 100644 index 00000000..710b6bfe --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UniRx; +using UnityEngine; + +public class Market : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + var gameData = GameDataManager.GameData; + CoinManager.Instance.ChangeCoin(gameData.coin); + Observable.Interval(TimeSpan.FromSeconds(2f)).Subscribe(_ => + { + CoinManager.Instance.AddCoinWithEffect(300, () => { }); + }).AddTo(this); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta new file mode 100644 index 00000000..ad9bd5ab --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf4a253e4bfcb47f18e7d6f28af64b01 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 7366c775..eecdd8d7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1004,6 +1004,12 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!224 &393700031 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} --- !u!4 &424265800 stripped Transform: m_CorrespondingSourceObject: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6, @@ -1433,32 +1439,32 @@ PrefabInstance: - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 91.25 objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 89.625 objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 135.25 objectReference: {fileID: 0} - target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1483,7 +1489,7 @@ PrefabInstance: - target: {fileID: 1174152334443072209, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1174152334880891972, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1493,27 +1499,27 @@ PrefabInstance: - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 44 objectReference: {fileID: 0} - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 22 objectReference: {fileID: 0} - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -22 objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2169,6 +2175,69 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1025201113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1025201115} + - component: {fileID: 1025201114} + - component: {fileID: 1025201116} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1025201114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025201113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 393700031} + coinCountText: {fileID: 1898034353} + coinAnimator: {fileID: 77455597} + coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, + type: 3} + duration: 0.5 + rootTransform: {fileID: 1991225675} +--- !u!4 &1025201115 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025201113} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1025201116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025201113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1035509476 GameObject: m_ObjectHideFlags: 0 @@ -4067,6 +4136,18 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1898034353 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1898891707 PrefabInstance: m_ObjectHideFlags: 0 @@ -4259,6 +4340,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1959722117} m_PrefabAsset: {fileID: 0} +--- !u!224 &1991225675 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} --- !u!1 &2016817760 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta b/popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta new file mode 100644 index 00000000..33567e15 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 218ec1e5576e74f079b70f1999eaf01f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs new file mode 100644 index 00000000..1e23bf3d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Shopping : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + var gameData = GameDataManager.GameData; + CoinManager.Instance.ChangeCoin(gameData.coin); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta new file mode 100644 index 00000000..39af0925 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e7b7e1a23513042b0bbac3c91ccab081 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 23782852..3821d09c 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -850,7 +850,7 @@ RectTransform: - {fileID: 1615189014} - {fileID: 1286971210} m_Father: {fileID: 1098091308} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1625,6 +1625,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1098091307} m_PrefabAsset: {fileID: 0} +--- !u!114 &1098091309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1102915445 GameObject: m_ObjectHideFlags: 0 @@ -2183,6 +2195,55 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470533649} m_CullTransparentMesh: 0 +--- !u!1 &1474305257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1474305258} + - component: {fileID: 1474305259} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1474305258 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1474305257} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1474305259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1474305257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 0} + coinCountText: {fileID: 1098091309} + coinAnimator: {fileID: 0} + coinPrefab: {fileID: 0} + duration: 0.5 + rootTransform: {fileID: 0} --- !u!1 &1551965076 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 32583ad3..6a125175 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -6,6 +6,8 @@ using UnityEngine.UI; public class CoinManager : SingletonMonoBehaviour { + private static readonly int Add = Animator.StringToHash("Add"); + // CoinView [SerializeField] private RectTransform coinIconTransform; [SerializeField] private TextWithCountUpInt coinCountText; @@ -20,7 +22,7 @@ public class CoinManager : SingletonMonoBehaviour private int ownCoin; public int OwnCoin => ownCoin; private string coinTextFormat = "{0}"; - + void Awake(){ if(CheckInstance()) return ; } @@ -52,31 +54,16 @@ public class CoinManager : SingletonMonoBehaviour private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback) { - var baseAngle = UnityEngine.Random.value * 360.0f; - var angle = -360.0f / count; - //コインアニメーション - for(int i = 0; i < count; ++i){ - var index = i; - // 円状にバラけてた位置を生成 - var tempPosition = from + (Vector3)Vector2.up.RotateDeg(baseAngle + i * angle + angle * UnityEngine.Random.value * 0.5f) * (0.2f + UnityEngine.Random.value * 0.8f); - // 0.1秒ごとにコインを生成 - this.CallWaitForSeconds(index * 0.1f, () => { - var effect = Instantiate(prefab, tempPosition, Quaternion.identity, rootTransform); - // 表示から1秒経ったら0.2秒かけてコイン表示部分に飛んでいく - this.CallWaitForSeconds(1.0f, () => { - this.CallLerp(0.2f, t => { - effect.position = Vector3.Lerp(tempPosition, to, t * t); - }, () => { - // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生 - VibrationManager.Instance.PlayVibrationOnceWeak(); - coinAnimator.SetTrigger("Add"); - SoundManager.Instance.PlaySE("se_coin_count"); - // コインは削除 - Destroy(effect.gameObject); - }); - }); - }); - } - this.CallWaitForSeconds(1.0f + 0.2f, callback); + var effect = Instantiate(prefab, Vector3.zero, Quaternion.identity, rootTransform); + // アニメ50フレーム + this.CallWaitForSeconds(1.0f, () => { + // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生 + VibrationManager.Instance.PlayVibrationOnceWeak(); + coinAnimator.SetTrigger(Add); + // SoundManager.Instance.PlaySE("se_coin_count"); + // コインは削除 + Destroy(effect.gameObject); + callback.Invoke(); + }); } } From 1c6798cdb81c63e43c42875f513313a4d32013a4 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 5 Aug 2021 09:34:37 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E7=84=A6=E3=81=92=E3=82=A2=E3=83=8B?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/corn.controller | 88 ++++++++++++------- 1 file changed, 57 insertions(+), 31 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/corn.controller b/popcorn/Assets/MyGame/Resource/Animation/corn.controller index e6f8618f..2714b949 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/corn.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/corn.controller @@ -1,5 +1,55 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8797755764172867904 +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: CornGrow + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6341160211334192665} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-8175191986188642306 +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.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-6451913813719917424 AnimatorState: serializedVersion: 5 @@ -10,8 +60,7 @@ AnimatorState: m_Name: CornWait m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 5154816746081122088} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -81,45 +130,22 @@ AnimatorStateMachine: m_Position: {x: 270, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: 6341160211334192665} - m_Position: {x: 430, y: 170, z: 0} + m_Position: {x: 270, y: -100, z: 0} - serializedVersion: 1 m_State: {fileID: 7193984417312256253} - m_Position: {x: 190, y: 170, z: 0} + m_Position: {x: 270, y: -190, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -8175191986188642306} + - {fileID: -8797755764172867904} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] 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_ExitPosition: {x: 550, y: 50, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -6451913813719917424} ---- !u!1101 &5154816746081122088 -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: CornGrow - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 6341160211334192665} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &6341160211334192665 AnimatorState: serializedVersion: 5 From fc064d6a2f0aaaab6bb36e90d2897487762b6a5a Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 5 Aug 2021 09:40:08 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E3=83=9F=E3=82=B9=E6=95=B0=E3=81=AB?= =?UTF-8?q?=E9=81=94=E3=81=97=E3=81=A6=E3=82=82=E3=82=B2=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=8C=E7=B6=9A=E3=81=8F=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Scripts/CornManager.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index 3bdf4a0e..14e9cb28 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -82,12 +82,12 @@ public class CornManager : MonoBehaviour }).AddTo(this); // ミス数上限で失敗 - missCount - .Where(x => x == maxFailedCornCount) - .Subscribe(_ => - { - SetResult(CornResult.Failure); - }).AddTo(this); + // missCount + // .Where(x => x == maxFailedCornCount) + // .Subscribe(_ => + // { + // SetResult(CornResult.Failure); + // }).AddTo(this); #if DEVELOPMENT_BUILD || UNITY_EDITOR cornCountSlider.wholeNumbers = true; From 63c4d7f0869dad152ec11c7fa61da3b1d5aa7efd Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 5 Aug 2021 10:11:10 +0900 Subject: [PATCH 7/8] =?UTF-8?q?Corn=E6=BC=94=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 | 12 +- .../MyGame/Resource/Animation/CornGrow.anim | 230 +++++++++++++++++- .../Material/popcorn/mt_spriteEmission.mat | 78 ++++++ .../popcorn/mt_spriteEmission.mat.meta | 8 + 4 files changed, 309 insertions(+), 19 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat create mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim index 1b533169..7cefde8f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim @@ -136,7 +136,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -164,7 +164,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -192,7 +192,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -493,7 +493,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -521,7 +521,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -549,7 +549,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index 822d5e4e..b9cc7596 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.16982037, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0, y: 1.6081347, z: 0} + value: {x: 0, y: 1.6547656, z: 0} inSlope: {x: 0, y: 8.7842655, z: 0} outSlope: {x: 0, y: 8.7842655, z: 0} tangentMode: 0 @@ -38,13 +38,13 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.29422888, z: 0.33333334} - serializedVersion: 3 time: 0.18333334 - value: {x: 0, y: 1.9818014, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 1.9351748, z: 0} + inSlope: {x: 0, y: -1.8622863, z: 0} + outSlope: {x: 0, y: -1.8622863, 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} + outWeight: {x: 0.33333334, y: 0.9773223, z: 0.33333334} - serializedVersion: 3 time: 0.3 value: {x: 0, y: 0, z: 0} @@ -242,7 +242,98 @@ AnimationClip: path: classID: 58 script: {fileID: 0} - m_PPtrCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.31132078 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: m_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: m_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: m_Color.b + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} + attribute: m_Materials.Array.data[0] + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -292,7 +383,36 @@ AnimationClip: typeID: 58 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: [] + - 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 + - serializedVersion: 2 + path: 3454031445 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -474,7 +594,7 @@ AnimationClip: outWeight: 0.16982037 - serializedVersion: 3 time: 0.06666667 - value: 1.6081347 + value: 1.6547656 inSlope: 8.7842655 outSlope: 8.7842655 tangentMode: 0 @@ -483,13 +603,13 @@ AnimationClip: outWeight: 0.29422888 - serializedVersion: 3 time: 0.18333334 - value: 1.9818014 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.9351748 + inSlope: -1.8622863 + outSlope: -1.8622863 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.9773223 - serializedVersion: 3 time: 0.3 value: 0 @@ -618,6 +738,90 @@ AnimationClip: path: classID: 58 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.31132078 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: m_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: m_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: 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/Material/popcorn/mt_spriteEmission.mat b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat new file mode 100644 index 00000000..44960c52 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mt_spriteEmission + m_Shader: {fileID: 4800000, guid: 35a8d5b95e0064223ad07f51cd54e73d, type: 3} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta new file mode 100644 index 00000000..6d8299dc --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f138cade846eb48a995388422833859d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: From 5d7e87c6f154b2d504a1a7d1dd3e8bc5ba00a375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Thu, 5 Aug 2021 11:21:21 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AA=BF=E7=90=86=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=82=92100=E7=B2=92=E3=81=AB=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 2 +- .../Cooking/Scripts/CornPopParameters.cs | 166 +++++++++++------- 2 files changed, 104 insertions(+), 64 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 196d33c7..0daf7892 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -13692,7 +13692,7 @@ MonoBehaviour: type: 3} spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc, type: 3} - cornSpawnCount: 80 + cornSpawnCount: 100 maxFailedCornCount: 25 baseGrowSpeed: 1 coldGrowSpeed: 0.1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs index 82e6e470..82813c26 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs @@ -1,7 +1,7 @@ public class CornPopParameters { public static readonly float[] CornPopTimeArray = { - 1f, +1f, 2.495f, 3.99f, 4.841f, @@ -20,77 +20,117 @@ public class CornPopParameters 12.864f, 13.271f, 13.678f, -13.906f, -14.134f, -14.344f, -14.554f, -14.747f, -14.94f, -15.119f, -15.298f, -15.463f, -15.628f, -15.781f, -15.934f, -16.077f, -16.219f, -16.352f, -16.484f, -16.608f, -16.732f, -16.848f, -16.964f, -17.073f, -17.182f, -17.284f, -17.387f, -17.484f, -17.581f, -17.672f, -17.764f, -17.851f, -17.938f, -18.02f, -18.103f, -18.182f, -18.261f, -18.337f, -18.413f, -18.485f, -18.558f, -18.627f, -18.697f, -18.765f, -18.832f, -18.897f, -18.962f, -19.025f, -19.088f, -19.15f, -19.211f, -19.271f, -19.33f, -19.389f, -19.447f, -19.504f, -19.561f, -19.616f, -19.672f, -19.727f, -19.782f, -19.835f, -19.889f, -19.942f, +14.044f, +14.41f, +14.739f, +15.069f, +15.366f, +15.662f, +15.929f, +16.196f, +16.436f, +16.676f, +16.892f, +17.109f, +17.303f, +17.498f, +17.673f, +17.848f, +18.006f, +18.163f, +18.305f, +18.447f, +18.575f, +18.702f, +18.817f, +18.932f, +19.035f, +19.139f, +19.232f, +19.325f, +19.409f, +19.492f, +19.568f, +19.643f, +19.711f, +19.779f, +19.84f, +19.901f, +19.956f, +20.011f, +20.06f, +20.11f, +20.154f, +20.199f, +20.239f, +20.279f, +20.315f, +20.351f, +20.383f, +20.416f, +20.445f, +20.474f, +20.501f, +20.527f, +20.551f, +20.574f, +20.596f, +20.617f, +20.636f, +20.655f, +20.672f, +20.69f, +20.705f, +20.721f, +20.735f, +20.749f, +20.761f, +20.774f, +20.785f, +20.796f, +20.807f, +20.817f, +20.826f, +20.835f, +20.843f, +20.852f, +20.859f, +20.866f, +20.873f, +20.88f, +20.886f, +20.892f, +20.897f, }; public static readonly float[] CornBurntTimeArray = { - 10f, +10f, +9f, 8f, +6.95f, 5.9f, +5.1f, 4.3f, +3.75f, 3.2f, +2.9f, 2.6f, +2.55f, 2.5f, +2.45f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, 2.4f, 2.4f, 2.4f,