From 33d88bdfa7bd48c17c1c769d6f295247b37169db Mon Sep 17 00:00:00 2001 From: Kirabsol <148810774+Kirabsol@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:20:29 +0100 Subject: [PATCH] Start of WiN/LOSE UI finishing later today --- Assets/Prefabs/StartArea.prefab | 111 +++++++++++++++ Assets/Prefabs/StartArea.prefab.meta | 7 + Assets/Scenes/LevelsTest/Flat 2.unity | 172 ++++++++--------------- Assets/{ => Scripts}/GameUI.cs | 6 +- Assets/{ => Scripts}/GameUI.cs.meta | 0 Assets/Scripts/LoseUI.cs | 21 +++ Assets/Scripts/LoseUI.cs.meta | 2 + Assets/Scripts/Singletons/GameManager.cs | 13 ++ 8 files changed, 221 insertions(+), 111 deletions(-) create mode 100644 Assets/Prefabs/StartArea.prefab create mode 100644 Assets/Prefabs/StartArea.prefab.meta rename Assets/{ => Scripts}/GameUI.cs (96%) rename Assets/{ => Scripts}/GameUI.cs.meta (100%) create mode 100644 Assets/Scripts/LoseUI.cs create mode 100644 Assets/Scripts/LoseUI.cs.meta diff --git a/Assets/Prefabs/StartArea.prefab b/Assets/Prefabs/StartArea.prefab new file mode 100644 index 0000000..2af6a2a --- /dev/null +++ b/Assets/Prefabs/StartArea.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7569653701291044145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1852553920262438280} + - component: {fileID: 2847168729042094331} + - component: {fileID: 8329624772352468447} + - component: {fileID: 1911725677042590628} + m_Layer: 3 + m_Name: StartArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1852553920262438280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569653701291044145} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -46.1, y: 2.3, z: 56.2} + m_LocalScale: {x: 2.3030813, y: 2.3030813, z: 2.3030813} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2847168729042094331 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569653701291044145} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8329624772352468447 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569653701291044145} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a2f035a0cba46f4438179e0f32656634, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1911725677042590628 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569653701291044145} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/StartArea.prefab.meta b/Assets/Prefabs/StartArea.prefab.meta new file mode 100644 index 0000000..0dce6f5 --- /dev/null +++ b/Assets/Prefabs/StartArea.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 003eb32f8bfc66c4fa6954c6dc9b7f30 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelsTest/Flat 2.unity b/Assets/Scenes/LevelsTest/Flat 2.unity index 255e6f5..bb8ff7d 100644 --- a/Assets/Scenes/LevelsTest/Flat 2.unity +++ b/Assets/Scenes/LevelsTest/Flat 2.unity @@ -26345,115 +26345,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 2002138670} m_PrefabAsset: {fileID: 0} ---- !u!1 &2002548185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2002548189} - - component: {fileID: 2002548188} - - component: {fileID: 2002548187} - - component: {fileID: 2002548186} - m_Layer: 3 - m_Name: StartArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &2002548186 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002548185} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2002548187 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002548185} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a2f035a0cba46f4438179e0f32656634, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2002548188 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002548185} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &2002548189 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002548185} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -46.1, y: 2.3, z: 56.2} - m_LocalScale: {x: 2.3030813, y: 2.3030813, z: 2.3030813} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2006222590 PrefabInstance: m_ObjectHideFlags: 0 @@ -27926,6 +27817,10 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6772871868213222444, guid: 47d419944f796b5c895d7a27016647a1, type: 3} + propertyPath: k__BackingField + value: 500 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -29430,6 +29325,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ec1b1522613fbdc488a8f29e180a7720, type: 3} +--- !u!1001 &1513702494036408917 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalPosition.x + value: -46.1 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalPosition.y + value: 2.3 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalPosition.z + value: 56.2 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1852553920262438280, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569653701291044145, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} + propertyPath: m_Name + value: StartArea + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 003eb32f8bfc66c4fa6954c6dc9b7f30, type: 3} --- !u!1 &1586535253100300694 GameObject: m_ObjectHideFlags: 0 @@ -31953,7 +31905,7 @@ SceneRoots: m_Roots: - {fileID: 2599097792330286008} - {fileID: 1336224317622087985} - - {fileID: 2002548189} + - {fileID: 1513702494036408917} - {fileID: 1024259134} - {fileID: 3733067540770527814} - {fileID: 1893629605} diff --git a/Assets/GameUI.cs b/Assets/Scripts/GameUI.cs similarity index 96% rename from Assets/GameUI.cs rename to Assets/Scripts/GameUI.cs index 6dfcf6b..2a988ae 100644 --- a/Assets/GameUI.cs +++ b/Assets/Scripts/GameUI.cs @@ -5,12 +5,14 @@ using UnityEngine; public class GameUI : MonoBehaviour { [SerializeField] TextMeshProUGUI timer; - private float time; + public float time; public bool timerActive; [SerializeField] TextMeshProUGUI units; private int enemiesLeft; + + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { @@ -33,4 +35,6 @@ public class GameUI : MonoBehaviour enemiesLeft = GlobalsVariable.AliveUnitsTeamA.Count; units.text = "Units Left: " + enemiesLeft.ToString(); } + + } diff --git a/Assets/GameUI.cs.meta b/Assets/Scripts/GameUI.cs.meta similarity index 100% rename from Assets/GameUI.cs.meta rename to Assets/Scripts/GameUI.cs.meta diff --git a/Assets/Scripts/LoseUI.cs b/Assets/Scripts/LoseUI.cs new file mode 100644 index 0000000..5d1bdbe --- /dev/null +++ b/Assets/Scripts/LoseUI.cs @@ -0,0 +1,21 @@ +using TMPro; +using UnityEngine; + +public class LoseUI : MonoBehaviour +{ + [SerializeField] GameUI gameUI; + + [SerializeField] TextMeshProUGUI time; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + time.text = gameUI.GetComponent().time.ToString(); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/LoseUI.cs.meta b/Assets/Scripts/LoseUI.cs.meta new file mode 100644 index 0000000..26bec7b --- /dev/null +++ b/Assets/Scripts/LoseUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5393cb13d8a7330418334d35a76e6da1 \ No newline at end of file diff --git a/Assets/Scripts/Singletons/GameManager.cs b/Assets/Scripts/Singletons/GameManager.cs index f1fc5d4..61f83e3 100644 --- a/Assets/Scripts/Singletons/GameManager.cs +++ b/Assets/Scripts/Singletons/GameManager.cs @@ -9,6 +9,12 @@ public class GameManager : MonoBehaviourSingletonPersistent [SerializeField] private List levelNames; int current_level = 0; + + [SerializeField] GameObject GameUI; + [SerializeField] GameObject LoseUI; + [SerializeField] GameObject WinUI; + + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { @@ -48,4 +54,11 @@ public class GameManager : MonoBehaviourSingletonPersistent } + public void Losing() + { + + LoseUI.SetActive(true); + this.enabled = false; + } + }