Navigathema blank scene is now unloaded when scene loaded.

mackysoft · Feb 14, 2024 · a8c8168 · a8c8168
1 parent f4a4f5a
commit a8c8168
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...ft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs b/...ft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs
@@ -327,7 +327,7 @@ async UniTask TryFinalizeAndUnloadCurrentScene (SceneHistoryEntry currentSceneEn
 				// NOTE: If the current scene is the only scene, create an empty scene to prevent an exception from being thrown when unloading.
 				if (SceneManager.sceneCount < 2)
 				{
-					SceneManager.CreateScene("Navigathena Blank");
+					await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Load(cancellationToken: cancellationToken);
 				}
 
 				await m_CurrentSceneState.Value.Handle.Unload(m_SceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken);

diff --git a/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs b/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs
@@ -67,6 +67,9 @@ public static async UniTask<SceneState> LoadSceneAndGetEntryPoint (ISceneIdentif
 			Scene loadedScene = await sceneHandle.Load(sceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken);
 			cancellationToken.ThrowIfCancellationRequested();
 
+			await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Unload(cancellationToken: cancellationToken);
+			cancellationToken.ThrowIfCancellationRequested();
+
 			var sceneEntryPoint = loadedScene.GetComponentInScene<ISceneEntryPoint>(true);
 			return new SceneState(scene, sceneHandle, sceneEntryPoint); 
 		}