From 93b0d889e4541263b6e761c640f0d2bf4d3d2fc4 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 15:51:16 -0400 Subject: [PATCH] integrated alerts --- Assets/Scenes/Game.unity | 241 ++++++++++++++++++++++++++++++++- Assets/Scripts/CannonScript.cs | 1 + Assets/Scripts/SpawnManager.cs | 5 - 3 files changed, 240 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5536fe7..109031b 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -763,6 +763,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 20.367, y: -442.989, z: 350.052} +--- !u!224 &413440576 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234080357054355, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} +--- !u!95 &413440577 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4950234080357054364, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1001 &493221991 PrefabInstance: m_ObjectHideFlags: 0 @@ -916,6 +926,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556811424} m_CullTransparentMesh: 1 +--- !u!224 &585796388 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7483763325311061105, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1 &644668651 GameObject: m_ObjectHideFlags: 0 @@ -1076,6 +1091,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 7386353508542285557, guid: 575ac473626334346a420aa1ebda6da6, type: 3} m_PrefabInstance: {fileID: 655620976} m_PrefabAsset: {fileID: 0} +--- !u!224 &738565943 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234080813960360, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} +--- !u!95 &738565944 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4950234080813960365, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1001 &752215056 PrefabInstance: m_ObjectHideFlags: 0 @@ -1138,6 +1163,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8416170107787829207, guid: 93ada555490a6074cab43a712f12b1ef, type: 3} m_PrefabInstance: {fileID: 752215056} m_PrefabAsset: {fileID: 0} +--- !u!224 &781055892 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 431853668021382708, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -1187,6 +1217,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1128943937 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965735, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1515045591526965757, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} + propertyPath: m_Name + value: SoundManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69bc9a9cf445e8e498bfbed18a1eccb8, type: 3} --- !u!1 &1139737892 GameObject: m_ObjectHideFlags: 0 @@ -1466,6 +1553,10 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: 7361106090890738573, guid: c6e211178d3ea1546899914e1452b290, type: 3} + propertyPath: animator + value: + objectReference: {fileID: 1872280433} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6e211178d3ea1546899914e1452b290, type: 3} --- !u!4 &1164703814 stripped @@ -1511,6 +1602,10 @@ PrefabInstance: propertyPath: dimensionId value: 2 objectReference: {fileID: 0} + - target: {fileID: 1836184234573858010, guid: 9f3415896428db647aa49abdf733b2f7, type: 3} + propertyPath: animator + value: + objectReference: {fileID: 413440577} - target: {fileID: 3716208029932851166, guid: 9f3415896428db647aa49abdf733b2f7, type: 3} propertyPath: m_Layer value: 9 @@ -1923,18 +2018,30 @@ MonoBehaviour: texture: {fileID: 0} renderQuad: {fileID: 21947026} material: {fileID: 0} + healthBar: {fileID: 585796388} + button: {fileID: 1730311051} + alert: {fileID: 738565943} layer: 7 - camera: {fileID: 222880924} texture: {fileID: 0} renderQuad: {fileID: 1281989148} material: {fileID: 0} + healthBar: {fileID: 1900654327} + button: {fileID: 2059352415} + alert: {fileID: 1872280432} layer: 8 - camera: {fileID: 1698949874} texture: {fileID: 0} renderQuad: {fileID: 644668655} material: {fileID: 0} + healthBar: {fileID: 2080652619} + button: {fileID: 781055892} + alert: {fileID: 413440576} layer: 9 tabWidth: 0.05 + healthBarPosFromTabEdge: 0.025 + buttonPosFromTabEdge: 0.025 + alertPosFromTabEdge: 0.025 quadOffset: 0.87 OnChangeWorld: m_PersistentCalls: @@ -2298,6 +2405,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 122.92801, y: -899.931, z: -13.550995} +--- !u!224 &1730311051 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2962670241177435889, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1 &1795017774 GameObject: m_ObjectHideFlags: 0 @@ -2641,6 +2753,10 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 4588112000306363475, guid: ff01e9d7f27785a4fba5bdc20964eba4, type: 3} + propertyPath: animator + value: + objectReference: {fileID: 738565944} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ff01e9d7f27785a4fba5bdc20964eba4, type: 3} --- !u!4 &1854821314 stripped @@ -2648,6 +2764,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 2398580280527440449, guid: ff01e9d7f27785a4fba5bdc20964eba4, type: 3} m_PrefabInstance: {fileID: 1854821313} m_PrefabAsset: {fileID: 0} +--- !u!224 &1872280432 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4950234079745660449, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1872280433 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4950234079745660450, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1 &1882905302 GameObject: m_ObjectHideFlags: 0 @@ -2701,6 +2827,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1900654327 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7877029066061758710, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!114 &1926098617 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4088869081495123135, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} @@ -2712,6 +2843,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79b7d4d08379c4a4b9c0c4a91499fb6d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &2059352415 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5037438043825057203, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2080652619 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 444301740144869469, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + m_PrefabInstance: {fileID: 7226858077067413575} + m_PrefabAsset: {fileID: 0} --- !u!1 &2081597135 GameObject: m_ObjectHideFlags: 0 @@ -2772,8 +2913,8 @@ MonoBehaviour: m_Calls: [] m_text: +1 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} - m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2927,6 +3068,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 512180123099629689, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 2082787375140496085, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2943,6 +3116,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3168393835055405244, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3290620518113273233, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3007,6 +3208,42 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4950234081163621393, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1536863736} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchWorld + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: WorldSwitcher, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5119874463897783294, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6310781014458571912, guid: 1fbf5b38e74bdfe4185768d47372abe2, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scripts/CannonScript.cs b/Assets/Scripts/CannonScript.cs index 189b9bb..8105601 100644 --- a/Assets/Scripts/CannonScript.cs +++ b/Assets/Scripts/CannonScript.cs @@ -30,6 +30,7 @@ public class CannonScript : MonoBehaviour void Update() { Debug.DrawRay(transform.position, lookDir * Mathf.Infinity, Color.red); + Debug.Log(EventSystem.current.IsPointerOverGameObject()); if (firing && !EventSystem.current.IsPointerOverGameObject()){ fireTimer += Time.deltaTime; diff --git a/Assets/Scripts/SpawnManager.cs b/Assets/Scripts/SpawnManager.cs index 2063a2c..ec2af4a 100644 --- a/Assets/Scripts/SpawnManager.cs +++ b/Assets/Scripts/SpawnManager.cs @@ -9,7 +9,6 @@ public class SpawnManager : MonoBehaviour public GameObject[] landingPoints; public bool running = true; public Animator animator; - public int spawnRateOvertime; public int dimensionLayer; float elapsedTime; @@ -21,9 +20,6 @@ public class SpawnManager : MonoBehaviour [SerializeField] private int countEnemies; - [SerializeField] - private GameObject EnemyAlert; - void OnEnable() { Random.InitState(worldSeed); @@ -39,7 +35,6 @@ public class SpawnManager : MonoBehaviour private void Update() { elapsedTime += Time.deltaTime; - Debug.Log(elapsedTime); }