Skip to content

Commit 666121b

Browse files
committed
fix(misc): make quit button return to menu from game scene
1 parent 6b3c568 commit 666121b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

‎Assets/Scripts/Core/CoreBooter.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ private AsyncOperation _LoadMenu()
108108
Scene s = SceneManager.GetSceneByName("GameScene");
109109
if (s != null && s.IsValid())
110110
SceneManager.UnloadSceneAsync(s);
111+
if (CoreDataHandler.instance.Scene != null)
112+
{
113+
s = SceneManager.GetSceneByName(CoreDataHandler.instance.Scene);
114+
if (s != null && s.IsValid())
115+
SceneManager.UnloadSceneAsync(s);
116+
}
111117

112118
SceneManager.SetActiveScene(SceneManager.GetSceneByName("MainMenu"));
113119
};

‎Assets/Scripts/UI/UIManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public void ResumeGame()
283283

284284
public void QuitGame()
285285
{
286-
Application.Quit();
286+
CoreBooter.instance.LoadMenu();
287287
}
288288

289289
private void _AddUnitSkillButtonListener(Button b, int i)

0 commit comments

Comments
 (0)