From ed88b7a378c67c78c3f510c536f18aba1af2338f Mon Sep 17 00:00:00 2001 From: RochesterX Date: Sun, 20 Apr 2025 12:35:58 -0400 Subject: [PATCH] Fix that bug --- Assets/Scenes/Platform3 (MOUNTAIN).unity | 2 +- Assets/Scripts/Game/GameManager.cs | 2 + Assets/Scripts/Game/HealthBarManager.cs | 6 ++- ...versalRenderPipelineGlobalSettings 1.asset | 48 +++++++++---------- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Assets/Scenes/Platform3 (MOUNTAIN).unity b/Assets/Scenes/Platform3 (MOUNTAIN).unity index 153f193..cf63d9c 100644 --- a/Assets/Scenes/Platform3 (MOUNTAIN).unity +++ b/Assets/Scenes/Platform3 (MOUNTAIN).unity @@ -7423,7 +7423,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1972151284 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs index a4a4783..866e28f 100644 --- a/Assets/Scripts/Game/GameManager.cs +++ b/Assets/Scripts/Game/GameManager.cs @@ -205,6 +205,7 @@ namespace Game if (GameManager.players.Count == 0) return; StartGameEvent?.Invoke(); + print("invoked startgameevent"); print("Starting game with mode: " + gameMode + " and map: " + map); if (gameMode == GameMode.freeForAll) { @@ -326,6 +327,7 @@ namespace Game // Trigger the end game event for any listeners EndGameEvent?.Invoke(); + print("invoked engameeveevt"); // Hide the leaderboard and timer UI if they exist if (LeaderboardCanvas != null) diff --git a/Assets/Scripts/Game/HealthBarManager.cs b/Assets/Scripts/Game/HealthBarManager.cs index 05a9cdb..caf3edf 100644 --- a/Assets/Scripts/Game/HealthBarManager.cs +++ b/Assets/Scripts/Game/HealthBarManager.cs @@ -25,10 +25,12 @@ namespace Game /// /// Sets up event listeners for when the game starts and ends. /// - private void Start() + private void Awake() { + print("Doing event stuff"); GameManager.Instance.StartGameEvent += OnGameStart; GameManager.Instance.EndGameEvent += OnGameEnd; + print("Done event stuff"); } /// @@ -65,6 +67,7 @@ namespace Game /// private void OnGameStart() { + print("Ongame start called"); foreach (GameObject player in GameManager.players) { if (!playerHealthBars.ContainsKey(player)) @@ -122,6 +125,7 @@ namespace Game /// private void OnGameEnd() { + print("Ongame end called"); // Remove all health bars foreach (var kvp in playerHealthBars) { diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset index b12ab13..96fa87d 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 3182681989864489033 - - rid: 3182681989864489034 + - rid: 3182681989864489183 + - rid: 3182681989864489184 - rid: 3813502778313015298 - rid: 3813502778313015299 - rid: 3813502778313015300 - - rid: 3182681989864489035 + - rid: 3182681989864489185 - rid: 3813502778313015302 - rid: 3813502778313015303 - rid: 3813502778313015304 - rid: 3813502778313015305 - - rid: 3182681989864489036 - - rid: 3182681989864489037 - - rid: 3182681989864489038 + - rid: 3182681989864489186 + - rid: 3182681989864489187 + - rid: 3182681989864489188 - rid: 3813502778313015309 - - rid: 3182681989864489039 - - rid: 3182681989864489040 - - rid: 3182681989864489041 + - rid: 3182681989864489189 + - rid: 3182681989864489190 + - rid: 3182681989864489191 - rid: 3813502778313015313 - - rid: 3182681989864489042 - - rid: 3182681989864489043 + - rid: 3182681989864489192 + - rid: 3182681989864489193 - rid: 3813502778313015316 - - rid: 3182681989864489044 + - rid: 3182681989864489194 m_RuntimeSettings: m_List: - rid: 3813502778313015298 @@ -90,7 +90,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 3182681989864489033 + - rid: 3182681989864489183 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -99,7 +99,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 3182681989864489034 + - rid: 3182681989864489184 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -111,18 +111,18 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 3182681989864489035 + - rid: 3182681989864489185 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 3182681989864489036 + - rid: 3182681989864489186 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 3182681989864489037 + - rid: 3182681989864489187 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -130,7 +130,7 @@ MonoBehaviour: m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 3182681989864489038 + - rid: 3182681989864489188 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -143,21 +143,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 3182681989864489039 + - rid: 3182681989864489189 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 3182681989864489040 + - rid: 3182681989864489190 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 3182681989864489041 + - rid: 3182681989864489191 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -170,7 +170,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 3182681989864489042 + - rid: 3182681989864489192 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -180,12 +180,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 3182681989864489043 + - rid: 3182681989864489193 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 3182681989864489044 + - rid: 3182681989864489194 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}