diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index d75da5ad3a82477555c2f20e36acb70a88e30efc..d823391144f370d19f52b46c0a45e4911884e9d4 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -1801,63 +1801,6 @@ 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: 9
- 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
@@ -2246,6 +2189,7 @@ MonoBehaviour:
fadeSpeed: 1
dialog: {fileID: 1084991974}
black: {fileID: 1277878621}
+ epilog: {fileID: 0}
--- !u!114 &504285669
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2902,8 +2846,6 @@ MonoBehaviour:
choice1: {fileID: 1235883371}
choice2: {fileID: 419196075}
epilog: {fileID: 1429657134}
- canvas: {fileID: 947488749}
- game: {fileID: 1745986121}
--- !u!1 &681042660
GameObject:
m_ObjectHideFlags: 0
@@ -6546,8 +6488,6 @@ MonoBehaviour:
Camera: {fileID: 1570269517}
black: {fileID: 741379108}
monolog: {fileID: 568250614}
- canvas: {fileID: 947488749}
- game: {fileID: 1745986121}
lines:
- Aarrgggggh...
- Akhirnya mereka mati smua
@@ -7567,7 +7507,7 @@ MonoBehaviour:
playerHealth: {fileID: 146948854}
enemy: {fileID: 152446141947964431, guid: 126948bc699e7da61ac66269cd743206, type: 3}
game: {fileID: 1745986121}
- spawnTime: 10
+ spawnTime: 3
spawnPoints:
- {fileID: 1269603458}
--- !u!4 &1605377956
@@ -7600,7 +7540,7 @@ MonoBehaviour:
playerHealth: {fileID: 146948854}
enemy: {fileID: 3972810617495639857, guid: 9a8837d6dea5bbb4498e9b639db329a0, type: 3}
game: {fileID: 1745986121}
- spawnTime: 10
+ spawnTime: 3
spawnPoints:
- {fileID: 264091982}
--- !u!114 &1605377958
@@ -7618,7 +7558,7 @@ MonoBehaviour:
playerHealth: {fileID: 146948854}
enemy: {fileID: 3663767924688358501, guid: 0d52eb49463a1ffc3a65c5e65d42d89f, type: 3}
game: {fileID: 1745986121}
- spawnTime: 10
+ spawnTime: 3
spawnPoints:
- {fileID: 557110022}
--- !u!1 &1637837199
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
index 0ebd8a1fe158c77086e063960c5e254092052b8a..0c7ed587a879c081df7273b1b01882c0169b11aa 100644
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -123,6 +123,11 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &263457895 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2666819087586650260, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &686018161
PrefabInstance:
m_ObjectHideFlags: 0
@@ -241,11 +246,21 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3}
+--- !u!1 &822046528 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4924546022121901339, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &904356402 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2666819086854733628, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
m_PrefabInstance: {fileID: 2666819088397972796}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1462227361 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2666819088545651488, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1671174045
PrefabInstance:
m_ObjectHideFlags: 0
@@ -307,6 +322,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3}
+--- !u!1 &1799387776 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2666819088208645311, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1801310423
GameObject:
m_ObjectHideFlags: 0
@@ -353,6 +373,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2054968316 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2666819088048231268, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ m_PrefabInstance: {fileID: 2666819088397972796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2060035117 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2666819088515132477, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
@@ -489,26 +514,310 @@ 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.size
+ value: 6
+ 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[1].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].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[1].m_Target
+ value:
+ objectReference: {fileID: 1462227361}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
+ value:
+ objectReference: {fileID: 1799387776}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
+ value:
+ objectReference: {fileID: 263457895}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target
+ value:
+ objectReference: {fileID: 2054968316}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target
+ value:
+ objectReference: {fileID: 822046528}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
- 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[1].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName
+ value: SetActive
+ 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[1].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ 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}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_BoolArgument
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_BoolArgument
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 3980839131197516645, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+ value:
+ objectReference: {fileID: 1462227361}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
+ value:
+ objectReference: {fileID: 1799387776}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
+ value:
+ objectReference: {fileID: 263457895}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target
+ value:
+ objectReference: {fileID: 2054968316}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target
+ value:
+ objectReference: {fileID: 822046528}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_TargetAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_BoolArgument
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669206530456354166, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2666819088075019379, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
- {fileID: 2666819086854733630, guid: 7ccdbf0a0797ec744987bd4afe740ddf, type: 3}
diff --git a/Assets/Scripts/Save/DataPersistenceManager.cs b/Assets/Scripts/Save/DataPersistenceManager.cs
index 389050e20758dad5dbcd34f6043f16c456b93b1c..4baf10401c241d3143b9ebe6e64f2fed8c69fd08 100644
--- a/Assets/Scripts/Save/DataPersistenceManager.cs
+++ b/Assets/Scripts/Save/DataPersistenceManager.cs
@@ -48,6 +48,7 @@ public class DataPersistenceManager : MonoBehaviour
public void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
+ Debug.Log("LOADED");
this.dataPersistenceObjects = FindAllDataPersistenceObjects();
LoadGame();
}
diff --git a/Assets/Scripts/Save/GameData.cs b/Assets/Scripts/Save/GameData.cs
index 29834e768905632d789c5cd4fe780b10005d9856..683e63a46ad2ce21b7637855d5e80448a4ff8546 100644
--- a/Assets/Scripts/Save/GameData.cs
+++ b/Assets/Scripts/Save/GameData.cs
@@ -13,9 +13,14 @@ public class GameData
public int health;
public string saveName;
public string lastUpdated;
-
public int timePlayed;
+ // Weapon Manager
+ public int selectedWeapon;
+ public List<bool> weaponBought = new List<bool>();
+ // --------------
+
+
// the values defined in this constructor will be the default values
// the game starts with when theres no data to load
public GameData(){
@@ -25,5 +30,13 @@ public class GameData
this.questExp = 0;
this.timePlayed = 0;
this.health = 100;
+
+ // Weapon Manager
+ this.selectedWeapon = 0;
+ this.weaponBought.Add(true);
+ this.weaponBought.Add(false);
+ this.weaponBought.Add(false);
+ this.weaponBought.Add(false);
+ // --------------
}
}
diff --git a/Assets/Scripts/Weapon/WeaponManager.cs b/Assets/Scripts/Weapon/WeaponManager.cs
index aff2485352eedb9b1bba59c92638075a2c4a6325..b2dad7ab04a7e35affd94774b4ab642726ad59b0 100644
--- a/Assets/Scripts/Weapon/WeaponManager.cs
+++ b/Assets/Scripts/Weapon/WeaponManager.cs
@@ -2,18 +2,18 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-public class WeaponManager : MonoBehaviour
+public class WeaponManager : MonoBehaviour, IDataPersistence
{
// Start is called before the first frame update
- public int selectedWeapon = 0;
+ public int selectedWeapon;
List<bool> weaponBought = new List<bool>();
void Start()
{
- weaponBought.Add(true);
- weaponBought.Add(false);
- weaponBought.Add(false);
- weaponBought.Add(false);
+ // weaponBought.Add(true);
+ // weaponBought.Add(false);
+ // weaponBought.Add(false);
+ // weaponBought.Add(false);
SelectWeapon();
}
@@ -95,4 +95,16 @@ public class WeaponManager : MonoBehaviour
weaponBought[weaponIndex] = true;
}
}
+
+ public void LoadData(GameData data)
+ {
+ this.selectedWeapon = data.selectedWeapon;
+ this.weaponBought = data.weaponBought;
+ }
+
+ public void SaveData(ref GameData data)
+ {
+ data.selectedWeapon = this.selectedWeapon;
+ data.weaponBought = this.weaponBought;
+ }
}