diff --git a/Assets/Scripts/Pause.cs b/Assets/Scripts/Pause.cs index 4e5535f..42aafda 100644 --- a/Assets/Scripts/Pause.cs +++ b/Assets/Scripts/Pause.cs @@ -13,17 +13,16 @@ public class Pause : MonoBehaviour bool paused; // Use this for initialization - void Start () + void Start() { - OptionsCanvas = GameObject.Find("OptionsCanvas"); imgFade = objFade.GetComponent(); - OptionsCanvas.SetActive(false); objText.SetActive(false); objButtons.SetActive(false); + OptionsCanvas.SetActive(false); } - + // Update is called once per frame - void Update () + void Update() { if (!busy && (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.P))) { @@ -52,10 +51,9 @@ IEnumerator _TransitionIn() imgFade.color = new Color(0, 0, 0, 0.4f); // Show the PAUSED text and the buttons - objText.SetActive(true); objButtons.SetActive(true); - + OptionsCanvas.SetActive(false); // Allow input again busy = false; } @@ -91,24 +89,25 @@ public void Resume() StartCoroutine(_TransitionOut()); } } - //Opens up OptionsCanvas, disables the pause menu while the options menu is up - public void Settings() + public void Option() { if (!busy) { - OptionsCanvas.SetActive(true); busy = true; + objText.SetActive(false); + objButtons.SetActive(false); + OptionsCanvas.SetActive(true); } } - //Mapped to exit button for options menu - public void closeSettings() + public void Quit() { - OptionsCanvas.SetActive(false); - busy = false; + Application.Quit(); } - public void Quit() + //method goes into option canvas to head back to pause menu + public void Back() { - Application.Quit(); + StartCoroutine(_TransitionIn()); } + } diff --git a/Assets/optionPause.unity b/Assets/optionPause.unity new file mode 100644 index 0000000..3f02e07 Binary files /dev/null and b/Assets/optionPause.unity differ diff --git a/Assets/optionPause.unity.meta b/Assets/optionPause.unity.meta new file mode 100644 index 0000000..433a6c0 --- /dev/null +++ b/Assets/optionPause.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 91ff8ea1b26091f4a8d560fd93df82ab +timeCreated: 1458177786 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 70fdf2d..88fbef1 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ