diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index 52785577966e3af2012c66edf1fc6e3de7d92ae1..66e2d78c8e9f384aafcf4af8c2ebd1e557a759b9 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -123,6 +123,241 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &53968900
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 53968901}
+ - component: {fileID: 53968903}
+ - component: {fileID: 53968902}
+ m_Layer: 5
+ m_Name: Rank
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &53968901
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 53968900}
+ 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: 1621744291}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 160, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &53968902
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 53968900}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Rank
+--- !u!222 &53968903
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 53968900}
+ m_CullTransparentMesh: 1
+--- !u!1 &185345917
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 185345921}
+ - component: {fileID: 185345920}
+ - component: {fileID: 185345919}
+ - component: {fileID: 185345918}
+ - component: {fileID: 185345922}
+ - component: {fileID: 185345924}
+ - component: {fileID: 185345923}
+ m_Layer: 5
+ m_Name: Scoreboard
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &185345918
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &185345919
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &185345920
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &185345921
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1621744291}
+ - {fileID: 1401294712}
+ m_Father: {fileID: 0}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &185345922
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 58324ca8e6e5b5742a7e19c015341504, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &185345923
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &185345924
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 185345917}
+ m_CullTransparentMesh: 1
--- !u!1 &187864682
GameObject:
m_ObjectHideFlags: 0
@@ -219,6 +454,7 @@ RectTransform:
- {fileID: 1911682874}
- {fileID: 1579432577}
- {fileID: 329025159}
+ - {fileID: 246477581}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -383,11 +619,140 @@ PrefabInstance:
objectReference: {fileID: 848793923}
- target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 1
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnClickNewGame
+ objectReference: {fileID: 0}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: MainMenuManager, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 2967926453879230644, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_text
+ value: New Game
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 350
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -664
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 358
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9020755201045807924, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_Name
+ value: NewGame
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b53f5da581305764887c66584e863af9, type: 3}
+--- !u!1001 &246477580
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 187864686}
+ m_Modifications:
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 848793923}
+ - target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnClickNewGame
+ value: OnClickLeaderboard
objectReference: {fileID: 0}
- target: {fileID: 397957212726258389, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
@@ -399,7 +764,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2967926453879230644, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_text
- value: New Game
+ value: Leaderboard
objectReference: {fileID: 0}
- target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_Pivot.x
@@ -411,7 +776,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_AnchorMax.x
@@ -471,7 +836,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 358
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -487,10 +852,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9020755201045807924, guid: b53f5da581305764887c66584e863af9, type: 3}
propertyPath: m_Name
- value: NewGame
+ value: Leaderboard
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b53f5da581305764887c66584e863af9, type: 3}
+--- !u!224 &246477581 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
+ m_PrefabInstance: {fileID: 246477580}
+ m_PrefabAsset: {fileID: 0}
--- !u!224 &329025159 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7625303295333978658, guid: b53f5da581305764887c66584e863af9, type: 3}
@@ -1861,6 +2231,86 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b53f5da581305764887c66584e863af9, type: 3}
+--- !u!1 &953547409
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 953547410}
+ - component: {fileID: 953547412}
+ - component: {fileID: 953547411}
+ m_Layer: 5
+ m_Name: Score
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &953547410
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953547409}
+ 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: 1621744291}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 160, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &953547411
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953547409}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Time
+--- !u!222 &953547412
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953547409}
+ m_CullTransparentMesh: 1
--- !u!1 &1092286327
GameObject:
m_ObjectHideFlags: 0
@@ -2608,6 +3058,81 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1401294711
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1401294712}
+ - component: {fileID: 1401294714}
+ - component: {fileID: 1401294713}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1401294712
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1401294711}
+ 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: 185345921}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -0.99835205, y: -124.76709}
+ m_SizeDelta: {x: 61.414, y: 18.9745}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1401294713
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1401294711}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7ce53f8b1ddaedf439ba6a83f36f8d70, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ rowUi: {fileID: 6851153376635591412, guid: cce1316027f70594d9119019b86bf0a8, type: 3}
+--- !u!114 &1401294714
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1401294711}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 1
+ m_StartCorner: 0
+ m_StartAxis: 1
+ m_CellSize: {x: 700, y: 100}
+ m_Spacing: {x: 0, y: 0}
+ m_Constraint: 1
+ m_ConstraintCount: 1
--- !u!1 &1405109819
GameObject:
m_ObjectHideFlags: 0
@@ -2882,6 +3407,7 @@ GameObject:
- component: {fileID: 1608202858}
- component: {fileID: 1608202859}
- component: {fileID: 1608202860}
+ - component: {fileID: 1608202861}
m_Layer: 0
m_Name: GlobalManager
m_TagString: Untagged
@@ -2929,6 +3455,124 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f711064c6cb9b5d4d93be5423b7e35c7, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &1608202861
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1608202857}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c5083c0afe09cdc42924cafe6560c551, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &1621744290
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1621744291}
+ - component: {fileID: 1621744294}
+ - component: {fileID: 1621744293}
+ - component: {fileID: 1621744292}
+ m_Layer: 5
+ m_Name: Header
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1621744291
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1621744290}
+ 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: 53968901}
+ - {fileID: 1768580508}
+ - {fileID: 953547410}
+ m_Father: {fileID: 185345921}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -1, y: -71}
+ m_SizeDelta: {x: 61.4167, y: 88.5603}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1621744292
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1621744290}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.55758274, g: 0.990566, b: 0.97673786, 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_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1621744293
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1621744290}
+ m_CullTransparentMesh: 1
+--- !u!114 &1621744294
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1621744290}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 1
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!1 &1643283511
GameObject:
m_ObjectHideFlags: 0
@@ -3297,6 +3941,86 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b53f5da581305764887c66584e863af9, type: 3}
+--- !u!1 &1768580507
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1768580508}
+ - component: {fileID: 1768580510}
+ - component: {fileID: 1768580509}
+ m_Layer: 5
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1768580508
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1768580507}
+ 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: 1621744291}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 160, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1768580509
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1768580507}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Name
+--- !u!222 &1768580510
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1768580507}
+ m_CullTransparentMesh: 1
--- !u!1 &1859302777
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Quest.unity b/Assets/Scenes/Quest.unity
index 50b0d9ac53fb845791899f85ca73ea29d6462182..42f448311b33d5969ae7f1302bb4aedc42db6d76 100644
--- a/Assets/Scenes/Quest.unity
+++ b/Assets/Scenes/Quest.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.45061475, g: 0.4986083, b: 0.56437457, a: 1}
+ m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -123,6 +123,256 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: 67db2f8839c528445afd6bb5b6b61e7a, type: 2}
+--- !u!1 &1785983
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1785987}
+ - component: {fileID: 1785986}
+ - component: {fileID: 1785985}
+ - component: {fileID: 1785984}
+ - component: {fileID: 1785988}
+ m_Layer: 5
+ m_Name: GameOverCanvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1785984
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785983}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &1785985
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785983}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &1785986
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785983}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &1785987
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785983}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1159039170}
+ - {fileID: 1459074193}
+ m_Father: {fileID: 0}
+ m_RootOrder: 22
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &1785988
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1785983}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b90794307d23f224996b2c253a49e3d3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &1903112
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1903113}
+ - component: {fileID: 1903115}
+ - component: {fileID: 1903114}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1903113
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1903112}
+ 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: 1459074193}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1903114
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1903112}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: From Last Load
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1903115
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1903112}
+ m_CullTransparentMesh: 1
--- !u!1 &4286604
GameObject:
m_ObjectHideFlags: 0
@@ -2385,26 +2635,161 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 520206061}
- 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: 749821179}
- m_Father: {fileID: 1495738172}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.25}
- m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &527737947 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 4031722965567369366, guid: 0c9cc319abb8ef1419bdfa93964b83c0, type: 3}
- m_PrefabInstance: {fileID: 1544359199}
- m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 520206061}
+ 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: 749821179}
+ m_Father: {fileID: 1495738172}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &527737947 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4031722965567369366, guid: 0c9cc319abb8ef1419bdfa93964b83c0, type: 3}
+ m_PrefabInstance: {fileID: 1544359199}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &534195196
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 534195197}
+ - component: {fileID: 534195199}
+ - component: {fileID: 534195198}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &534195197
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534195196}
+ 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: 1159039170}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &534195198
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534195196}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Main Menu
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &534195199
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534195196}
+ m_CullTransparentMesh: 1
--- !u!1 &535099968
GameObject:
m_ObjectHideFlags: 0
@@ -9499,6 +9884,140 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1159039169
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1159039170}
+ - component: {fileID: 1159039173}
+ - component: {fileID: 1159039172}
+ - component: {fileID: 1159039171}
+ m_Layer: 5
+ m_Name: GoToMainMenu
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1159039170
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1159039169}
+ 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: 534195197}
+ m_Father: {fileID: 1785987}
+ m_RootOrder: 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: 119, y: 0}
+ m_SizeDelta: {x: 200, y: 60}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1159039171
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1159039169}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1159039172}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1785988}
+ m_TargetAssemblyTypeName: GameOverCanvas, Assembly-CSharp
+ m_MethodName: OnClickMainMenu
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &1159039172
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1159039169}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1159039173
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1159039169}
+ m_CullTransparentMesh: 1
--- !u!1 &1195641661
GameObject:
m_ObjectHideFlags: 0
@@ -10155,6 +10674,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1424570291}
m_CullTransparentMesh: 1
+--- !u!1 &1459074192
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1459074193}
+ - component: {fileID: 1459074196}
+ - component: {fileID: 1459074195}
+ - component: {fileID: 1459074194}
+ m_Layer: 5
+ m_Name: ReloadSave
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1459074193
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1459074192}
+ 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: 1903113}
+ m_Father: {fileID: 1785987}
+ m_RootOrder: 1
+ 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: -161.25, y: 0}
+ m_SizeDelta: {x: 200, y: 60}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1459074194
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1459074192}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1459074195}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1785988}
+ m_TargetAssemblyTypeName: GameOverCanvas, Assembly-CSharp
+ m_MethodName: OnClickLatestSave
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &1459074195
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1459074192}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1459074196
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1459074192}
+ m_CullTransparentMesh: 1
--- !u!1 &1495738171
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Scoreboard.unity b/Assets/Scenes/Scoreboard.unity
index 75273e7f7d4c6e35ab44d9b1f6d18dcfe90dcf87..bdf7bd212dea180a68c2d16b2cb835eb6b50ccca 100644
--- a/Assets/Scenes/Scoreboard.unity
+++ b/Assets/Scenes/Scoreboard.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.45061475, g: 0.4986083, b: 0.56437457, a: 1}
+ m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -9649,43 +9649,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 39ba8ce6f187a75438f6054648c957a5, type: 3}
m_Name:
m_EditorClassIdentifier:
- petCount: 0
+ petIdx: -1
currency: 0
- equipedWeapon:
- - image: {fileID: 0}
- description:
- price: 0
- characterName:
- isPurchased: 0
- isWeapon: 0
- weaponType: 0
- level: 0
- - image: {fileID: 0}
- description:
- price: 0
- characterName:
- isPurchased: 0
- isWeapon: 0
- weaponType: 0
- level: 0
- - image: {fileID: 0}
- description:
- price: 0
- characterName:
- isPurchased: 0
- isWeapon: 0
- weaponType: 0
- level: 0
- - image: {fileID: 0}
- description:
- price: 0
- characterName:
- isPurchased: 0
- isWeapon: 0
- weaponType: 0
- level: 0
cheatOneHitKill: 0
cantShoot: 0
+ fullHPPet: 0
+ killPet: 0
--- !u!4 &1088314968
Transform:
m_ObjectHideFlags: 0
@@ -11049,7 +11018,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f012ec333759d34daa92349f607b165, type: 3}
m_Name:
m_EditorClassIdentifier:
- txt: {fileID: 622410117}
--- !u!4 &1643283513
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/GameOver.meta b/Assets/Scripts/GameOver.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1f1e2b9dbcc9464d7340bdf55e54a44e8be616f7
--- /dev/null
+++ b/Assets/Scripts/GameOver.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b48355f1105d5cd46bac266db62a9e27
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/GameOver/GameOverCanvas.cs b/Assets/Scripts/GameOver/GameOverCanvas.cs
new file mode 100644
index 0000000000000000000000000000000000000000..954256e873de70a01003c1d52c8ffa5607e9d3ff
--- /dev/null
+++ b/Assets/Scripts/GameOver/GameOverCanvas.cs
@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class GameOverCanvas : MonoBehaviour
+{
+ // Start is called before the first frame update
+ private bool isSet = false;
+ public bool IsSet { get => isSet; set => isSet = value; }
+ void Start()
+ {
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+
+ private void Awake()
+ {
+ }
+
+ public void OnClickMainMenu()
+ {
+ SceneManager.LoadScene("MainMenu");
+ IsSet = true;
+ }
+
+ public void OnClickLatestSave()
+ {
+ SceneManager.LoadScene("Quest");
+ IsSet = true;
+ }
+}
diff --git a/Assets/Scripts/GameOver/GameOverCanvas.cs.meta b/Assets/Scripts/GameOver/GameOverCanvas.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..5c40c0f3dd0c820bff38409b24fc20780dafc8c2
--- /dev/null
+++ b/Assets/Scripts/GameOver/GameOverCanvas.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b90794307d23f224996b2c253a49e3d3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Managers/GlobalManager.cs b/Assets/Scripts/Managers/GlobalManager.cs
index d167c709f0809907bbbfa84151ba432bf40a48ab..f5ce1f195845dc0a9813849bc0b6ce0f41efeda6 100644
--- a/Assets/Scripts/Managers/GlobalManager.cs
+++ b/Assets/Scripts/Managers/GlobalManager.cs
@@ -107,6 +107,7 @@ public class GlobalManager : MonoBehaviour
{
Debug.Log("ON SCENE LOADED");
SaveLoadManager.Instance.LoadState(idxSaveSlot);
+ isFirstLoad = false;
}
}
@@ -119,14 +120,5 @@ public class GlobalManager : MonoBehaviour
// Update is called once per frame
void Update()
{
-/* if (Input.GetKeyDown(KeyCode.B))
- {
- SaveState();
- }
-
- if (Input.GetKeyDown(KeyCode.N))
- {
- LoadState();
- }*/
}
}
diff --git a/Assets/Scripts/Managers/HUD.cs b/Assets/Scripts/Managers/HUD.cs
index ebd7fc6993d37a655588e8f71a86f6efb2179a5e..dbc92865c4a27deb0e066cbb0ca8ff66602603aa 100644
--- a/Assets/Scripts/Managers/HUD.cs
+++ b/Assets/Scripts/Managers/HUD.cs
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class HUD : MonoBehaviour
@@ -8,9 +9,12 @@ public class HUD : MonoBehaviour
public GameObject MessagePanel;
private Text textTransform;
[SerializeField] GameObject textInput;
+ private GameOverCanvas gameOverCanvas;
private void Awake() {
textTransform = MessagePanel.transform.Find("Text").GetComponent<Text>();
+ gameOverCanvas = FindObjectOfType<GameOverCanvas>();
+ gameOverCanvas.gameObject.SetActive(false);
}
public void OpenMessagePanel (string text) {
@@ -42,4 +46,15 @@ public class HUD : MonoBehaviour
yield return new WaitForSeconds(secs);
CloseMessagePanel();
}
+
+ public IEnumerator GameOverHandler()
+ {
+ gameOverCanvas.gameObject.SetActive(true);
+
+ yield return new WaitForSeconds(5);
+ if (!gameOverCanvas.IsSet)
+ {
+ SceneManager.LoadScene("MainMenu");
+ }
+ }
}
diff --git a/Assets/Scripts/Managers/MainMenuManager.cs b/Assets/Scripts/Managers/MainMenuManager.cs
index ccae19b04cc6f478b31d5277645edb8066e9e812..511e16c628c59724aaa9708d80e76fcf4777e77b 100644
--- a/Assets/Scripts/Managers/MainMenuManager.cs
+++ b/Assets/Scripts/Managers/MainMenuManager.cs
@@ -7,6 +7,7 @@ public class MainMenuManager : MonoBehaviour
{
private LoadDialogHandler loadDialogHandler;
private SettingManager settingPanel;
+ private ScoreBoard scoreboard;
private void Awake()
{
@@ -14,6 +15,8 @@ public class MainMenuManager : MonoBehaviour
this.loadDialogHandler.gameObject.SetActive(false);
this.settingPanel = FindObjectOfType<SettingManager>();
this.settingPanel.gameObject.SetActive(false);
+ this.scoreboard = FindObjectOfType<ScoreBoard>();
+ this.scoreboard.gameObject.SetActive(false);
}
public void OnClickNewGame()
@@ -31,6 +34,11 @@ public class MainMenuManager : MonoBehaviour
this.settingPanel.gameObject.SetActive(true);
}
+ public void OnClickLeaderboard()
+ {
+ this.scoreboard.gameObject.SetActive(true) ;
+ }
+
private void Update()
{
var gm = GlobalManager.Instance;
diff --git a/Assets/Scripts/Managers/SettingManager.cs b/Assets/Scripts/Managers/SettingManager.cs
index 22700cee7543fcbbf68fa48ddf0d2c6e328bfa5d..acf3fe2a38e03ac53448bcf0829a484c9a0b0e5e 100644
--- a/Assets/Scripts/Managers/SettingManager.cs
+++ b/Assets/Scripts/Managers/SettingManager.cs
@@ -26,7 +26,6 @@ public class SettingManager : MonoBehaviour
Debug.Log("VOLUME: " + GlobalManager.Instance.Volume);
if (Input.GetKeyDown(KeyCode.Escape))
{
- Debug.Log("CLOSINGGGGGGGGG");
Close();
}
}
diff --git a/Assets/Scripts/Managers/ToastManager.cs b/Assets/Scripts/Managers/ToastManager.cs
index fab595b2633644bb33efd1c804184c1ea9c052a0..b91bdaa1f0661434a30ee9c2b98899539829ef97 100644
--- a/Assets/Scripts/Managers/ToastManager.cs
+++ b/Assets/Scripts/Managers/ToastManager.cs
@@ -42,6 +42,11 @@ class ToastManager : MonoBehaviour
public void ShowToast(string text,
int duration)
+ {
+ StartCoroutine(showToastCOR(text, duration));
+ }
+
+ public void ShowToastQueue(string text, int duration)
{
//StartCoroutine(showToastCOR(text, duration));
toasts.Enqueue((text, duration));
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index f943ad08ba3e54d2f0e2bef63639815033b43dae..7ebbd46cac4fccafc6703ac726c7d1f9179cf708 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -1,6 +1,7 @@
using UnityEngine;
using UnityEngine.UI;
using System.Collections;
+using UnityEngine.SceneManagement;
public class PlayerHealth : MonoBehaviour
{
@@ -121,10 +122,25 @@ public class PlayerHealth : MonoBehaviour
playerMovement.enabled = false;
playerShooting.enabled = false;
+
+ // go to reload the scene
+ //GlobalManager.Instance.IsFirstLoad = true;
+ //if (GlobalManager.Instance.IdxSaveSlot == -1)
+ //{
+ // SceneManager.LoadScene("MainMenu");
+ // return;
+ //}
+ //SceneManager.LoadScene("Quest");
+
+ HUD hud = FindObjectOfType<HUD>();
+ TimerManager timeManager = FindObjectOfType<TimerManager>();
+ timeManager.StopTimer();
+ StartCoroutine(hud.GameOverHandler());
}
public void SetCheatNoDamage(bool value)
{
cheatNoDamage = value;
}
+
}
diff --git a/Assets/Scripts/Quest/Temple/Temple.cs b/Assets/Scripts/Quest/Temple/Temple.cs
index 4272a6e503bfb5982f596fec3c263b1cf95def53..e0e3bfa5dd7e3dad3858eebd30542eb6263e395f 100644
--- a/Assets/Scripts/Quest/Temple/Temple.cs
+++ b/Assets/Scripts/Quest/Temple/Temple.cs
@@ -1,3 +1,4 @@
+using System.Collections;
using UnityEngine;
using UnityEngine.SceneManagement;
@@ -98,17 +99,17 @@ public class Temple : MonoBehaviour
}
idxCurrentQuest++;
- ToastManager.Instance.ShowToast("Quest " + idxCurrentQuest + " is Completed! You got additional coins: " + reward, 1);
+ ToastManager.Instance.ShowToastQueue("Quest " + idxCurrentQuest + " is Completed! You got additional coins: " + reward, 1);
// retrieve the time
// add it to the global time
// remove the timer
var questTime = timer.TakeTime();
- ToastManager.Instance.ShowToast("Your total time now: "
+ ToastManager.Instance.ShowToastQueue("Your total time now: "
+ System.TimeSpan.FromSeconds(GlobalManager.Instance.TotalTime).ToString("mm':'ss")
+ " + " + System.TimeSpan.FromSeconds(questTime).ToString("mm':'ss"), 1);
GlobalManager.Instance.TotalTime += questTime;
- ToastManager.Instance.ShowToast(System.TimeSpan.FromSeconds(GlobalManager.Instance.TotalTime).ToString("mm':'ss"), 1);
+ ToastManager.Instance.ShowToastQueue(System.TimeSpan.FromSeconds(GlobalManager.Instance.TotalTime).ToString("mm':'ss"), 1);
this.saveDialog.Show();
}
@@ -162,10 +163,10 @@ public class Temple : MonoBehaviour
if (questNumberEnemy.IsEmpty())
{
ExitingQuest();
- if (enemyType.Equals(EnemyType.FinalBoss))
+ if (idxCurrentQuest == 1)
{
- SceneManager.LoadSceneAsync("CutsceneEnding");
- return;
+ ToastManager.Instance.ShowToast("YOU WIN", 1);
+ StartCoroutine(winHandler());
}
}
else
@@ -173,4 +174,11 @@ public class Temple : MonoBehaviour
ToastManager.Instance.ShowToast("Quest Enemies Left:\n" + questNumberEnemy.Stats(), 1);
}
}
+
+ private IEnumerator winHandler()
+ {
+ yield return new WaitForSeconds(5);
+ ScoreBoardScoreManager.Instance.AddScore(new Score(GlobalManager.Instance.PlayerName, (float)GlobalManager.Instance.TotalTime));
+ SceneManager.LoadScene("CutsceneEnding");
+ }
}
diff --git a/Assets/Scripts/SaveLoad/SaveLoadManager.cs b/Assets/Scripts/SaveLoad/SaveLoadManager.cs
index 34886000b6d10c2c2a42514c4efee420ae9e5969..cad9cacdcb0b20601fa3edc762880a4fc60b7cf6 100644
--- a/Assets/Scripts/SaveLoad/SaveLoadManager.cs
+++ b/Assets/Scripts/SaveLoad/SaveLoadManager.cs
@@ -69,6 +69,7 @@ public class SaveLoadManager : MonoBehaviour
var file = SaveLoadConfig.files[Id];
var path = Application.persistentDataPath + "/" + file + ".json";
File.WriteAllText(path, json);
+ GlobalManager.Instance.IdxSaveSlot = Id;
saveDialog.Close();
}
diff --git a/Assets/Scripts/Scoreboard/ScoreBoard.cs b/Assets/Scripts/Scoreboard/ScoreBoard.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ea3bd6c4427937199e666ce7cc8ee423f693c1a7
--- /dev/null
+++ b/Assets/Scripts/Scoreboard/ScoreBoard.cs
@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class ScoreBoard : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ if (Input.GetKeyDown(KeyCode.Escape))
+ {
+ Close();
+ }
+
+ }
+ public void Show()
+ {
+ gameObject.SetActive(true);
+ }
+
+ public void Close()
+ {
+ gameObject.SetActive(false);
+ }
+}
diff --git a/Assets/Scripts/Scoreboard/ScoreBoard.cs.meta b/Assets/Scripts/Scoreboard/ScoreBoard.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..351987de4cb6f69f1b7b8c27803b93677557765c
--- /dev/null
+++ b/Assets/Scripts/Scoreboard/ScoreBoard.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 58324ca8e6e5b5742a7e19c015341504
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Scoreboard/ScoreBoardScoreManager.cs b/Assets/Scripts/Scoreboard/ScoreBoardScoreManager.cs
index 370af911fd6f4680626aad6b5009e0bac95a7fab..0b26676090590545c88e4a4f3c7b9a3ea9b47ad1 100644
--- a/Assets/Scripts/Scoreboard/ScoreBoardScoreManager.cs
+++ b/Assets/Scripts/Scoreboard/ScoreBoardScoreManager.cs
@@ -6,12 +6,23 @@ using System.Linq;
public class ScoreBoardScoreManager : MonoBehaviour
{
+ public static ScoreBoardScoreManager Instance { get; private set; }
private ScoreData sd;
-
- void Awake()
+
+
+ private void Awake()
{
- var json = PlayerPrefs.GetString("scores", "{}");
- sd = JsonUtility.FromJson<ScoreData>(json);
+ if (Instance != null && Instance != this)
+ {
+ Destroy(this);
+ }
+ else
+ {
+ var json = PlayerPrefs.GetString("scores", "{}");
+ sd = JsonUtility.FromJson<ScoreData>(json);
+ Instance = this;
+ DontDestroyOnLoad(gameObject);
+ }
}
public IEnumerable<Score> GetHighScores()
diff --git a/Assets/Scripts/Scoreboard/ScoreUI.cs b/Assets/Scripts/Scoreboard/ScoreUI.cs
index 6e2125c19310bd1f8e8235732c4cf82f28c2bd74..6995e0ee655f83c73d209c2bcb78446a1c1ab841 100644
--- a/Assets/Scripts/Scoreboard/ScoreUI.cs
+++ b/Assets/Scripts/Scoreboard/ScoreUI.cs
@@ -6,7 +6,6 @@ using System.Linq;
public class ScoreUI : MonoBehaviour
{
public RowUi rowUi;
- public ScoreBoardScoreManager scoreManager;
void Start()
{
@@ -14,7 +13,7 @@ public class ScoreUI : MonoBehaviour
// scoreManager.AddScore(new Score("hhohoho", 1000));
//scoreManager.AddScore(new Score("lalalla", 9000));
- var scores = scoreManager.GetHighScores().ToArray();
+ var scores = ScoreBoardScoreManager.Instance.GetHighScores().ToArray();
for (int i = 0; i < scores.Length; i ++)
{
var row = Instantiate(rowUi, transform).GetComponent<RowUi>();
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 9a3bfb206bfbdbac1536517ebd4e8847bf221582..8374c1c6b3586fa44262fe4749eba38e9ee8b753 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -17,4 +17,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Quest.unity
guid: 38a6c15e74822d542a4df5ef901a7e70
+ - enabled: 1
+ path: Assets/Scenes/CutsceneEnding.unity
+ guid: e37ac0bc2554f1144a42b2c9bbef9a0f
m_configObjects: {}