diff options
author | Jakob Stendahl <jakob.stendahl@outlook.com> | 2017-10-01 19:15:40 +0200 |
---|---|---|
committer | Jakob Stendahl <jakob.stendahl@outlook.com> | 2017-10-01 19:15:40 +0200 |
commit | c7d2d5cdb20d42a2014ff99d2fdffae68657e02e (patch) | |
tree | fd6922a8625ca8e20dd3281401395ff77e8d94f6 | |
parent | 149bd76007f3c1edcda05ae6bc9bf0b48cf28aae (diff) | |
download | TD-c7d2d5cdb20d42a2014ff99d2fdffae68657e02e.tar.gz TD-c7d2d5cdb20d42a2014ff99d2fdffae68657e02e.zip |
Started on settings menu
-rw-r--r-- | td/Assets/Prefabs/UI/msgBoxYesNo.prefab | bin | 16912 -> 16912 bytes | |||
-rw-r--r-- | td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta | 2 | ||||
-rw-r--r-- | td/Assets/Scenes/Level 1.unity | bin | 54344 -> 69440 bytes | |||
-rw-r--r-- | td/Assets/Scripts/mainGUI.cs | 21 |
4 files changed, 22 insertions, 1 deletions
diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab Binary files differindex bb1a31f..d5b775a 100644 --- a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab +++ b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta index b881c23..3c4996f 100644 --- a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta +++ b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 21dda97ff00d54fca8607f4d476e82e3 -timeCreated: 1506728240 +timeCreated: 1506877151 licenseType: Free NativeFormatImporter: mainObjectFileID: 100100000 diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity Binary files differindex 44a726e..7c17039 100644 --- a/td/Assets/Scenes/Level 1.unity +++ b/td/Assets/Scenes/Level 1.unity diff --git a/td/Assets/Scripts/mainGUI.cs b/td/Assets/Scripts/mainGUI.cs index 3c135b2..d9f7ee0 100644 --- a/td/Assets/Scripts/mainGUI.cs +++ b/td/Assets/Scripts/mainGUI.cs @@ -7,10 +7,13 @@ public class mainGUI : MonoBehaviour { GameObject pnlMenu; GameObject pnlSidebar; + GameObject pnlSettings; RectTransform pnlSidebarTransform; Button btnToggleSidebar; Button btnPauseGame; Button btnResumeGame; + Button btnExitGame; + Button btnSettings; bool sidebarExpanded; float[] sidebarStates = new float[2] {0f, -202.4f}; // The x position of the sidebar expanded or collapsed @@ -21,19 +24,26 @@ public class mainGUI : MonoBehaviour { /* Panels */ pnlMenu = transform.Find ("menu").gameObject; pnlSidebar = transform.Find ("sidebarWrapper").gameObject; + pnlSettings = transform.Find ("settings").gameObject; pnlSidebarTransform = pnlSidebar.GetComponent <RectTransform> (); /* Buttons */ btnToggleSidebar = pnlSidebar.transform.Find("toggleSidebar").gameObject.GetComponent <Button> (); btnPauseGame = pnlSidebar.transform.Find ("pauseGame").gameObject.GetComponent <Button> (); btnResumeGame = pnlMenu.transform.Find ("resumeGame").gameObject.GetComponent <Button> (); + btnExitGame = pnlMenu.transform.Find ("exitGame").gameObject.GetComponent <Button> (); + btnSettings = pnlMenu.transform.Find ("settings").gameObject.GetComponent <Button> (); if (btnToggleSidebar != null) { btnToggleSidebar.onClick.AddListener (toggleSidebarHandler); } if (btnPauseGame != null) { btnPauseGame.onClick.AddListener (pauseGameHandler); } if (btnResumeGame != null) { btnResumeGame.onClick.AddListener (btnResumeGameHandler); } + if (btnExitGame != null) { btnExitGame.onClick.AddListener (btnExitGameHandler); } + if (btnSettings != null) { btnSettings.onClick.AddListener (btnSettingsHandler); } + /* Set up initial states */ updateSidebarPosandBtn (); pnlMenu.SetActive (false); + pnlSettings.SetActive (false); } void toggleSidebarHandler() { @@ -60,6 +70,17 @@ public class mainGUI : MonoBehaviour { btnPauseGame.interactable = true; } + void btnExitGameHandler() { + /* handler for btnExitGame */ + Application.Quit (); + } + + void btnSettingsHandler() { + /* handler for btnSettings */ + pnlMenu.SetActive (false); + pnlSettings.SetActive (true); + } + void updateSidebarPosandBtn() { /* update state of sidebar based on the expanded var */ if (sidebarExpanded) { |