diff --git a/MoCha/Assets/Materials/Blackout.mat b/MoCha/Assets/Materials/Blackout.mat new file mode 100644 index 0000000..47953a2 Binary files /dev/null and b/MoCha/Assets/Materials/Blackout.mat differ diff --git a/MoCha/Assets/Materials/Blackout.mat.meta b/MoCha/Assets/Materials/Blackout.mat.meta new file mode 100644 index 0000000..80f29d7 --- /dev/null +++ b/MoCha/Assets/Materials/Blackout.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8b09d9a7c0cb3ca42a798802c96d28c8 +timeCreated: 1524748932 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab index 5ae202c..b46718c 100644 Binary files a/MoCha/Assets/Prefabs/Navigation.prefab and b/MoCha/Assets/Prefabs/Navigation.prefab differ diff --git a/MoCha/Assets/Prefabs/Navigation.prefab.meta b/MoCha/Assets/Prefabs/Navigation.prefab.meta index a619c74..c9cf27e 100644 --- a/MoCha/Assets/Prefabs/Navigation.prefab.meta +++ b/MoCha/Assets/Prefabs/Navigation.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 326b00dfcab7e8c4da45c990cef3c9b6 -timeCreated: 1524679668 +timeCreated: 1524753018 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 3751dd5..0e6547a 100644 Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index a926d33..ac1d336 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scripts/NavigationManager.cs b/MoCha/Assets/Scripts/NavigationManager.cs new file mode 100644 index 0000000..e255db4 --- /dev/null +++ b/MoCha/Assets/Scripts/NavigationManager.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class NavigationManager : MonoBehaviour +{ + private GameObject navMenu; + + public void Start() + { + //navMenu = GameObject.Find("Navigation Menu"); + navMenu = gameObject.transform.Find("Navigation Menu").gameObject; + } + + public void OpenNavMenu() + { + navMenu.SetActive (true); + } + + public void CloseNavMenu() + { + navMenu.SetActive (false); + } +} diff --git a/MoCha/Assets/Scripts/NavigationManager.cs.meta b/MoCha/Assets/Scripts/NavigationManager.cs.meta new file mode 100644 index 0000000..c392c20 --- /dev/null +++ b/MoCha/Assets/Scripts/NavigationManager.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 658e48ac784a5d543bc76161835f7156 +timeCreated: 1524750227 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/SceneLoader.cs b/MoCha/Assets/Scripts/SceneLoader.cs index c318319..d61788b 100644 --- a/MoCha/Assets/Scripts/SceneLoader.cs +++ b/MoCha/Assets/Scripts/SceneLoader.cs @@ -26,6 +26,14 @@ public class SceneLoader : MonoBehaviour { if (!(SceneManager.GetActiveScene ().name == "StepCounter")) SceneManager.LoadScene ("StepCounter"); break; + case "Profile": + if (!(SceneManager.GetActiveScene ().name == "Stats")) + SceneManager.LoadScene ("Stats"); + break; + case "Monster Creator": + if (!(SceneManager.GetActiveScene ().name == "MonsterCreator")) + SceneManager.LoadScene ("MonsterCreator"); + break; default: if (!(SceneManager.GetActiveScene ().name == scenetext)) SceneManager.LoadScene (scenetext);