From e1ae7deba54d896fa23c738b1001e6f0d9c3f5e1 Mon Sep 17 00:00:00 2001 From: Zenny Date: Sun, 14 Aug 2022 16:49:18 -0700 Subject: [PATCH] Fix scene load arguments --- Assets/Scenes/BaseScene.unity | 2 +- Assets/Scenes/TempleA.unity | 4 ++++ Assets/Scenes/TempleB.unity | 4 ++-- Assets/Scenes/TempleC.unity | 8 ++++++++ Assets/Scenes/TempleD.unity | 2 +- Assets/Scripts/BaseSceneManager.cs | 2 +- Assets/Scripts/GameManager.cs | 18 +++++++++--------- Assets/Scripts/LoadScene.cs | 4 ++-- Assets/Scripts/TitleScreen.cs | 2 +- Assets/Scripts/UnloadScene.cs | 3 +-- 10 files changed, 30 insertions(+), 19 deletions(-) diff --git a/Assets/Scenes/BaseScene.unity b/Assets/Scenes/BaseScene.unity index 76ee15b..2058ea9 100644 --- a/Assets/Scenes/BaseScene.unity +++ b/Assets/Scenes/BaseScene.unity @@ -1697,7 +1697,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2050966537 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TempleA.unity b/Assets/Scenes/TempleA.unity index f152d1d..a90409e 100644 --- a/Assets/Scenes/TempleA.unity +++ b/Assets/Scenes/TempleA.unity @@ -130,6 +130,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5353799689805060140, guid: cdecf5aa30b8c3649aa7cc748758d68a, type: 3} + propertyPath: scene + value: TempleB + objectReference: {fileID: 0} - target: {fileID: 5353799689805060140, guid: cdecf5aa30b8c3649aa7cc748758d68a, type: 3} propertyPath: spawnPoint value: diff --git a/Assets/Scenes/TempleB.unity b/Assets/Scenes/TempleB.unity index 5e008ee..f8a85a1 100644 --- a/Assets/Scenes/TempleB.unity +++ b/Assets/Scenes/TempleB.unity @@ -746,7 +746,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spawnPoint: {fileID: 361166861} - sceneIndex: 2 + scene: TempleC --- !u!23 &1156064028215898908 MeshRenderer: m_ObjectHideFlags: 0 @@ -970,7 +970,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spawnPoint: {fileID: 1864713635} - sceneIndex: 0 + scene: TempleB --- !u!65 &4444024360594741996 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TempleC.unity b/Assets/Scenes/TempleC.unity index cf3fe5c..3bf1eb6 100644 --- a/Assets/Scenes/TempleC.unity +++ b/Assets/Scenes/TempleC.unity @@ -799,6 +799,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3124016421593227013, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} + propertyPath: scene + value: TempleD + objectReference: {fileID: 0} - target: {fileID: 3124016421593227013, guid: 285b65b1583472147a5dcee7cfb4a4e0, type: 3} propertyPath: sceneIndex value: 3 @@ -931,6 +935,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5353799689805060140, guid: cdecf5aa30b8c3649aa7cc748758d68a, type: 3} + propertyPath: scene + value: TempleB + objectReference: {fileID: 0} - target: {fileID: 5353799689805060140, guid: cdecf5aa30b8c3649aa7cc748758d68a, type: 3} propertyPath: spawnPoint value: diff --git a/Assets/Scenes/TempleD.unity b/Assets/Scenes/TempleD.unity index b24c315..9c96aa6 100644 --- a/Assets/Scenes/TempleD.unity +++ b/Assets/Scenes/TempleD.unity @@ -479,7 +479,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spawnPoint: {fileID: 524613079} - sceneIndex: 2 + scene: TempleC --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BaseSceneManager.cs b/Assets/Scripts/BaseSceneManager.cs index 2eae0df..33b8acd 100644 --- a/Assets/Scripts/BaseSceneManager.cs +++ b/Assets/Scripts/BaseSceneManager.cs @@ -8,7 +8,7 @@ namespace Scampz.GameJam { void Start() { - GameManager.Instance.LoadScene(SceneManager.GetSceneByName(SceneNames.TempleC), LoadSceneMode.Additive); + GameManager.Instance.LoadScene(SceneNames.TempleC, LoadSceneMode.Additive); } } } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 17a537e..6c513ec 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -17,21 +17,21 @@ namespace Scampz.GameJam } } - public void LoadScene(Scene scene, LoadSceneMode loadSceneMode) + public void LoadScene(string sceneName, LoadSceneMode loadSceneMode) { - StartCoroutine(LoadSceneAsync(scene, loadSceneMode)); + StartCoroutine(LoadSceneAsync(sceneName, loadSceneMode)); } - public void UnloadScene(Scene scene) + public void UnloadScene(string sceneName) { - StartCoroutine(UnloadSceneAsync(scene)); + StartCoroutine(UnloadSceneAsync(sceneName)); } - private IEnumerator LoadSceneAsync(Scene scene, LoadSceneMode loadSceneMode) + private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) { yield return null; - var loadSceneOperation = SceneManager.LoadSceneAsync(scene.name, loadSceneMode); + var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); loadSceneOperation.allowSceneActivation = false; while (!loadSceneOperation.isDone) { @@ -43,11 +43,11 @@ namespace Scampz.GameJam yield return loadSceneOperation; } - private IEnumerator UnloadSceneAsync(Scene scene) + private IEnumerator UnloadSceneAsync(string sceneName) { yield return null; - if (SceneManager.GetSceneByName(scene.name).IsValid()) - SceneManager.UnloadSceneAsync(scene); + if (SceneManager.GetSceneByName(sceneName).IsValid()) + SceneManager.UnloadSceneAsync(sceneName); } } } diff --git a/Assets/Scripts/LoadScene.cs b/Assets/Scripts/LoadScene.cs index 951ab50..d199366 100644 --- a/Assets/Scripts/LoadScene.cs +++ b/Assets/Scripts/LoadScene.cs @@ -9,7 +9,7 @@ namespace Scampz.GameJam private bool loaded = false; public Transform spawnPoint; [SerializeField] - public int scene; + private string scene; void OnTriggerEnter(Collider collider) { @@ -19,7 +19,7 @@ namespace Scampz.GameJam var player = GameObject.FindWithTag("Player"); var cc = player.GetComponent(); cc.enabled = false; - GameManager.Instance.LoadScene(SceneManager.GetSceneByName(SceneNames.TempleA), LoadSceneMode.Additive); + GameManager.Instance.LoadScene(scene, LoadSceneMode.Additive); player.transform.position = spawnPoint.position; player.transform.rotation = spawnPoint.rotation; cc.enabled = true; diff --git a/Assets/Scripts/TitleScreen.cs b/Assets/Scripts/TitleScreen.cs index 08cd780..99eb566 100644 --- a/Assets/Scripts/TitleScreen.cs +++ b/Assets/Scripts/TitleScreen.cs @@ -10,7 +10,7 @@ namespace Scampz.GameJam { if (Input.GetButtonDown(InputOptions.Submit)) { - GameManager.Instance.LoadScene(SceneManager.GetSceneByName(SceneNames.BaseScene), LoadSceneMode.Single); + GameManager.Instance.LoadScene(SceneNames.BaseScene, LoadSceneMode.Single); } } } diff --git a/Assets/Scripts/UnloadScene.cs b/Assets/Scripts/UnloadScene.cs index bfb5091..c596f0b 100644 --- a/Assets/Scripts/UnloadScene.cs +++ b/Assets/Scripts/UnloadScene.cs @@ -1,12 +1,11 @@ using UnityEngine; -using UnityEngine.SceneManagement; namespace Scampz.GameJam { public class UnloadScene : MonoBehaviour { [SerializeField] - public Scene scene; + private string scene; private bool unloaded = false; void OnTriggerEnter(Collider collider)