diff --git a/Assets/Prefabs/Scoreboard/Row.prefab b/Assets/Prefabs/Scoreboard/Row.prefab
index 5c845e04e8b81eead144e4942a3977e5eb9ad5a5..04e4bbcf85bd25c70326d68a1beedb0b486a59bb 100644
--- a/Assets/Prefabs/Scoreboard/Row.prefab
+++ b/Assets/Prefabs/Scoreboard/Row.prefab
@@ -59,7 +59,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -139,7 +139,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -219,7 +219,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 7d552ffc113fd0bf6dabbef408a34cc3011d3307..365ed8d3405fb42d44f2048b2a12306fe3b24f63 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -123,6 +123,86 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: 1af2ff1ad0664d043b8b16500bfa565c, type: 2}
+--- !u!1 &9637472
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9637473}
+ - component: {fileID: 9637475}
+ - component: {fileID: 9637474}
+ m_Layer: 5
+ m_Name: Time
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9637473
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9637472}
+ 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: 1500555571}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 728.33325, y: -40}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &9637474
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9637472}
+ 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: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 1
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Time
+--- !u!222 &9637475
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9637472}
+ m_CullTransparentMesh: 1
--- !u!1 &43179831
GameObject:
m_ObjectHideFlags: 0
@@ -415,7 +495,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &65180354
Transform:
m_ObjectHideFlags: 0
@@ -547,6 +627,86 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 22475538, guid: 751f7137cfffd4a16b1a4c191e687d64, type: 3}
m_PrefabInstance: {fileID: 1331372521}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &80496915
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 80496916}
+ - component: {fileID: 80496918}
+ - component: {fileID: 80496917}
+ m_Layer: 5
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &80496916
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80496915}
+ 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: 1500555571}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 436.99997, y: -40}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &80496917
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80496915}
+ 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: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 1
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Name
+--- !u!222 &80496918
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 80496915}
+ m_CullTransparentMesh: 1
--- !u!1 &83872241
GameObject:
m_ObjectHideFlags: 0
@@ -806,6 +966,10 @@ PrefabInstance:
propertyPath: m_Name
value: crossbow
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: abb0f8985aeba6042ab01fe6fafae663, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: abb0f8985aeba6042ab01fe6fafae663, type: 3}
propertyPath: m_TagString
value: Crossbow
@@ -1405,6 +1569,10 @@ PrefabInstance:
propertyPath: m_Name
value: sword
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3}
propertyPath: m_TagString
value: Sword
@@ -2226,7 +2394,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &450320206
Transform:
m_ObjectHideFlags: 0
@@ -8384,6 +8552,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 635668783}
m_CullTransparentMesh: 1
+--- !u!1 &639777913
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 639777914}
+ - component: {fileID: 639777916}
+ - component: {fileID: 639777915}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &639777914
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 639777913}
+ 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: 1788874787}
+ 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, y: -50}
+ m_SizeDelta: {x: 0, y: -100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &639777915
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 639777913}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8b5034a90b2480249ba5a762e595254e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ rowUi: {fileID: 5118511110587072604, guid: 01f34aa98e49bca41966bee32d1198fb, type: 3}
+ sm: {fileID: 888918217}
+--- !u!114 &639777916
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 639777913}
+ 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: 900, y: 50}
+ m_Spacing: {x: 0, y: 0}
+ m_Constraint: 1
+ m_ConstraintCount: 1
--- !u!1001 &660794843
PrefabInstance:
m_ObjectHideFlags: 0
@@ -9110,6 +9354,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 862835713}
m_CullTransparentMesh: 1
+--- !u!1 &888918216
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 888918218}
+ - component: {fileID: 888918217}
+ m_Layer: 0
+ m_Name: ScoreboardManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &888918217
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 888918216}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eaf26a06acf355e44b7ef9276ba65ac7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &888918218
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 888918216}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 412, y: 184.66666, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 19
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &925461252
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15998,6 +16286,10 @@ PrefabInstance:
propertyPath: m_Name
value: shotgun
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: abd916789bc97d749bbd99ecea64cc61, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: abd916789bc97d749bbd99ecea64cc61, type: 3}
propertyPath: m_TagString
value: Shotgun
@@ -16176,7 +16468,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &1493232822
Transform:
m_ObjectHideFlags: 0
@@ -21316,6 +21608,112 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
+--- !u!1 &1500555570
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1500555571}
+ - component: {fileID: 1500555574}
+ - component: {fileID: 1500555573}
+ - component: {fileID: 1500555572}
+ m_Layer: 5
+ m_Name: Header
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1500555571
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1500555570}
+ 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: 1854308720}
+ - {fileID: 80496916}
+ - {fileID: 9637473}
+ m_Father: {fileID: 1788874787}
+ 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: 0, y: -40}
+ m_SizeDelta: {x: 0, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1500555572
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1500555570}
+ 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: 0.9594254, b: 0.7798742, 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 &1500555573
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1500555570}
+ m_CullTransparentMesh: 1
+--- !u!114 &1500555574
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1500555570}
+ 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: 4
+ 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!1001 &1527263228
PrefabInstance:
m_ObjectHideFlags: 0
@@ -22562,6 +22960,148 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1769324172}
m_CullTransparentMesh: 1
+--- !u!1 &1788874781
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1788874787}
+ - component: {fileID: 1788874786}
+ - component: {fileID: 1788874785}
+ - component: {fileID: 1788874784}
+ - component: {fileID: 1788874783}
+ - component: {fileID: 1788874782}
+ m_Layer: 5
+ m_Name: Scoreboard
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &1788874782
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ 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: 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 &1788874783
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ m_CullTransparentMesh: 1
+--- !u!114 &1788874784
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ 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 &1788874785
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ 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 &1788874786
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ 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 &1788874787
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1788874781}
+ 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: 1500555571}
+ - {fileID: 639777914}
+ m_Father: {fileID: 0}
+ m_RootOrder: 18
+ 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!1 &1820352861
GameObject:
m_ObjectHideFlags: 0
@@ -22723,6 +23263,86 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 22475538, guid: 751f7137cfffd4a16b1a4c191e687d64, type: 3}
m_PrefabInstance: {fileID: 2137412592}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1854308719
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1854308720}
+ - component: {fileID: 1854308722}
+ - component: {fileID: 1854308721}
+ m_Layer: 5
+ m_Name: Rank
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1854308720
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1854308719}
+ 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: 1500555571}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 145.66666, y: -40}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1854308721
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1854308719}
+ 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: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 60
+ m_Alignment: 4
+ m_AlignByGeometry: 1
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Rank
+--- !u!222 &1854308722
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1854308719}
+ m_CullTransparentMesh: 1
--- !u!1001 &1873354560
PrefabInstance:
m_ObjectHideFlags: 0
@@ -22932,6 +23552,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
warningText: {fileID: 1970749372}
playerHealth: {fileID: 624092170}
+ scoreboard: {fileID: 1788874781}
--- !u!114 &1939156178
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -22949,7 +23570,7 @@ MonoBehaviour:
questDisplayProgress: {fileID: 1239888143}
questDisplayDescription2: {fileID: 1090695712}
questDisplayProgress2: {fileID: 635668785}
- sm: {fileID: 0}
+ sm: {fileID: 888918217}
shop: {fileID: 1752408730}
player: {fileID: 624092162}
enemyManager: {fileID: 192641034}
diff --git a/Assets/Scenes/LocalScoreboard.unity b/Assets/Scenes/LocalScoreboard.unity
index 718b0463a13e35a44fd12613d69f22b4bd985635..707ea89244b588c8626d050f2a167a05d68b8c46 100644
--- a/Assets/Scenes/LocalScoreboard.unity
+++ b/Assets/Scenes/LocalScoreboard.unity
@@ -123,6 +123,140 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &220424484
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 220424485}
+ - component: {fileID: 220424488}
+ - component: {fileID: 220424487}
+ - component: {fileID: 220424486}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &220424485
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 220424484}
+ 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: 468532115}
+ m_Father: {fileID: 1322901020}
+ m_RootOrder: 2
+ 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: -333, y: -206}
+ m_SizeDelta: {x: 107.8906, y: 30.2487}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &220424486
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 220424484}
+ 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: 220424487}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 455230184}
+ m_TargetAssemblyTypeName: ScoreUi, Assembly-CSharp
+ m_MethodName: Back
+ 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 &220424487
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 220424484}
+ 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 &220424488
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 220424484}
+ m_CullTransparentMesh: 1
--- !u!1 &432719275
GameObject:
m_ObjectHideFlags: 0
@@ -243,6 +377,141 @@ MonoBehaviour:
m_EditorClassIdentifier:
rowUi: {fileID: 5118511110587072604, guid: 01f34aa98e49bca41966bee32d1198fb, type: 3}
sm: {fileID: 432719276}
+--- !u!1 &468532114
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 468532115}
+ - component: {fileID: 468532117}
+ - component: {fileID: 468532116}
+ 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 &468532115
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 468532114}
+ 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: 220424485}
+ 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 &468532116
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 468532114}
+ 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: Back
+ 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 &468532117
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 468532114}
+ m_CullTransparentMesh: 1
--- !u!1 &743912751
GameObject:
m_ObjectHideFlags: 0
@@ -633,7 +902,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
+ m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
@@ -651,6 +920,7 @@ RectTransform:
m_Children:
- {fileID: 1386484027}
- {fileID: 455230182}
+ - {fileID: 220424485}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index 891725380c4ab0359a7f8d442fc9acf187dbad21..132b7e4d10fee48ce08e31a585c57315f2c27939 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18325518, g: 0.22694159, b: 0.2950065, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -940,7 +940,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 773398433}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 852741937}
+ m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
+ m_MethodName: ScoreBoard
+ 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 &773398433
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1258,6 +1270,7 @@ GameObject:
m_Component:
- component: {fileID: 852741936}
- component: {fileID: 852741937}
+ - component: {fileID: 852741938}
m_Layer: 5
m_Name: Menu
m_TagString: Untagged
@@ -1304,6 +1317,23 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadPanel: {fileID: 295360072}
+ saveHandler: {fileID: 852741938}
+--- !u!114 &852741938
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 852741935}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2a82d67e83b3fd24a91fc94eafea0658, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ saveGameAgreement: {fileID: 0}
+ saveGameSlots: {fileID: 295360072}
+ saveGameInput: {fileID: 0}
+ inputHandler: {fileID: 0}
--- !u!1 &888715639
GameObject:
m_ObjectHideFlags: 0
@@ -1639,6 +1669,7 @@ MonoBehaviour:
saveGameAgreement: {fileID: 0}
saveGameSlots: {fileID: 295360072}
saveGameInput: {fileID: 0}
+ inputHandler: {fileID: 0}
--- !u!1 &940136380
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/TestPetLich.unity b/Assets/Scenes/TestPetLich.unity
index f2e64d5ce4dcd06898ec1d6c3ca893f081eb9e71..a61212c2189f516b3e6bcbca3ff532005b82560a 100644
--- a/Assets/Scenes/TestPetLich.unity
+++ b/Assets/Scenes/TestPetLich.unity
@@ -213,6 +213,10 @@ PrefabInstance:
propertyPath: weapon
value:
objectReference: {fileID: 1003343662}
+ - target: {fileID: 6649821425492048567, guid: 50754b1bd29cde544bf7b1e78400a3fd, type: 3}
+ propertyPath: player
+ value:
+ objectReference: {fileID: 624092162}
- target: {fileID: 9140073484006322690, guid: 50754b1bd29cde544bf7b1e78400a3fd, type: 3}
propertyPath: player
value:
@@ -800,6 +804,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 6
+ pet: 0
+ Pets: []
--- !u!82 &624092164
AudioSource:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs
index 4a4192d4467c23666fb086f02f64875a8e91959c..6c327196f7f29e7c4dc203d97cb66668a7c7c1dc 100644
--- a/Assets/Scripts/MainMenu.cs
+++ b/Assets/Scripts/MainMenu.cs
@@ -6,6 +6,8 @@ using UnityEngine.SceneManagement;
public class MainMenu : MonoBehaviour
{
public GameObject LoadPanel;
+ public SaveHandler saveHandler;
+
public void PlayGame() {
SceneManager.LoadScene("Level_01");
}
@@ -14,8 +16,12 @@ public class MainMenu : MonoBehaviour
}
public void LoadGame() {
LoadPanel.SetActive(true);
+ saveHandler.LoadSaveSlots();
}
public void Settings() {
SceneManager.LoadScene("Settings");
}
+ public void ScoreBoard(){
+ SceneManager.LoadScene("LocalScoreboard");
+ }
}
diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs
index 60f1de96178787622d3bf1d9d22a821882ff95b0..0e94b95a1fe7049607d1e9e02cc040ee8d5ef14a 100644
--- a/Assets/Scripts/Managers/GameOverManager.cs
+++ b/Assets/Scripts/Managers/GameOverManager.cs
@@ -1,12 +1,15 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
+using System.Collections;
+using System.Collections.Generic;
+using System;
public class GameOverManager : MonoBehaviour
{
public Text warningText;
public PlayerHealth playerHealth;
-
+ public GameObject scoreboard;
Animator anim;
void Awake()
@@ -19,6 +22,7 @@ public class GameOverManager : MonoBehaviour
if (playerHealth.GetCurrentHealth() <= 0)
{
anim.SetTrigger("GameOver");
+ StartCoroutine(LoadScoreBoard());
}
}
@@ -27,4 +31,12 @@ public class GameOverManager : MonoBehaviour
warningText.text = string.Format("! {0} m", Mathf.RoundToInt(enemyDistance));
anim.SetTrigger("Warning");
}
+
+ private IEnumerator LoadScoreBoard()
+ {
+ yield return new WaitForSeconds(2);
+ scoreboard.SetActive(true);
+ yield return new WaitForSeconds(5);
+ SceneManager.LoadScene("MainMenu");
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Pet/PetHealth.cs b/Assets/Scripts/Pet/PetHealth.cs
index 0a079a06ec79ec6ac75dc07e9edb7aae5ad3b43c..207128fb0fa3a6ea78c6f23751bfdf690f218e7f 100644
--- a/Assets/Scripts/Pet/PetHealth.cs
+++ b/Assets/Scripts/Pet/PetHealth.cs
@@ -16,6 +16,14 @@ public class PetHealth : MonoBehaviour, Attackable
private Rigidbody rb;
private AudioSource petAudio;
+ // For cheat
+ private bool isImmortal = false;
+ private bool isTyping = false;
+ private string CHEAT_CODE_KILL = "kill";
+ private string CHEAT_CODE_IMMORTAL = "imt";
+ private string cheat = "";
+ private float timer = 0f;
+
// Start is called before the first frame update
void Awake()
{
@@ -30,7 +38,37 @@ public class PetHealth : MonoBehaviour, Attackable
// Update is called once per frame
void Update()
{
- // Do something
+ if (isTyping) {
+ if (Input.anyKey) {
+ cheat += Input.inputString;
+ // Debug.Log(cheat);
+
+ if (cheat == CHEAT_CODE_KILL) {
+ currentHealth = 0;
+ TakeDamage(1);
+
+ isTyping = false;
+ // Debug.Log("Killed pet");
+ } else if (cheat == CHEAT_CODE_IMMORTAL) {
+ isImmortal = !isImmortal;
+
+ isTyping = false;
+ // Debug.Log("Immortal: " + isImmortal);
+ }
+ }
+
+ timer += Time.deltaTime;
+ if (timer >= 3f) {
+ isTyping = false;
+ cheat = "";
+ }
+ } else {
+ if (Input.GetKeyDown("k") || Input.GetKeyDown("i")) {
+ cheat += Input.inputString;
+ isTyping = true;
+ timer = 0f;
+ }
+ }
}
public void TakeDamage(int amount)
@@ -38,6 +76,9 @@ public class PetHealth : MonoBehaviour, Attackable
if (isDead)
return;
+ if (isImmortal)
+ return;
+
currentHealth -= (amount - armor);
petAudio.Play();
diff --git a/Assets/Scripts/Save/SaveHandler.cs b/Assets/Scripts/Save/SaveHandler.cs
index d261099b4711cc1f90b15a756092ce1fd24a10f9..86b1133bbe6786eccee14f5fcd068aa89461a2fd 100644
--- a/Assets/Scripts/Save/SaveHandler.cs
+++ b/Assets/Scripts/Save/SaveHandler.cs
@@ -18,35 +18,14 @@ public class SaveHandler : MonoBehaviour
saveGameAgreement.SetActive(false);
saveGameSlots.SetActive(true);
- if (!Directory.Exists(Application.persistentDataPath + "/save/"))
- {
- Directory.CreateDirectory(Application.persistentDataPath + "/save/");
- }
-
- string[] files_str = Directory.GetFiles(Application.persistentDataPath + "/save/");
- Dictionary<int, Tuple<string, DateTime>> files = preprocessFileName(files_str);
-
- List<GameObject> slots = new List<GameObject> {
- saveGameSlots.transform.Find("SaveSlot1").gameObject,
- saveGameSlots.transform.Find("SaveSlot2").gameObject,
- saveGameSlots.transform.Find("SaveSlot3").gameObject
- };
-
- for (int i=0; i<slots.Count; i++)
- {
- if (files.ContainsKey(i))
- {
- slots[i].transform.Find("SaveName").gameObject.GetComponent<Text>().text = files[i].Item1;
- slots[i].transform.Find("SaveDate").gameObject.GetComponent<Text>().text = "Last saved: " + files[i].Item2.ToString();
- }
- }
+ LoadSaveSlots();
}
public void OnSaveDisagreement()
{
saveGameAgreement.SetActive(false);
Time.timeScale = 1;
- inputHandler.setIsSaving(false);
+ // inputHandler.setInactive(false);
}
public void OnSaveSlotSelection(int slotIdx)
@@ -75,7 +54,7 @@ public class SaveHandler : MonoBehaviour
}
OnSaveGame(slotIdx, saveName);
Time.timeScale = 1;
- inputHandler.setIsSaving(false);
+ // inputHandler.setInactive(false);
}
public void OnSaveInputBack()
@@ -152,4 +131,30 @@ public class SaveHandler : MonoBehaviour
return true;
}
+
+ public void LoadSaveSlots()
+ {
+ if (!Directory.Exists(Application.persistentDataPath + "/save/"))
+ {
+ Directory.CreateDirectory(Application.persistentDataPath + "/save/");
+ }
+
+ string[] files_str = Directory.GetFiles(Application.persistentDataPath + "/save/");
+ Dictionary<int, Tuple<string, DateTime>> files = preprocessFileName(files_str);
+
+ List<GameObject> slots = new List<GameObject> {
+ saveGameSlots.transform.Find("SaveSlot1").gameObject,
+ saveGameSlots.transform.Find("SaveSlot2").gameObject,
+ saveGameSlots.transform.Find("SaveSlot3").gameObject
+ };
+
+ for (int i = 0; i < slots.Count; i++)
+ {
+ if (files.ContainsKey(i))
+ {
+ slots[i].transform.Find("SaveName").gameObject.GetComponent<Text>().text = files[i].Item1;
+ slots[i].transform.Find("SaveDate").gameObject.GetComponent<Text>().text = "Last saved: " + files[i].Item2.ToString();
+ }
+ }
+ }
}
diff --git a/Assets/Scripts/Scoreboard/ScoreUi.cs b/Assets/Scripts/Scoreboard/ScoreUi.cs
index 4faaa2e92ce2a9d5fc2f97fdc50e2dcd99f54ba5..a5ce99fbb5d977d7d6896661c27aeb574801571f 100644
--- a/Assets/Scripts/Scoreboard/ScoreUi.cs
+++ b/Assets/Scripts/Scoreboard/ScoreUi.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.SceneManagement;
public class ScoreUi : MonoBehaviour
{
@@ -20,4 +21,9 @@ public class ScoreUi : MonoBehaviour
}
}
+ public void Back()
+ {
+ SceneManager.LoadScene("MainMenu");
+ }
+
}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 1f5bc9847a8ff99f5b08757d141e022538270da5..c4cde6db7791d698253bfd986e53da8ae96d8188 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -8,10 +8,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Opening.unity
guid: 5a879cf53e215d4489f61a5cf3f1e9f8
- - enabled: 1
+ - enabled: 0
path: Assets/Scenes/TestPetRobo.unity
guid: 040952f78919059438226e972e48142e
- - enabled: 1
+ - enabled: 0
path: Assets/Scenes/TestPetLich.unity
guid: ff3d380191ec6ea46991c9b02f42c135
- enabled: 1
@@ -20,4 +20,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Level_01.unity
guid: 3ecc56cf9200054488b28c4a74339c25
+ - enabled: 1
+ path: Assets/Scenes/Settings.unity
+ guid: 2dffe17a5b63eb641aa7b784496170c5
+ - enabled: 1
+ path: Assets/Scenes/LocalScoreboard.unity
+ guid: b1bc290496b5f674dbb37a711483ea65
m_configObjects: {}