diff --git a/popcorn/Assets/MyGame/Resource/Animation/fire.controller b/popcorn/Assets/MyGame/Resource/Animation/fire.controller index aac7de8a..db11e675 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/fire.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/fire.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-2552036499883455211 +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: 2910670259628047273} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -32,7 +54,8 @@ AnimatorState: m_Name: fire_on m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -2552036499883455211} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -88,7 +111,7 @@ AnimatorStateMachine: m_Position: {x: 200, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: 2441633503552092190} - m_Position: {x: 230, y: 60, z: 0} + m_Position: {x: 300, y: 90, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -98,4 +121,4 @@ 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: 2910670259628047273} + m_DefaultState: {fileID: 2441633503552092190} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 1b25667b..879bbef5 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -901,11 +901,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &582721658 stripped @@ -2312,11 +2307,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &715927681 stripped @@ -3002,11 +2992,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1162700676 stripped @@ -3082,11 +3067,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1208759823 stripped @@ -3236,11 +3216,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1251548297 stripped @@ -3316,11 +3291,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1264847295 stripped @@ -3436,11 +3406,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1349912572 stripped @@ -8800,6 +8765,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startingGuide: {fileID: 8786490829224139677} + fire: {fileID: 1295632042} perfectResultObject: {fileID: 642263093} goodResultObject: {fileID: 1370567321} failureResultObject: {fileID: 460945446} @@ -9108,11 +9074,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4189135571766057540, guid: da466a69e7f81564eba63d910bc85f2d, - type: 3} - propertyPath: m_SortingOrder - value: -3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da466a69e7f81564eba63d910bc85f2d, type: 3} --- !u!4 &1933828730 stripped @@ -14049,6 +14010,11 @@ PrefabInstance: propertyPath: m_Name value: Pan objectReference: {fileID: 0} + - target: {fileID: 1453251556377932392, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_RootOrder @@ -14481,7 +14447,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_fire.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_fire.prefab index 097bbaac..cd0009cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_fire.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_fire.prefab @@ -9,8 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3772627274706997384} - - component: {fileID: 4189135571766057540} - - component: {fileID: 7755872639150338302} m_Layer: 0 m_Name: effect_fire m_TagString: Untagged @@ -29,17 +27,50 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1889904565130543173} + - {fileID: 6709590364533756691} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4189135571766057540 +--- !u!1 &4701189767270335338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6709590364533756691} + - component: {fileID: 1450568038936768719} + - component: {fileID: 2049479913842428937} + m_Layer: 0 + m_Name: outer_fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6709590364533756691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4701189767270335338} + 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: + - {fileID: 4363939461775704141} + m_Father: {fileID: 3772627274706997384} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1450568038936768719 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456535642183626708} + m_GameObject: {fileID: 4701189767270335338} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -83,14 +114,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7755872639150338302 +--- !u!95 &2049479913842428937 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2456535642183626708} + m_GameObject: {fileID: 4701189767270335338} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 3889e7045aba98047b023728590d81d1, type: 2} @@ -102,7 +133,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &6899071804911683556 +--- !u!1 &7043945120048336955 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -110,9 +141,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1889904565130543173} - - component: {fileID: 8864900012862228660} - - component: {fileID: 4181408658334566392} + - component: {fileID: 4363939461775704141} + - component: {fileID: 3003146384192310975} m_Layer: 0 m_Name: fire_a m_TagString: Untagged @@ -120,27 +150,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1889904565130543173 +--- !u!4 &4363939461775704141 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6899071804911683556} + m_GameObject: {fileID: 7043945120048336955} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3772627274706997384} + m_Father: {fileID: 6709590364533756691} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8864900012862228660 +--- !u!212 &3003146384192310975 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6899071804911683556} + m_GameObject: {fileID: 7043945120048336955} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -184,22 +214,3 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &4181408658334566392 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6899071804911683556} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 253327fc435da504d8828fe1b0323312, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs index bfdae0aa..0d1874c1 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs @@ -16,6 +16,7 @@ public enum GameState public class PopcornGameManager : MonoBehaviour { [SerializeField] private GameObject startingGuide; + [SerializeField] private GameObject fire; [SerializeField] private GameObject perfectResultObject; [SerializeField] private GameObject goodResultObject; [SerializeField] private GameObject failureResultObject; @@ -96,6 +97,7 @@ public class PopcornGameManager : MonoBehaviour private void ResetUI() { startingGuide.SetActive(true); + fire.SetActive(false); perfectResultObject.SetActive(false); goodResultObject.SetActive(false); failureResultObject.SetActive(false); @@ -168,6 +170,7 @@ public class PopcornGameManager : MonoBehaviour private void StartGame() { startingGuide.SetActive(false); + fire.SetActive(true); thermoMeter.gameObject.SetActive(true); thermalControl.StartMeter(); state.Value = GameState.Playing;