mirror of
https://github.com/boudji-ludwig-pett/cnam-geometry-dash.git
synced 2025-06-10 22:20:40 +02:00
feat: escape keyboard shortcut to set menu pause (#63)
This commit is contained in:
@ -6008,6 +6008,7 @@ MonoBehaviour:
|
|||||||
pauseButton: {fileID: 1038445495}
|
pauseButton: {fileID: 1038445495}
|
||||||
levelLoader: {fileID: 1999482186}
|
levelLoader: {fileID: 1999482186}
|
||||||
volumeSlider: {fileID: 6776934}
|
volumeSlider: {fileID: 6776934}
|
||||||
|
isPause: 0
|
||||||
--- !u!1 &988798827
|
--- !u!1 &988798827
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -6562,8 +6563,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: ebe0bd74200510d4aa75c327a76499c6, type: 3}
|
m_Script: {fileID: 11500000, guid: ebe0bd74200510d4aa75c327a76499c6, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
pauseMenu: {fileID: 892725783}
|
||||||
SpeedMultiplier: 1
|
SpeedMultiplier: 1
|
||||||
IsAI: 0
|
|
||||||
--- !u!61 &1267397460
|
--- !u!61 &1267397460
|
||||||
BoxCollider2D:
|
BoxCollider2D:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -87,7 +87,6 @@ public class NormalGameMode : IGameMode
|
|||||||
{
|
{
|
||||||
player.IsColliding = true;
|
player.IsColliding = true;
|
||||||
|
|
||||||
Debug.Log(collision.gameObject.tag.ToString());
|
|
||||||
if (collision.gameObject.CompareTag("Kill"))
|
if (collision.gameObject.CompareTag("Kill"))
|
||||||
{
|
{
|
||||||
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
|
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
|
||||||
|
@ -11,6 +11,7 @@ public class Player : MonoBehaviour
|
|||||||
public bool IsColliding { get; set; } = true;
|
public bool IsColliding { get; set; } = true;
|
||||||
public bool HasStarted { get; set; } = false;
|
public bool HasStarted { get; set; } = false;
|
||||||
public bool CanJump { get; set; } = true;
|
public bool CanJump { get; set; } = true;
|
||||||
|
public PauseMenu pauseMenu;
|
||||||
|
|
||||||
public IGameMode CurrentGameMode { get; set; }
|
public IGameMode CurrentGameMode { get; set; }
|
||||||
public float SpeedMultiplier = 1f;
|
public float SpeedMultiplier = 1f;
|
||||||
@ -69,6 +70,18 @@ public class Player : MonoBehaviour
|
|||||||
{
|
{
|
||||||
LevelsLoader.CalculateCurrentProgressionPercent(transform.position);
|
LevelsLoader.CalculateCurrentProgressionPercent(transform.position);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Input.GetKeyDown(KeyCode.Escape))
|
||||||
|
{
|
||||||
|
if (pauseMenu.pauseMenu.activeSelf)
|
||||||
|
{
|
||||||
|
pauseMenu.Resume();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pauseMenu.Pause();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void OnCollisionEnter2D(Collision2D collision)
|
public virtual void OnCollisionEnter2D(Collision2D collision)
|
||||||
|
@ -32,7 +32,7 @@ rectangle "Menu Pause" {
|
|||||||
|
|
||||||
rectangle "Création de niveaux" {
|
rectangle "Création de niveaux" {
|
||||||
usecase "Créer un nouveau niveau" as CreerNouveauNiveau
|
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 "Tester un niveau" as TesterNiveau
|
||||||
usecase "Exporter un niveau" as ExporterNiveau
|
usecase "Exporter un niveau" as ExporterNiveau
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user