From 576c113fadde0791c40fad63b374f9430f875af5 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Wed, 27 Dec 2023 18:17:22 +0000
Subject: [PATCH] Changed drops, no need just go directly into inventory
---
Assets/Scripts/PauseMenu.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs
index 9e77542..630aa70 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();
@@ -65,7 +74,9 @@
public void OnGameSaveClicked()
{
PlayerController playerController = GameObject.Find("Player").GetComponent<PlayerController>();
- SaveSystem.SavePlayer(playerController);
+ SaveSystem.SavePlayer(new SaveDataPlayer(playerController));
+ GameManager gameManager= GameObject.Find("GameManager").GetComponent<GameManager>();
+ SaveSystem.SaveMapState(new SaveDataMap(gameManager.destroyedTiles, gameManager.generateTileMap.seed.Value));
animator.SetTrigger("GameSaved");
}
--
Gitblit v1.9.3