diff --git a/.gitignore b/.gitignore index 4b71db8..b004b77 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ **/UnityPackageManager/ MoCha/Assets/Plugins/Android.meta MoCha/ProjectSettings/ProjectVersion.txt +MoCha/Assets/Plugins.meta diff --git a/MoCha/Assets/Plugins.meta b/MoCha/Assets/Plugins.meta deleted file mode 100644 index c2bfce5..0000000 --- a/MoCha/Assets/Plugins.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: c0d1cd17861ddfa469b8a67ce9249897 -folderAsset: yes -timeCreated: 1523557753 -======= -guid: eba9d66c763b541cfbbd65c831b9bdd0 -folderAsset: yes -timeCreated: 1523992298 ->>>>>>> darrel -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity new file mode 100644 index 0000000..57eb13b Binary files /dev/null and b/MoCha/Assets/Scenes/Goals.unity differ diff --git a/MoCha/Assets/Scenes/Goals.unity.meta b/MoCha/Assets/Scenes/Goals.unity.meta new file mode 100644 index 0000000..89f224f --- /dev/null +++ b/MoCha/Assets/Scenes/Goals.unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4b0ca444941a84684a96bbf0c34cadf5 +timeCreated: 1524164968 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index dfea7e8..b7814d6 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scripts/Goals.cs b/MoCha/Assets/Scripts/Goals.cs new file mode 100644 index 0000000..7273f2d --- /dev/null +++ b/MoCha/Assets/Scripts/Goals.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Goals : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/MoCha/Assets/Scripts/Goals.cs.meta b/MoCha/Assets/Scripts/Goals.cs.meta new file mode 100644 index 0000000..dbac0c0 --- /dev/null +++ b/MoCha/Assets/Scripts/Goals.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 5f138b644c262457385474b2256308a7 +timeCreated: 1524165858 +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 c30d69b..70f9a42 100644 --- a/MoCha/Assets/Scripts/SceneLoader.cs +++ b/MoCha/Assets/Scripts/SceneLoader.cs @@ -15,6 +15,7 @@ public class SceneLoader : MonoBehaviour { public void LoadScene() { string scenetext = buttontext.text; + Debug.Log (" " + scenetext); switch (scenetext) { case "Home": diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index c186820..df63f52 100644 Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ