From a04eee0a2f485b9e41f853a825059f5cb5b69002 Mon Sep 17 00:00:00 2001 From: mushgunAX Date: Wed, 1 Mar 2023 23:56:40 +0800 Subject: [PATCH 1/7] mouse centering and visibility when appropriate --- Assets/Scripts/Gameplay/SC_GameManager.cs | 5 +++++ Assets/Scripts/UI/SC_EndScene.cs | 7 +++++++ Assets/Scripts/UI/SC_MainMenu.cs | 2 ++ Assets/Scripts/UI/SC_PauseMenu.cs | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 3746ec0c..606bbbb5 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -90,11 +90,16 @@ public class GameManager : Script { if (GamePause) { + Input.SetMouseCentering(false); + Application.IsCursorVisible = true; return; } if (currGameState == GameState.START) { + Input.SetMouseCentering(true); + Application.IsCursorVisible = false; + timer -= Time.DeltaTimeF; if(scoreText) scoreText.GetComponent().Text = $"Score: {Score}"; diff --git a/Assets/Scripts/UI/SC_EndScene.cs b/Assets/Scripts/UI/SC_EndScene.cs index 2117b24a..34b972d7 100644 --- a/Assets/Scripts/UI/SC_EndScene.cs +++ b/Assets/Scripts/UI/SC_EndScene.cs @@ -12,6 +12,13 @@ public class EndScene : Script AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element"); AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success"); } + + protected override void start() + { + Input.SetMouseCentering(false); + Application.IsCursorVisible = true; + } + protected override void update() { if (Input.GetKeyDown(Input.KeyCode.R)) diff --git a/Assets/Scripts/UI/SC_MainMenu.cs b/Assets/Scripts/UI/SC_MainMenu.cs index 59b6594e..8af3e651 100644 --- a/Assets/Scripts/UI/SC_MainMenu.cs +++ b/Assets/Scripts/UI/SC_MainMenu.cs @@ -23,6 +23,8 @@ public class MainMenu : Script protected override void start() { + Input.SetMouseCentering(false); + Application.IsCursorVisible = true; } protected override void update() { diff --git a/Assets/Scripts/UI/SC_PauseMenu.cs b/Assets/Scripts/UI/SC_PauseMenu.cs index 71e2b8c3..fd1245ea 100644 --- a/Assets/Scripts/UI/SC_PauseMenu.cs +++ b/Assets/Scripts/UI/SC_PauseMenu.cs @@ -39,6 +39,8 @@ public class PauseMenu : Script if (GameManager.Instance.GamePause) { GameManager.Instance.GamePause = false; + Input.SetMouseCentering(true); + Application.IsCursorVisible = false; AudioHandler.PauseAllSounds(false); if (gamePauseText) gamePauseText.GetComponent().Enabled = false; @@ -89,6 +91,8 @@ public class PauseMenu : Script if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause) { GameManager.Instance.GamePause = true; + Input.SetMouseCentering(false); + Application.IsCursorVisible = true; AudioHandler.PauseAllSounds(true); if (gamePauseText) gamePauseText.GetComponent().Enabled = true; -- 2.40.1 From 4131c58c081b63848a444ee5cefd99e059e87820 Mon Sep 17 00:00:00 2001 From: SHAM-DP Date: Thu, 2 Mar 2023 10:01:52 +0800 Subject: [PATCH 2/7] Modified calls to IsCursorVisible --- Assets/Scripts/Gameplay/SC_GameManager.cs | 6 +++--- Assets/Scripts/UI/SC_EndScene.cs | 1 + Assets/Scripts/UI/SC_PauseMenu.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 606bbbb5..b873dae9 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -84,6 +84,7 @@ public class GameManager : Script AudioHandler.audioClipHandlers["SFXHumming"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_humming"); AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f); AudioHandler.audioClipHandlers["SFXHumming"].Play(); + Application.IsCursorVisible = false; } protected override void update() @@ -91,15 +92,14 @@ public class GameManager : Script if (GamePause) { Input.SetMouseCentering(false); - Application.IsCursorVisible = true; + //Application.IsCursorVisible = true; return; } if (currGameState == GameState.START) { Input.SetMouseCentering(true); - Application.IsCursorVisible = false; - + timer -= Time.DeltaTimeF; if(scoreText) scoreText.GetComponent().Text = $"Score: {Score}"; diff --git a/Assets/Scripts/UI/SC_EndScene.cs b/Assets/Scripts/UI/SC_EndScene.cs index 34b972d7..f5029865 100644 --- a/Assets/Scripts/UI/SC_EndScene.cs +++ b/Assets/Scripts/UI/SC_EndScene.cs @@ -16,6 +16,7 @@ public class EndScene : Script protected override void start() { Input.SetMouseCentering(false); + Debug.Log("EndScene::Start():"); Application.IsCursorVisible = true; } diff --git a/Assets/Scripts/UI/SC_PauseMenu.cs b/Assets/Scripts/UI/SC_PauseMenu.cs index fd1245ea..ca2f61df 100644 --- a/Assets/Scripts/UI/SC_PauseMenu.cs +++ b/Assets/Scripts/UI/SC_PauseMenu.cs @@ -88,7 +88,7 @@ public class PauseMenu : Script protected override void update() { - if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause) + if (Input.GetKeyUp(Input.KeyCode.Escape) && !GameManager.Instance.GamePause) { GameManager.Instance.GamePause = true; Input.SetMouseCentering(false); -- 2.40.1 From 802924141a648f33864ee03f0d4241c4afb0e312 Mon Sep 17 00:00:00 2001 From: mushgunAX Date: Thu, 2 Mar 2023 15:47:00 +0800 Subject: [PATCH 3/7] Scene Fade In and Out Fixes --- Assets/Materials/UI/UIMat_Black.shmat | 2 +- Assets/Scenes/Level1.shade | 5 ++- Assets/Scenes/LoseScene.shade | 44 +++++++++++++++++-- Assets/Scenes/MainMenu.shade | 53 ++++++++++++++++++++++- Assets/Scenes/WinScene.shade | 44 +++++++++++++++++-- Assets/Scripts/UI/SC_ChangeSceneButton.cs | 11 ++--- Assets/Scripts/UI/SC_EndScene.cs | 2 + Assets/Scripts/UI/SC_MainMenu.cs | 2 + Assets/Scripts/UI/SC_SceneFadeInOut.cs | 12 ++--- 9 files changed, 151 insertions(+), 24 deletions(-) diff --git a/Assets/Materials/UI/UIMat_Black.shmat b/Assets/Materials/UI/UIMat_Black.shmat index 183b5f26..8451828f 100644 --- a/Assets/Materials/UI/UIMat_Black.shmat +++ b/Assets/Materials/UI/UIMat_Black.shmat @@ -1,6 +1,6 @@ - VertexShader: 46580970 FragmentShader: 50110174 - SubPass: UI + SubPass: UI Translucent Properties: data.color: {x: 0, y: 0, z: 0, w: 1} data.textureIndex: 0 diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index 3aca2ae6..a375acdb 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -4300,6 +4300,7 @@ Text Renderer Component: Text: My name is Brandon. Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 206 @@ -4315,6 +4316,7 @@ Text Renderer Component: Text: My name is Brandon. Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 238 @@ -4330,6 +4332,7 @@ Text Renderer Component: Text: TEST Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 236 @@ -5307,7 +5310,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0} + Translate: {x: 0, y: 0, z: 0.0500000007} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade index f7c01b1d..0cd337ac 100644 --- a/Assets/Scenes/LoseScene.shade +++ b/Assets/Scenes/LoseScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.100000001} + Translate: {x: 0, y: 0, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0} + Translate: {x: 0, y: 75, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0} + Translate: {x: 0, y: -200, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -153,4 +153,40 @@ Components: ~ Scripts: - Type: SHADE_Scripting.UI.TweenManager - Enabled: true \ No newline at end of file + Enabled: true +- EID: 8 + Name: TransitionCanvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 9 + Name: Transition + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 120016136 + IsActive: true + UI Component: + Canvas ID: 8 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SceneFadeInOut + Enabled: true + alphaValue: 1 + fadeInTime: 0.5 + fadeOutTime: 0.5 \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 1edd67b5..e3f0e2aa 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -587,6 +587,7 @@ Text Renderer Component: Text: Options Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -607,6 +608,7 @@ Text Renderer Component: Text: Audio Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -643,6 +645,7 @@ Text Renderer Component: Text: Master Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -663,6 +666,7 @@ Text Renderer Component: Text: SFX Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -683,6 +687,7 @@ Text Renderer Component: Text: BGM Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -788,6 +793,7 @@ Text Renderer Component: Text: Camera Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -824,6 +830,7 @@ Text Renderer Component: Text: FOV Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -844,6 +851,7 @@ Text Renderer Component: Text: Sensitivity Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -942,6 +950,7 @@ Text Renderer Component: Text: 100 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -967,6 +976,7 @@ Text Renderer Component: Text: 100 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -992,6 +1002,7 @@ Text Renderer Component: Text: 100 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1033,6 +1044,7 @@ Text Renderer Component: Text: 100 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1058,6 +1070,7 @@ Text Renderer Component: Text: 100 Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1142,6 +1155,7 @@ Text Renderer Component: Text: Credits Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 46 @@ -1221,10 +1235,47 @@ Text Renderer Component: Text: Level Select Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 50 Hovered: false Clicked: false IsActive: true - Scripts: ~ \ No newline at end of file + Scripts: ~ +- EID: 55 + Name: Transition Canvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 56 + Name: Transition + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 120016136 + IsActive: true + UI Component: + Canvas ID: 55 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SceneFadeInOut + Enabled: true + alphaValue: 1 + fadeInTime: 0.5 + fadeOutTime: 0.5 \ No newline at end of file diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade index c6e676c3..589ea9e1 100644 --- a/Assets/Scenes/WinScene.shade +++ b/Assets/Scenes/WinScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.100000001} + Translate: {x: 0, y: 0, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0} + Translate: {x: 0, y: 75, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0} + Translate: {x: 0, y: -200, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -153,4 +153,40 @@ Components: ~ Scripts: - Type: SHADE_Scripting.UI.TweenManager - Enabled: true \ No newline at end of file + Enabled: true +- EID: 8 + Name: TransitionCanvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 9 + Name: Transition + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 120016136 + IsActive: true + UI Component: + Canvas ID: 8 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SceneFadeInOut + Enabled: true + alphaValue: 1 + fadeInTime: 0.5 + fadeOutTime: 0.5 \ No newline at end of file diff --git a/Assets/Scripts/UI/SC_ChangeSceneButton.cs b/Assets/Scripts/UI/SC_ChangeSceneButton.cs index 6a51716b..09e4cf5b 100644 --- a/Assets/Scripts/UI/SC_ChangeSceneButton.cs +++ b/Assets/Scripts/UI/SC_ChangeSceneButton.cs @@ -22,22 +22,19 @@ public class ChangeSceneButton : Script { ui.OnRelease.RegisterAction(() => { - if (sceneID != 0) { - Audio.PlaySFXOnce2D("event:/UI/success"); - - Audio.StopAllSounds(); - + Audio.PlaySFXOnce2D("event:/UI/success"); + Audio.StopAllSounds(); + if (SceneFadeInOut.Instance != null) SceneFadeInOut.Instance.CallFadeIn(); - clickedFlag = true; + clickedFlag = true; } }); } else { Debug.LogError("Failed to register button action for ChangeSceneButton."); - } } protected override void update() diff --git a/Assets/Scripts/UI/SC_EndScene.cs b/Assets/Scripts/UI/SC_EndScene.cs index f5029865..7d00c334 100644 --- a/Assets/Scripts/UI/SC_EndScene.cs +++ b/Assets/Scripts/UI/SC_EndScene.cs @@ -1,6 +1,7 @@ using System; using SHADE; using SHADE_Scripting.Audio; +using SHADE_Scripting.UI; public class EndScene : Script { @@ -18,6 +19,7 @@ public class EndScene : Script Input.SetMouseCentering(false); Debug.Log("EndScene::Start():"); Application.IsCursorVisible = true; + SceneFadeInOut.Instance.CallFadeOut(); } protected override void update() diff --git a/Assets/Scripts/UI/SC_MainMenu.cs b/Assets/Scripts/UI/SC_MainMenu.cs index 8af3e651..16c2d593 100644 --- a/Assets/Scripts/UI/SC_MainMenu.cs +++ b/Assets/Scripts/UI/SC_MainMenu.cs @@ -1,6 +1,7 @@ using System; using SHADE; using SHADE_Scripting.Audio; +using SHADE_Scripting.UI; public class MainMenu : Script { @@ -25,6 +26,7 @@ public class MainMenu : Script { Input.SetMouseCentering(false); Application.IsCursorVisible = true; + SceneFadeInOut.Instance.CallFadeOut(); } protected override void update() { diff --git a/Assets/Scripts/UI/SC_SceneFadeInOut.cs b/Assets/Scripts/UI/SC_SceneFadeInOut.cs index 4224474b..c426f8a6 100644 --- a/Assets/Scripts/UI/SC_SceneFadeInOut.cs +++ b/Assets/Scripts/UI/SC_SceneFadeInOut.cs @@ -43,7 +43,6 @@ namespace SHADE_Scripting.UI protected override void start() { - } protected override void update() @@ -56,7 +55,6 @@ namespace SHADE_Scripting.UI if (fadeInTime == 0.0f) { alphaValue = 1.0f; - } else { @@ -64,8 +62,8 @@ namespace SHADE_Scripting.UI } if (alphaValue >= 1.0f) { - alphaValue = 1.0f; - GameObject.Parent.SetActive(false); + alphaValue = 1.0f; + //GameObject.Parent.SetActive(false); } } @@ -83,8 +81,10 @@ namespace SHADE_Scripting.UI } if (alphaValue <= 0.0f) { - alphaValue = 0.0f; - GameObject.Parent.SetActive(false); + alphaValue = 0.0f; + //This line is to be added so that (because the fade in and out item is usually the front-most UI element) + //the fade in and out UI element does not block functionality of other UI elements + GameObject.Parent.SetActive(false); } } -- 2.40.1 From f7c33bc89a2d84cd3d2cd67c92527d7cfd57ccd0 Mon Sep 17 00:00:00 2001 From: mushgunAX Date: Fri, 3 Mar 2023 14:26:36 +0800 Subject: [PATCH 4/7] Various null checks --- Assets/Scripts/Gameplay/SC_GameManager.cs | 25 +++++++++++++++++++---- Assets/Scripts/UI/SC_PauseMenu.cs | 3 ++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 28fcc9fd..26b2c885 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -95,7 +95,8 @@ public class GameManager : Script AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f); AudioHandler.audioClipHandlers["SFXHumming"].Play(); - SceneFadeInOut.Instance.CallFadeOut(); + if (SceneFadeInOut.Instance != null) + SceneFadeInOut.Instance.CallFadeOut(); Application.IsCursorVisible = false; } @@ -143,7 +144,8 @@ public class GameManager : Script AudioHandler.StopAllSounds(false); AudioHandler.audioClipHandlers["BGMWin"].Play(); goingToWin = true; - SceneFadeInOut.Instance.CallFadeIn(); + if (SceneFadeInOut.Instance != null) + SceneFadeInOut.Instance.CallFadeIn(); } else if(!goingToWin && (timer < 0 || Input.GetKeyDown(Input.KeyCode.F2))) { @@ -151,12 +153,27 @@ public class GameManager : Script AudioHandler.StopAllSounds(false); AudioHandler.audioClipHandlers["BGMLose"].Play(); goingToLose = true; - SceneFadeInOut.Instance.CallFadeIn(); + if (SceneFadeInOut.Instance != null) + SceneFadeInOut.Instance.CallFadeIn(); } } //Handling transitions - if (SceneFadeInOut.Instance.FadeInFinished()) + if (SceneFadeInOut.Instance != null) + { + if (SceneFadeInOut.Instance.FadeInFinished()) + { + if (goingToWin) + { + SceneManager.ChangeScene(winScene); + } + if (goingToLose) + { + SceneManager.ChangeScene(loseScene); + } + } + } + else { if (goingToWin) { diff --git a/Assets/Scripts/UI/SC_PauseMenu.cs b/Assets/Scripts/UI/SC_PauseMenu.cs index 49e92583..a20dd586 100644 --- a/Assets/Scripts/UI/SC_PauseMenu.cs +++ b/Assets/Scripts/UI/SC_PauseMenu.cs @@ -13,7 +13,8 @@ public class PauseMenu : Script protected override void awake() { - GameManager.Instance.GamePause = false; + if (GameManager.Instance != null) + GameManager.Instance.GamePause = false; if (canvas) { -- 2.40.1 From 9eb40d59284e17d4a51ea79bfe66e12bfd46ed7b Mon Sep 17 00:00:00 2001 From: SHAM-DP Date: Fri, 3 Mar 2023 16:52:43 +0800 Subject: [PATCH 5/7] Fix showcursor --- SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp index 078d9fc8..84df5f88 100644 --- a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp +++ b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp @@ -198,7 +198,8 @@ namespace SHADE void SHWindow::SetMouseVisible(bool show) { - ShowCursor(show); + while(GetMouseVisible() != show) + ShowCursor(show); } void SHWindow::SetMousePosition(int x, int y) -- 2.40.1 From d65af9716698758d5ba9b9570cff1837005bb527 Mon Sep 17 00:00:00 2001 From: mushgunAX Date: Fri, 3 Mar 2023 17:21:21 +0800 Subject: [PATCH 6/7] Revert of a previous commit for scene files --- Assets/Scenes/Level1.shade | 5 +--- Assets/Scenes/LoseScene.shade | 44 +++-------------------------- Assets/Scenes/MainMenu.shade | 53 +---------------------------------- Assets/Scenes/WinScene.shade | 44 +++-------------------------- 4 files changed, 10 insertions(+), 136 deletions(-) diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index cd5ba82e..0ddccf49 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -4120,7 +4120,6 @@ Text Renderer Component: Text: "Score: 0" Font: 176667660 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 206 @@ -4136,7 +4135,6 @@ Text Renderer Component: Text: "Time Left: 200" Font: 176667660 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 238 @@ -4152,7 +4150,6 @@ Text Renderer Component: Text: "" Font: 176667660 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 236 @@ -5326,7 +5323,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.100000001} + Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 2500, y: 1080, z: 1} IsActive: true diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade index 0cd337ac..f7c01b1d 100644 --- a/Assets/Scenes/LoseScene.shade +++ b/Assets/Scenes/LoseScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.200000003} + Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0.100000001} + Translate: {x: 0, y: 75, z: 0} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0.100000001} + Translate: {x: 0, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -153,40 +153,4 @@ Components: ~ Scripts: - Type: SHADE_Scripting.UI.TweenManager - Enabled: true -- EID: 8 - Name: TransitionCanvas - IsActive: true - NumberOfChildren: 1 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 9 - Name: Transition - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1920, y: 1080, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 120016136 - IsActive: true - UI Component: - Canvas ID: 8 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.SceneFadeInOut - Enabled: true - alphaValue: 1 - fadeInTime: 0.5 - fadeOutTime: 0.5 \ No newline at end of file + Enabled: true \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index e3f0e2aa..1edd67b5 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -587,7 +587,6 @@ Text Renderer Component: Text: Options Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -608,7 +607,6 @@ Text Renderer Component: Text: Audio Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -645,7 +643,6 @@ Text Renderer Component: Text: Master Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -666,7 +663,6 @@ Text Renderer Component: Text: SFX Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -687,7 +683,6 @@ Text Renderer Component: Text: BGM Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -793,7 +788,6 @@ Text Renderer Component: Text: Camera Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -830,7 +824,6 @@ Text Renderer Component: Text: FOV Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -851,7 +844,6 @@ Text Renderer Component: Text: Sensitivity Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -950,7 +942,6 @@ Text Renderer Component: Text: 100 Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -976,7 +967,6 @@ Text Renderer Component: Text: 100 Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1002,7 +992,6 @@ Text Renderer Component: Text: 100 Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1044,7 +1033,6 @@ Text Renderer Component: Text: 100 Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1070,7 +1058,6 @@ Text Renderer Component: Text: 100 Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 19 @@ -1155,7 +1142,6 @@ Text Renderer Component: Text: Credits Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 46 @@ -1235,47 +1221,10 @@ Text Renderer Component: Text: Level Select Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true UI Component: Canvas ID: 50 Hovered: false Clicked: false IsActive: true - Scripts: ~ -- EID: 55 - Name: Transition Canvas - IsActive: true - NumberOfChildren: 1 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 56 - Name: Transition - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1920, y: 1080, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 120016136 - IsActive: true - UI Component: - Canvas ID: 55 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.SceneFadeInOut - Enabled: true - alphaValue: 1 - fadeInTime: 0.5 - fadeOutTime: 0.5 \ No newline at end of file + Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade index 589ea9e1..c6e676c3 100644 --- a/Assets/Scenes/WinScene.shade +++ b/Assets/Scenes/WinScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.200000003} + Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0.100000001} + Translate: {x: 0, y: 75, z: 0} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0.100000001} + Translate: {x: 0, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -153,40 +153,4 @@ Components: ~ Scripts: - Type: SHADE_Scripting.UI.TweenManager - Enabled: true -- EID: 8 - Name: TransitionCanvas - IsActive: true - NumberOfChildren: 1 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 9 - Name: Transition - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1920, y: 1080, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 120016136 - IsActive: true - UI Component: - Canvas ID: 8 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.SceneFadeInOut - Enabled: true - alphaValue: 1 - fadeInTime: 0.5 - fadeOutTime: 0.5 \ No newline at end of file + Enabled: true \ No newline at end of file -- 2.40.1 From 0a224726b35e43ca5179ef3e7191fd8abc1c668f Mon Sep 17 00:00:00 2001 From: mushgunAX Date: Fri, 3 Mar 2023 17:25:09 +0800 Subject: [PATCH 7/7] revert? --- Assets/Scenes/Level1.shade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index 0ddccf49..cd5ba82e 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -4120,6 +4120,7 @@ Text Renderer Component: Text: "Score: 0" Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 206 @@ -4135,6 +4136,7 @@ Text Renderer Component: Text: "Time Left: 200" Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 238 @@ -4150,6 +4152,7 @@ Text Renderer Component: Text: "" Font: 176667660 + Color: {x: 1, y: 1, z: 1, w: 1} IsActive: true Scripts: ~ - EID: 236 @@ -5323,7 +5326,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0} + Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 2500, y: 1080, z: 1} IsActive: true -- 2.40.1