From 6db269b9430900667b240bada58f8436ef3442af Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 01 Apr 2025 14:44:13 +0000
Subject: [PATCH] #32 inventory improvements
---
Assets/Scripts/PauseMenu.cs | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs
index 630aa70..75664f1 100644
--- a/Assets/Scripts/PauseMenu.cs
+++ b/Assets/Scripts/PauseMenu.cs
@@ -7,7 +7,6 @@
public class PauseMenu : MonoBehaviour
{
- public static bool GameIsPaused = false;
public GameObject pauseMenuUI;
public GameObject settingsMenuUI;
@@ -18,14 +17,13 @@
private void Awake()
{
animator = GetComponent<Animator>();
- GameIsPaused = false;
}
public void OnEscapedPressed(InputAction.CallbackContext context)
{
if (context.started)
{
- ResumeOrPauseGame(GameIsPaused);
+ ResumeOrPauseGame(GameManager.GameIsPaused);
}
}
@@ -43,38 +41,29 @@
private void ResumeWithMenu()
{
- // TODO make it dynamic (whichever UI is activ set it to falsen when unpaused)
+ // TODO make it dynamic (whichever UI is activ set it to false when unpaused)
+ GameManager.ResumeGame();
pausePanel.SetActive(false);
- Resume();
- }
- public void Resume()
- {
- Time.timeScale = 1f;
- GameIsPaused = false;
}
private void PauseWithMenu()
{
+ GameManager.PauseGame();
settingsMenuUI.SetActive(false);
pauseMenuUI.SetActive(true);
pausePanel.SetActive(true);
- Pause();
- }
- public void Pause()
- {
- Time.timeScale = 0f;
- GameIsPaused = true;
}
public void OnResumeClicked()
{
- Resume();
+ ResumeWithMenu();
}
public void OnGameSaveClicked()
{
PlayerController playerController = GameObject.Find("Player").GetComponent<PlayerController>();
- SaveSystem.SavePlayer(new SaveDataPlayer(playerController));
+ Inventory playerInventory = GameObject.Find("Player").GetComponent<Inventory>();
+ SaveSystem.SavePlayer(new SaveDataPlayer(playerController, playerInventory));
GameManager gameManager= GameObject.Find("GameManager").GetComponent<GameManager>();
SaveSystem.SaveMapState(new SaveDataMap(gameManager.destroyedTiles, gameManager.generateTileMap.seed.Value));
animator.SetTrigger("GameSaved");
@@ -97,7 +86,7 @@
public void OnExitClicked()
{
- Resume();
+ GameManager.ResumeGame();
SceneManager.LoadScene("MainMenu");
}
--
Gitblit v1.9.3