From 53ab0c1b9fa744045e5d39cb32c9c42d5e062b78 Mon Sep 17 00:00:00 2001 From: KelvinPham Date: Wed, 16 Mar 2016 19:44:48 -0700 Subject: [PATCH] Added Options Menu to Pause Menu Bring up a list of options to select from if options button was selected in pause(note: only option available so far is back). --- Assets/Scripts/Pause.cs | 31 +++++++++++++------------- Assets/optionPause.unity | Bin 0 -> 28160 bytes Assets/optionPause.unity.meta | 8 +++++++ ProjectSettings/ProjectSettings.asset | Bin 37337 -> 37337 bytes 4 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 Assets/optionPause.unity create mode 100644 Assets/optionPause.unity.meta 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 0000000000000000000000000000000000000000..3f02e075f0705fb393ad3119b45c8853f815d0bd GIT binary patch literal 28160 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 literal 0 HcmV?d00001 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 70fdf2daa2a20c9683e92fc095e8013d90ea7d73..88fbef1bd9ecfa2d8973cd0127efd7ca7bdf414b 100644 GIT binary patch delta 15 Xcmcb)nCa$XrU{ZvX@(o6_e}%