From ecc3e5876f947abd1b1dedd48ab19b3a3e4b76b4 Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Mon, 30 Apr 2018 18:58:50 -0500 Subject: [PATCH 1/4] Monsters load on home and stats page! --- MoCha/Assets/Materials/Background Shade.mat | Bin 5260 -> 5280 bytes MoCha/Assets/Scenes/Home.unity | Bin 95432 -> 97080 bytes MoCha/Assets/Scenes/MonsterCreator.unity | Bin 101156 -> 103348 bytes MoCha/Assets/Scenes/Stats.unity | Bin 93784 -> 95728 bytes MoCha/Assets/Scripts/MonsterDraw.cs | 9 +-- MoCha/Assets/Scripts/MonsterManager.cs | 69 -------------------- MoCha/ProjectSettings/TagManager.asset | Bin 4340 -> 4404 bytes 7 files changed, 5 insertions(+), 73 deletions(-) diff --git a/MoCha/Assets/Materials/Background Shade.mat b/MoCha/Assets/Materials/Background Shade.mat index 24b147b789d7456b694c127597626a3904a1b0bf..ae96152d29e53fcd35058d51c99405c1f532b2dd 100644 GIT binary patch delta 173 zcmeCtT%ak%z`)tVz#y`Kfq_Agfk6OBF)$bz7@F%DPn7DGY+ztyU}Df?W@yj=igN%l z3lK9hG)&y5&)6{Woj7B|WH!crEb90m>Nc-qT+R%ZW=Ao`3@V++`i_}#!RA=b`)m^F fKrz=4XTx~ch!EExKS!TM}^G}0zNDNU=<%S delta 153 zcmZ3W*`q1Nz`)tVz#sy|41x>{0zis^!N|bST+e8tRJSAp10w?ygB~+Og9cEX1Bh9G zn2~{D;y!&whKcXQ85t(CG4^9o#|Kfjc^%_&X0S9niZNzT={(kV%#1yoV>$1$u>=Ff KHiroKumAw>L=`~* diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 7ef2903515ea0d96b69ba98bf234a3f5085185c3..de38b46a498904ea1e5208de4aca740e7874a8e3 100644 GIT binary patch delta 7830 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 SyIiY3V%F9MoO;X(zUzPQ`mNRg delta 7328 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 Zo{JSR&*n?zl(XGQ4^T$3wX(o~{{d{3MEd{$ delta 6646 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 X4DUj|LELzF0dCYTGH={jz)$`U^g6I! 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/ProjectSettings/TagManager.asset b/MoCha/ProjectSettings/TagManager.asset index 1db4d5d55a298aeeb4209a85d108eca1b3289343..2ada0c1ea9ec0c0cbeb3661a16db1a17e9a08116 100644 GIT binary patch delta 114 zcmeyOxJ8MBfr05S1B0N+Mvfm$OeTz*8JYj_FfvbO6i^oCV_;zLODxMwPb|sI&+|>q zD`l9hED*`f4iwML&nqrTEt<^891B!^S3q2a2`C!s$-t1gxi|{QWI$5IU|-o14-x|a Daz-1I delta 67 zcmdm@^hJ?_fr05S1B1YqjT}Fi7{6>5WPZ;xS%F!Ak!docfbwJufr!b{%n1^V3=9nH QK Date: Mon, 30 Apr 2018 21:30:05 -0500 Subject: [PATCH 2/4] added new progress bar, should all work... --- MoCha/Assets/Scenes/Goals.unity | Bin 48672 -> 50248 bytes MoCha/Assets/Scripts/GetGoals.cs | 56 +++++++++++++++++++------------ 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 2516d160cd8acf20f7b56ea633e9c690d73a78da..4f0e9c5c65b92ab0c7f2e15342b8a1c571dbcf01 100644 GIT binary patch delta 2048 zcmYk7YfO_@7{{Nt6s_D=C`fS*%8<)8HcKqXMFizy0|PP0f|4bGV@SfKN=X2fRY(*_Uq<9ok>;G|0I??z4t-pra=1cm9B+q%m&r8{re1} zrFL1V5{0i44u-j$L9mh22k3fD=T5#+su@iY92#G|@o@oH6+=*o{%N`$RGS-e>lm95Zy zBJUJbMzm5i{_zI9`cw3I^=@9Rl!;dCQ_gEs_JmZr@}^Yo4Jj)^%1Tz^4dzSog|9x| z)ahz(@1&kiF;U;1dSu}E@s3`1qr1b^U)wQ6?ml;0cSB!SubYSJSLJ^G!3)Bak(L$cM-${!X$0*gF_MhxWZ>IToU3jFCE8kjx9_!gvGPZOI;qwh>Ed zLt{x-&R{kVb{dg)w@Bs`*Woak6!u1-BspW+Ow@=m0&SM8 z6@wLwqtM=a=*UE%a-n!Er8km^K9)1%a;6mrFe^kTJ~}6vD}{)witFRh(=#t4(4;s3 z2kRE1uQ6ip7CEy7rm3$z{`VDD6JBxvfp0M@*`W9c4*spWdQQ&Ff=xonuAb^?I|4ah zAR0ns2d`v7@fREh@pjsYN9Bw^O?U07Nh`-9ng!DwdL^@qJzh&`(55@MJ<;X77u0XcYaIG zOoC|+9g*h&=Zm!-A?2{p+!S? za=;T_96+wM+kIiKY{eV}!L+}CFC}Zp(+$6pY!xh58s3o1xXpE#%Cn6 z?hN}C^TuNm&I0DhoA@PLD%1^s8Sfs39HoY*H>y`g{RUC)GpSj=kqu&H&Vqqa{OH># z&R;O8ch06p1H>5l;l;|uL?b_#cye*8^0$Z|%NEOile+6tt|kXY7g}&HH!(Y%!>0%tsXu=f6R8-~2Xm?-Rwhlw>y5Oev#C}T zd@8Qux}kl2ZQV9k=!5aVeu~YcX9Aa zf|)n*mhpEzd|})mE3C-#*@XS9N&WEinMlPVPT$H9u~WpxlW zM-$z55m5s6u3pENqQuWfo_wgS9)zG42`MoVb!Sz!Zf}R zbmrKcL;+BID)mdG9IOidM68Fx2En$%hYj ztg7b}=1C;-!$*jw3ajNj&6zWb$VSjg+O@kz}Y z%tZqZ3sD>*?Go`%C-T6zV{QK3vH*r^!Rla@LYc5JupaoT(iUOeGt9F$zW-T>5DkLW zz^b!7!iq3m)Qul6+$%7^OPZWHS_)AYQk875@QN3Pl4qIaHDO&~M)@XTMcf31K$_Xa z{i#Cu|hVn9Q&+ZHYOV z5n&y{rDoygx4){CU@aS3b1=1KJWFDF6Tf diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index cb5c15e..0958508 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -60,14 +60,17 @@ namespace PedometerU.Tests private int savedSteps; private int savedPoints; + public string currentStepsKey; + public string totalPointsKey; + void OnStep (int steps, double distance) { //userDistance = (distance * 3.28084); userSteps = steps + savedSteps; - PlayerPrefs.SetInt("currentSteps",userSteps); + PlayerPrefs.SetInt(currentStepsKey,userSteps); stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); userPoints = steps*5 + savedPoints; - PlayerPrefs.SetInt("totalPoints",userPoints); + PlayerPrefs.SetInt(totalPointsKey,userPoints); pointsText.text = "Points: " + userPoints.ToString (); } @@ -82,30 +85,38 @@ namespace PedometerU.Tests void Start () { + PlayerPrefs.DeleteAll(); //danger!! if(prefKey == "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("currentSteps"); - savedPoints = PlayerPrefs.GetInt("totalPoints"); + 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(prefKey == "daily") - if(PlayerPrefs.HasKey("totalPoints")) - { - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); - } - else - { - PlayerPrefs.SetInt("totalPoints", 0); - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); - } + 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")) { @@ -217,7 +228,7 @@ namespace PedometerU.Tests updateTimeRemaining (); updateProgressBar (); - updateMyGoalProgressBar (); + //updateMyGoalProgressBar (); if(prefKey == "daily") { @@ -226,9 +237,10 @@ namespace PedometerU.Tests currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); } - //userSteps = (int)(Time.time); + //userSteps = (int)(Time.time*10.0f); //barDisplay = Time.time*0.05f; barDisplay = (float)userSteps/(float)stepsGoal; + stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); //check if the current date matches the goal date if(prefKey == "daily" && currentDayStr == goalDayStr) @@ -243,23 +255,25 @@ namespace PedometerU.Tests //reset steps... userSteps = 0; - PlayerPrefs.SetInt("currentSteps", userSteps); + PlayerPrefs.SetInt(currentStepsKey, userSteps); } //goal complete if(barDisplay >= 1.0f) { - Debug.Log("Goal complete! +100pts!"); + Debug.Log(prefKey + "... Goal complete! +100pts!"); userSteps = 0; - PlayerPrefs.SetInt("currentSteps", userSteps); + PlayerPrefs.SetInt(currentStepsKey, userSteps); savedSteps = 0; //OnStep(0,0); stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); //destroy the goal and set a new one? savedPoints += stepsGoal*10; - PlayerPrefs.SetInt("totalPoints", savedPoints); - pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); + PlayerPrefs.SetInt(totalPointsKey, savedPoints); + pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); + if(!PlayerPrefs.HasKey("inventory")) + PlayerPrefs.SetString("inventory", ""); //Random item StringBuilder invList = new StringBuilder (); invList.Append(PlayerPrefs.GetString ("inventory")); From d8ad2def11b6d9a8347cf094c17259aa44020383 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Tue, 1 May 2018 03:45:51 -0500 Subject: [PATCH 3/4] added new progress bar, should all work... --- MoCha/Assets/Scripts/GetGoals.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 0958508..b34f334 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -85,7 +85,7 @@ namespace PedometerU.Tests void Start () { - PlayerPrefs.DeleteAll(); //danger!! + //PlayerPrefs.DeleteAll(); //danger!! if(prefKey == "daily") { // This should later only get called per goal @@ -134,9 +134,9 @@ namespace PedometerU.Tests userPoints = savedPoints; //OnStep(savedSteps, 0); //necessary? - Debug.Log(savedSteps); + //Debug.Log(savedSteps); - Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString()); + //Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString()); //barPos = new Vector2(pbbg.transform.position.x, 1895 - pbbg.transform.position.y); @@ -227,7 +227,6 @@ namespace PedometerU.Tests { updateTimeRemaining (); updateProgressBar (); - //updateMyGoalProgressBar (); if(prefKey == "daily") @@ -258,23 +257,22 @@ namespace PedometerU.Tests PlayerPrefs.SetInt(currentStepsKey, userSteps); } //goal complete - if(barDisplay >= 1.0f) + else if(barDisplay >= 1.0f) { Debug.Log(prefKey + "... Goal complete! +100pts!"); userSteps = 0; PlayerPrefs.SetInt(currentStepsKey, userSteps); savedSteps = 0; //OnStep(0,0); - stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); //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", ""); - //Random item StringBuilder invList = new StringBuilder (); invList.Append(PlayerPrefs.GetString ("inventory")); invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); From b873cbd08321dfe472073e4f6773ada2f65a3727 Mon Sep 17 00:00:00 2001 From: Patrick Kitchens Date: Thu, 3 May 2018 15:51:17 -0500 Subject: [PATCH 4/4] Ugly fitbit version :( --- MoCha/Assets/Scenes/FitbitLogin.unity | Bin 0 -> 45888 bytes MoCha/Assets/Scenes/FitbitLogin.unity.meta | 9 +++++++++ MoCha/Assets/Scenes/Main.unity | Bin 50060 -> 49964 bytes MoCha/Assets/Scripts/FitBitAPI.cs | 3 ++- .../ProjectSettings/EditorBuildSettings.asset | Bin 4604 -> 4660 bytes MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 MoCha/Assets/Scenes/FitbitLogin.unity create mode 100644 MoCha/Assets/Scenes/FitbitLogin.unity.meta diff --git a/MoCha/Assets/Scenes/FitbitLogin.unity b/MoCha/Assets/Scenes/FitbitLogin.unity new file mode 100644 index 0000000000000000000000000000000000000000..1976fcab35087e024ad9a2e3d42e8a3b5c3e7b29 GIT binary patch literal 45888 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 LJ7d2}>*GHGt%zM) literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Scenes/FitbitLogin.unity.meta b/MoCha/Assets/Scenes/FitbitLogin.unity.meta new file mode 100644 index 0000000..f5aae61 --- /dev/null +++ b/MoCha/Assets/Scenes/FitbitLogin.unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e4e05e44213ffe141906009c29238b2e +timeCreated: 1525379963 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 8368caa509594d536667bd64ce61b34c18c21d39..f4fef048c01d547b927bde2bf8326aa5c2ae6673 100644 GIT binary patch delta 811 zcmYMy%TH556bA6Glo|}L!UaSgwFpKM8&b3ZTtG-jOff9fZa{>93!p}zJWO<93WcHz zHuO>`e*ljV7my~bTwvU22%&Lda3?z!U?LA`NJ#wV_B35g&ON_7bIzTaJNv=>X~tXv zEIb3gIsoMH*~f_c&f5B#2b(3!E^FpJ$7B1<^DXUia4Fok{w2ESvb^vYqydGT7zlV; z)B-n`T1`L^pQpsy^MPvS3e_+r&e$NJZ)z=dxQzRl#jqkWqbfNX)I9bj|#-_v?s!}%=@&w0N0*ACWjHo5xahr_Q{8Y7b{VcQj`6tv zv<^r!wA=#hjD=D3xzj?eN>TgBbKWIE=!7T>v>%j0p9jiJ_VL{ZS`p8r~#M+WjtSm zxyZVxvkSD_Z}n0jEPmSe$GfKMnvIYZ+FTXps0AMDbgYk`0u!ntX~e$Mr02VnXT5Cc zHU$C)fJc=2rW?Xm$aKHVj!j{1XFirG@LSjnnV&k{u_Y`=_J%sAgqF|t5C!JzfC$iQ z7V!#nyZ(<8t-`Woja(zQiIc)|2a9VQFFkvYCb$l9rIfnqq_DKIC?nQUpKqNNF(H-& znMX(QObW}A6-E(vgw3q2hl?8<6qX_@Y%J*?y3Z8w9RVIt>gr0^0vR7ii+S$}fq|pN z$1y4F=CR^++IIXI&D|91x_hP6s X7`+;ds>rmVwr3k{G-kZdH*5X@nue3Q diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs index aca4ed7..fb44361 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs +++ b/MoCha/Assets/Scripts/FitBitAPI.cs @@ -18,7 +18,7 @@ namespace Assets.Scripts.Fitbit 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/-/"; @@ -73,6 +73,7 @@ namespace Assets.Scripts.Fitbit { _bFirstFire = false; } + GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories); } public void LoginToFitbit() diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index 779d0c613253d62b93726e10b4691210cd912d31..846ffd7bfc588c0279d90f6bba5fed9aa7efa90e 100644 GIT binary patch delta 74 zcmV-Q0JZ=8BeWz40006h000s+u?Qpr0yF}%F#^*K1ONa43bO?e_W_gO5EddvX>?*~ gbWCq&X>KlcZfSIR08S3&L=yAwL6Kkp$&xa-;>A%HYXATM delta 35 rcmdm@@<*A2fq_YrfkE)kMh+Dwraz3E4Vf