diff --git a/.vscode/settings.json b/.vscode/settings.json
index b24499237864e05d8f6480039ce84dc15b47ef3c..daa9bf8ff2c64d09b2a41257222553cd234a17dc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,5 +51,5 @@
"temp/": true,
"Temp/": true
},
- "dotnet.defaultSolution": "if3210-2024-unity-ngk.sln"
+ "dotnet.defaultSolution": "GamePBD.sln"
}
\ No newline at end of file
diff --git a/Assets/Scenes/Main 1.unity b/Assets/Scenes/Main 1.unity
index 6051e45efab45374d15fc9de647c94bf1b7dd8f2..9cec8f77082c0a0eb4805f9506c4e8a71128e8c7 100644
--- a/Assets/Scenes/Main 1.unity
+++ b/Assets/Scenes/Main 1.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -4783,7 +4783,7 @@ MonoBehaviour:
saveGameManager: {fileID: 640774429}
gamePlayUI: {fileID: 2036252845}
gameOver: {fileID: 1480421093}
- questManager: {fileID: 0}
+ questManager: {fileID: 1692862996}
playerName: Addin
volume: 0
difficulty: 0
@@ -5015,8 +5015,8 @@ RectTransform:
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: -17.6}
- m_SizeDelta: {x: 200, y: 50}
+ m_AnchoredPosition: {x: 0, y: -55}
+ m_SizeDelta: {x: 1400, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &378195467
MonoBehaviour:
@@ -5065,8 +5065,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36
- m_fontSizeBase: 36
+ m_fontSize: 56
+ m_fontSizeBase: 56
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -5632,8 +5632,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -0.000015259, y: 57.8}
- m_SizeDelta: {x: 112.0334, y: 55.2159}
+ m_AnchoredPosition: {x: -0.000015259, y: 132}
+ m_SizeDelta: {x: 336.1002, y: 55.2159}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &458933623
MonoBehaviour:
@@ -6774,7 +6774,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
fileNameInput: {fileID: 1841202352}
slotDropdown: {fileID: 2015763015}
- saveUI: {fileID: 1612420041}
player: {fileID: 1734600098}
currentGameData:
playerName:
@@ -6783,6 +6782,7 @@ MonoBehaviour:
difficulty: 0
spawnedPets:
safeHousePrefab: {fileID: 400716903824990860, guid: 00d6c6705cb31ab47bab79a3f1bf9aec, type: 3}
+ nav: {fileID: 878613045}
--- !u!4 &640774431
Transform:
m_ObjectHideFlags: 0
@@ -7048,8 +7048,8 @@ RectTransform:
m_GameObject: {fileID: 748939475}
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_LocalScale: {x: 2.83, y: 2.83, z: 2.83}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 436685820}
- {fileID: 2722287}
@@ -7058,7 +7058,7 @@ RectTransform:
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: -52.600006}
+ m_AnchoredPosition: {x: 0, y: -118.400024}
m_SizeDelta: {x: 231.9065, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &748939477
@@ -7074,10 +7074,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Navigation:
- m_Mode: 3
+ m_Mode: 4
m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
+ m_SelectOnUp: {fileID: 1234049310}
+ m_SelectOnDown: {fileID: 1234049310}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
@@ -7311,7 +7311,7 @@ RectTransform:
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: 78}
+ m_AnchoredPosition: {x: 0, y: 160}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &761067727
@@ -7361,8 +7361,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36
- m_fontSizeBase: 36
+ m_fontSize: 48
+ m_fontSizeBase: 48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -8476,8 +8476,11 @@ GameObject:
- component: {fileID: 878613042}
- component: {fileID: 878613041}
- component: {fileID: 878613040}
+ - component: {fileID: 878613044}
+ - component: {fileID: 878613043}
+ - component: {fileID: 878613045}
m_Layer: 5
- m_Name: InGameMenuCanvas
+ m_Name: Menu Navigator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -8496,6 +8499,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1612420044}
+ - {fileID: 1560957795}
- {fileID: 154434726}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8536,7 +8540,7 @@ MonoBehaviour:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
- m_ReferenceResolution: {x: 1366, y: 720}
+ m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
@@ -8567,6 +8571,69 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 3
m_TargetDisplay: 0
+--- !u!114 &878613043
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 878613038}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_SendPointerHoverToParent: 1
+ m_MoveRepeatDelay: 0.5
+ m_MoveRepeatRate: 0.1
+ m_XRTrackingOrigin: {fileID: 0}
+ m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+ m_DeselectOnBackgroundClick: 1
+ m_PointerBehavior: 0
+ m_CursorLockBehavior: 0
+--- !u!114 &878613044
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 878613038}
+ 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: 10
+--- !u!114 &878613045
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 878613038}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d4734a8554fc6c84799907886ae344d4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ MenuPanel: {fileID: 154434725}
+ menuFirst: {fileID: 1234049310}
+ SavePanel: {fileID: 1612420041}
+ saveFirst: {fileID: 458933625}
+ ShopPanel: {fileID: 1560957792}
+ shopFirst: {fileID: 1806581148}
--- !u!1 &901454058
GameObject:
m_ObjectHideFlags: 0
@@ -12218,7 +12285,7 @@ RectTransform:
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: 43}
+ m_AnchoredPosition: {x: 0, y: 64}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1234049309
@@ -12268,8 +12335,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36
- m_fontSizeBase: 36
+ m_fontSize: 56
+ m_fontSizeBase: 56
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -12325,8 +12392,8 @@ MonoBehaviour:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
+ m_SelectOnUp: {fileID: 748939477}
+ m_SelectOnDown: {fileID: 748939477}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
@@ -12549,6 +12616,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1256409658}
m_CullTransparentMesh: 1
+--- !u!1 &1270295816
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1270295817}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1270295817
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1270295816}
+ 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:
+ - {fileID: 1806581151}
+ - {fileID: 1939795768}
+ m_Father: {fileID: 1560957795}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: 146}
+ m_SizeDelta: {x: 0, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1310813059
GameObject:
m_ObjectHideFlags: 0
@@ -16313,7 +16417,7 @@ MonoBehaviour:
reward_value: {fileID: 1399948692}
death_value: {fileID: 675790319}
player: {fileID: 1734600098}
- managers: {fileID: 0}
+ managers: {fileID: 37516884}
playerStats: {fileID: 1734600108}
gameOverPanel: {fileID: 17414709}
mainSceneController: {fileID: 353772448}
@@ -16370,9 +16474,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f3bc99523532b43fb80e9ece4926ecda, type: 3}
m_Name:
m_EditorClassIdentifier:
- menuPanel: {fileID: 154434725}
volumeSlider: {fileID: 748939477}
mainMenuScene: Main Menu -Abil
+ nav: {fileID: 878613045}
--- !u!4 &1487545492
Transform:
m_ObjectHideFlags: 0
@@ -16869,8 +16973,8 @@ RectTransform:
- {fileID: 135845}
- {fileID: 1665606156}
- {fileID: 2032110167}
- - {fileID: 2105288090}
- m_Father: {fileID: 2036252846}
+ - {fileID: 1270295817}
+ m_Father: {fileID: 878613039}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -19652,7 +19756,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &1612420042
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -22956,7 +23060,7 @@ MonoBehaviour:
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
+ m_SelectOnLeft: {fileID: 1939795769}
m_SelectOnRight: {fileID: 1939795769}
m_Transition: 1
m_Colors:
@@ -23042,15 +23146,15 @@ RectTransform:
m_GameObject: {fileID: 1806581147}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.1500691, y: 1.1500691, z: 1.1500691}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2.16, y: 2.16, z: 2.16}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 1689318110}
- m_Father: {fileID: 2105288090}
+ m_Father: {fileID: 1270295817}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 309.08282, y: 84.6}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -435, y: 61}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1841202348
@@ -23081,15 +23185,15 @@ RectTransform:
m_GameObject: {fileID: 1841202348}
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_LocalScale: {x: 1.91, y: 1.91, z: 1.91}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 629302878}
m_Father: {fileID: 1612420044}
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: 33.3}
+ m_AnchoredPosition: {x: 0, y: 59}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1841202350
@@ -23709,15 +23813,15 @@ RectTransform:
m_GameObject: {fileID: 1939795767}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.1500691, y: 1.1500691, z: 1.1500691}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2.16, y: 2.16, z: 2.16}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 35880653}
- m_Father: {fileID: 2105288090}
+ m_Father: {fileID: 1270295817}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0.5}
- m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 795.93115, y: 84.6}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 435, y: 61}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1939795769
@@ -23738,7 +23842,7 @@ MonoBehaviour:
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 1806581148}
- m_SelectOnRight: {fileID: 0}
+ m_SelectOnRight: {fileID: 1806581148}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
@@ -23956,6 +24060,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1192642866}
m_Modifications:
+ - target: {fileID: 4498850462545079711, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
+ propertyPath: nav
+ value:
+ objectReference: {fileID: 878613045}
- target: {fileID: 4498850462545079711, guid: 52eff72d3b1cec44ebdcabc26791c5b6, type: 3}
propertyPath: popUp
value:
@@ -24323,8 +24431,8 @@ RectTransform:
m_GameObject: {fileID: 2015763011}
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_LocalScale: {x: 1.92, y: 1.92, z: 1.92}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 834180331}
- {fileID: 1745492834}
@@ -24333,7 +24441,7 @@ RectTransform:
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: -7.5}
+ m_AnchoredPosition: {x: 0, y: -35}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2015763013
@@ -24758,7 +24866,6 @@ RectTransform:
- {fileID: 1043500343}
- {fileID: 281897756}
- {fileID: 398550415}
- - {fileID: 1560957795}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -25379,86 +25486,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2091891617}
m_CullTransparentMesh: 1
---- !u!1 &2105288089
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2105288090}
- - component: {fileID: 2105288092}
- - component: {fileID: 2105288091}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2105288090
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2105288089}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -959.99994, y: -452.53403, z: 0}
- m_LocalScale: {x: 1.7438691, y: 1.7438691, z: 1.7438691}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1806581151}
- - {fileID: 1939795768}
- m_Father: {fileID: 1560957795}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2105288091
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2105288089}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_SendPointerHoverToParent: 1
- m_MoveRepeatDelay: 0.5
- m_MoveRepeatRate: 0.1
- m_XRTrackingOrigin: {fileID: 0}
- m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
- m_DeselectOnBackgroundClick: 1
- m_PointerBehavior: 0
- m_CursorLockBehavior: 0
---- !u!114 &2105288092
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2105288089}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 1806581147}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
--- !u!1 &2130656938
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Cutscene/DialogueManager.cs b/Assets/Scripts/Cutscene/DialogueManager.cs
index c3baa3614ed43944f70d80742aed6876f259c2c1..e7bb250c3bc35491c133b2e35eb8601fa7e131e4 100644
--- a/Assets/Scripts/Cutscene/DialogueManager.cs
+++ b/Assets/Scripts/Cutscene/DialogueManager.cs
@@ -103,7 +103,7 @@ public class DialogueManager : MonoBehaviour
private void Update()
{
- if (DialogueInput())
+ if (DialogueInput() && Time.timeScale > 0)
{
SkipOrNextDialogue();
}
diff --git a/Assets/Scripts/Menu/InGameNavigator.cs b/Assets/Scripts/Menu/InGameNavigator.cs
index d9d1570e2912707a58674e12ca14b01954f937fd..47aefd1c588c81c24f7e100836a6f7e631063600 100644
--- a/Assets/Scripts/Menu/InGameNavigator.cs
+++ b/Assets/Scripts/Menu/InGameNavigator.cs
@@ -1,17 +1,31 @@
using UnityEngine;
+using UnityEngine.EventSystems;
using UnityEngine.SceneManagement;
+using UnityEngine.UI;
public class InGameNavigator : MonoBehaviour
{
public GameObject MenuPanel;
+ [SerializeField] private Selectable menuFirst;
public GameObject SavePanel;
+ [SerializeField] private Selectable saveFirst;
public GameObject ShopPanel;
+ [SerializeField] private Selectable shopFirst;
+
+ private EventSystem eventSystem;
+
+ private void Awake()
+ {
+ eventSystem = EventSystem.current;
+ }
void Start()
{
MenuPanel.SetActive(false);
SavePanel.SetActive(false);
ShopPanel.SetActive(false);
+
+ Time.timeScale = 1f;
}
public void OpenMainMenu() {
@@ -20,6 +34,8 @@ public class InGameNavigator : MonoBehaviour
ShopPanel.SetActive(false);
Time.timeScale = 0f;
Cursor.lockState = CursorLockMode.None;
+
+ eventSystem.SetSelectedGameObject(menuFirst.gameObject);
}
public void OpenShop() {
@@ -28,6 +44,8 @@ public class InGameNavigator : MonoBehaviour
MenuPanel.SetActive(false);
Time.timeScale = 0f;
Cursor.lockState = CursorLockMode.None;
+
+ eventSystem.SetSelectedGameObject(shopFirst.gameObject);
}
public void OpenSave() {
@@ -35,6 +53,8 @@ public class InGameNavigator : MonoBehaviour
MenuPanel.SetActive(false);
ShopPanel.SetActive(false);
Cursor.lockState = CursorLockMode.None;
+
+ eventSystem.SetSelectedGameObject(saveFirst.gameObject);
}
public void CloseAll() {
@@ -43,6 +63,8 @@ public class InGameNavigator : MonoBehaviour
ShopPanel.SetActive(false);
Time.timeScale = 1f;
Cursor.lockState = CursorLockMode.Locked;
+
+ eventSystem.SetSelectedGameObject(null);
}
public bool IsMainMenuOpen() {
diff --git a/Assets/Scripts/Menu/SaveGameManager.cs b/Assets/Scripts/Menu/SaveGameManager.cs
index c1110ba3a2e608cff9ea80ba6a23b95c58e16bc5..a95eeebcc47b5f83bea85e04330af159a10e1602 100644
--- a/Assets/Scripts/Menu/SaveGameManager.cs
+++ b/Assets/Scripts/Menu/SaveGameManager.cs
@@ -37,6 +37,8 @@ public class SaveGameManager : MonoBehaviour
public GameObject safeHousePrefab;
private GameObject instantiatedSafeHouse;
+ private bool isSaveUIOpen = false;
+
public InGameNavigator nav;
private void Start()
@@ -64,12 +66,12 @@ public class SaveGameManager : MonoBehaviour
// If the player walks into the safe house trigger, show the save game UI
if (PlayerEntersSafeHouse(instantiatedSafeHouse.transform.position))
{
- openSaveUI();
+ if (!nav.IsMainMenuOpen()) openSaveUI();
} else {
- closeSaveUI();
+ if (nav.IsSaveOpen()) closeSaveUI();
}
} else {
- closeSaveUI();
+ if (nav.IsSaveOpen()) closeSaveUI();
}
}
diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs
index eca17eacfc7050d7af0e04b6f5427737c70df99d..65491c836a5dffae3a33a8586973b1609561b1ef 100644
--- a/Assets/Scripts/Quest/QuestManager.cs
+++ b/Assets/Scripts/Quest/QuestManager.cs
@@ -131,7 +131,7 @@ public class QuestManager : MonoBehaviour
// QUEST 4
quests.Add(new Quest(new List<Goal> {
new GoalSurvive("Survive for 10 sec ", 10),
- new GoalKill("Kill 1 Boss", 1, EnemyType.Boss)
+ new GoalKill("Kill The Boss", 1, EnemyType.Boss)
}, 200, new WaveData
{
}, onQuestStarted: () => {