diff --git a/Assets/Scenes/Trailer_BG.unity b/Assets/Scenes/Trailer_BG.unity
index dcc12bf01fa5ec81e8fe1b48fac63786dee8395e..509ccc1c5642768e6dd753bbd64d04bda350333c 100644
--- a/Assets/Scenes/Trailer_BG.unity
+++ b/Assets/Scenes/Trailer_BG.unity
@@ -1326,6 +1326,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
sceneBuildIndex: 0
+ deathSpawnPoint: {fileID: 0}
+ player: {fileID: 4121029672727752963, guid: d99c2016aaf9e4e479ff6d9fe04f2813, type: 3}
--- !u!1 &1798569351
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/LevelLoad.cs b/Assets/Scripts/LevelLoad.cs
index 7dd5204a799753b4162700b1967dff21348a2bf8..ad5ef73511a85ab6ea5a59595c71ad558b697eab 100644
--- a/Assets/Scripts/LevelLoad.cs
+++ b/Assets/Scripts/LevelLoad.cs
@@ -9,6 +9,9 @@ public class LevelLoad : MonoBehaviour
public GameObject healthPrefab;
+ private static GameObject player;
+ private GameObject health;
+
//public GameObject filterPrefab;
// Start is called before the first frame update
@@ -18,7 +21,8 @@ void Awake()
GameObject[] players = GameObject.FindGameObjectsWithTag("Player");
if (players.Length == 0 )
{
- player = GameObject.Instantiate(playerPrefab);
+ //player = GameObject.Instantiate(playerPrefab);
+ InstantiatePlayer();
Debug.Log("Instantiate Player");
}
else
@@ -26,12 +30,6 @@ void Awake()
player = players[0];
}
-
- //if (!player.GetComponent<PlayerAttack>().bossDestroyed)
- //{
- //Instantiate(filterPrefab);
- //Debug.Log("Filter instantiated");
- //}
GameObject health = null;
GameObject[] healthBars = GameObject.FindGameObjectsWithTag("Health");
@@ -52,4 +50,18 @@ void Update()
ICinemachineCamera camera = GameObject.FindWithTag("MainCamera").GetComponent<CinemachineBrain>().ActiveVirtualCamera;
camera.Follow = GameObject.FindWithTag("Player").transform;
}
+
+ private void InstantiatePlayer()
+ {
+ player = GameObject.Instantiate(playerPrefab);
+ }
+
+ public static void DestroyPlayer()
+ {
+ if (player != null)
+ {
+ Destroy(player);
+ player = null;
+ }
+ }
}
diff --git a/Assets/Scripts/Menus/MainMenu.cs b/Assets/Scripts/Menus/MainMenu.cs
index 0d82e8daac08c62f33ff64d004519f2bdded39ad..5f9cc619c2c6456527c9bfb457efa49d689f25bc 100644
--- a/Assets/Scripts/Menus/MainMenu.cs
+++ b/Assets/Scripts/Menus/MainMenu.cs
@@ -22,6 +22,7 @@ public void PlayGame()
// playerMovement.SetSpawnPoint(deathSpawnPoint.transform.position);
// }
// }
+ LevelLoad.DestroyPlayer();
SceneManager.LoadScene("Room 14", LoadSceneMode.Single);
}
diff --git a/Assets/Scripts/Menus/PauseMenu.cs b/Assets/Scripts/Menus/PauseMenu.cs
index d50eaeb6aa3f65f651761322ca6c7aac07cd29d9..1c6c7549f0ea06efbc5543cf73d612142b4cc047 100644
--- a/Assets/Scripts/Menus/PauseMenu.cs
+++ b/Assets/Scripts/Menus/PauseMenu.cs
@@ -63,6 +63,7 @@ public void LoadMenu()
{
Debug.Log("Loading menu");
Resume();
+ LevelLoad.DestroyPlayer();
SceneManager.LoadScene("Trailer_BG");
isPaused = false;
}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 3b6c35945a02e3c8a36c0e1aa4a9d937fffa0bed..7917e068480e8d2e6af24a12b6ca9dfbf037183b 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
- value: 5506055257005c025d565f7644740a4410164b28297f74637e784a6abab56360
+ value: 5309035456030c0a5858557047760d44464f1e727a2b71322b7d4966b6b63061
flags: 0
RecentlyUsedSceneGuid-1:
- value: 0153500006500f5d55565b7b16720b44434f4e2f7c2925607a7c1e62e1b96560
+ value: 550107560650510f0e5d087043265e441215487b747c73362b714d37e7b76460
flags: 0
RecentlyUsedSceneGuid-2:
- value: 0702040353045a095d5f0a2146735c4443164e7e742a71662e2c4e31e4b6606a
+ value: 0208515203505b0f5c58597345215d444f161e7e7c70233329281c37e6e4606f
flags: 0
RecentlyUsedSceneGuid-3:
- value: 5309035456030c0a5858557047760d44464f1e727a2b71322b7d4966b6b63061
+ value: 02085055510d505f0b5e5a734070094410154b7e757e76677c281c6be0b0356b
flags: 0
RecentlyUsedSceneGuid-4:
- value: 550107560650510f0e5d087043265e441215487b747c73362b714d37e7b76460
+ value: 0207025701040d5a585e097447755d4445151b282a7823327a791f66b5b46c3c
flags: 0
RecentlyUsedSceneGuid-5:
- value: 0208515203505b0f5c58597345215d444f161e7e7c70233329281c37e6e4606f
+ value: 560502575d0d0f0c5f580e20427a0e44124f4e7f742b7f66287c4460e0e26d3e
flags: 0
RecentlyUsedSceneGuid-6:
- value: 02085055510d505f0b5e5a734070094410154b7e757e76677c281c6be0b0356b
+ value: 55025256510450085d0c557612255b44424f1d7f7f7a77327b791f37e0b8323c
flags: 0
RecentlyUsedSceneGuid-7:
- value: 0207025701040d5a585e097447755d4445151b282a7823327a791f66b5b46c3c
+ value: 0153500006500f5d55565b7b16720b44434f4e2f7c2925607a7c1e62e1b96560
flags: 0
RecentlyUsedSceneGuid-8:
- value: 560502575d0d0f0c5f580e20427a0e44124f4e7f742b7f66287c4460e0e26d3e
+ value: 5506055257005c025d565f7644740a4410164b28297f74637e784a6abab56360
flags: 0
RecentlyUsedSceneGuid-9:
- value: 55025256510450085d0c557612255b44424f1d7f7f7a77327b791f37e0b8323c
+ value: 5654020256035d0f0c08547245250f444115497d2871716974711e6ae7b3373e
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
index 5ad96ab649dd0f0f32d633c97fbf203ca1b539d4..3c0656dcbf1109cd6567eba03a8a01857860625c 100644
--- a/UserSettings/Layouts/default-2022.dwlt
+++ b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 989
m_ShowMode: 4
- m_Title: Inspector
+ m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 127
+ controlID: 64
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -235,7 +235,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ProjectBrowser
+ m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -244,15 +244,15 @@ MonoBehaviour:
y: 612
width: 1393
height: 327
- m_MinSize: {x: 231, y: 271}
- m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 17}
+ m_MinSize: {x: 101, y: 121}
+ m_MaxSize: {x: 4001, y: 4021}
+ m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 17}
- {fileID: 18}
- {fileID: 19}
- m_Selected: 0
- m_LastSelected: 1
+ m_Selected: 1
+ m_LastSelected: 0
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -272,8 +272,8 @@ MonoBehaviour:
y: 0
width: 527
height: 939
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
@@ -346,7 +346,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
+ m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -410,9 +410,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 94eeffff
- m_LastClickedID: -4460
- m_ExpandedIDs: 96eeffff18f0ffffbcf1ffff12f3fffffaf3ffffc0f4fffff2f5ffff2cf7ffff36f8ffff0efbffff
+ m_SelectedIDs: 942b0000
+ m_LastClickedID: 0
+ m_ExpandedIDs: 2adeffff24e0ffff22e1ffffeee1ffffb6eeffff06fbfffff4ffffffca9700001898000060a30000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -727,9 +727,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 0.95262146, y: 10.865643, z: 0.28088164}
+ m_Target: {x: 971.30005, y: 666.30005, z: 0}
speed: 2
- m_Value: {x: 0.9526203, y: 10.865639, z: 0.2808814}
+ m_Value: {x: 971.30005, y: 666.30005, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -779,9 +779,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 76.842865
+ m_Target: 152.84872
speed: 2
- m_Value: 76.84282
+ m_Value: 152.84872
m_Ortho:
m_Target: 1
speed: 2
@@ -990,22 +990,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Scenes/Windfell Forest
+ - Assets/Scripts/Menus
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Scenes/Windfell Forest
+ - Assets/Scripts/Menus
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Git\GuardiansGame
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 60720000
- m_LastClickedID: 29280
- m_ExpandedIDs: 000000001e72000020720000227200002472000026720000287200002a7200002c7200002e72000000ca9a3b
+ scrollPos: {x: 0, y: 2}
+ m_SelectedIDs: d2720000
+ m_LastClickedID: 29394
+ m_ExpandedIDs: 000000002472000026720000287200002a7200002c7200002e7200003072000032720000347200006a72000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1033,7 +1033,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 000000001e72000020720000227200002472000026720000287200002a7200002c7200002e720000
+ m_ExpandedIDs: 000000002472000026720000287200002a7200002c7200002e720000307200003272000034720000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1058,8 +1058,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs:
- m_LastClickedInstanceID: 0
+ m_SelectedInstanceIDs: 942b0000
+ m_LastClickedInstanceID: 11156
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000006980000ce9700008a830000526d0000deb80000a06d00002a6e00000c6d000006780000308a0000466e00003e7a0000748d0000fa6e0000da6e0000ec6c0000026f0000a070000056710000d4960000367900006c7100002889000070720000307b00009a6e0000f06e000034730000ee7b00007e860000e2800000567200007c700000e07100001672000028700000ee7000008a790000267a00008e71000008700000d26f000084800000f06b0000e06f0000e66d0000de6f0000866e0000cc750000707500009a7300006c8e0000d4700000c86f0000c0ab0000ee750000940001007e730000b6720000
m_RenameOverlay:
@@ -1109,10 +1109,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 8
- y: 689
- width: 1380
- height: 294
+ x: 0
+ y: 685
+ width: 1392
+ height: 306
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -1147,7 +1147,7 @@ MonoBehaviour:
m_SaveData: []
m_LockTracker:
m_IsLocked: 0
- m_LastSelectedObjectID: 192994
+ m_LastSelectedObjectID: 41746
--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52