From 06d4dab38286a40e3ba7acc8f4805a64977cfc24 Mon Sep 17 00:00:00 2001
From: Nat10k <110515021+Nat10k@users.noreply.github.com>
Date: Fri, 10 May 2024 08:49:19 +0700
Subject: [PATCH] fix : more bugs
---
Assets/Inputs/Controls.cs | 2 +-
Assets/Inputs/Controls.inputactions | 2 +-
Assets/Lighting/LightingData.asset | Bin 4223452 -> 4231348 bytes
Assets/Prefabs/Player.prefab | 6 +-
Assets/Prefabs/ShopCanvas.prefab | 16 -
Assets/Scenes/Main.unity | 378 ++++++---------------
Assets/Scenes/Quest03.unity | 83 -----
Assets/Scripts/GameManager.cs | 5 +-
Assets/Scripts/Managers/SettingsManager.cs | 1 -
9 files changed, 110 insertions(+), 383 deletions(-)
diff --git a/Assets/Inputs/Controls.cs b/Assets/Inputs/Controls.cs
index 1ef3dd8..0b0ae9e 100644
--- a/Assets/Inputs/Controls.cs
+++ b/Assets/Inputs/Controls.cs
@@ -424,7 +424,7 @@ public partial class @Controls: IInputActionCollection2, IDisposable
""id"": ""4cd0b8b9-709b-4ffb-8dcc-2861b7e586d3"",
""expectedControlType"": ""Button"",
""processors"": """",
- ""interactions"": """",
+ ""interactions"": ""Tap"",
""initialStateCheck"": true
},
{
diff --git a/Assets/Inputs/Controls.inputactions b/Assets/Inputs/Controls.inputactions
index 6f67b37..ab023b3 100644
--- a/Assets/Inputs/Controls.inputactions
+++ b/Assets/Inputs/Controls.inputactions
@@ -402,7 +402,7 @@
"id": "4cd0b8b9-709b-4ffb-8dcc-2861b7e586d3",
"expectedControlType": "Button",
"processors": "",
- "interactions": "",
+ "interactions": "Tap",
"initialStateCheck": true
},
{
diff --git a/Assets/Lighting/LightingData.asset b/Assets/Lighting/LightingData.asset
index f34598f157a117133f2b1611cf639136f1e2ca40..f6e8031df0e06190defb7c63a7c761a15f5e40ad 100644
GIT binary patch
delta 27164
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
delta 19101
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
E0JRIRlmGw#
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 0a44301..eeb8645 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -216,7 +216,7 @@ GameObject:
- component: {fileID: 11400002}
- component: {fileID: 13600000}
- component: {fileID: 8200002}
- - component: {fileID: 7588598180635152441}
+ - component: {fileID: 5475400658131949190}
m_Layer: 0
m_Name: Player
m_TagString: Player
@@ -324,6 +324,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 6
+ originalSpeed: 6
+ prevSpeed: 0
--- !u!136 &13600000
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -473,8 +475,6 @@ MonoBehaviour:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
---- !u!114 &7588598180635152441
- balance: 0
--- !u!1 &100008
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/ShopCanvas.prefab b/Assets/Prefabs/ShopCanvas.prefab
index 8db95b9..7416a63 100644
--- a/Assets/Prefabs/ShopCanvas.prefab
+++ b/Assets/Prefabs/ShopCanvas.prefab
@@ -202,7 +202,6 @@ GameObject:
- component: {fileID: 3346195467346129619}
- component: {fileID: 4608170235991123505}
- component: {fileID: 3639470170173531391}
- - component: {fileID: 7246818182021831408}
- component: {fileID: 9118376375914274098}
m_Layer: 5
m_Name: ShopCanvas
@@ -284,21 +283,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &7246818182021831408
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8884385034281895471}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 19ed055c6eb86c94ba753f5adfd3bf80, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- masterMixer: {fileID: 24100000, guid: 5b84db49d40ea449aa4f3e3bd229ab5b, type: 2}
- sfxSlider: {fileID: 0}
- musicSlider: {fileID: 0}
--- !u!114 &9118376375914274098
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index e838f26..06bd8d2 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -535,7 +535,7 @@ MonoBehaviour:
increaseDamageOrbPrefab: {fileID: 5928907673800009345, guid: eb4274969abbb7944acd2b2888294bba, type: 3}
restoreHealthOrbPrefab: {fileID: 108012326883433976, guid: cbc7c018424f013499d4f4feb5ff52db, type: 3}
increaseSpeedOrbPrefab: {fileID: 6926906167359508983, guid: 842d4cdd8e369c745bf786e8286b0723, type: 3}
- inputField: {fileID: 0}
+ inputField: {fileID: 975036580}
--- !u!1 &148003751
GameObject:
m_ObjectHideFlags: 0
@@ -570,9 +570,9 @@ RectTransform:
- {fileID: 1077360189}
m_Father: {fileID: 1722116047}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 807.99994, y: -72.000046}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -474.48077, y: 184.89262}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &148003753
@@ -2371,6 +2371,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 588015466}
m_CullTransparentMesh: 1
+--- !u!1 &593988439
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 593988440}
+ - component: {fileID: 593988442}
+ - component: {fileID: 593988441}
+ - component: {fileID: 593988443}
+ m_Layer: 5
+ m_Name: CountdownText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &593988440
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 593988439}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1722116047}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 457.48, y: 190.94}
+ m_SizeDelta: {x: 82.0657, y: 62.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &593988441
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 593988439}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 5
+ m_MaxSize: 109
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!222 &593988442
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 593988439}
+ m_CullTransparentMesh: 1
+--- !u!114 &593988443
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 593988439}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c7b6e7c3c78b01d4eb3cc6223c46fc2f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ countdownTime: 10
+ countdownDisplay: {fileID: 593988441}
--- !u!114 &667749386 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 11400000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
@@ -4188,7 +4282,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1077360188}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_ConstrainProportionsScale: 0
@@ -4197,7 +4291,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -740, y: 0}
+ m_AnchoredPosition: {x: 25.000008, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1077360190
@@ -5189,85 +5283,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
---- !u!1 &1450818666
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1450818667}
- - component: {fileID: 1450818669}
- - component: {fileID: 1450818668}
- m_Layer: 5
- m_Name: GameOverText
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1450818667
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1450818666}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 153}
- m_SizeDelta: {x: 130, y: 50}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1450818668
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1450818666}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
- m_FontSize: 50
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 50
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: Game Over!
---- !u!222 &1450818669
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1450818666}
- m_CullTransparentMesh: 1
--- !u!1 &1497441291
GameObject:
m_ObjectHideFlags: 0
@@ -5661,175 +5676,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1536312378
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1581133371}
- - component: {fileID: 1581133373}
- - component: {fileID: 1581133372}
- - component: {fileID: 1536312381}
- - component: {fileID: 1536312379}
- - component: {fileID: 1536312380}
- m_Layer: 5
- m_Name: GameOverAsk
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1536312379
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c7b6e7c3c78b01d4eb3cc6223c46fc2f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- countdownTime: 10
- countdownDisplay: {fileID: 1536312380}
---- !u!114 &1536312380
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
- m_FontSize: 50
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 50
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: 10
---- !u!222 &1536312381
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- m_CullTransparentMesh: 1
---- !u!224 &1581133371
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1722116047}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -105}
- m_SizeDelta: {x: 130, y: 50}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1581133372
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
- m_FontSize: 30
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 50
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 1
- m_VerticalOverflow: 1
- m_LineSpacing: 1
- m_Text: Start a new game?
---- !u!222 &1581133373
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1536312378}
- m_CullTransparentMesh: 1
---- !u!1 &1630565378
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1630565379}
- m_Layer: 5
- m_Name: CountdownText
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1630565379
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1630565378}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1641232233
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6098,15 +5944,13 @@ PrefabInstance:
propertyPath: m_NeverAutoSwitchControlSchemes
value: 0
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 7588598180635152441, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
m_RemovedGameObjects:
- {fileID: 8455667667674168468, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- {fileID: 100008, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 100006, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
- insertIndex: -1
- addedObject: {fileID: 2023876524}
- targetCorrespondingSourceObject: {fileID: 100006, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
insertIndex: -1
addedObject: {fileID: 2023876525}
@@ -6470,7 +6314,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
timerManager: {fileID: 867131478}
- countdownManager: {fileID: 1536312379}
+ countdownManager: {fileID: 593988443}
mobileHUD: {fileID: 990504890}
restartDelay: 10
--- !u!95 &1722116043
@@ -6562,10 +6406,10 @@ RectTransform:
- {fileID: 1931296998}
- {fileID: 687138047}
- {fileID: 1062315028}
- - {fileID: 1581133371}
- {fileID: 2141633467}
- {fileID: 246063895}
- {fileID: 867131481}
+ - {fileID: 593988440}
- {fileID: 2090690035}
- {fileID: 966331550}
- {fileID: 975036583}
@@ -7611,18 +7455,6 @@ Animator:
m_CorrespondingSourceObject: {fileID: 9500000, guid: 4e5a0d387dc27394b81600988ad0216f, type: 3}
m_PrefabInstance: {fileID: 1641232233}
m_PrefabAsset: {fileID: 0}
---- !u!114 &2023876524
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1974427093}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 472ec104c593ad9439f5dbb57bd16de6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!114 &2023876525
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8022,7 +7854,6 @@ CanvasRenderer:
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- - {fileID: 1630565379}
- {fileID: 1851598982}
- {fileID: 1047928118}
- {fileID: 1889514490}
@@ -8038,5 +7869,4 @@ SceneRoots:
- {fileID: 1102438310}
- {fileID: 4043336}
- {fileID: 28357258}
- - {fileID: 1450818667}
- {fileID: 1497441295}
diff --git a/Assets/Scenes/Quest03.unity b/Assets/Scenes/Quest03.unity
index 7374874..be206ed 100644
--- a/Assets/Scenes/Quest03.unity
+++ b/Assets/Scenes/Quest03.unity
@@ -3120,89 +3120,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 2.6714668, y: 3.0484924, z: 1.128832}
m_Center: {x: -0.4395647, y: 1.4388156, z: -0.34513283}
---- !u!1 &1236001944
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1236001945}
- - component: {fileID: 1236001948}
- - component: {fileID: 1236001947}
- - component: {fileID: 1236001946}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1236001945
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1236001944}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1165414997}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1236001946
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1236001944}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_SendPointerHoverToParent: 1
- m_ForceModuleActive: 0
---- !u!114 &1236001947
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1236001944}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_SendPointerHoverToParent: 1
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &1236001948
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1236001944}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 5
--- !u!1 &1254193698
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index dba0bbb..c9b6df9 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -1,10 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class GameManager : MonoBehaviour {
- static GameManager instance;
public void startGame() {
SceneManager.LoadScene("Cutscene01", LoadSceneMode.Single);
}
@@ -14,6 +11,6 @@ public class GameManager : MonoBehaviour {
}
private void Awake() {
- // DontDestroyOnLoad(gameObject);
+ ControlRef.control.Enable();
}
}
diff --git a/Assets/Scripts/Managers/SettingsManager.cs b/Assets/Scripts/Managers/SettingsManager.cs
index 36e9fa2..7db40c7 100644
--- a/Assets/Scripts/Managers/SettingsManager.cs
+++ b/Assets/Scripts/Managers/SettingsManager.cs
@@ -11,7 +11,6 @@ public class SettingsManager : MonoBehaviour
private void Awake()
{
- ControlRef.control.Enable();
nameInput.text = PlayerPrefs.GetString("PlayerName", "");
toggles[PlayerPrefs.GetInt("Difficulty", 0)].isOn = true;
--
GitLab