From d2ab30e7a69bfe7efda63ae75812207377917bd3 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sun, 30 Mar 2025 18:50:27 +0000
Subject: [PATCH] Merge branch 'Flexalon-UI-Layouts' into develop
---
Assets/Scripts/Managers/GameManager.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 4f26218..e0670dd 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -10,6 +10,8 @@
public class GameManager : SettingsManager
{
+ public static bool GameIsPaused = false;
+
public GameObject damageTextPrefab;
public GameObject healthTextPrefab;
public Canvas playerUI;
@@ -24,6 +26,7 @@
private void Awake()
{
+ GameIsPaused = false;
SoundManager.instance.ChangeMusic(SoundName.MusicHappy);
LoadTileMaps(SaveSystem.isGameLoaded);
}
@@ -32,7 +35,7 @@
private void LoadTileMaps(bool loadFromSave)
{
generateTileMap = tilemap.GetComponent<GenerateTileMap>();
- pauseMenuUI.GetComponent<PauseMenu>().Pause();
+ PauseGame();
levelChanger.GetComponent<Animator>().SetBool("SceneLoading", true);
if (loadFromSave)
{
@@ -67,7 +70,7 @@
}
public void GameLoaded()
{
- pauseMenuUI.GetComponent<PauseMenu>().Resume();
+ ResumeGame();
pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
}
@@ -141,8 +144,11 @@
{
// Change no drops, only inventory
//Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform);
- //Debug.Log(.name);
-
+ Inventory playerInventory = contact.rigidbody.gameObject.GetComponent<Inventory>();
+ if (playerInventory != null)
+ {
+ playerInventory.AddItem(tileGameObject?.GetComponent<Dropable>().dropable);
+ }
}
tilemap.SetTile(cellCoord, null);
destroyedTiles.Add(cellCoord);
@@ -156,4 +162,20 @@
}
#endregion
+
+ #region GameState
+
+ public static void PauseGame()
+ {
+ Time.timeScale = 0f;
+ GameIsPaused = true;
+ //GameStateEvents.gameStatePauseChanged.Invoke(GameIsPaused);
+ }
+ public static void ResumeGame()
+ {
+ Time.timeScale = 1f;
+ GameIsPaused = false;
+ //GameStateEvents.gameStatePauseChanged.Invoke(GameIsPaused);
+ }
+ #endregion
}
--
Gitblit v1.9.3