From eab47305629d96d19626e10b649ba4247d1f55f5 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 23 Dec 2023 21:20:31 +0000
Subject: [PATCH] Added loading screen, moved tilemap generation to coroutine
---
Assets/Scripts/PauseMenu.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs
index 9e77542..90c5270 100644
--- a/Assets/Scripts/PauseMenu.cs
+++ b/Assets/Scripts/PauseMenu.cs
@@ -33,30 +33,39 @@
{
if (resume)
{
- Resume();
+ ResumeWithMenu();
}
else
{
- Pause();
+ PauseWithMenu();
}
}
- private void Resume()
+ private void ResumeWithMenu()
{
// TODO make it dynamic (whichever UI is activ set it to falsen when unpaused)
pausePanel.SetActive(false);
+ Resume();
+ }
+ public void Resume()
+ {
Time.timeScale = 1f;
GameIsPaused = false;
}
- private void Pause()
+ private void PauseWithMenu()
{
settingsMenuUI.SetActive(false);
pauseMenuUI.SetActive(true);
pausePanel.SetActive(true);
+ Pause();
+ }
+ public void Pause()
+ {
Time.timeScale = 0f;
GameIsPaused = true;
}
+
public void OnResumeClicked()
{
Resume();
--
Gitblit v1.9.3