From a95431b83651611a93072636a69fb2a5504b90e6 Mon Sep 17 00:00:00 2001 From: "j.mei7" Date: Sat, 5 Mar 2022 14:37:58 +0100 Subject: [PATCH] money UI --- Assets/Scenes/SampleScene.unity | 160 ++++++++++++++++++++++++- Assets/Scripts/CameraMovement.cs | 3 - Assets/Scripts/EconomyManager.cs | 4 +- Assets/Scripts/TimeManager.cs | 8 +- Assets/Scripts/UI.meta | 8 ++ Assets/Scripts/UI/MoneyUI.cs | 19 +++ Assets/Scripts/UI/MoneyUI.cs.meta | 11 ++ Assets/Scripts/{ => UI}/TimeUI.cs | 8 +- Assets/Scripts/{ => UI}/TimeUI.cs.meta | 0 9 files changed, 204 insertions(+), 17 deletions(-) create mode 100644 Assets/Scripts/UI.meta create mode 100644 Assets/Scripts/UI/MoneyUI.cs create mode 100644 Assets/Scripts/UI/MoneyUI.cs.meta rename Assets/Scripts/{ => UI}/TimeUI.cs (62%) rename Assets/Scripts/{ => UI}/TimeUI.cs.meta (100%) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index bf57abb..7165b38 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -621,6 +621,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2006173391} + - {fileID: 627379117} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6244,7 +6245,6 @@ MonoBehaviour: speed: 150 fastSpeed: 300 slowSpeed: 50 - cameraSize: 15 maxCameraSize: 100 minCameraSize: 3 cameraSizeSteps: 3 @@ -6285,6 +6285,154 @@ Transform: m_CorrespondingSourceObject: {fileID: 8483988689672967185, guid: 23ae9a68a9ff79940adf19a8638591c2, type: 3} m_PrefabInstance: {fileID: 805870941} m_PrefabAsset: {fileID: 0} +--- !u!1 &627379116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627379117} + - component: {fileID: 627379120} + - component: {fileID: 627379119} + - component: {fileID: 627379118} + m_Layer: 5 + m_Name: Money + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &627379117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627379116} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 203761406} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &627379118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627379116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 24ee615049306e041af2b4679b9a19f1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &627379119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627379116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Money + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &627379120 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627379116} + m_CullTransparentMesh: 1 --- !u!4 &643639046 stripped Transform: m_CorrespondingSourceObject: {fileID: 8483988689672967185, guid: 23ae9a68a9ff79940adf19a8638591c2, type: 3} @@ -7651,7 +7799,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: partOfDay: 0 - intervalTime: 1 + intervalTime: 0.5 readOnlyTimeString: --- !u!4 &1360475758 Transform: @@ -22462,9 +22610,9 @@ RectTransform: m_Father: {fileID: 203761406} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -30} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -120, y: -30} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2006173392 @@ -22499,7 +22647,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: '08:00pm asdasdasd ' + m_text: Time and Date m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/CameraMovement.cs index 1bd1afb..a8bcf9f 100644 --- a/Assets/Scripts/CameraMovement.cs +++ b/Assets/Scripts/CameraMovement.cs @@ -13,9 +13,6 @@ public class CameraMovement : MonoBehaviour float slowSpeed = 50f; [Header("Zoom")] - [SerializeField] - float cameraSize = 15.0f; - [SerializeField] float maxCameraSize = 100f; diff --git a/Assets/Scripts/EconomyManager.cs b/Assets/Scripts/EconomyManager.cs index c31b754..36414e9 100644 --- a/Assets/Scripts/EconomyManager.cs +++ b/Assets/Scripts/EconomyManager.cs @@ -11,11 +11,13 @@ public class EconomyManager : MonoBehaviour private void Awake() { - instance = this; + if (instance == null) + instance = this; } public void AddMoney(float value) => money += value; public float GetMoney() => money; + public string GetMoneyStr() => money.ToString() + " €"; public void SetMoney(float value) => money = value; public void RemoveMone(float value) => money -= value; } diff --git a/Assets/Scripts/TimeManager.cs b/Assets/Scripts/TimeManager.cs index f08d8ca..c4494f6 100644 --- a/Assets/Scripts/TimeManager.cs +++ b/Assets/Scripts/TimeManager.cs @@ -43,7 +43,13 @@ public class TimeManager : MonoBehaviour [Header("ReadOnly")] [SerializeField] - string readOnlyTimeString; + string readOnlyTimeString; + + private void Awake() + { + if (instance == null) + instance = this; + } void Start() { diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta new file mode 100644 index 0000000..239a0b3 --- /dev/null +++ b/Assets/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b6d236e48426364cb29789a24ffe55a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/MoneyUI.cs b/Assets/Scripts/UI/MoneyUI.cs new file mode 100644 index 0000000..e52ee20 --- /dev/null +++ b/Assets/Scripts/UI/MoneyUI.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using TMPro; + +public class MoneyUI : MonoBehaviour +{ + TextMeshProUGUI moneyText; + + void Start() + { + TimeManager.OnTimeUpdate += OnTimeUpdate; + moneyText = GetComponent(); + } + + void OnTimeUpdate() + { + if (moneyText != null) + moneyText.text = EconomyManager.instance.GetMoneyStr(); + } +} diff --git a/Assets/Scripts/UI/MoneyUI.cs.meta b/Assets/Scripts/UI/MoneyUI.cs.meta new file mode 100644 index 0000000..705de76 --- /dev/null +++ b/Assets/Scripts/UI/MoneyUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 24ee615049306e041af2b4679b9a19f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/TimeUI.cs b/Assets/Scripts/UI/TimeUI.cs similarity index 62% rename from Assets/Scripts/TimeUI.cs rename to Assets/Scripts/UI/TimeUI.cs index 4b0ecc3..c9ec89d 100644 --- a/Assets/Scripts/TimeUI.cs +++ b/Assets/Scripts/UI/TimeUI.cs @@ -1,25 +1,21 @@ using System; -using System.Collections.Generic; using UnityEngine; using TMPro; public class TimeUI : MonoBehaviour { TextMeshProUGUI dateTimeText; - TimeManager timeManager; private void Start() { - timeManager = GameObject.Find("GameManager").GetComponent(); TimeManager.OnTimeUpdate += OnTimeUpdate; dateTimeText = GetComponent(); - } void OnTimeUpdate() { - DateTime dateTime = timeManager.GetDateTime(); + DateTime dateTime = TimeManager.instance.GetDateTime(); if (dateTimeText != null) - dateTimeText.text = dateTime.ToString("hh:mm tt / dd.MM.yyyy", timeManager.cultureInfo); + dateTimeText.text = dateTime.ToString("hh:mm tt / dd.MM.yyyy", TimeManager.instance.cultureInfo); } } \ No newline at end of file diff --git a/Assets/Scripts/TimeUI.cs.meta b/Assets/Scripts/UI/TimeUI.cs.meta similarity index 100% rename from Assets/Scripts/TimeUI.cs.meta rename to Assets/Scripts/UI/TimeUI.cs.meta