From c7d2d5cdb20d42a2014ff99d2fdffae68657e02e Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sun, 1 Oct 2017 19:15:40 +0200 Subject: Started on settings menu --- td/Assets/Prefabs/UI/msgBoxYesNo.prefab | Bin 16912 -> 16912 bytes td/Assets/Prefabs/UI/msgBoxYesNo.prefab.meta | 2 +- td/Assets/Scenes/Level 1.unity | Bin 54344 -> 69440 bytes td/Assets/Scripts/mainGUI.cs | 21 +++++++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) (limited to 'td/Assets') diff --git a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab index bb1a31f..d5b775a 100644 Binary files a/td/Assets/Prefabs/UI/msgBoxYesNo.prefab and b/td/Assets/Prefabs/UI/msgBoxYesNo.prefab differ 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 index 44a726e..7c17039 100644 Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ 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 (); /* Buttons */ btnToggleSidebar = pnlSidebar.transform.Find("toggleSidebar").gameObject.GetComponent