diff --git a/Assets/Scripts/UmaSceneController.cs b/Assets/Scripts/UmaSceneController.cs index 86691ac..5e2646a 100644 --- a/Assets/Scripts/UmaSceneController.cs +++ b/Assets/Scripts/UmaSceneController.cs @@ -14,14 +14,15 @@ public class UmaSceneController:MonoBehaviour if (instance) { Destroy(gameObject); + return; } instance = this; DontDestroyOnLoad(this); } - public void LoadScene(string name, Action OnSceneloaded = null, Action OnLastSceneUnloaded = null) + public static void LoadScene(string name, Action OnSceneloaded = null, Action OnLastSceneUnloaded = null) { - StartCoroutine(LoadLiveSceneAsync(name, OnSceneloaded, OnLastSceneUnloaded)); + instance.StartCoroutine(instance.LoadLiveSceneAsync(name, OnSceneloaded, OnLastSceneUnloaded)); } IEnumerator LoadLiveSceneAsync(string sceneName, Action OnSceneloaded, Action OnLastSceneUnloaded) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 4f5b9cc..5162383 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -682,7 +682,7 @@ public class UmaViewerBuilder : MonoBehaviour GameObject.Find("AudioManager") }; - UmaSceneController.instance.LoadScene("LiveScene", + UmaSceneController.LoadScene("LiveScene", delegate () { // Move the GameObject (you attach this in the Inspector) to the newly loaded Scene diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 25787d4..ea9024d 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -502,7 +502,7 @@ namespace Gallop.Live if (Input.GetKeyDown(KeyCode.Escape)) { isExit = true; - UmaSceneController.instance.LoadScene("Version2"); + UmaSceneController.LoadScene("Version2"); AssetBundle.UnloadAllAssetBundles(true); }