diff --git a/Assets/_Scenes/DevRoom.unity b/Assets/_Scenes/DevRoom.unity index a29a0b59cfcc023744acf7331d6e2260e7daf249..e3c2145716d93207ea8c2703bed39822f7e98a97 100644 --- a/Assets/_Scenes/DevRoom.unity +++ b/Assets/_Scenes/DevRoom.unity @@ -5008,51 +5008,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464623400} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &574010110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 574010112} - - component: {fileID: 574010111} - m_Layer: 0 - m_Name: GameSaveManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &574010111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574010110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b8b7dd8bdd25ac8d491abc96d38eaf67, type: 3} - m_Name: - m_EditorClassIdentifier: - activeGameSaveIndex: -1 ---- !u!4 &574010112 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574010110} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -51.1379, y: 3.9086382, z: 49.587833} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &580745003 GameObject: m_ObjectHideFlags: 0 @@ -5441,7 +5396,7 @@ MonoBehaviour: meshQuery: layers: 33554440 maskAndChannels: 8 - surfaceParameter: 50584 + surfaceParameter: 50666 meshQueryIndex: 2 subMeshQueryIndex: 0 geometryHashValue: -1365392548276624071 @@ -6475,7 +6430,7 @@ MonoBehaviour: meshQuery: layers: 33554440 maskAndChannels: 8 - surfaceParameter: 50584 + surfaceParameter: 50666 meshQueryIndex: 2 subMeshQueryIndex: 0 geometryHashValue: -1365392548276624071 @@ -8236,7 +8191,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 51426 + surfaceParameter: 51514 meshQueryIndex: 0 subMeshQueryIndex: 0 geometryHashValue: -2436489981782101099 @@ -11884,7 +11839,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 50896 + surfaceParameter: 50982 meshQueryIndex: 1 subMeshQueryIndex: 0 geometryHashValue: 5432873912789261714 @@ -14060,6 +14015,52 @@ Transform: - {fileID: 954295820} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2012910004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2012910006} + - component: {fileID: 2012910005} + m_Layer: 0 + m_Name: ScenesManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2012910005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012910004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92dad55a555e8c9718807280ab97fed4, type: 3} + m_Name: + m_EditorClassIdentifier: + LoadingScreen: {fileID: 4608723408205958242} + MinimumTransitionTimeSeconds: 0 +--- !u!4 &2012910006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2012910004} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -51.1379, y: 3.9086382, z: 49.587833} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2016902677 GameObject: m_ObjectHideFlags: 0 @@ -29352,6 +29353,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2a5a02652110cb4e854896b35e3e3a8, type: 3} +--- !u!114 &4608723408205958242 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 47419240839385305, guid: e2a5a02652110cb4e854896b35e3e3a8, type: 3} + m_PrefabInstance: {fileID: 4608723408205958241} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6388430732250035799 PrefabInstance: m_ObjectHideFlags: 0 @@ -31512,4 +31524,4 @@ SceneRoots: - {fileID: 4313360953454956523} - {fileID: 1036636693} - {fileID: 45123353} - - {fileID: 574010112} + - {fileID: 2012910006} diff --git a/Assets/_Scripts/Core/Game/Data/GameStatisticsManager.cs b/Assets/_Scripts/Core/Game/Data/GameStatisticsManager.cs index 25ab1489b2e5bdea7b522c7536cfe519e7a5eaa0..b1d5c503e9d57bf2833e37ed90b39a57dcffa613 100644 --- a/Assets/_Scripts/Core/Game/Data/GameStatisticsManager.cs +++ b/Assets/_Scripts/Core/Game/Data/GameStatisticsManager.cs @@ -66,9 +66,19 @@ namespace _Scripts.Core.Game.Data // Constructor public void Awake() { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + } + + if (Instance == this) + { + return; + } + Instance = this; DontDestroyOnLoad(gameObject); - + Debug.Log("Loaded Statistics Manager"); } diff --git a/Assets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs b/Assets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs index 1fd783e08b4e41be55c4c9ac4d830d090162ce98..dbd8abc3820444e196beaad4801b1ea680ee59ac 100644 --- a/Assets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs +++ b/Assets/_Scripts/Core/Game/Data/Saves/GameSaveManager.cs @@ -40,6 +40,16 @@ public class GameSaveManager : MonoBehaviour // Constructor public void Awake() { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + } + + if (Instance == this) + { + return; + } + Instance = this; DontDestroyOnLoad(gameObject); @@ -103,7 +113,7 @@ public class GameSaveManager : MonoBehaviour { return GameSaveResult.MAX_SAVES_REACHED; } - + activeGameSaveIndex = gameSaves.Count; activeGameSave.SaveGame(SAVE_PATH); gameSaves.Add(activeGameSave); diff --git a/Assets/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs b/Assets/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs index 21a6a069d91fa8e61de2c14b9d8143fc5264603a..a7913a7cdd8370a78c007c6010d0ee68232a1b55 100644 --- a/Assets/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs +++ b/Assets/_Scripts/Core/Game/Data/Settings/GameSettingsManager.cs @@ -14,6 +14,16 @@ public class GameSettingsManager : MonoBehaviour public void Awake() { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + } + + if (Instance == this) + { + return; + } + Instance = this; Debug.Log("Loaded Settings Manager"); SETTINGS_PATH = Application.persistentDataPath + "/settings.json";