diff --git a/MoCha/Assets/Materials/Background Shade.mat b/MoCha/Assets/Materials/Background Shade.mat index 24b147b..ae96152 100644 Binary files a/MoCha/Assets/Materials/Background Shade.mat and b/MoCha/Assets/Materials/Background Shade.mat differ diff --git a/MoCha/Assets/Prefabs 1/Base Canvas.prefab b/MoCha/Assets/Prefabs 1/Base Canvas.prefab deleted file mode 100644 index e9760d9..0000000 Binary files a/MoCha/Assets/Prefabs 1/Base Canvas.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta b/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta deleted file mode 100644 index e351690..0000000 --- a/MoCha/Assets/Prefabs 1/Base Canvas.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 2ff4eb0700f8b12488930f0e38c76712 -timeCreated: 1523557265 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Cube.prefab b/MoCha/Assets/Prefabs 1/Cube.prefab deleted file mode 100644 index 1ee1982..0000000 Binary files a/MoCha/Assets/Prefabs 1/Cube.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Cube.prefab.meta b/MoCha/Assets/Prefabs 1/Cube.prefab.meta deleted file mode 100644 index 5495692..0000000 --- a/MoCha/Assets/Prefabs 1/Cube.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e51ca5c9f429b994b809de4f27b07ef8 -timeCreated: 1523381771 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Home Button.prefab b/MoCha/Assets/Prefabs 1/Home Button.prefab deleted file mode 100644 index f34f2c0..0000000 Binary files a/MoCha/Assets/Prefabs 1/Home Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Home Button.prefab.meta b/MoCha/Assets/Prefabs 1/Home Button.prefab.meta deleted file mode 100644 index 6b87914..0000000 --- a/MoCha/Assets/Prefabs 1/Home Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 5e931df1f395ce34593d0c8d743fb7bc -timeCreated: 1523381756 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/ItemSlot.prefab b/MoCha/Assets/Prefabs 1/ItemSlot.prefab deleted file mode 100644 index 0c05dbf..0000000 Binary files a/MoCha/Assets/Prefabs 1/ItemSlot.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Main Camera.prefab b/MoCha/Assets/Prefabs 1/Main Camera.prefab deleted file mode 100644 index b4a07d8..0000000 Binary files a/MoCha/Assets/Prefabs 1/Main Camera.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta b/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta deleted file mode 100644 index 78bcca4..0000000 --- a/MoCha/Assets/Prefabs 1/Main Camera.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b43a02c13753e5d4085147253e07502c -timeCreated: 1523382230 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Run Button.prefab b/MoCha/Assets/Prefabs 1/Run Button.prefab deleted file mode 100644 index 2e34aff..0000000 Binary files a/MoCha/Assets/Prefabs 1/Run Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Run Button.prefab.meta b/MoCha/Assets/Prefabs 1/Run Button.prefab.meta deleted file mode 100644 index 70b48db..0000000 --- a/MoCha/Assets/Prefabs 1/Run Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: fbf6aa2e9f888374b950a720d0d4a1c7 -timeCreated: 1523381760 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Stats Button.prefab b/MoCha/Assets/Prefabs 1/Stats Button.prefab deleted file mode 100644 index 20c5220..0000000 Binary files a/MoCha/Assets/Prefabs 1/Stats Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta b/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta deleted file mode 100644 index 7e17407..0000000 --- a/MoCha/Assets/Prefabs 1/Stats Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 37f0b1e2cab100b45b13105c713988a1 -timeCreated: 1523381758 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs 1/Title.prefab b/MoCha/Assets/Prefabs 1/Title.prefab deleted file mode 100644 index 2ebe5cf..0000000 Binary files a/MoCha/Assets/Prefabs 1/Title.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs 1/Title.prefab.meta b/MoCha/Assets/Prefabs 1/Title.prefab.meta deleted file mode 100644 index ac799c3..0000000 --- a/MoCha/Assets/Prefabs 1/Title.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6f1ad5af631524940bf3e10e7792b9b8 -timeCreated: 1524663319 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Base Canvas.prefab b/MoCha/Assets/Prefabs/Base Canvas.prefab deleted file mode 100644 index e62b971..0000000 Binary files a/MoCha/Assets/Prefabs/Base Canvas.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Base Canvas.prefab.meta b/MoCha/Assets/Prefabs/Base Canvas.prefab.meta deleted file mode 100644 index 192a4b1..0000000 --- a/MoCha/Assets/Prefabs/Base Canvas.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 7d0f216d6d3858a479598e82060a4c1e -timeCreated: 1523557265 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Cube.prefab b/MoCha/Assets/Prefabs/Cube.prefab deleted file mode 100644 index 1ee1982..0000000 Binary files a/MoCha/Assets/Prefabs/Cube.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Cube.prefab.meta b/MoCha/Assets/Prefabs/Cube.prefab.meta deleted file mode 100644 index e093e0a..0000000 --- a/MoCha/Assets/Prefabs/Cube.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f4270938654392741b69c20500b1c26a -timeCreated: 1523381771 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Home Button.prefab b/MoCha/Assets/Prefabs/Home Button.prefab deleted file mode 100644 index f34f2c0..0000000 Binary files a/MoCha/Assets/Prefabs/Home Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Home Button.prefab.meta b/MoCha/Assets/Prefabs/Home Button.prefab.meta deleted file mode 100644 index f8bdc54..0000000 --- a/MoCha/Assets/Prefabs/Home Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a9f18dad3047a8143a388663f4df1d7d -timeCreated: 1523381756 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Main Camera.prefab b/MoCha/Assets/Prefabs/Main Camera.prefab deleted file mode 100644 index b4a07d8..0000000 Binary files a/MoCha/Assets/Prefabs/Main Camera.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Main Camera.prefab.meta b/MoCha/Assets/Prefabs/Main Camera.prefab.meta deleted file mode 100644 index d31f32f..0000000 --- a/MoCha/Assets/Prefabs/Main Camera.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d89e27eba9f3ae145819263a78f1432d -timeCreated: 1523382230 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab index 5f7be4e..9fc7b82 100644 Binary files a/MoCha/Assets/Prefabs/Navigation.prefab and b/MoCha/Assets/Prefabs/Navigation.prefab differ diff --git a/MoCha/Assets/Prefabs/Progress Bar.prefab b/MoCha/Assets/Prefabs/Progress Bar.prefab deleted file mode 100644 index 3e61fa4..0000000 Binary files a/MoCha/Assets/Prefabs/Progress Bar.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Progress Bar.prefab.meta b/MoCha/Assets/Prefabs/Progress Bar.prefab.meta deleted file mode 100644 index 2b39af1..0000000 --- a/MoCha/Assets/Prefabs/Progress Bar.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 441f50f7e865a4e9c937038cedf667ee -timeCreated: 1524703581 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Progress Bars & Text.prefab b/MoCha/Assets/Prefabs/Progress Bars & Text.prefab new file mode 100644 index 0000000..0154166 Binary files /dev/null and b/MoCha/Assets/Prefabs/Progress Bars & Text.prefab differ diff --git a/MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta b/MoCha/Assets/Prefabs/Progress Bars & Text.prefab.meta similarity index 72% rename from MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta rename to MoCha/Assets/Prefabs/Progress Bars & Text.prefab.meta index 3278214..c9cdb7c 100644 --- a/MoCha/Assets/Prefabs 1/ItemSlot.prefab.meta +++ b/MoCha/Assets/Prefabs/Progress Bars & Text.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 47cdeeb9927ccbc428e5e853529cabdd -timeCreated: 1524162403 +guid: 5b086532012024c1d89b53fd7a7a004c +timeCreated: 1525034977 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/MoCha/Assets/Prefabs/Run Button.prefab b/MoCha/Assets/Prefabs/Run Button.prefab deleted file mode 100644 index 2e34aff..0000000 Binary files a/MoCha/Assets/Prefabs/Run Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Run Button.prefab.meta b/MoCha/Assets/Prefabs/Run Button.prefab.meta deleted file mode 100644 index 9fc5385..0000000 --- a/MoCha/Assets/Prefabs/Run Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 7961087b887dd2c4b94eedd27077ebec -timeCreated: 1523381760 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Stats Button.prefab b/MoCha/Assets/Prefabs/Stats Button.prefab deleted file mode 100644 index 20c5220..0000000 Binary files a/MoCha/Assets/Prefabs/Stats Button.prefab and /dev/null differ diff --git a/MoCha/Assets/Prefabs/Stats Button.prefab.meta b/MoCha/Assets/Prefabs/Stats Button.prefab.meta deleted file mode 100644 index c03c8cd..0000000 --- a/MoCha/Assets/Prefabs/Stats Button.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: ec93336fd97bdc84c8786bb7af6bff7a -timeCreated: 1523381758 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Title.prefab b/MoCha/Assets/Prefabs/Title.prefab index 2ebe5cf..bfb4fe2 100644 Binary files a/MoCha/Assets/Prefabs/Title.prefab and b/MoCha/Assets/Prefabs/Title.prefab differ diff --git a/MoCha/Assets/Scenes/Credits.unity b/MoCha/Assets/Scenes/Credits.unity index 4b60143..b5611cb 100644 Binary files a/MoCha/Assets/Scenes/Credits.unity and b/MoCha/Assets/Scenes/Credits.unity differ diff --git a/MoCha/Assets/Scenes/FitbitLogin.unity b/MoCha/Assets/Scenes/FitbitLogin.unity new file mode 100644 index 0000000..03fcbbb Binary files /dev/null and b/MoCha/Assets/Scenes/FitbitLogin.unity differ diff --git a/MoCha/Assets/Scenes/Social.unity.meta b/MoCha/Assets/Scenes/FitbitLogin.unity.meta similarity index 68% rename from MoCha/Assets/Scenes/Social.unity.meta rename to MoCha/Assets/Scenes/FitbitLogin.unity.meta index 5fa5973..f5aae61 100644 --- a/MoCha/Assets/Scenes/Social.unity.meta +++ b/MoCha/Assets/Scenes/FitbitLogin.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 8d5718db90a3f2f46ab023b0588466b5 -timeCreated: 1523381729 +guid: e4e05e44213ffe141906009c29238b2e +timeCreated: 1525379963 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index a6508ce..ae30587 100644 Binary files a/MoCha/Assets/Scenes/Goals.unity and b/MoCha/Assets/Scenes/Goals.unity differ diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 58855a1..46e28c2 100644 Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ diff --git a/MoCha/Assets/Scenes/Leaderboard.unity b/MoCha/Assets/Scenes/Leaderboard.unity index 60fd14a..86241ea 100644 Binary files a/MoCha/Assets/Scenes/Leaderboard.unity and b/MoCha/Assets/Scenes/Leaderboard.unity differ diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 057588d..f4fef04 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 0831bb6..5c52b36 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scenes/Social.unity b/MoCha/Assets/Scenes/Social.unity deleted file mode 100644 index dba2543..0000000 Binary files a/MoCha/Assets/Scenes/Social.unity and /dev/null differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 4f3b02f..4486b21 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scenes/StepCounter.unity b/MoCha/Assets/Scenes/StepCounter.unity index 95f0dfa..e2171cd 100644 Binary files a/MoCha/Assets/Scenes/StepCounter.unity and b/MoCha/Assets/Scenes/StepCounter.unity differ diff --git a/MoCha/Assets/Scenes/StepCounter.unity.meta b/MoCha/Assets/Scenes/StepCounter.unity.meta index b9cc508..535bf2c 100644 --- a/MoCha/Assets/Scenes/StepCounter.unity.meta +++ b/MoCha/Assets/Scenes/StepCounter.unity.meta @@ -1,15 +1,8 @@ fileFormatVersion: 2 guid: e5fcab55ab6a24d8eb5dd6198b597019 -<<<<<<< HEAD timeCreated: 1497532216 licenseType: Pro DefaultImporter: -======= -timeCreated: 1523382829 -licenseType: Free -DefaultImporter: - externalObjects: {} ->>>>>>> alex userData: assetBundleName: assetBundleVariant: diff --git a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta index a7829bd..a23005d 100644 --- a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta +++ b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 80685d60eb42cd340a5c76d410187801 timeCreated: 1524716619 -======= -guid: 1d9a971c325c98e4a81ea4ec2e52aed6 -timeCreated: 1524756178 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs index aca4ed7..0770a24 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs +++ b/MoCha/Assets/Scripts/FitBitAPI.cs @@ -11,14 +11,14 @@ using UnityEngine; namespace Assets.Scripts.Fitbit { - + public class FitBitAPI : MonoBehaviour { - + private const string _consumerSecret = "69307b9f332caf9946ef4e23cabde2e4"; private const string _clientId = "22CX4L"; private const string _callbackURL = "http://localhost/callback"; - private const string CustomAndroidScheme = "mocha://"; + private const string CustomAndroidScheme = "http://localhost/callback"; private const string _tokenUrl = "https://api.fitbit.com/oauth2/token"; private const string _baseGetUrl = "https://api.fitbit.com/1/user/-/"; @@ -42,7 +42,7 @@ namespace Assets.Scripts.Fitbit private OAuth2AccessToken _oAuth2 = new OAuth2AccessToken(); public FitbitData _fitbitData = new FitbitData(); - + private string _statusMessage; private string CallBackUrl @@ -73,6 +73,7 @@ namespace Assets.Scripts.Fitbit { _bFirstFire = false; } + //GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories); } public void LoginToFitbit() @@ -123,7 +124,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_tokenUrl, form.data, headers); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -192,7 +193,7 @@ namespace Assets.Scripts.Fitbit _returnCode = code; UseReturnCode(); } - + public void GetAllData() { GetProfileData(); @@ -221,7 +222,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_profileUrl, null, headers); Debug.Log("Doing GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -239,7 +240,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_caloriesUrl, null, headers); Debug.Log("Doing Calories GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -255,7 +256,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_distanceUrl, null, headers); Debug.Log("Doing Distance GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -272,7 +273,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_stepsUrl, null, headers); Debug.Log("Doing Steps GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -315,7 +316,7 @@ namespace Assets.Scripts.Fitbit { if (kvp.Key == "avatar") continue; - + //put a space between the camelCase var tempKey = Regex.Replace(kvp.Key, "(\\B[A-Z])", " $1"); //then capitalize the first letter @@ -397,6 +398,7 @@ namespace Assets.Scripts.Fitbit var root = doc.Descendants("value").FirstOrDefault(); _fitbitData.CurrentSteps = ToInt(root.Value); Debug.Log("Steps from Fitbit: " + _fitbitData.CurrentSteps); + PlayerPrefs.SetInt("fitbitSteps", _fitbitData.CurrentSteps); } private void ParseDistanceData(string data) @@ -412,6 +414,7 @@ namespace Assets.Scripts.Fitbit _fitbitData.CurrentDistance = ToDouble(root); Debug.Log("Distance from Fitbit is:" + _fitbitData.CurrentDistance); + PlayerPrefs.SetFloat("fitbitDistance", (float)_fitbitData.CurrentDistance); } private void ParseCaloriesData(string data) @@ -422,6 +425,7 @@ namespace Assets.Scripts.Fitbit var calories = doc.Descendants("value").FirstOrDefault().Value; _fitbitData.CurrentCalories = ToInt(calories); + PlayerPrefs.SetInt("fitbitCalories", ToInt(calories)); } private void ParseSleepData(string data) diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs.meta b/MoCha/Assets/Scripts/FitBitAPI.cs.meta index beb83a4..8514324 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs.meta +++ b/MoCha/Assets/Scripts/FitBitAPI.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: aa5e856e9b878764db7c192f3aa20277 timeCreated: 1524716713 -======= -guid: 849590d4a954ae445aa5db73d734450c -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitbitCaller.cs.meta b/MoCha/Assets/Scripts/FitbitCaller.cs.meta index 57119f4..1dc151a 100644 --- a/MoCha/Assets/Scripts/FitbitCaller.cs.meta +++ b/MoCha/Assets/Scripts/FitbitCaller.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 36444c03eedb84147a326a329de30d0e timeCreated: 1524716713 -======= -guid: 80ba6a52e9d55564fbe8130844b17f29 -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitbitData.cs.meta b/MoCha/Assets/Scripts/FitbitData.cs.meta index e0b1ea8..add5ba3 100644 --- a/MoCha/Assets/Scripts/FitbitData.cs.meta +++ b/MoCha/Assets/Scripts/FitbitData.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 7a928c029cb14204588724261a513ec1 timeCreated: 1524716713 -======= -guid: 1d8622418b8bead4cad17658d650c6c2 -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 6044ca4..1febe08 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -7,180 +7,296 @@ using UnityEngine.UI; using System.Text; //Pretty much a copy of GetData... -namespace PedometerU.Tests { +namespace PedometerU.Tests +{ -public class GetGoals : MonoBehaviour { - - public Image background; - private string[] items = { "circle_eye", "crazy_hair", "circle_head", "gap_mouth", "pig_nose", "crown" }; - - public Text goalText; - public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - public string prefKey; - - //Progress Bar... - public float barDisplay; //current progress - private Vector2 barPos; - private Vector2 barSize = new Vector2(725, 39); - - //Pedometer - private Pedometer pedometer; - int userSteps; - int userPoints; - double userDistance; - int stepsGoal = 100; - public Text stepText; - public Text pointsText; - private int savedSteps; - private int savedPoints; - - void OnStep (int steps, double distance) { - userDistance = (distance * 3.28084); - userSteps = steps + savedSteps; - PlayerPrefs.SetInt("currentSteps",userSteps); - stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); - - userPoints = steps*5 + savedPoints; - PlayerPrefs.SetInt("totalPoints",userPoints); - pointsText.text = "Points: " + userPoints.ToString (); - } - - private void OnDisable () { - // Release the pedometer - pedometer.Dispose(); - pedometer = null; - } - - //saved value from last session loads in on START - //write usersteps + saved val to pref in ONSTEP - - void Start () { - savedSteps = PlayerPrefs.GetInt("currentSteps"); - savedPoints = PlayerPrefs.GetInt("totalPoints"); - // Create a new pedometer - pedometer = new Pedometer(OnStep); - // Reset UI - stepText.text = savedSteps.ToString () + "/" + stepsGoal.ToString(); - if(PlayerPrefs.HasKey("totalPoints")) - { - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); - } - else - { - PlayerPrefs.SetInt("totalPoints", 0); - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); - } - userSteps = savedSteps; - userPoints = savedPoints; - - //OnStep(savedSteps, 0); - Debug.Log(savedSteps); - - - //goalText.text = prefKey; - goalText.color = new Color(0f, 0f, 0f); - Debug.Log(background.rectTransform.anchoredPosition.x.ToString() + " " + background.rectTransform.anchoredPosition.y.ToString()); - - barPos = new Vector2(background.transform.position.x, 2135 - background.transform.position.y); - - currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - Debug.Log(goalDayStr); - - if(prefKey == "daily") - savePersistantGoalDate("daily"); - } - - - //Texture the progress bar using these parameters - public Texture2D emptyTex; - public Texture2D fullTex; - - //on a button press? begin a goal? - void startGoal() + public class GetGoals : MonoBehaviour { - } + // For HTTP requests to the server. + private MochaParser mp; - void savePersistantGoalDate(string key) - { - PlayerPrefs.SetString(key, goalDayStr); - } + // Goals Progress Bar + public Image pbbg; + public Image pbf; - bool checkNewDay(string key) - { - string checkDay = PlayerPrefs.GetString(key); - if(checkDay == currentDayStr) - return false; - return true; - } - // - void OnGUI() { - //draw the background: - GUI.BeginGroup(new Rect(barPos.x, barPos.y, barSize.x, barSize.y)); - GUI.Box(new Rect(0,0, barSize.x, barSize.y), emptyTex); + // My Goal Progress Bar + public Image mgpbbg; + public Image mgpbf; - //draw the filled-in part: - GUI.BeginGroup(new Rect(0,0, barSize.x * barDisplay, barSize.y)); - GUI.Box(new Rect(0,0, barSize.x, barSize.y), fullTex); - GUI.EndGroup(); - GUI.EndGroup(); - } + // Monster Progress Bar + public Image mpbbg; + public Image mpbf; + private string[] items = { "circle_eye", "crazy_hair", "circle_head", "gap_mouth", "pig_nose", "crown" }; - void Update() { - //needs current points counting toward this goal (daily?) - //needs the total required points for this goal - currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - //barDisplay = Time.time*0.05f; //put actual progress here (current/total) - barDisplay = (float)userSteps/(float)stepsGoal; + // Display Text + public Text rivalText; + public Text goalText; + public Text stepText; + public Text pointsText; + public Text remainingText; - //failed to complete goal - if(currentDayStr != goalDayStr) - { - Debug.Log(currentDayStr); - Debug.Log(goalDayStr); + // Goal information. + private string currentDayStr; + private string goalDayStr; + public string prefKey; - Debug.Log("DAY HAS PASSED!!"); + // Used for time calculation. + private int timeUsed; + private int timeRemaining; + private const int secondsperday = 86400; - //make it so user dismisses the goal instead! - //Destroy(this); - //destroy the goal and set a new one? + //Progress Bar... + private float barDisplay; //current progress + //private Vector2 barPos; + // This gets overwritten later by the background's size values. + private Vector2 barSize = new Vector2(5000, 10); - } - //goal complete - if(barDisplay >= 1.0f) - { - Debug.Log("Goal complete! +100pts!"); - userSteps = 0; - PlayerPrefs.SetInt("currentSteps", userSteps); - savedSteps = 0; - //OnStep(0,0); - stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); + //Pedometer + private Pedometer pedometer; + int userSteps; + int userPoints; + public int stepsGoal; + private int savedSteps; + private int savedPoints; - //destroy the goal and set a new one? - savedPoints += stepsGoal*10; - PlayerPrefs.SetInt("totalPoints", savedPoints); - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); + public string currentStepsKey; + public string totalPointsKey; - //Random item - StringBuilder invList = new StringBuilder (); - invList.Append(PlayerPrefs.GetString ("inventory")); - invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); - PlayerPrefs.SetString ("inventory", invList.ToString()); + void OnStep (int steps, double distance) { + //userDistance = (distance * 3.28084); + userSteps = steps + savedSteps; + PlayerPrefs.SetInt(currentStepsKey,userSteps); + stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); + + userPoints = steps*5 + savedPoints; + PlayerPrefs.SetInt(totalPointsKey,userPoints); + pointsText.text = "Points: " + userPoints.ToString (); } - //only applies if "daily" goal - if(prefKey == "daily") + private void OnDisable () { + // Release the pedometer + pedometer.Dispose(); + pedometer = null; + } + + //saved value from last session loads in on START + //write usersteps + saved val to pref in ONSTEP + + void Start () { - if(checkNewDay(prefKey)) + //PlayerPrefs.SetInt("currentGoals", 0); + //PlayerPrefs.DeleteAll(); //danger!! + if(prefKey == "daily") { - Debug.Log("You failed your goal"); //not true if progress is actually complete! - goalDayStr = currentDayStr; - savePersistantGoalDate("daily"); + // This should later only get called per goal + StartCoroutine(updateRival()); + currentStepsKey = "currentSteps"; + totalPointsKey = "totalPoints"; + } + else + { + currentStepsKey = "currentSteps_p"; + totalPointsKey = "totalPoints_p"; + } + + savedSteps = PlayerPrefs.GetInt(currentStepsKey); + savedPoints = PlayerPrefs.GetInt(totalPointsKey); + // Create a new pedometer + pedometer = new Pedometer(OnStep); + // Reset UI + stepText.text = savedSteps.ToString () + "/" + stepsGoal.ToString(); + + if(!PlayerPrefs.HasKey("goalComplete")) + { + PlayerPrefs.SetInt("goalComplete", 0); + } + + + if(PlayerPrefs.HasKey(totalPointsKey)) + { + pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); + } + else + { + PlayerPrefs.SetInt(totalPointsKey, 0); + pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); + } + + if(prefKey == "daily") + { + if(PlayerPrefs.HasKey("goalDate")) + { + goalDayStr = PlayerPrefs.GetString("goalDate"); + } + else + { + PlayerPrefs.SetString("goalDate", + System.DateTime.Now.AddDays(1).ToString("MM/dd/yyyy")); + goalDayStr = PlayerPrefs.GetString("goalDate"); + } + goalText.color = new Color(0f, 0f, 0f); + } + userSteps = savedSteps; + userPoints = savedPoints; + + //OnStep(savedSteps, 0); //necessary? + //Debug.Log(savedSteps); + + //Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString()); + + //barPos = new Vector2(pbbg.transform.position.x, 1895 - pbbg.transform.position.y); + + currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + } + + // Was used for testing. + private float tempcounter = 0.1f; + + // Call this to update the goals progress bar. + public void updateProgressBar() + { + //Debug.Log (pbbg.rectTransform.rect.width + " " + pbbg.rectTransform.rect.height); + barSize.x = pbbg.rectTransform.rect.width; + + //tempcounter += 0.0005f; + + // resize the fill. + RectTransform temp = pbf.rectTransform; + //temp.sizeDelta = new Vector2 (-barSize.x + barSize.x * tempcounter, 0); + temp.sizeDelta = new Vector2 (-barSize.x + (barSize.x * barDisplay), 0); + temp.anchoredPosition = new Vector2 (temp.rect.width * 0.5f - (barSize.x * 0.5f),0); + } + + // Use this for the progress bar you're testing with. + public void updateMyGoalProgressBar() + { + //Debug.Log (pbbg.rectTransform.rect.width + " " + pbbg.rectTransform.rect.height); + barSize.x = mgpbbg.rectTransform.rect.width; + + //tempcounter += 0.0005f; + + // resize the fill. + RectTransform temp = mgpbf.rectTransform; + //temp.sizeDelta = new Vector2 (-barSize.x + barSize.x * tempcounter, 0); + temp.sizeDelta = new Vector2 (-barSize.x + (barSize.x * barDisplay), 0); + temp.anchoredPosition = new Vector2 (temp.rect.width * 0.5f - (barSize.x * 0.5f),0); + } + + // Call this to update the monster's progress bar. + public void updateMonsterProgressBar() + { + float fractionused = (float)(timeUsed) / (float)(secondsperday); + //Debug.Log (dayleft); + + barSize.x = mpbbg.rectTransform.rect.width; + + //tempcounter += 0.0005f; + + // resize the fill. + RectTransform temp = mpbf.rectTransform; + //temp.sizeDelta = new Vector2 (-barSize.x + barSize.x * tempcounter, 0); + temp.sizeDelta = new Vector2 (-barSize.x + (barSize.x * fractionused), 0); + temp.anchoredPosition = new Vector2 (temp.rect.width * 0.5f - (barSize.x * 0.5f),0); + } + + // Calculates the time remaining for the day. + // Will likely make a separate function for smaller timed goals if we have time. + public void updateTimeRemaining() + { + timeUsed = ((System.DateTime.Now.Hour * 60 * 60) + (System.DateTime.Now.Minute * 60) + System.DateTime.Now.Second); + + timeRemaining = secondsperday - timeUsed; + } + + // Format the time remaining variable to a proper string. + public string formatTimeRemaining() + { + string output = "Time remaining: "; + + output += "" + (timeRemaining / 3600); + output += ":" + (timeRemaining % 3600 / 60); + output += ":" + (timeRemaining % 60); + + return output; + } + + // Shell function for now to update rival text. + // You'll wanna call this with startcoroutine(). + public IEnumerator updateRival() + { + mp = new MochaParser (); + yield return mp.MakeRequest ("http://corder.tech/mocha/random"); + rivalText.text = "You are being chased by " + mp.players [0].username; + } + + public void refreshSteps() + { + int fitbitSteps = PlayerPrefs.GetInt("fitbitSteps"); + PlayerPrefs.SetInt(currentStepsKey, fitbitSteps); + } + + void Update() + { + updateTimeRemaining (); + updateProgressBar (); + //updateMyGoalProgressBar (); + + if(prefKey == "daily") + { + updateMonsterProgressBar (); + remainingText.text = formatTimeRemaining (); + currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + } + + userSteps = PlayerPrefs.GetInt(currentStepsKey); + barDisplay = (float)userSteps/(float)stepsGoal; + if(barDisplay > 1.0f) + barDisplay = 1.0f; + stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); + + //check if the current date matches the goal date + if(prefKey == "daily" && currentDayStr == goalDayStr) + { + Debug.Log("current: " + currentDayStr); + Debug.Log("goal: " + goalDayStr); + Debug.Log(prefKey + "...DAY HAS PASSED!! SETTING GOAL TO NEXT DAY!!"); + PlayerPrefs.SetString("goalDate", + System.DateTime.Now.AddDays(1).ToString("MM/dd/yyyy")); + PlayerPrefs.SetInt("goalComplete", 0); + goalDayStr = PlayerPrefs.GetString("goalDate"); + Debug.Log("new goal: " + goalDayStr); + + //reset steps... + userSteps = 0; + PlayerPrefs.SetInt(currentStepsKey, userSteps); + } + //goal complete + else if(barDisplay >= 1.0f) + { + if(PlayerPrefs.GetInt("goalComplete") == 0) + { + Debug.Log(prefKey + "... Goal complete! +100pts!"); + userSteps = 0; + PlayerPrefs.SetInt(currentStepsKey, userSteps); + savedSteps = 0; + //OnStep(0,0); + + //destroy the goal and set a new one? + savedPoints += stepsGoal*10; + PlayerPrefs.SetInt(totalPointsKey, savedPoints); + pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); + + //Random item + if(!PlayerPrefs.HasKey("inventory")) + PlayerPrefs.SetString("inventory", ""); + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); + PlayerPrefs.SetInt("goalComplete", 1); + } } } } } - -} diff --git a/MoCha/Assets/Scripts/Item.cs b/MoCha/Assets/Scripts/Item.cs index 329438d..620899a 100644 --- a/MoCha/Assets/Scripts/Item.cs +++ b/MoCha/Assets/Scripts/Item.cs @@ -5,5 +5,5 @@ public class Item : ScriptableObject { public Sprite sprite; - public string name; + public string nameString; } diff --git a/MoCha/Assets/Scripts/JSONObject.cs.meta b/MoCha/Assets/Scripts/JSONObject.cs.meta index 7347c44..c095bab 100644 --- a/MoCha/Assets/Scripts/JSONObject.cs.meta +++ b/MoCha/Assets/Scripts/JSONObject.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: da64cad21a33a6444ac511376fcb771b timeCreated: 1524716713 -======= -guid: 9101b04121334074fb6e70fc34eeb3f9 -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/MonsterDraw.cs b/MoCha/Assets/Scripts/MonsterDraw.cs index 6e9dc54..c3f06ff 100644 --- a/MoCha/Assets/Scripts/MonsterDraw.cs +++ b/MoCha/Assets/Scripts/MonsterDraw.cs @@ -6,13 +6,13 @@ using UnityEngine.UI; public class MonsterDraw : MonoBehaviour { public GameObject anchorPoint; - + public float scale; private Vector2 anchorPos; void Start() { - anchorPos = new Vector2 (anchorPoint.transform.position.x, anchorPoint.transform.position.y); + anchorPos = new Vector3 (anchorPoint.transform.position.x, anchorPoint.transform.position.y, anchorPoint.transform.position.z); loadMonster(); } @@ -25,10 +25,11 @@ public class MonsterDraw : MonoBehaviour { string savedString = PlayerPrefs.GetString(equipped[i]); string[] values = savedString.Split (); GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i])); - //instance.rectTransform.anchoredPosition = new Vector2(float.Parse(values[0]), float.Parse(values[1])); instance.name = equipped [i]; //instance.GetComponent ().inventory = inv; - instance.transform.position = new Vector2(float.Parse(values[0]), float.Parse(values[1])); + instance.transform.position = new Vector3(float.Parse(values[0]), float.Parse(values[1]), float.Parse(values[2])); + instance.transform.localScale -= new Vector3(scale, scale, 0); + } } } diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 24b2b2d..cdbedb2 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -39,43 +39,6 @@ public class MonsterManager : MonoBehaviour { PlayerPrefs.SetString(/*SceneManager.GetActiveScene().name + */monsterParts[i].name, savedString); } PlayerPrefs.SetString ("Equipped", equippedString); - /* - StringBuilder eyePos = new StringBuilder(); - - eyePos.Append(GameObject.Find("circle_eye").transform.position.x).Append(" ").Append(GameObject.Find("circle_eye").transform.position.y).Append(" ").Append(GameObject.Find("circle_eye").transform.position.z); - string savedString = eyePos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "eyePosition", savedString); - - StringBuilder hairPos = new StringBuilder(); - - hairPos.Append(GameObject.Find("crazy_hair").transform.position.x).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.y).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.z); - savedString = hairPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hairPosition", savedString); - - StringBuilder headPos = new StringBuilder(); - - headPos.Append(GameObject.Find("circle_head").transform.position.x).Append(" ").Append(GameObject.Find("circle_head").transform.position.y).Append(" ").Append(GameObject.Find("circle_head").transform.position.z); - savedString = headPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "headPosition", savedString); - - StringBuilder hatPos = new StringBuilder(); - - hatPos.Append(GameObject.Find("crown").transform.position.x).Append(" ").Append(GameObject.Find("crown").transform.position.y).Append(" ").Append(GameObject.Find("crown").transform.position.z); - savedString = hatPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hatPosition", savedString); - - StringBuilder mouthPos = new StringBuilder(); - - mouthPos.Append(GameObject.Find("gap_mouth").transform.position.x).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.y).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.z); - savedString = mouthPos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "mouthPosition", savedString); - - StringBuilder nosePos = new StringBuilder(); - - nosePos.Append(GameObject.Find("pig_nose").transform.position.x).Append(" ").Append(GameObject.Find("pig_nose").transform.position.y).Append(" ").Append(GameObject.Find("pig_nose").transform.position.z); - savedString = nosePos.ToString(); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "nosePosition", savedString); - */ } public void loadMonster () @@ -92,37 +55,5 @@ public class MonsterManager : MonoBehaviour { instance.GetComponent ().inventory = inv; instance.transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); } - - /* - string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "eyePosition"); - string[] values = savedString.Split(' '); - - GameObject.Find("circle_eye").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hairPosition"); - values = savedString.Split(' '); - - GameObject.Find("crazy_hair").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "headPosition"); - values = savedString.Split(' '); - - GameObject.Find("circle_head").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hatPosition"); - values = savedString.Split(' '); - - GameObject.Find("crown").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "mouthPosition"); - values = savedString.Split(' '); - - GameObject.Find("gap_mouth").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - - savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "nosePosition"); - values = savedString.Split(' '); - - GameObject.Find("pig_nose").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2])); - */ } } diff --git a/MoCha/Assets/Scripts/NavigationManager.cs b/MoCha/Assets/Scripts/NavigationManager.cs index e255db4..81b92ec 100644 --- a/MoCha/Assets/Scripts/NavigationManager.cs +++ b/MoCha/Assets/Scripts/NavigationManager.cs @@ -2,9 +2,11 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using UnityEngine.SceneManagement; public class NavigationManager : MonoBehaviour { + private float timelastactive; private GameObject navMenu; public void Start() @@ -13,6 +15,26 @@ public class NavigationManager : MonoBehaviour navMenu = gameObject.transform.Find("Navigation Menu").gameObject; } + public void Update() + { + if (Input.GetKeyDown (KeyCode.Escape)) + { + if (navMenu.activeSelf) { + CloseNavMenu (); + timelastactive = Time.time; + } + else if (Time.time > (timelastactive + 1.0f)) + { + PreviousPage (); + } + } + } + + public bool isActive() + { + return navMenu.activeSelf; + } + public void OpenNavMenu() { navMenu.SetActive (true); @@ -22,4 +44,59 @@ public class NavigationManager : MonoBehaviour { navMenu.SetActive (false); } + + public void LoadScene(string scene) + { + string scenetext = scene; + Debug.Log (" " + scenetext); + + switch (scenetext) { + case "Start": + if (!(SceneManager.GetActiveScene ().name == "Home")) + SceneManager.LoadScene ("Home"); + break; + case "Run": + if (!(SceneManager.GetActiveScene ().name == "Goals")) + SceneManager.LoadScene ("Goals"); + 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); + break; + } + } + + public void PreviousPage() + { + string currentscene = SceneManager.GetActiveScene ().name; + + switch(currentscene) + { + case "Main": + Application.Quit(); + break; + case "Home": + break; + case "MonsterCreator": + SceneManager.LoadScene ("Stats"); + break; + case "Leaderboard": + SceneManager.LoadScene ("Stats"); + break; + case "Goals": + case "Credits": + case "Stats": + default: + SceneManager.LoadScene ("Home"); + break; + } + } } diff --git a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta index ba51381..320c6d8 100644 --- a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta +++ b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 2e4069fa83cbbb041aa91e83f7ece28e timeCreated: 1524716713 -======= -guid: 1d4c10710438d404085599a6fe50d37b -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/RunningMan.cs b/MoCha/Assets/Scripts/RunningMan.cs index 659a7a8..454ea3d 100644 Binary files a/MoCha/Assets/Scripts/RunningMan.cs and b/MoCha/Assets/Scripts/RunningMan.cs differ diff --git a/MoCha/Assets/Scripts/SceneLoader.cs b/MoCha/Assets/Scripts/SceneLoader.cs deleted file mode 100644 index 44a92ac..0000000 --- a/MoCha/Assets/Scripts/SceneLoader.cs +++ /dev/null @@ -1,45 +0,0 @@ -using UnityEngine; -using UnityEngine.SceneManagement; -using System.Collections; -using UnityEngine.UI; - -public class SceneLoader : MonoBehaviour { - - Text buttontext; - - public void Start() - { - buttontext = GetComponentInChildren (); - // grab a UI element, set its rectTransform.anchoredPosition = to a Vector2 of the new position coordinates. - //buttontext.rectTransform.anchoredPosition = new Vector2(buttontext.rectTransform.anchoredPosition.x, buttontext.rectTransform.anchoredPosition.y + 100); - } - - public void LoadScene() - { - string scenetext = buttontext.text; - Debug.Log (" " + scenetext); - - switch (scenetext) { - case "Start": - if (!(SceneManager.GetActiveScene ().name == "Home")) - SceneManager.LoadScene ("Home"); - break; - case "Run": - if (!(SceneManager.GetActiveScene ().name == "Goals")) - SceneManager.LoadScene ("Goals"); - 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); - break; - } - } -} \ No newline at end of file diff --git a/MoCha/Assets/Scripts/StatsUpdate.cs b/MoCha/Assets/Scripts/StatsUpdate.cs index f05c58f..23e511d 100644 --- a/MoCha/Assets/Scripts/StatsUpdate.cs +++ b/MoCha/Assets/Scripts/StatsUpdate.cs @@ -9,12 +9,25 @@ public class StatsUpdate : MonoBehaviour { public Text score; public Text steps; public Text distance; + public Text calories; // Use this for initialization void Start () { - steps.text = PlayerPrefs.GetInt("currentSteps").ToString(); + //steps.text = PlayerPrefs.GetInt("currentSteps").ToString(); + steps.text = PlayerPrefs.GetInt("fitbitSteps").ToString(); score.text = PlayerPrefs.GetInt("totalPoints").ToString(); - distance.text = ((float)PlayerPrefs.GetInt("currentSteps")/2000.0f).ToString() + " mi."; + //distance.text = ((float)PlayerPrefs.GetInt("currentSteps")/2000.0f).ToString() + " mi."; + distance.text = PlayerPrefs.GetFloat("fitbitDistance").ToString() + " mi."; + calories.text = PlayerPrefs.GetInt("fitbitCalories").ToString(); + } + + public void refreshPrefs() { + //steps.text = PlayerPrefs.GetInt("currentSteps").ToString(); + steps.text = PlayerPrefs.GetInt("fitbitSteps").ToString(); + score.text = PlayerPrefs.GetInt("totalPoints").ToString(); + //distance.text = ((float)PlayerPrefs.GetInt("currentSteps")/2000.0f).ToString() + " mi."; + distance.text = PlayerPrefs.GetFloat("fitbitDistance").ToString() + " mi."; + calories.text = PlayerPrefs.GetInt("fitbitCalories").ToString(); } // Update is called once per frame diff --git a/MoCha/Assets/Prefabs 1.meta b/MoCha/Assets/SimpleAndroidNotifications.meta similarity index 70% rename from MoCha/Assets/Prefabs 1.meta rename to MoCha/Assets/SimpleAndroidNotifications.meta index 2e0f9dc..d503920 100644 --- a/MoCha/Assets/Prefabs 1.meta +++ b/MoCha/Assets/SimpleAndroidNotifications.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: fa408530e9193f04a89413db536ecad6 +guid: 2df7842d377a9a84abfb17bc840cbab4 folderAsset: yes -timeCreated: 1523381747 +timeCreated: 1525117456 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity b/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity new file mode 100644 index 0000000..174d306 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity @@ -0,0 +1,1568 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 7 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37356448, g: 0.3811204, b: 0.35887685, a: 1} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 7 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 4 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_DirectLightInLightProbes: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: 0.16666667 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &357751065 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 357751066} + - 222: {fileID: 357751068} + - 114: {fileID: 357751067} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &357751066 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 357751065} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1374351615} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &357751067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 357751065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Custom with callback in 5 sec +--- !u!222 &357751068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 357751065} +--- !u!1 &499851274 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 499851275} + - 222: {fileID: 499851277} + - 114: {fileID: 499851276} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &499851275 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 499851274} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1277080975} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &499851276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 499851274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Rate on the Asset Store! +--- !u!222 &499851277 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 499851274} +--- !u!1 &562684326 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 562684331} + - 20: {fileID: 562684330} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &562684330 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 562684326} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.21568629, g: 0.21568629, b: 0.21568629, a: 0.019607844} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &562684331 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 562684326} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &567826150 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 567826154} + - 114: {fileID: 567826153} + - 114: {fileID: 567826152} + - 114: {fileID: 567826151} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &567826151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 567826150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &567826152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 567826150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &567826153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 567826150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &567826154 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 567826150} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 +--- !u!1 &590570191 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 590570192} + - 222: {fileID: 590570195} + - 114: {fileID: 590570194} + - 114: {fileID: 590570193} + m_Layer: 5 + m_Name: Wiki + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &590570192 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590570191} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1101659641} + m_Father: {fileID: 936376384} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &590570193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590570191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 590570194} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: OpenWiki + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &590570194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590570191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7843138, g: 1, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &590570195 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590570191} +--- !u!1 &795221044 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 795221045} + - 222: {fileID: 795221047} + - 114: {fileID: 795221046} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &795221045 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 795221044} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 878081487} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &795221046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 795221044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Normal in 5 sec +--- !u!222 &795221047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 795221044} +--- !u!1 &878081486 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 878081487} + - 222: {fileID: 878081490} + - 114: {fileID: 878081489} + - 114: {fileID: 878081488} + m_Layer: 5 + m_Name: ScheduleNormal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &878081487 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 878081486} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 795221045} + m_Father: {fileID: 936376384} + m_RootOrder: 4 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &878081488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 878081486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 878081489} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: ScheduleNormal + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &878081489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 878081486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &878081490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 878081486} +--- !u!1 &936376383 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 936376384} + - 223: {fileID: 936376387} + - 114: {fileID: 936376386} + - 114: {fileID: 936376385} + - 114: {fileID: 936376388} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &936376384 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 936376383} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1277080975} + - {fileID: 590570192} + - {fileID: 1073014968} + - {fileID: 958376520} + - {fileID: 878081487} + - {fileID: 1374351615} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &936376385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 936376383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &936376386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 936376383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 500, y: 500} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &936376387 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 936376383} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &936376388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 936376383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 1 + m_CellSize: {x: 200, y: 35} + m_Spacing: {x: 0, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &958376519 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 958376520} + - 222: {fileID: 958376523} + - 114: {fileID: 958376522} + - 114: {fileID: 958376521} + m_Layer: 5 + m_Name: ScheduleSimple + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &958376520 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 958376519} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1901820667} + m_Father: {fileID: 936376384} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &958376521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 958376519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 958376522} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: ScheduleSimple + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &958376522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 958376519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &958376523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 958376519} +--- !u!1 &1073014967 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1073014968} + - 222: {fileID: 1073014971} + - 114: {fileID: 1073014970} + - 114: {fileID: 1073014969} + m_Layer: 5 + m_Name: CancelAll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1073014968 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1073014967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1810882205} + m_Father: {fileID: 936376384} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1073014969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1073014967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1073014970} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: CancelAll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1073014970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1073014967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.39215687, b: 0.24264705, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1073014971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1073014967} +--- !u!1 &1101659640 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1101659641} + - 222: {fileID: 1101659643} + - 114: {fileID: 1101659642} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1101659641 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1101659640} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 590570192} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1101659642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1101659640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: FAQ & Troubleshooting +--- !u!222 &1101659643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1101659640} +--- !u!1 &1277080974 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1277080975} + - 222: {fileID: 1277080978} + - 114: {fileID: 1277080977} + - 114: {fileID: 1277080976} + m_Layer: 5 + m_Name: Rate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1277080975 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1277080974} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 499851275} + m_Father: {fileID: 936376384} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1277080976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1277080974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1277080977} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: Rate + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1277080977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1277080974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7843138, g: 1, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1277080978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1277080974} +--- !u!1 &1374351611 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1374351615} + - 222: {fileID: 1374351614} + - 114: {fileID: 1374351613} + - 114: {fileID: 1374351612} + m_Layer: 5 + m_Name: ScheduleCustom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1374351612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1374351611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1374351613} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1580474106} + m_MethodName: ScheduleCustom + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1374351613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1374351611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1374351614 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1374351611} +--- !u!224 &1374351615 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1374351611} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 357751066} + m_Father: {fileID: 936376384} + m_RootOrder: 5 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1580474105 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1580474107} + - 114: {fileID: 1580474106} + m_Layer: 0 + m_Name: NotificationExample + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1580474106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1580474105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a71b5771fef6424bb435eb90ac4c555, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1580474107 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1580474105} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1 &1810882204 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1810882205} + - 222: {fileID: 1810882207} + - 114: {fileID: 1810882206} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1810882205 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1810882204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1073014968} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1810882206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1810882204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Cancel all +--- !u!222 &1810882207 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1810882204} +--- !u!1 &1901820666 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1901820667} + - 222: {fileID: 1901820669} + - 114: {fileID: 1901820668} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1901820667 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1901820666} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 958376520} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1901820668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1901820666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Simple in 5 sec +--- !u!222 &1901820669 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1901820666} diff --git a/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity.meta b/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity.meta new file mode 100644 index 0000000..052515e --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/DemoScene.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04bafa369dbac00478feecb96bf71f90 +timeCreated: 1504018996 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf b/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf new file mode 100644 index 0000000..9e11caa Binary files /dev/null and b/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf differ diff --git a/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf.meta b/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf.meta new file mode 100644 index 0000000..af6c256 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/Manual.pdf.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25883581d81d38b44b43224baa0c1bbe +timeCreated: 1473442595 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs b/MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs new file mode 100644 index 0000000..16328a0 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs @@ -0,0 +1,53 @@ +using System; +using UnityEngine; + +namespace Assets.SimpleAndroidNotifications +{ + public class NotificationExample : MonoBehaviour + { + public void Rate() + { + Application.OpenURL("http://u3d.as/y6r"); + } + + public void OpenWiki() + { + Application.OpenURL("https://github.com/hippogamesunity/SimpleAndroidNotificationsPublic/wiki"); + } + + public void ScheduleSimple() + { + NotificationManager.Send(TimeSpan.FromSeconds(5), "Simple notification", "Customize icon and color", new Color(1, 0.3f, 0.15f)); + } + + public void ScheduleNormal() + { + NotificationManager.SendWithAppIcon(TimeSpan.FromSeconds(5), "Notification", "Notification with app icon", new Color(0, 0.6f, 1), NotificationIcon.Message); + } + + public void ScheduleCustom() + { + var notificationParams = new NotificationParams + { + Id = UnityEngine.Random.Range(0, int.MaxValue), + Delay = TimeSpan.FromSeconds(5), + Title = "Custom notification", + Message = "Message", + Ticker = "Ticker", + Sound = true, + Vibrate = true, + Light = true, + SmallIcon = NotificationIcon.Heart, + SmallIconColor = new Color(0, 0.5f, 0), + LargeIcon = "app_icon" + }; + + NotificationManager.SendCustom(notificationParams); + } + + public void CancelAll() + { + NotificationManager.CancelAll(); + } + } +} \ No newline at end of file diff --git a/MoCha/Assets/Scripts/SceneLoader.cs.meta b/MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs.meta similarity index 63% rename from MoCha/Assets/Scripts/SceneLoader.cs.meta rename to MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs.meta index d674490..de46b71 100644 --- a/MoCha/Assets/Scripts/SceneLoader.cs.meta +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationExample.cs.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 39ce724310132854a9cfdd3e31737ae7 -timeCreated: 1523377353 -licenseType: Free +guid: 3a71b5771fef6424bb435eb90ac4c555 +timeCreated: 1470125386 +licenseType: Store MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs b/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs new file mode 100644 index 0000000..a6881be --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs @@ -0,0 +1,12 @@ +namespace Assets.SimpleAndroidNotifications +{ + public enum NotificationIcon + { + Bell, + Clock, + Event, + Heart, + Message, + Star + } +} \ No newline at end of file diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs.meta b/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs.meta new file mode 100644 index 0000000..968f0f1 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationIcon.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 243b640bb54d927499ad71bfe4b8137e +timeCreated: 1473424878 +licenseType: Store +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs b/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs new file mode 100644 index 0000000..234e797 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs @@ -0,0 +1,123 @@ +using System; +using UnityEngine; + +#if UNITY_ANDROID && !UNITY_EDITOR + +using System.Linq; + +#endif + +namespace Assets.SimpleAndroidNotifications +{ + public static class NotificationManager + { + #if UNITY_ANDROID && !UNITY_EDITOR + + private const string FullClassName = "com.hippogames.simpleandroidnotifications.Controller"; + private const string MainActivityClassName = "com.unity3d.player.UnityPlayerActivity"; + + #endif + + /// + /// Schedule simple notification without app icon. + /// + /// List of build-in small icons: notification_icon_bell (default), notification_icon_clock, notification_icon_heart, notification_icon_message, notification_icon_nut, notification_icon_star, notification_icon_warning. + public static int Send(TimeSpan delay, string title, string message, Color smallIconColor, NotificationIcon smallIcon = 0) + { + return SendCustom(new NotificationParams + { + Id = UnityEngine.Random.Range(0, int.MaxValue), + Delay = delay, + Title = title, + Message = message, + Ticker = message, + Sound = true, + Vibrate = true, + Light = true, + SmallIcon = smallIcon, + SmallIconColor = smallIconColor, + LargeIcon = "" + }); + } + + /// + /// Schedule notification with app icon. + /// + /// List of build-in small icons: notification_icon_bell (default), notification_icon_clock, notification_icon_heart, notification_icon_message, notification_icon_nut, notification_icon_star, notification_icon_warning. + public static int SendWithAppIcon(TimeSpan delay, string title, string message, Color smallIconColor, NotificationIcon smallIcon = 0) + { + return SendCustom(new NotificationParams + { + Id = UnityEngine.Random.Range(0, int.MaxValue), + Delay = delay, + Title = title, + Message = message, + Ticker = message, + Sound = true, + Vibrate = true, + Light = true, + SmallIcon = smallIcon, + SmallIconColor = smallIconColor, + LargeIcon = "app_icon" + }); + } + + /// + /// Schedule customizable notification. + /// + public static int SendCustom(NotificationParams notificationParams) + { + #if UNITY_ANDROID && !UNITY_EDITOR + + var p = notificationParams; + var delay = (long) p.Delay.TotalMilliseconds; + + new AndroidJavaClass(FullClassName).CallStatic("SetNotification", p.Id, delay, p.Title, p.Message, p.Ticker, + p.Sound ? 1 : 0, p.Vibrate ? 1 : 0, p.Light ? 1 : 0, p.LargeIcon, GetSmallIconName(p.SmallIcon), ColotToInt(p.SmallIconColor), MainActivityClassName); + + #else + + Debug.LogWarning("Simple Android Notifications are not supported for current platform. Build and play this scene on android device!"); + + #endif + + return notificationParams.Id; + } + + /// + /// Cancel notification by id. + /// + public static void Cancel(int id) + { + #if UNITY_ANDROID && !UNITY_EDITOR + + new AndroidJavaClass(FullClassName).CallStatic("CancelScheduledNotification", id); + + #endif + } + + /// + /// Cancel all notifications. + /// + public static void CancelAll() + { + #if UNITY_ANDROID && !UNITY_EDITOR + + new AndroidJavaClass(FullClassName).CallStatic("CancelAllScheduledNotifications"); + + #endif + } + + private static int ColotToInt(Color color) + { + var smallIconColor = (Color32) color; + + return smallIconColor.r * 65536 + smallIconColor.g * 256 + smallIconColor.b; + } + + private static string GetSmallIconName(NotificationIcon icon) + { + return "anp_" + icon.ToString().ToLower(); + } + } +} \ No newline at end of file diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs.meta b/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs.meta new file mode 100644 index 0000000..18a6b47 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0126c966198c04149a015ab2e2993d7c +timeCreated: 1470125384 +licenseType: Store +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs b/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs new file mode 100644 index 0000000..6e5d8f7 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs @@ -0,0 +1,26 @@ +using System; +using UnityEngine; + +namespace Assets.SimpleAndroidNotifications +{ + public class NotificationParams + { + /// + /// Use random id for each new notification. + /// + public int Id; + public TimeSpan Delay; + public string Title; + public string Message; + public string Ticker; + public bool Sound = true; + public bool Vibrate = true; + public bool Light = true; + public NotificationIcon SmallIcon; + public Color SmallIconColor; + /// + /// Use "" for simple notification. Use "app_icon" to use the app icon. Use custom value but first place image to "simple-android-notifications.aar/res/". To modify "aar" file just rename it to "zip" and back. + /// + public string LargeIcon; + } +} \ No newline at end of file diff --git a/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs.meta b/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs.meta new file mode 100644 index 0000000..58cf4b8 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/NotificationParams.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 21f9537b0dde1ff499b93870d79d2169 +timeCreated: 1470161197 +licenseType: Store +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/Plugins.meta b/MoCha/Assets/SimpleAndroidNotifications/Plugins.meta new file mode 100644 index 0000000..3c28cab --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/Plugins.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1ae4658634a06794699458349d94b91a +folderAsset: yes +timeCreated: 1470052745 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android.meta b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android.meta new file mode 100644 index 0000000..097c1f0 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 05659514faf5c00438b20237116fb96d +folderAsset: yes +timeCreated: 1470052745 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar new file mode 100644 index 0000000..34b2362 Binary files /dev/null and b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar differ diff --git a/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar.meta b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar.meta new file mode 100644 index 0000000..c36b056 --- /dev/null +++ b/MoCha/Assets/SimpleAndroidNotifications/Plugins/Android/simple-android-notifications.aar.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 452bdd37e0400c94491ff114e437eba0 +timeCreated: 1470202238 +licenseType: Store +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: {} + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/Asset 1.png b/MoCha/Assets/Sprites/Asset 1.png new file mode 100644 index 0000000..da06c58 Binary files /dev/null and b/MoCha/Assets/Sprites/Asset 1.png differ diff --git a/MoCha/Assets/Sprites/Asset 1.png.meta b/MoCha/Assets/Sprites/Asset 1.png.meta new file mode 100644 index 0000000..d8f1345 --- /dev/null +++ b/MoCha/Assets/Sprites/Asset 1.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 5e61f4351ff403445a1633bb46270048 +timeCreated: 1525112241 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Sprites/running_man.png b/MoCha/Assets/Sprites/running_man.png new file mode 100644 index 0000000..fb0a07c Binary files /dev/null and b/MoCha/Assets/Sprites/running_man.png differ diff --git a/MoCha/Assets/Sprites/running_man.png.meta b/MoCha/Assets/Sprites/running_man.png.meta new file mode 100644 index 0000000..2400708 --- /dev/null +++ b/MoCha/Assets/Sprites/running_man.png.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: b868443409c4bd7488485b342bebc4d6 +timeCreated: 1525111249 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index 2fef5ca..08a7dc1 100644 Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ diff --git a/MoCha/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset index 34db7e5..3d00004 100644 Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index ddc29c5..27997c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -m_EditorVersion: 2017.4.0f1 -======= m_EditorVersion: 2017.3.1f1 ->>>>>>> alex diff --git a/MoCha/ProjectSettings/TagManager.asset b/MoCha/ProjectSettings/TagManager.asset index 1db4d5d..2ada0c1 100644 Binary files a/MoCha/ProjectSettings/TagManager.asset and b/MoCha/ProjectSettings/TagManager.asset differ