diff --git a/Assets/Scenes/LevelScene.unity b/Assets/Scenes/LevelScene.unity index 03201d8..e887183 100644 --- a/Assets/Scenes/LevelScene.unity +++ b/Assets/Scenes/LevelScene.unity @@ -6008,6 +6008,7 @@ MonoBehaviour: pauseButton: {fileID: 1038445495} levelLoader: {fileID: 1999482186} volumeSlider: {fileID: 6776934} + isPause: 0 --- !u!1 &988798827 GameObject: m_ObjectHideFlags: 0 @@ -6562,8 +6563,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ebe0bd74200510d4aa75c327a76499c6, type: 3} m_Name: m_EditorClassIdentifier: + pauseMenu: {fileID: 892725783} SpeedMultiplier: 1 - IsAI: 0 --- !u!61 &1267397460 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameMode/NormalGameMode.cs b/Assets/Scripts/GameMode/NormalGameMode.cs index a148992..2df2454 100644 --- a/Assets/Scripts/GameMode/NormalGameMode.cs +++ b/Assets/Scripts/GameMode/NormalGameMode.cs @@ -87,7 +87,6 @@ public class NormalGameMode : IGameMode { player.IsColliding = true; - Debug.Log(collision.gameObject.tag.ToString()); if (collision.gameObject.CompareTag("Kill")) { SceneManager.LoadScene(SceneManager.GetActiveScene().name); diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index b5bf376..5a819e5 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -11,6 +11,7 @@ public class Player : MonoBehaviour public bool IsColliding { get; set; } = true; public bool HasStarted { get; set; } = false; public bool CanJump { get; set; } = true; + public PauseMenu pauseMenu; public IGameMode CurrentGameMode { get; set; } public float SpeedMultiplier = 1f; @@ -69,6 +70,18 @@ public class Player : MonoBehaviour { LevelsLoader.CalculateCurrentProgressionPercent(transform.position); } + + if (Input.GetKeyDown(KeyCode.Escape)) + { + if (pauseMenu.pauseMenu.activeSelf) + { + pauseMenu.Resume(); + } + else + { + pauseMenu.Pause(); + } + } } public virtual void OnCollisionEnter2D(Collision2D collision) diff --git a/Documentation/UML/use-case-diagram.puml b/Documentation/UML/use-case-diagram.puml index 0e05c0f..8f13209 100644 --- a/Documentation/UML/use-case-diagram.puml +++ b/Documentation/UML/use-case-diagram.puml @@ -32,7 +32,7 @@ rectangle "Menu Pause" { rectangle "Création de niveaux" { usecase "Créer un nouveau niveau" as CreerNouveauNiveau - usecase "Modifier un niveau existante" as ModifierNiveau + usecase "Modifier un niveau existant" as ModifierNiveau usecase "Tester un niveau" as TesterNiveau usecase "Exporter un niveau" as ExporterNiveau }