From f5e15fa93d84acbae6a26b86fddf20add38bb485 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 01 Apr 2025 13:21:41 +0000
Subject: [PATCH] #31 added inventory to savefile, added itemDatabase
---
Assets/Scripts/PauseMenu.cs | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs
index 4888cd0..c995f60 100644
--- a/Assets/Scripts/PauseMenu.cs
+++ b/Assets/Scripts/PauseMenu.cs
@@ -7,16 +7,23 @@
public class PauseMenu : MonoBehaviour
{
- public static bool GameIsPaused = false;
public GameObject pauseMenuUI;
public GameObject settingsMenuUI;
+ public GameObject pausePanel;
+ public GameObject saveGameText;
+ Animator animator;
+
+ private void Awake()
+ {
+ animator = GetComponent<Animator>();
+ }
public void OnEscapedPressed(InputAction.CallbackContext context)
{
if (context.started)
{
- ResumeOrPauseGame(GameIsPaused);
+ ResumeOrPauseGame(GameManager.GameIsPaused);
}
}
@@ -24,32 +31,52 @@
{
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)
- pauseMenuUI.SetActive(false);
- settingsMenuUI.SetActive(false);
- Time.timeScale = 1f;
- GameIsPaused = false;
+ // TODO make it dynamic (whichever UI is activ set it to false when unpaused)
+ GameManager.ResumeGame();
+ pausePanel.SetActive(false);
}
- private void Pause()
+ private void PauseWithMenu()
{
+ GameManager.PauseGame();
+ settingsMenuUI.SetActive(false);
pauseMenuUI.SetActive(true);
- Time.timeScale = 0f;
- GameIsPaused = true;
+ pausePanel.SetActive(true);
}
+
public void OnResumeClicked()
{
- Resume();
+ GameManager.ResumeGame();
+ }
+
+ public void OnGameSaveClicked()
+ {
+ PlayerController playerController = GameObject.Find("Player").GetComponent<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");
+ }
+
+ public void OnSettingsSaveClicked()
+ {
+ animator.SetTrigger("GameSettingsSaved");
+ }
+
+ public void OnGamedLoaded()
+ {
+ animator.SetTrigger("GameLoaded");
}
public void OnMenuClicked()
@@ -59,7 +86,7 @@
public void OnExitClicked()
{
- Resume();
+ GameManager.ResumeGame();
SceneManager.LoadScene("MainMenu");
}
--
Gitblit v1.9.3