From 96fdac4acc1b1a6bf08fba1d71f52b8ab3d53f35 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Fri, 1 Oct 2021 11:11:58 +0200 Subject: [PATCH] ResourceText --- Assets/Scripts/Building/Building.cs | 8 +++++ .../Buildings/House/HouseBuildingScript.cs | 1 + .../Scripts/Building/Types/StorageBuilding.cs | 5 ++- Assets/Scripts/ResourceUiTextScript.cs | 35 +++++++++++++++++++ Assets/Scripts/ResourceUiTextScript.cs.meta | 11 ++++++ .../Resources/Scripts/ResourceManager.cs | 6 ++-- Assets/Scripts/TimeTextScript.cs | 5 +-- 7 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 Assets/Scripts/ResourceUiTextScript.cs create mode 100644 Assets/Scripts/ResourceUiTextScript.cs.meta diff --git a/Assets/Scripts/Building/Building.cs b/Assets/Scripts/Building/Building.cs index 504b843..63c02e7 100644 --- a/Assets/Scripts/Building/Building.cs +++ b/Assets/Scripts/Building/Building.cs @@ -7,4 +7,12 @@ public abstract class Building : MonoBehaviour public string title = "New Building"; public string description = "A cool new building"; + public enum BuildingType + { + Housing, + Storage, + Decoration + } + + public BuildingType buildingType; } diff --git a/Assets/Scripts/Building/Buildings/House/HouseBuildingScript.cs b/Assets/Scripts/Building/Buildings/House/HouseBuildingScript.cs index 9902331..a7734a8 100644 --- a/Assets/Scripts/Building/Buildings/House/HouseBuildingScript.cs +++ b/Assets/Scripts/Building/Buildings/House/HouseBuildingScript.cs @@ -8,6 +8,7 @@ public class HouseBuildingScript : Building { title = "House"; description = "A place to live in"; + buildingType = BuildingType.Housing; } } diff --git a/Assets/Scripts/Building/Types/StorageBuilding.cs b/Assets/Scripts/Building/Types/StorageBuilding.cs index 7514cc8..55f3dde 100644 --- a/Assets/Scripts/Building/Types/StorageBuilding.cs +++ b/Assets/Scripts/Building/Types/StorageBuilding.cs @@ -7,7 +7,10 @@ public class StorageBuilding : Building [SerializeField] private List inventory = new List(); public int inventorySpace; - + public void Start() + { + buildingType = BuildingType.Storage; + } public void Add(Item item) { if(GetFreeSpace() >= item.count) diff --git a/Assets/Scripts/ResourceUiTextScript.cs b/Assets/Scripts/ResourceUiTextScript.cs new file mode 100644 index 0000000..ff3ac1a --- /dev/null +++ b/Assets/Scripts/ResourceUiTextScript.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class ResourceUiTextScript : MonoBehaviour +{ + private ResourceManager resourceManager; + + + private string str = ""; + private TMPro.TextMeshProUGUI textResource; + + private void Start() + { + resourceManager = GameObject.Find("GameManager").GetComponent(); + textResource = GetComponent(); + } + void Update() + { + List inventory = new List(); + inventory = resourceManager.GetAllResources(); + str = ""; + foreach(Item i in inventory) + { + if(i != null) + { + str += i.count.ToString() + " " + i.name + "\n"; + } + + } + + textResource.text = str; + } +} diff --git a/Assets/Scripts/ResourceUiTextScript.cs.meta b/Assets/Scripts/ResourceUiTextScript.cs.meta new file mode 100644 index 0000000..94d93a1 --- /dev/null +++ b/Assets/Scripts/ResourceUiTextScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fcb96c8b7ecf3554ab9aea050b13d5b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Resources/Scripts/ResourceManager.cs b/Assets/Scripts/Resources/Scripts/ResourceManager.cs index 541f05a..d8af4ea 100644 --- a/Assets/Scripts/Resources/Scripts/ResourceManager.cs +++ b/Assets/Scripts/Resources/Scripts/ResourceManager.cs @@ -5,13 +5,13 @@ using UnityEngine; public class ResourceManager: MonoBehaviour { [SerializeField] private GameObject[] storageBuildings; - + private void Start() { storageBuildings = GameObject.FindGameObjectsWithTag("StorageBuilding"); } - /* + private void Update() { if (Input.GetKeyDown(KeyCode.K)) @@ -30,7 +30,7 @@ public class ResourceManager: MonoBehaviour { GetAllResources(); } - }*/ + } public List GetAllResources() diff --git a/Assets/Scripts/TimeTextScript.cs b/Assets/Scripts/TimeTextScript.cs index 235a4c2..1ef499a 100644 --- a/Assets/Scripts/TimeTextScript.cs +++ b/Assets/Scripts/TimeTextScript.cs @@ -5,18 +5,19 @@ using UnityEngine.UI; public class TimeTextScript : MonoBehaviour { - [SerializeField] private GameObject GamerManager; + private GameObject GameManager; private string timeStr = ""; private Text timeText; private void Start() { + GameManager = GameObject.Find("GameManager"); timeText = GetComponent(); } void Update() { - timeStr = GamerManager.GetComponent().GetTimeString(); + timeStr = GameManager.GetComponent().GetTimeString(); timeText.text = timeStr; } }