From b78755ed410f6decb80f23027889ce21affd2fec Mon Sep 17 00:00:00 2001
From: mikeleo03 <leonmichael463@gmail.com>
Date: Thu, 2 May 2024 11:56:58 +0700
Subject: [PATCH] fix : game over mechanism conflict
---
Assets/Scenes/Main.unity | 24 +++++++++++++++++++-----
Assets/Scripts/States.meta | 8 ++++++++
2 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 Assets/Scripts/States.meta
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 00c182f..8e65e04 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -2773,8 +2773,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1074333546}
+ - component: {fileID: 1124016429}
- component: {fileID: 1074333545}
+ - component: {fileID: 1124016430}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
@@ -2788,7 +2789,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1124016427}
+ m_GameObject: {fileID: 1074333544}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa10cc87aff30c04dbe0aa648f5b6adc, type: 3}
@@ -2814,6 +2815,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1124016430
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1074333544}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f885ef90267c9e34886fc0ff0361d2da, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1125301618
GameObject:
m_ObjectHideFlags: 0
@@ -2978,6 +2991,8 @@ RectTransform:
- {fileID: 1878018288}
- {fileID: 1863767945}
- {fileID: 1506604691}
+ - {fileID: 7602486}
+ - {fileID: 735558820}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -3747,7 +3762,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1074333545}
+ - m_Target: {fileID: 1124016430}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: goToMenu
m_Mode: 1
@@ -5036,7 +5051,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1074333545}
+ - m_Target: {fileID: 1124016430}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: startGame
m_Mode: 1
@@ -5351,4 +5366,3 @@ SceneRoots:
- {fileID: 244922607}
- {fileID: 1796129603}
- {fileID: 68121383}
- - {fileID: 1074333546}
diff --git a/Assets/Scripts/States.meta b/Assets/Scripts/States.meta
new file mode 100644
index 0000000..c052937
--- /dev/null
+++ b/Assets/Scripts/States.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 731d5d4b7ca81034cb2649066c4fe546
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab