From 8db8d93fb755c7649fd7fd557f34e81b1b0dc7d8 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 01 Apr 2025 17:16:44 +0000
Subject: [PATCH] cleanup project, moved scripts into folders
---
Assets/Scripts/Managers/GameManager.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 00a5bc0..21fb0d4 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -10,10 +10,14 @@
public class GameManager : SettingsManager
{
+ public static bool GameIsPaused = false;
+
public GameObject damageTextPrefab;
public GameObject healthTextPrefab;
+ public GameObject lootTextPrefab;
public Canvas playerUI;
public Canvas pauseMenuUI;
+ public Canvas worldSpaceUI;
public GameObject levelChanger;
public Tilemap tilemap;
[NonSerialized]
@@ -24,6 +28,7 @@
private void Awake()
{
+ GameIsPaused = false;
SoundManager.instance.ChangeMusic(SoundName.MusicHappy);
LoadTileMaps(SaveSystem.isGameLoaded);
}
@@ -32,7 +37,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 +72,7 @@
}
public void GameLoaded()
{
- pauseMenuUI.GetComponent<PauseMenu>().Resume();
+ ResumeGame();
pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
}
@@ -109,6 +114,20 @@
tmpText.text = healthRestored.ToString();
}
+ public void CharacterLootObtained(Vector3 position, Item itemReceived, int quantity)
+ {
+ // Offset the position slightly up so it doesn't spawn inside the ground/player
+ position += Vector3.up * 0.5f;
+
+ // Create text in world space (no parent needed)
+ GameObject textObj = Instantiate(lootTextPrefab, position, Quaternion.identity, worldSpaceUI.transform);
+ TextMeshProUGUI tmpText = textObj.GetComponent<TextMeshProUGUI>();
+ tmpText.text = $"+{quantity} ({itemReceived.itemName})";
+
+ // Ensure it's visible to the camera
+ textObj.transform.rotation = Camera.main.transform.rotation;
+
+ }
public void CharacterDrill(ContactPoint2D contact, DrillDirection drillDirection)
{
GridLayout grid = tilemap.transform.GetComponentInParent<GridLayout>();
@@ -137,11 +156,18 @@
// middle of tile
cellWorldPosition.x += 0.5f;
cellWorldPosition.y += 0.5f;
- if (tileGameObject?.GetComponent<Dropable>()?.isDropable ?? false)
+ Dropable dropable = tileGameObject?.GetComponent<Dropable>();
+ if (dropable?.isDropable ?? false)
{
- Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform);
- //Debug.Log(.name);
-
+ // Change no drops, only inventory
+ //Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform);
+ Inventory playerInventory = contact.rigidbody.gameObject.GetComponent<Inventory>();
+ if (playerInventory != null)
+ {
+ Item item = dropable.dropable;
+ playerInventory.AddItem(item, dropable.dropAmount);
+ CharacterLootObtained(tileGameObject.transform.position, item, dropable.dropAmount);
+ }
}
tilemap.SetTile(cellCoord, null);
destroyedTiles.Add(cellCoord);
@@ -155,4 +181,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.10.0