Merge branch 'MenuConfiguration'

Assets/Scenes/MenuDebut.unity.meta

+fileFormatVersion: 2
+guid: b678e7143094cd546bd677e139e22b25
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameMenuScript.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class GameMenuScript : MonoBehaviour
+{
+    public GameObject PanelMenu;
+    public GameObject PanelSetting;
+
+    public void Continuer(){
+        System.Threading.Thread.Sleep(1000);
+        PanelMenu.SetActive(false);
+        Time.timeScale = 1f;
+    }
+
+    public void Setting(){
+        PanelMenu.SetActive(false);
+        PanelSetting.SetActive(true);
+    }
+
+    public void Quitter (){
+        SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - 1);
+    }
+}

Assets/Scripts/GameMenuScript.cs.meta

+fileFormatVersion: 2
+guid: bedc737933073f1488c792d9feefb992
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MainMenuScript.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class MainMenuScript : MonoBehaviour
+{
+    public void Jouer (){
+        SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
+    }
+    
+    public void Quitter (){
+        Application.Quit();
+    }
+}

Assets/Scripts/MainMenuScript.cs.meta

+fileFormatVersion: 2
+guid: 501b45a8bb9289a4390864ede4feb047
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MenuMort.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MenuMort : MonoBehaviour
+{
+  
+}
\ No newline at end of file

Assets/Scripts/MenuMort.cs.meta

+fileFormatVersion: 2
+guid: 74a1154a07b8e004e908cc3ed065ba65
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PlayerMovement.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class PlayerMovement : MonoBehaviour
 {
@@ -31,6 +32,9 @@ public class PlayerMovement : MonoBehaviour
     private bool isHit;
     private float currentHealth;
     
+    // Menu pause
+    public GameObject Panel;
+    
 
     // Start is called before the first frame update
     void Start()
@@ -63,6 +67,11 @@ public class PlayerMovement : MonoBehaviour
         animator.SetBool("Jump", false);
         animator.SetBool("hit", false);
 
+        if(Input.GetKey(KeyCode.Escape)){
+            Panel.SetActive(true);
+            Time.timeScale = 0f;
+        }
+
         if (Input.GetKey(inputFront) && !isOver)
         {
             transform.Translate(Vector3.forward * walkSpeed * Time.deltaTime);
@@ -148,10 +157,6 @@ public class PlayerMovement : MonoBehaviour
             animator.SetBool("hit", true);
         }
         
-        if (isOver)
-        {
-            animator.SetBool("Die", true);
-        }
 
         if (isAttacking)
         {
@@ -188,7 +193,13 @@ public class PlayerMovement : MonoBehaviour
     public void GameOver()
     {
         isOver = true;
-        // TODO : return to the main menu.
+        animator.SetBool("Die", true);
+        StartCoroutine("AnimMort");
+    }
+
+    public IEnumerator AnimMort(){
+        yield return new WaitForSeconds(3);
+        SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - 1);
     }
 
     public void Attack()

Assets/Scripts/SettingMenu.cs

+using System.Collections;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class SettingMenu : MonoBehaviour
+{
+    public GameObject PanelSetting;
+    public GameObject PanelMenu;
+
+    public void Valider(){
+        PanelSetting.SetActive(false);
+        PanelMenu.SetActive(true);
+    }
+}

Assets/Scripts/SettingMenu.cs.meta

+fileFormatVersion: 2
+guid: c03e2869fc6b6dc40af71b21fe4bc884
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Store/Pictures.meta

+fileFormatVersion: 2
+guid: 23e94fee428ceee4fa2d1758cba0e2a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,11 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/MenuDebut.unity
+    guid: b678e7143094cd546bd677e139e22b25
+  - enabled: 1
+    path: Assets/Scenes/Scene.unity
+    guid: 94552ce546889c34f9658dc37aa1c74a
   m_configObjects: {}