From fc7914f4c5110eda52ebc8980ed3c8ff479335f7 Mon Sep 17 00:00:00 2001 From: "PC-PAUL\\paulf" Date: Wed, 15 Jan 2025 15:01:04 +0100 Subject: [PATCH] =?UTF-8?q?Bug=20Fix=20:=20Menu=20pause,=20resume=20qui=20?= =?UTF-8?q?relance=20en=20mode=20solo=20m=C3=AAme=20en=20mode=201VS1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/GameSession/GameSession.cs | 22 ++++++++++++---------- Assets/Scripts/GameSession/GoToScene.cs | 14 +++++++------- Assets/Scripts/UI/Views/PausedView.cs | 4 ++-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Assets/Scripts/GameSession/GameSession.cs b/Assets/Scripts/GameSession/GameSession.cs index db9bc39..f5547ab 100644 --- a/Assets/Scripts/GameSession/GameSession.cs +++ b/Assets/Scripts/GameSession/GameSession.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using Assets.Scripts.GameSession; using JetBrains.Annotations; using UnityEngine; using UnityEngine.SceneManagement; @@ -162,20 +163,21 @@ public class GameSession : MonoBehaviour,IResettable SceneManager.LoadScene("DeathScreen1VS1"); } - public void GoToSoloMode() + public void PausePlayAgain() { - SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single); + if (isDuoMode) + { + GoToScene.GoToDuoMode(); + } + else + { + GoToScene.GoToSoloMode(); + } ResetToDefault(); } - - public void GoToDuoMode() + public void PauseBackToMainMenu() { - SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single); - ResetToDefault(); - } - public void GoToMainMenu() - { - SceneManager.LoadScene("MainMenu", LoadSceneMode.Single); + GoToScene.GoToMainMenu(); ResetToDefault(); } diff --git a/Assets/Scripts/GameSession/GoToScene.cs b/Assets/Scripts/GameSession/GoToScene.cs index f531515..5e7024c 100644 --- a/Assets/Scripts/GameSession/GoToScene.cs +++ b/Assets/Scripts/GameSession/GoToScene.cs @@ -5,26 +5,26 @@ namespace Assets.Scripts.GameSession { public class GoToScene : MonoBehaviour { - public void GoToSoloMode() + public static void GoToSoloMode() { SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single); } - public void GoToDuoMode() + public static void GoToDuoMode() { SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single); } - public void GoToMainMenu() + public static void GoToMainMenu() { SceneManager.LoadScene("MainMenu", LoadSceneMode.Single); } - public void GoToDeathScreenSolo() + public static void GoToDeathScreenSolo() { - SceneManager.LoadScene("", LoadSceneMode.Single); + SceneManager.LoadScene("DeathScreen", LoadSceneMode.Single); } - public void GoToDeathScreen1VS1() + public static void GoToDeathScreen1VS1() { - SceneManager.LoadScene("", LoadSceneMode.Single); + SceneManager.LoadScene("DeathScreen1VS1", LoadSceneMode.Single); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Views/PausedView.cs b/Assets/Scripts/UI/Views/PausedView.cs index acd7325..851d996 100644 --- a/Assets/Scripts/UI/Views/PausedView.cs +++ b/Assets/Scripts/UI/Views/PausedView.cs @@ -26,12 +26,12 @@ public class PausedView : BaseView mainMenuButton.onClick.AddListener(() => { - GameSession.Instance.GoToMainMenu(); + GameSession.Instance.PauseBackToMainMenu(); }); restartButton.onClick.AddListener(() => { - GameSession.Instance.GoToSoloMode(); + GameSession.Instance.PausePlayAgain(); }); base.Init(); }