diff --git a/Assets/Prefabs/MainMenu.prefab b/Assets/Prefabs/MainMenu.prefab
index f98d4d32de0983e8330250b52c6a1aa7e2b0ec7a..f6fa2db4f137e6a7a690a4b8f621b0fa9a8a7bee 100644
--- a/Assets/Prefabs/MainMenu.prefab
+++ b/Assets/Prefabs/MainMenu.prefab
@@ -1,5 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2658532307295422021
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 648854089293949085}
+ - component: {fileID: 3714734246158075719}
+ - component: {fileID: 698186391053421945}
+ m_Layer: 5
+ m_Name: Text (Legacy)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &648854089293949085
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2658532307295422021}
+ 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: 1342256261960572203}
+ 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!222 &3714734246158075719
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2658532307295422021}
+ m_CullTransparentMesh: 1
+--- !u!114 &698186391053421945
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2658532307295422021}
+ 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: 14
+ m_FontStyle: 0
+ 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: Load game
--- !u!1 &2666819086854733628
GameObject:
m_ObjectHideFlags: 0
@@ -48,7 +128,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
panel: {fileID: 2666819088515132477}
- prolog: {fileID: 0}
mainMenu: {fileID: 2666819086854733628}
--- !u!1 &2666819086958553803
GameObject:
@@ -247,6 +326,8 @@ RectTransform:
- {fileID: 2666819088208645304}
- {fileID: 2666819087586650261}
- {fileID: 2666819088048231269}
+ - {fileID: 1342256261960572203}
+ - {fileID: 5669206529347075144}
- {fileID: 2666819088515132478}
m_Father: {fileID: 2666819086854733629}
m_RootOrder: 1
@@ -744,7 +825,6 @@ GameObject:
- component: {fileID: 2666819088075019378}
- component: {fileID: 2666819088075019373}
- component: {fileID: 2666819088075019372}
- - component: {fileID: 2666819088075019379}
- component: {fileID: 2666819088075019374}
m_Layer: 0
m_Name: Main Camera
@@ -819,20 +899,6 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2666819088075019377}
m_Enabled: 1
---- !u!114 &2666819088075019379
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2666819088075019377}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 028afd8bdc91fa645b68b4a7eeeefd9e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- target: {fileID: 0}
- smoothing: 5
--- !u!95 &2666819088075019374
Animator:
serializedVersion: 5
@@ -1175,11 +1241,11 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2666819087583471830}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -0.000030517578, y: 0.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2666819088515132472
@@ -1257,7 +1323,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 40}
+ m_AnchoredPosition: {x: 0, y: 71}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2666819088545651484
@@ -1434,3 +1500,254 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Score
+--- !u!1 &4924546022121901339
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1342256261960572203}
+ - component: {fileID: 1378070122106744660}
+ - component: {fileID: 1207217965151747105}
+ - component: {fileID: 3980839131197516645}
+ m_Layer: 5
+ m_Name: LoadGame
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1342256261960572203
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4924546022121901339}
+ 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: 648854089293949085}
+ m_Father: {fileID: 2666819087583471830}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 34}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1378070122106744660
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4924546022121901339}
+ m_CullTransparentMesh: 1
+--- !u!114 &1207217965151747105
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4924546022121901339}
+ 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.27450982, g: 0.7490196, b: 0.8313726, 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!114 &3980839131197516645
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4924546022121901339}
+ 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: 1207217965151747105}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 5669206529347075191}
+ m_TargetAssemblyTypeName: LoadSlotsMenu, Assembly-CSharp
+ m_MethodName: ActivateMenu
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 1
+ m_CallState: 2
+--- !u!1001 &5233719296102234140
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2666819087583471830}
+ m_Modifications:
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251157, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: m_Name
+ value: LoadSlotsMenu
+ objectReference: {fileID: 0}
+ - target: {fileID: 435994522645251179, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ propertyPath: MainMenu
+ value:
+ objectReference: {fileID: 2666819086854733628}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+--- !u!224 &5669206529347075144 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 435994522645251156, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ m_PrefabInstance: {fileID: 5233719296102234140}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &5669206529347075191 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 435994522645251179, guid: 3fd64cb05ba81e94888f912226e1997b, type: 3}
+ m_PrefabInstance: {fileID: 5233719296102234140}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0a86844161278a6488519fc6002e56b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index d3ffc954c123f1915665d1ca0bb491825254b752..2ec51c7967f0babad55fd55060e7d553dac51740 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18319169, g: 0.22679472, b: 0.2945608, a: 1}
+ m_IndirectSpecularColor: {r: 0.18319218, g: 0.2267955, b: 0.29456192, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1331,6 +1331,63 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
+--- !u!1001 &477667973
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8724558115133895232, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_Name
+ value: DataPersistenceManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_RootOrder
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 583.2763
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 335.15546
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.20224163
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
--- !u!1001 &484780872
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2085,63 +2142,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!1001 &686018161
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 8724558115133895232, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_Name
- value: DataPersistenceManager
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_RootOrder
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalPosition.x
- value: 583.2763
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalPosition.y
- value: 335.15546
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0.20224163
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
--- !u!1001 &771914175
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5558,6 +5558,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1723625082}
m_CullTransparentMesh: 1
+--- !u!1 &1772748159
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1772748161}
+ - component: {fileID: 1772748160}
+ m_Layer: 0
+ m_Name: Timer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1772748160
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1772748159}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7e16f39d070c15847a6df5f09597f439, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ timePlayed: 0
+--- !u!4 &1772748161
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1772748159}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 510.9308, y: 337.57578, z: -20.340664}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 16
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1822223761
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index a988915a4ed9239472b9bff04e4f0424e1d4ea09..0ebd8a1fe158c77086e063960c5e254092052b8a 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -123,6 +123,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1001 &686018161
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 8724558115133895232, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_Name
+ value: DataPersistenceManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 583.2763
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 335.15546
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.20224166
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8724558115133895234, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2cce45e1d8ff931429ec4af4fa1ea5ea, type: 3}
--- !u!1001 &718683521
PrefabInstance:
m_ObjectHideFlags: 0
@@ -134,6 +191,10 @@ PrefabInstance:
propertyPath: m_Name
value: Lights
objectReference: {fileID: 0}
+ - target: {fileID: 126720, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 409160, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -196,6 +257,10 @@ PrefabInstance:
propertyPath: m_Name
value: Environment
objectReference: {fileID: 0}
+ - target: {fileID: 186378, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -372,6 +437,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: Score
objectReference: {fileID: 0}
+ - target: {fileID: 2666819088010446877, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2666819088048231270, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -380,6 +449,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: Exit
objectReference: {fileID: 0}
+ - target: {fileID: 2666819088075019377, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2666819088075019379, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
propertyPath: target
value:
@@ -396,6 +469,18 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2666819088515132478, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2666819088515132478, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2666819088545651489, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 72
+ objectReference: {fileID: 0}
- target: {fileID: 2666819088545651490, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -404,7 +489,38 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: NewGame
objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 2666819088397972797}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ActivateMenu
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: LoadSlotsMenu, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2666819088075019379, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
- {fileID: 2666819086854733630, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+--- !u!114 &2666819088397972797 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5669206529347075191, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0a86844161278a6488519fc6002e56b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Scripts/Load/LoadSlotsMenu.cs b/Assets/Scripts/Load/LoadSlotsMenu.cs
index 42a41a54e06eb2a52aa1d44feb0f78b6b93949f0..4f5115d3ba46bc6576ab424b7800fa5729e143b9 100644
--- a/Assets/Scripts/Load/LoadSlotsMenu.cs
+++ b/Assets/Scripts/Load/LoadSlotsMenu.cs
@@ -29,12 +29,12 @@ public class LoadSlotsMenu : MonoBehaviour
DataPersistenceManager.instance.NewGame();
}
- SceneManager.LoadSceneAsync("Leve_01");
+ SceneManager.LoadSceneAsync("Level_01");
}
public void ActivateMenu(bool isLoadingGame){
this.gameObject.SetActive(true);
- MainMenu.SetActive(false);
+ // MainMenu.SetActive(false);
this.isLoadingGame = isLoadingGame;
@@ -59,7 +59,7 @@ public class LoadSlotsMenu : MonoBehaviour
public void OnBackClicked(){
this.DeactivateMenu();
- MainMenu.SetActive(true);
+ // MainMenu.SetActive(true);
}
private void DisableMenuButtons(){
diff --git a/Assets/Scripts/Player/TimePlayed.cs b/Assets/Scripts/Player/TimePlayed.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1b801213b29be433eee7b2e9b2075cc4fc0a341c
--- /dev/null
+++ b/Assets/Scripts/Player/TimePlayed.cs
@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TimePlayed : MonoBehaviour, IDataPersistence
+{
+ // Start is called before the first frame update
+
+ public int timePlayed;
+
+ void Start()
+ {
+ StartCoroutine("Playtimer");
+ }
+
+ // Update is called once per frame
+ private IEnumerator Playtimer()
+ {
+ while (true)
+ {
+ yield return new WaitForSeconds(1);
+ timePlayed++;
+ }
+ }
+
+ public void LoadData(GameData data)
+ {
+ this.timePlayed = data.timePlayed;
+ }
+
+ public void SaveData(ref GameData data)
+ {
+ data.timePlayed = this.timePlayed;
+ }
+}
diff --git a/Assets/Scripts/Player/TimePlayed.cs.meta b/Assets/Scripts/Player/TimePlayed.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4bb21a7b3e358f4f8028c29a3cb71806b7e7b0b0
--- /dev/null
+++ b/Assets/Scripts/Player/TimePlayed.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e16f39d070c15847a6df5f09597f439
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Save/GameData.cs b/Assets/Scripts/Save/GameData.cs
index 8102d347561989d732d0589faa9c2d51cca40acf..29834e768905632d789c5cd4fe780b10005d9856 100644
--- a/Assets/Scripts/Save/GameData.cs
+++ b/Assets/Scripts/Save/GameData.cs
@@ -14,6 +14,8 @@ public class GameData
public string saveName;
public string lastUpdated;
+ public int timePlayed;
+
// the values defined in this constructor will be the default values
// the game starts with when theres no data to load
public GameData(){
@@ -21,6 +23,7 @@ public class GameData
this.killCount = 0;
this.score = 0;
this.questExp = 0;
+ this.timePlayed = 0;
this.health = 100;
}
}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index f8251a7aff364eef348a2a84df6e9282b704095d..bca3d022af91c9ac9ea71b8b4daa517f7d5e3bcd 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.22f1
-m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)
+m_EditorVersion: 2021.3.21f1
+m_EditorVersionWithRevision: 2021.3.21f1 (1b156197d683)