From 9e5d3feec0a6d84f7f53ab44b79ba647854ad7fb Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 24 Apr 2018 13:49:36 -0500 Subject: [PATCH 01/33] Merged alex + darrel --- MoCha/Assets/Scenes/MonsterCreator.unity | Bin 96444 -> 96508 bytes MoCha/Assets/Scripts/MonsterManager.cs | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 3ba305fb1b41da86af7871cfd15a0b3fb0d90693..5f1c5044b0836fe58428d9f84db5c6a02f61b9b9 100644 GIT binary patch delta 1987 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 diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index bc5d34f..b19f367 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -9,17 +9,12 @@ public class MonsterManager : MonoBehaviour { public GameObject inventory; public Item item; - private Inventory inv; + public Inventory inv; void Start() { - inv = FindObjectOfType (); - giveItem (item); - } - - public void giveItem(Item itm) - { - inv.AddItem (itm); + //inv = FindObjectOfType (); + inv.AddItem (item); } public void showItems() From 5cf0257e181451aa6c819ed13800965adf6d62a7 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Wed, 25 Apr 2018 13:47:56 -0500 Subject: [PATCH 02/33] Added progress bars, working on integrating the actual fitbit data and goal system --- MoCha/Assets/Prefabs/ProgressBar.prefab | Bin 0 -> 5292 bytes MoCha/Assets/Prefabs/ProgressBar.prefab.meta | 10 +++ MoCha/Assets/Scripts/GetGoals.cs | 84 ++++++++++++++++++ .../{Goals.cs.meta => GetGoals.cs.meta} | 4 +- MoCha/Assets/Scripts/Goals.cs | 16 ---- MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 6 files changed, 97 insertions(+), 19 deletions(-) create mode 100644 MoCha/Assets/Prefabs/ProgressBar.prefab create mode 100644 MoCha/Assets/Prefabs/ProgressBar.prefab.meta create mode 100644 MoCha/Assets/Scripts/GetGoals.cs rename MoCha/Assets/Scripts/{Goals.cs.meta => GetGoals.cs.meta} (77%) delete mode 100644 MoCha/Assets/Scripts/Goals.cs diff --git a/MoCha/Assets/Prefabs/ProgressBar.prefab b/MoCha/Assets/Prefabs/ProgressBar.prefab new file mode 100644 index 0000000000000000000000000000000000000000..f735d608f81871d1152eba96ade16bbe7630da10 GIT binary patch literal 5292 zcmeHLU2GIp6h5>4x?SAvmf2}#Nep8G z#;C*>1u-!x4-%0kMkC=T#y~=1cmTr#CK5$r^g-iaAdy6a_51GKyPetH7z|G)4jlHL zZ|?o>nRD;??hGOmKNFcWEF!mwOuU3&X{>KpT-Q`r-_sy}jf{*~<-mR@!#^VDE7fshM`9*`EXS0xSZ%7!iN5h>sy7aM2R6@aI68_#au~lg7#$TOzl^*q`Gq zpZ6nj7Cf`y-vr~VdQ6#I1Y;9?@@Os}_sXOW{0{*e1FL{xD#ddi_)7TXuO#mCUYXSZ z9vbl~;wOlgEBW@P@K0Aj}os6#d#}nWmWPRVq~23C**O>zXLw`vBo9&ClZeq z^K*Sl@lVR*IuEp)zPE2OLRv zZgIN2^-hli{w@c+>z%&zpwr!&?(0vdFlR>1#o2Yh?2=A<58HjtIyD%;>WsdZi;}B} zt?J?czRI=kwAut_#7$Nx?CA@OddX8rK5e4xc%o;P9fbQ@9Qx z4~(CJgU13Ij$a8*v^ahxI2gkCgTgf`IGTSW`jDT3Q;J^+PPCX`3r;b=798T1e2V;R z1}$?#!QoZ7AC%yz_0k1y_JbB2U-9sOi(@SFGb%VbZX;uIW_sOpbg`h)N+m=+uq za);+GThX2H((a0Fo|DR;l$%i%#ig1rD#^Dx?1U>_rr0p5-Of5LemC0j4W64w#aUln zN*o@w2iH28UejZBCf4O81|1bVGTnLg;MpbT#vEQVBepmB@`1zmAjUUxv3hvU|8l)i zhzE0ZtLjZXSGaCfz2)#=J&e|yCEtUGb;~`^dK0O}T1I3))^!Oyt~d8o5MK(9IO{El zFM~&%^%lgN;StyMMt;nT{6~S2Th&{Md0B5k9y2fNEr^?WS#KKG{2lPfuj;J?KkF^X zWB6HbLEP}O-V8qv_-Ej;o>_0D^p5pbO7B>2F&OoNFNj9(SZ^BFF9b%{SZ@Xot|RMB zR5=Hs5u=L_)3KTF|5if6x!?vvRC zxXEX20dDd+Cx>6ZUbLsX?Bx2ir{4~?NmjPY^VA699qCLW_tv2N4ZwJSxArEI-8iq& zT#18Ti3v~ab#Aw6tIjJ1l8zfo#gk5ERRS*-e2K;N&B^LLmHtyb{ad{mM;dob-4k8Z z_VcW7H;sMzc*U_VzTOE5kz+8XuL|Y(zob|)#L_@6m=pEQ5MzGy5wa$Cgm4@2KJi|Z zz>hg8(~?3wEM@AOL41V=OF(}!5HCK$Eno43UO{g32w#Xe%@J<-DxMI(KEjEIUvXH1 z7^?8#D*`1&==f>hriId(nOm#(mYGaK;&~uSVdd_QS$Fu6aI$Po5?iuR@+h z3iA~ntW)l5@?WpitA4dD1D?lMN3S=L=~Qh^P`lCD<~8TO)z}u-**f54Jn0&6`DNB- zXYsBm@wA=HH9Kv$Es^O@+F3ypM}_e8KyyQ4yAxm?aGl1sW^wxZy)2leXCRs6FBfMh zezgKW>M{vfGJo>rITOl-?@E0z3pVfEu)BZL1eNrD_z~FA--loO>Cj$l3OalYzYNB{ zv`g6!@UL!5^tXMlOr5#r*LNYIpKU69Xzw|q=>(K)WSUr zy;9FvYChACzb5B}T!lWraeF#;*Ilt`;cGmP!h F*WZ-SCJX=o literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Prefabs/ProgressBar.prefab.meta b/MoCha/Assets/Prefabs/ProgressBar.prefab.meta new file mode 100644 index 0000000..0ce5346 --- /dev/null +++ b/MoCha/Assets/Prefabs/ProgressBar.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 76a3a676c97c14505abe10fa7fa30134 +timeCreated: 1524600874 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs new file mode 100644 index 0000000..0e38cfd --- /dev/null +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -0,0 +1,84 @@ +using System; +using System.Globalization; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +//Pretty much a copy of GetData... + +public class GetGoals : MonoBehaviour { + + public Text objectText; + + public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy/mm"); + public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy/mm"); + + public string prefKey; + + void Start () { + objectText = GetComponent (); + + currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + } + + //Progress Bar... + public float barDisplay; //current progress + public Vector2 barPos = new Vector2(20,190); + public Vector2 barSize = new Vector2(60,20); + public Texture2D emptyTex; + public Texture2D fullTex; + + //on a button press? begin a goal? + void startGoal() + { + } + + void savePersistantGoalDate(string key) + { + PlayerPrefs.SetString(key, goalDayStr); + } + + 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); + + //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(); + } + + 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) + + if(currentDayStr != goalDayStr) + { + //check if goal is complete or not, the day is over + + barDisplay = 1.0f; + Debug.Log("DAY HAS PASSED!!"); + + } + if(checkNewDay("daily")) + { + Debug.Log("You failed your goal"); //not true if progress is actually complete! + goalDayStr = currentDayStr; + savePersistantGoalDate("daily"); + } + } +} diff --git a/MoCha/Assets/Scripts/Goals.cs.meta b/MoCha/Assets/Scripts/GetGoals.cs.meta similarity index 77% rename from MoCha/Assets/Scripts/Goals.cs.meta rename to MoCha/Assets/Scripts/GetGoals.cs.meta index dbac0c0..d0d081d 100644 --- a/MoCha/Assets/Scripts/Goals.cs.meta +++ b/MoCha/Assets/Scripts/GetGoals.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 5f138b644c262457385474b2256308a7 -timeCreated: 1524165858 +guid: 040f99a891f1b4fed92f5a44e33fc47f +timeCreated: 1524166714 licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/Goals.cs b/MoCha/Assets/Scripts/Goals.cs deleted file mode 100644 index 7273f2d..0000000 --- a/MoCha/Assets/Scripts/Goals.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Goals : MonoBehaviour { - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index 27997c5..ac7d214 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.3.1f1 +m_EditorVersion: 2017.4.0f1 From 9b7c5de38502933e2e22f405af2bcfb559b767d0 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Wed, 25 Apr 2018 13:50:59 -0500 Subject: [PATCH 03/33] Added progress bars, working on integrating the actual fitbit data and goal system --- MoCha/Assets/Scenes/Goals.unity | Bin 37360 -> 24200 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 57eb13b706c23b17a3b4dbb2394310fc1a119b25..6a614fcf236dbe67bcdef53cfb8a88e456b0044b 100644 GIT binary patch delta 1186 zcmZ9LT}V@57{{Np4_l@+b&dlwTp!jHo%_n;>>@=a=|Yq&yb>X67^r0qHr+XAh8GJ8 z25%Qu28l&o2pZ?Q=!=pdm={tvg%=@86cR#0<$9j8cd0w@p6B`ho{#rE&%3S97!uEf z3V`aZC?b;J>ttD@mG7Z|& zDaj}pwZdkHMf(`sG^-}WLOMOS@pES7!kK7M`|*>(f!M+x#Pt-yMUMm!7c;K@7BFH( zZ%Kf70b0t-ECYPO++(PzwL#}`j2Xafgm^7#3oaw)Ol-5B*3Y1W-Nj~}lv|v~d23() z$k1?WWaQ%Dwf><&cBrpX5LwIBE_J=F1#@sK+;_t@y~CLci>gu6XWh*(6}ma3s(U;!f$TQwd|XqUIk9_o zlQK1ecM6b1wu%FyL%%pT>mU}{2M|R|8^7di6WIi6H1LWux{Pj60q9a*bNC5Gc9Y`A zqen0VZG`~iXsKZdXDMVIsL_CpGw1$HEgC50EQ#VQ>I1m!oUI~zh}w#4!Sa>; z9iHy70!xkAToD8m@CV%Wbpekb-TzNcvRFv-uX9U5f1Tu!Sd&s>+1aal6vK2KHQu1x z=R4u|?dq1Zd1K78UELV7v7527Z7`o3{j)Rbl#jCIu!(i3)w=aeShRvj+$fmYtuaY| zm$R>9B6@#yJrFBrT`|%FF^ZFZqwCMQE|qJM%JN|rl1p`uvesk=OUYEVCj0T-sW@1@ zLb_AQXp!Al9J&_SqV9cHsMA3e<65WsTVNfEN$b6y5?FHFVqT!Dq`|QVQ4{N(2vFFT L9U=`r`(OJ9Z8-fh delta 10549 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 KvLq^uasLO7m*edK From c6e0281a9ba7462cd0d919d3217779b4ca67bf46 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Wed, 25 Apr 2018 19:59:40 -0500 Subject: [PATCH 04/33] multiple progress bars, text is overlapping though --- MoCha/Assets/Scripts/GetGoals.cs | 48 +++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 0e38cfd..bd49f7b 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -9,24 +9,35 @@ using UnityEngine.UI; public class GetGoals : MonoBehaviour { - public Text objectText; + public Text goalText; - public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy/mm"); - public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy/mm"); + public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); public string prefKey; void Start () { - objectText = GetComponent (); + goalText.text = prefKey; + goalText.color = new Color(1f, 0.5f, 0.8f); currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + Debug.Log(goalDayStr); + Debug.Log("hoauaouou"); + + if(prefKey == "daily") + savePersistantGoalDate("daily"); } + + public float goalValue; + //Progress Bar... public float barDisplay; //current progress public Vector2 barPos = new Vector2(20,190); public Vector2 barSize = new Vector2(60,20); + + //Texture the progress bar using these parameters public Texture2D emptyTex; public Texture2D fullTex; @@ -66,19 +77,36 @@ public class GetGoals : MonoBehaviour { currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); barDisplay = Time.time*0.05f; //put actual progress here (current/total) + //failed to complete goal if(currentDayStr != goalDayStr) { - //check if goal is complete or not, the day is over + Debug.Log(currentDayStr); + Debug.Log(goalDayStr); - barDisplay = 1.0f; Debug.Log("DAY HAS PASSED!!"); + //make it so user dismisses the goal instead! + //Destroy(this); + //destroy the goal and set a new one? + } - if(checkNewDay("daily")) + //goal complete + if(barDisplay >= 1.0f) { - Debug.Log("You failed your goal"); //not true if progress is actually complete! - goalDayStr = currentDayStr; - savePersistantGoalDate("daily"); + Debug.Log("Goal complete! +100pts!"); + + //destroy the goal and set a new one? + } + + //only applies if "daily" goal + if(prefKey == "daily") + { + if(checkNewDay(prefKey)) + { + Debug.Log("You failed your goal"); //not true if progress is actually complete! + goalDayStr = currentDayStr; + savePersistantGoalDate("daily"); + } } } } From 97557bfb4739b4f55d110e63f6cec2ae75adb82c Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Wed, 25 Apr 2018 22:33:46 -0500 Subject: [PATCH 05/33] Created resources folder + more work on inventory --- MoCha/Assets/Items/circle_eye.asset | Bin 4188 -> 4204 bytes MoCha/Assets/Items/circle_head.asset | Bin 4188 -> 4204 bytes MoCha/Assets/Items/crazy_hair.asset | Bin 4188 -> 4204 bytes MoCha/Assets/Items/crown.asset | Bin 4184 -> 4196 bytes MoCha/Assets/Items/gap_mouth.asset | Bin 4188 -> 4204 bytes MoCha/Assets/Items/pig_nose.asset | Bin 4184 -> 4196 bytes MoCha/Assets/Resources.meta | 10 ++++++++++ MoCha/Assets/Resources/circle_eye.prefab | Bin 0 -> 7984 bytes MoCha/Assets/Resources/circle_eye.prefab.meta | 10 ++++++++++ MoCha/Assets/Resources/circle_head.prefab | Bin 0 -> 9104 bytes .../Assets/Resources/circle_head.prefab.meta | 10 ++++++++++ MoCha/Assets/Resources/crazy_hair.prefab | Bin 0 -> 9224 bytes MoCha/Assets/Resources/crazy_hair.prefab.meta | 10 ++++++++++ MoCha/Assets/Resources/crown.prefab | Bin 0 -> 8720 bytes MoCha/Assets/Resources/crown.prefab.meta | 10 ++++++++++ MoCha/Assets/Resources/gap_mouth.prefab | Bin 0 -> 8720 bytes MoCha/Assets/Resources/gap_mouth.prefab.meta | 10 ++++++++++ MoCha/Assets/Resources/pig_nose.prefab | Bin 0 -> 8720 bytes MoCha/Assets/Resources/pig_nose.prefab.meta | 10 ++++++++++ MoCha/Assets/Scenes/MonsterCreator.unity | Bin 96508 -> 91428 bytes MoCha/Assets/Scripts/DragAndDrop.cs | 6 +++++- MoCha/Assets/Scripts/Inventory.cs | 15 +++++++++++++++ MoCha/Assets/Scripts/Item.cs | 2 ++ MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 24 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 MoCha/Assets/Resources.meta create mode 100644 MoCha/Assets/Resources/circle_eye.prefab create mode 100644 MoCha/Assets/Resources/circle_eye.prefab.meta create mode 100644 MoCha/Assets/Resources/circle_head.prefab create mode 100644 MoCha/Assets/Resources/circle_head.prefab.meta create mode 100644 MoCha/Assets/Resources/crazy_hair.prefab create mode 100644 MoCha/Assets/Resources/crazy_hair.prefab.meta create mode 100644 MoCha/Assets/Resources/crown.prefab create mode 100644 MoCha/Assets/Resources/crown.prefab.meta create mode 100644 MoCha/Assets/Resources/gap_mouth.prefab create mode 100644 MoCha/Assets/Resources/gap_mouth.prefab.meta create mode 100644 MoCha/Assets/Resources/pig_nose.prefab create mode 100644 MoCha/Assets/Resources/pig_nose.prefab.meta diff --git a/MoCha/Assets/Items/circle_eye.asset b/MoCha/Assets/Items/circle_eye.asset index 19fb32fbbb0b97935579241476c0a31c0050b9af..4ea5fe01108265d048e811390b95161c503c67ec 100644 GIT binary patch delta 175 zcmcbk@J4}yfr0rX1A{=$L=JON6*;a2n$;CkkA&;2UNm8ex;z5|gVV;4ZYE7e21W)C zW`+h^pvZq9kOtBW4Gch0CPqUb3xq-9GLx9Zn5D1jW0%8zf4kAAJ9+RD9 tUSe)4SP@Xn;qzJ`2?05qb(tsgOx6%E5#R!fBxe>S=cLA`R;DsA005r*Co=#5 delta 77 zcmaE(a7TfIfq^-Zfk7Z^g4;l!kf88y+=30aIQfUST2HTAx-At41nQa9b bfjo!LYk?#L#B83*Jegn5D1jW0%8zf4kAAJ9+RD9 tUSe)4SP@Xn;qzJ`2?05qb(tsgOx6%E5#R=jBxe>S=cLAGq$Z{?005tcCxZY0 delta 77 zcmaE(a7TfIfq^-Zfk7Z^g4;l!kf88y+=30aIQfUST2HTAx-At41nQa9b bfjo!LYk?#L#B83*Jegn5D1jW0%8zf4kAAJ9+RD9 tUSe)4SP@Xn;qzJ`2?05qb(tsgOx6%E5#R!fBo`%CRmNu|W)?9p005uLCrbbT delta 77 zcmaE(a7TfIfq^-Zfk7Z^g4;l!kf88y+=30aIQfUST2HTAx-At41nQa9b bfjo!LYk?#L#B83*Jegn5D1jW0%8zf4kAAJ9+RD9 nUSe)4SP@Xn;qzJ`2>~gab(tsgOx6%E;9&)dBp2nE=K*N|@_;2D delta 77 zcmaE&a6^HEfq^-Zfk7Z*B8R!?q$>^g4;l!kf88y+=30aIQfUST2HTAx-At41nQa9b bfjo!LYk?#LL~NeQJegn5D1jW0%8zf4kAAJ9+RD9 rUSe)4SP@Xn;qzJ`2?05qb(tsgOx6%E5#R)hq$d`{=jNA|WB}O!o;4=o delta 77 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 literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Resources/circle_eye.prefab.meta b/MoCha/Assets/Resources/circle_eye.prefab.meta new file mode 100644 index 0000000..32099f7 --- /dev/null +++ b/MoCha/Assets/Resources/circle_eye.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49942256293e57045bbb9b1a407a1667 +timeCreated: 1524683726 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/circle_head.prefab b/MoCha/Assets/Resources/circle_head.prefab new file mode 100644 index 0000000000000000000000000000000000000000..bba6d8a25dadada6f90e71b673bb82054ce2d3ff GIT binary patch literal 9104 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 literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Resources/circle_head.prefab.meta b/MoCha/Assets/Resources/circle_head.prefab.meta new file mode 100644 index 0000000..02a2678 --- /dev/null +++ b/MoCha/Assets/Resources/circle_head.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 645789e883e1d3c40aabb865a433d896 +timeCreated: 1524683718 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Resources/crazy_hair.prefab b/MoCha/Assets/Resources/crazy_hair.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1d82be8b304acdf7b34079f36e6e273858f8713a GIT binary patch literal 9224 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 b(G9IAXsw-Xy|HL!pUkfwkSsS;uRzH|G|bk9z3 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 WQP5i3TY6&An(tRaFQPBAj(-En3u~eP literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Resources/pig_nose.prefab.meta b/MoCha/Assets/Resources/pig_nose.prefab.meta new file mode 100644 index 0000000..0169296 --- /dev/null +++ b/MoCha/Assets/Resources/pig_nose.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5bb017abc66da2e4bb908eb3c97d29b4 +timeCreated: 1524683729 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 5f1c5044b0836fe58428d9f84db5c6a02f61b9b9..68a3b2067ef7e4d6ff97d67cd2284185be5e4d2a 100644 GIT binary patch delta 11176 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 bXW;^Cp4 Date: Wed, 25 Apr 2018 23:16:28 -0500 Subject: [PATCH 06/33] Resources stuff --- MoCha/Assets/Resources/circle_eye.prefab | Bin 7984 -> 7992 bytes MoCha/Assets/Resources/circle_head.prefab | Bin 9104 -> 9112 bytes MoCha/Assets/Resources/crazy_hair.prefab | Bin 9224 -> 9232 bytes MoCha/Assets/Resources/crown.prefab | Bin 8720 -> 8720 bytes MoCha/Assets/Resources/gap_mouth.prefab | Bin 8720 -> 8728 bytes MoCha/Assets/Resources/pig_nose.prefab | Bin 8720 -> 8720 bytes MoCha/Assets/Scenes/MonsterCreator.unity | Bin 91428 -> 91396 bytes MoCha/Assets/Scripts/MonsterManager.cs | 19 ++++++++++++++++++- MoCha/ProjectSettings/TagManager.asset | Bin 4308 -> 4340 bytes 9 files changed, 18 insertions(+), 1 deletion(-) diff --git a/MoCha/Assets/Resources/circle_eye.prefab b/MoCha/Assets/Resources/circle_eye.prefab index 86c4533ec3c168435de18d586824835589c5f450..f1449e8368b067570d97de6ef9f84139d6cc0ccb 100644 GIT binary patch delta 115 zcmdmBx5JKufkCE(fkED4BgYnL)lLQm21X!W#w>cDQHP)51dv?-#7sc^DZs|LLhKxa z#pH+5!lE5OWdT4@79ei(k!BZI^NH!kW=cDQHP)50FYe(#7sc^DZs|LLhKxa z!Q_Y1!lDg8WdT4@79ei(k!BZI^NH!gW=={M?uZ$Z? diff --git a/MoCha/Assets/Resources/circle_head.prefab b/MoCha/Assets/Resources/circle_head.prefab index bba6d8a25dadada6f90e71b673bb82054ce2d3ff..e5efc685f799be673426bb59e1c8af5cc67c41f5 100644 GIT binary patch delta 114 zcmbQ>KEs`ZfkA!)1B3F6jT|53EISz(7#M+AX$tUsqe0{ZD=tYb3P>y}nS4=Rbn*px Jj>Qucm;q1s9%ldm delta 116 zcmbQ?KEa)XfkA!)1B3E}jT|53EL#~E7#M+AX$tUsqe0fS4I5_G!|MO75uXj0+|k$_q1o*z78=&d38ak|8v&Br!cbHD&Ted6CH%lPlCLnI}oG)=%=>~%Z zP{9izW(JB`eA|+E_UTkcg~^8U!i)u*UFFpo`MH4-zWI5@C8(c!_tz#zYYfkB01BgY3h%T@*k21Xz*V7`^XWGBdQ0K^7jCLnI}oG)=%=>~%V zP{9izW(JB`eA|+E_UTkciOGiY!i*W4UFFpod4NVTgyxkbrl+T-Oui^DGWmi$%j6GA L8k-L&1TX^t9B>{k diff --git a/MoCha/Assets/Resources/crown.prefab b/MoCha/Assets/Resources/crown.prefab index 3b0dcae840cf1c75d9ed26f8ea91c897f097e2f3..a044b4ca703e01e824203aa755b2f64721224503 100644 GIT binary patch delta 43 zcmbQ>GQnj-f*fP(=0v%4Mt*Jv1_s~!yyBA7qJYGrlF5ehqLUL8ST=uGQnj-f*fPx=0v%4Mjj3Z28PhQlEn1%)Rf7F@*GQ)*~fk9q^fk8=PBS(asU?&3u10xWJ@bhzfF6Co5F}YAqSknS1)B_Y{2I7W} zzxR^@r!k%YiUk1qEI=IgZb8;<`7cZoo7c+8GxBo-g?#h#ic3<90uqZ#CL79&PEJtZ K*!)3Wfe8SW5F9E1 delta 116 zcmbQ?GQov|fk9q^fk8=NBS(asU@HRy10xWJ@bhzfF6Co5Fu71pSknL~)B_Y{2I7W} zzxR^@r!gJ?iUk1qEI=IgZb8;<`7cZYo7c+8Gx7k9WC+bGNlZ^qO_^*cFEaUqJj-MQ Ld6CUL3Oq~zo%I_r diff --git a/MoCha/Assets/Resources/pig_nose.prefab b/MoCha/Assets/Resources/pig_nose.prefab index c910047d214a34730b305cf6d2fcb5922b4b8646..69134eea49fca488840c8a0939a2370f2df76fa9 100644 GIT binary patch delta 43 zcmbQ>GQnj-f*fP(=0v%4Mt*Jv1_s~!yyBA7qJYGrlF5ehqLUL8ST=uGQnj-f*fPx=0v%4Mjj3Z28PhQlEn1%)Rf7F@*2~M51>|KB2Y;Nj(*u?t;NPxJj(2xU`*I1MT4MB6U!3=;9z=^V)tL z5^QJ&2LB}I;GXyH`Ul1JgCbLu_CSGK z1w~O#5)b!Sa|5dWm5pP7t@dO8SNru1IPUL#HdQ!*U%p+YoF9v9ja|x*V}tLTpi9h! zWl3>qBE+4EO?kFw_@h_P0ks~(A=iBGyHx=d-~4uE8o2+og!L(-)|d*{oo34db0L>i zEC)hd4{Urk(a{Su(6CERq=B8DPE-y>zaM5R0&^i(G&~AjRih6NuO{Bw;c2XXI8RSJ ziq7F$bV`zVAc$%>io{|N*_5ks4S(#4z8a@p$NBA=>^eT|t9TeQYDs*7vXO{vB{tp- zn7@Q`AZ85e8r~Cd++tM4Q+7#^;?-=aG)u?jw76Dzbg&; z4h-j@%3mzft3O$!QORzmu(Mg>+7d8++o2<8mS{Go^qg$of1b_>zqL%)2-sj@8NSZ` E0bo+<0ssI2 delta 725 zcmYk3PiPZC6vp>KqP1z7DU!NibUm~nZj|6I&Z(Gc!An{^D0)!IK@T3p9t1Bf1oSF2 zd8Tuz_^($**-AkWJeFdiCl6Aw7ZZen3l@^i?t*V;CMB2I@B8h(@8iur-Au1;rkPWNhn=+xINfNX-x&73H$Gp1VXywf z&Oipg{JuzMEYGPHC;hHvi4_}6Df?igD8Y$#0lS2~HtqpT0;Tc03Z4#1I3F`nb%CXi(neWa47gY-0;L26TzG9N;|H!1 z)t<~QV6`_uD7b*znjG$3j+Y+qoy5NzlWJ%_wD3ll?;Ab16Poxn)CD_XNxhzlOx%8} z=}dG$^B9Zc{ZI0Ee>H>OBBsD@R8)e+T9jis$h=y7?JSIntPPgfKSTE^HSeRl$(@gi zMH{%d>OxA?Y}(}3hN+xygFDEVHLn(-lyKAAef|m7Z=VC6f}Geo4;HR9O(nS|V#1-4 zoS1T`gw0V&+0iA^eQ>B`fK!Qdr(7x_#n$Qf>>mRro>gdzM-@twnrnm$%^|T@0Y*Nq cK!WLEC2Np;Fgrk&6Y_Hw97-LVgMZ`y0T&4Xt^fc4 diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index b19f367..2505c60 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -26,6 +26,18 @@ public class MonsterManager : MonoBehaviour { public void saveMonster() { + GameObject[] monsterParts = GameObject.FindGameObjectsWithTag("MonsterPart"); + + StringBuilder pos = new StringBuilder (); + string savedString; + + for (int i = 0; i < monsterParts.Length; i++) { + pos = new StringBuilder (); + pos.Append(GameObject.Find(monsterParts[i].name).transform.position.x).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.y).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.z); + savedString = pos.ToString (); + PlayerPrefs.SetString(SceneManager.GetActiveScene().name + monsterParts[i].name, savedString); + } + /* 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); @@ -61,10 +73,15 @@ public class MonsterManager : MonoBehaviour { 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 () { + string savedString; + string[] values; + + /* string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "eyePosition"); string[] values = savedString.Split(' '); @@ -94,6 +111,6 @@ public class MonsterManager : MonoBehaviour { 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 18056218f86af2bb1d64f10ffed67dc7684d8171..1db4d5d55a298aeeb4209a85d108eca1b3289343 100644 GIT binary patch delta 331 zcmcbj_(jp4fr05S1B1X91_lN}APuA#7>o=I&Gn4+4ATr5{{8>|pOFzL<_D7a|9^95 z6Zf)T|8{1INqsW=DDOGZ(v-1bV!pWK0R{#}24;qP3=9p@%nS`IK-J73EesRqi%T|u zBv}{@fs!B$H1j_zP>RuE;(2jN5QBl0ArL5$1;ilB*ui2G|3h^$q3GlUN-`Xntj`G5 z%FN&av=F2fWG**IwqbHSP}TurFtU?)fs%|2llvLPf#h;VeZ~WuuQQ4=@`FSX;LBz~ q=FdEn6_|OHnSi1^K%ASOS6q@>6km{7R06WX7s3w!awjtjTm%3K225oD delta 313 zcmeyOctz2Yfr0541B1X71_lOxAPuA#7) Date: Wed, 25 Apr 2018 23:16:41 -0500 Subject: [PATCH 07/33] progress bars --- MoCha/Assets/Scripts/GetGoals.cs | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index bd49f7b..f4850d9 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -16,27 +16,39 @@ public class GetGoals : MonoBehaviour { public string prefKey; + public float goalValue; + + //Progress Bar... + public float barDisplay; //current progress + public Vector2 barPos; + Vector2 barSize = new Vector2(227,20); + void Start () { - goalText.text = prefKey; - goalText.color = new Color(1f, 0.5f, 0.8f); + //goalText.text = prefKey; + goalText.color = new Color(0f, 0f, 0f); + + goalText.transform.position = new Vector2(barPos.x + 45.0f,barPos.y + 55.0f); + + + //barPos.x = goalText.transform.position.x; + //barPos.y = goalText.transform.position.y + 10.0f; + + //Debug.Log(barPos.x + " " + barPos.y); + + //barPos.x = 0; + //barPos.y = 0; + currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); Debug.Log(goalDayStr); - Debug.Log("hoauaouou"); + Debug.Log("hauaouou"); if(prefKey == "daily") savePersistantGoalDate("daily"); } - public float goalValue; - - //Progress Bar... - public float barDisplay; //current progress - public Vector2 barPos = new Vector2(20,190); - public Vector2 barSize = new Vector2(60,20); - //Texture the progress bar using these parameters public Texture2D emptyTex; public Texture2D fullTex; From 00e3956098dde5c629f581ded2475ba64f9f7a5c Mon Sep 17 00:00:00 2001 From: asleal2 Date: Wed, 25 Apr 2018 23:24:16 -0500 Subject: [PATCH 08/33] progress bars --- MoCha/Assets/Prefabs/Progress Bar.prefab | Bin 0 -> 9240 bytes ...r.prefab.meta => Progress Bar.prefab.meta} | 4 ++-- MoCha/Assets/Prefabs/ProgressBar.prefab | Bin 5292 -> 0 bytes MoCha/Assets/Scenes/Goals.unity | Bin 24200 -> 29244 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 MoCha/Assets/Prefabs/Progress Bar.prefab rename MoCha/Assets/Prefabs/{ProgressBar.prefab.meta => Progress Bar.prefab.meta} (72%) delete mode 100644 MoCha/Assets/Prefabs/ProgressBar.prefab diff --git a/MoCha/Assets/Prefabs/Progress Bar.prefab b/MoCha/Assets/Prefabs/Progress Bar.prefab new file mode 100644 index 0000000000000000000000000000000000000000..3e61fa49b28319b8e1a9358acbe8717135c1bdf5 GIT binary patch literal 9240 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 literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Prefabs/ProgressBar.prefab.meta b/MoCha/Assets/Prefabs/Progress Bar.prefab.meta similarity index 72% rename from MoCha/Assets/Prefabs/ProgressBar.prefab.meta rename to MoCha/Assets/Prefabs/Progress Bar.prefab.meta index 0ce5346..2b39af1 100644 --- a/MoCha/Assets/Prefabs/ProgressBar.prefab.meta +++ b/MoCha/Assets/Prefabs/Progress Bar.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 76a3a676c97c14505abe10fa7fa30134 -timeCreated: 1524600874 +guid: 441f50f7e865a4e9c937038cedf667ee +timeCreated: 1524703581 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/MoCha/Assets/Prefabs/ProgressBar.prefab b/MoCha/Assets/Prefabs/ProgressBar.prefab deleted file mode 100644 index f735d608f81871d1152eba96ade16bbe7630da10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 zcmeHLU2GIp6h5>4x?SAvmf2}#Nep8G z#;C*>1u-!x4-%0kMkC=T#y~=1cmTr#CK5$r^g-iaAdy6a_51GKyPetH7z|G)4jlHL zZ|?o>nRD;??hGOmKNFcWEF!mwOuU3&X{>KpT-Q`r-_sy}jf{*~<-mR@!#^VDE7fshM`9*`EXS0xSZ%7!iN5h>sy7aM2R6@aI68_#au~lg7#$TOzl^*q`Gq zpZ6nj7Cf`y-vr~VdQ6#I1Y;9?@@Os}_sXOW{0{*e1FL{xD#ddi_)7TXuO#mCUYXSZ z9vbl~;wOlgEBW@P@K0Aj}os6#d#}nWmWPRVq~23C**O>zXLw`vBo9&ClZeq z^K*Sl@lVR*IuEp)zPE2OLRv zZgIN2^-hli{w@c+>z%&zpwr!&?(0vdFlR>1#o2Yh?2=A<58HjtIyD%;>WsdZi;}B} zt?J?czRI=kwAut_#7$Nx?CA@OddX8rK5e4xc%o;P9fbQ@9Qx z4~(CJgU13Ij$a8*v^ahxI2gkCgTgf`IGTSW`jDT3Q;J^+PPCX`3r;b=798T1e2V;R z1}$?#!QoZ7AC%yz_0k1y_JbB2U-9sOi(@SFGb%VbZX;uIW_sOpbg`h)N+m=+uq za);+GThX2H((a0Fo|DR;l$%i%#ig1rD#^Dx?1U>_rr0p5-Of5LemC0j4W64w#aUln zN*o@w2iH28UejZBCf4O81|1bVGTnLg;MpbT#vEQVBepmB@`1zmAjUUxv3hvU|8l)i zhzE0ZtLjZXSGaCfz2)#=J&e|yCEtUGb;~`^dK0O}T1I3))^!Oyt~d8o5MK(9IO{El zFM~&%^%lgN;StyMMt;nT{6~S2Th&{Md0B5k9y2fNEr^?WS#KKG{2lPfuj;J?KkF^X zWB6HbLEP}O-V8qv_-Ej;o>_0D^p5pbO7B>2F&OoNFNj9(SZ^BFF9b%{SZ@Xot|RMB zR5=Hs5u=L_)3KTF|5if6x!?vvRC zxXEX20dDd+Cx>6ZUbLsX?Bx2ir{4~?NmjPY^VA699qCLW_tv2N4ZwJSxArEI-8iq& zT#18Ti3v~ab#Aw6tIjJ1l8zfo#gk5ERRS*-e2K;N&B^LLmHtyb{ad{mM;dob-4k8Z z_VcW7H;sMzc*U_VzTOE5kz+8XuL|Y(zob|)#L_@6m=pEQ5MzGy5wa$Cgm4@2KJi|Z zz>hg8(~?3wEM@AOL41V=OF(}!5HCK$Eno43UO{g32w#Xe%@J<-DxMI(KEjEIUvXH1 z7^?8#D*`1&==f>hriId(nOm#(mYGaK;&~uSVdd_QS$Fu6aI$Po5?iuR@+h z3iA~ntW)l5@?WpitA4dD1D?lMN3S=L=~Qh^P`lCD<~8TO)z}u-**f54Jn0&6`DNB- zXYsBm@wA=HH9Kv$Es^O@+F3ypM}_e8KyyQ4yAxm?aGl1sW^wxZy)2leXCRs6FBfMh zezgKW>M{vfGJo>rITOl-?@E0z3pVfEu)BZL1eNrD_z~FA--loO>Cj$l3OalYzYNB{ zv`g6!@UL!5^tXMlOr5#r*LNYIpKU69Xzw|q=>(K)WSUr zy;9FvYChACzb5B}T!lWraeF#;*Ilt`;cGmP!h F*WZ-SCJX=o diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 6a614fcf236dbe67bcdef53cfb8a88e456b0044b..9bb606e1d60bb095a40a698b2ff1446883b4865e 100644 GIT binary patch delta 3866 zcmeHKdu)?c6u;kIEw3^5=w2|Z4%RJDz81zd!j$P$vW>2Lbq@xmLLI}k9c@`w5^WKA z$3?i16(zbQKK{TUrqMreBs``fi3ys3B;Xv05kz7(V9w@)9x=Fbk$bedS!h4*7eEowE;RZH3A8h5E9B)s0i#ELe9Z=Q;|nk zn=|S5>J<94SxeuoHc*dQD6Ioem2^hBex*Z&mp`JLT3BWpW-eusOF zlL^e7gvbwNCGkRHB%?enS?CzuqYdu8SI5@ z0Aqk%1w(kKr>@`3Ml1wMSujq4{sqUvfaQaXdw9I*qg)usalp312&TvhjxB?QUME39 zrU7`8gJ%J30XZ4^DUKOnb=jF=j)ehh2hMcpsUL275(aVuu+1={ku;8BT3JC(fu7E> zvw-1x7*$4)gG<4S1^`l_>o^t$YzX8u=M*>fxO@a04rf@aa-q`2iGI0PX~`Vwp=WLJt9Pe4Zj4TAy29WLVmeD_2NI! zu)co2Szd%ZocE`eEX6q{)@a~koDw)WV%@igIfwI-m#6f=5J!?|g(W8?)!zKO@5Zy* z_g+g}(rkX?5N)#56?{LIdj9;DtyTT|uNqbl3}0r6N-D<_gMGHDcMkf*(<7dq-{R;+ z%hy6e5-``N(DMbK$269;hlO~0xxE%XO)Ia= zW_H1ZoUCY0K1Q6gqoSAV(rD?b(qOd1@&QFVEaS4nxDvK#efcb-^<_LtpI))fNXD9) zScmr6jFVNOj$X25DWThHhPzouYnoLIce82@WDKbpBhALe6ISx#v6fx-dXL9n>s{;g zvV<~Wgo-x7r?0kTKh}$S%U;pd+2M9M z-G1qEk&c62vrT4uaArnL%U|2V0=_9PI=oho<dX%nR>6Hzl{jK)zWsXw3 z--^O_Zl1}kO0$Vj9#zzXSJVQQBzHdUkzFj!O=arzisnYAx%^u|$&=DNDCIfcgK+1? zu2c9AffsQ}nx3|>(1z-Fv2mk;8 delta 951 zcmZ9LT}V@57{{M?&be~gX|8pmfOvuCQG^#pU0MH^y_1eFJo`WY-+A7zJ?A|C!unq@ zh3L=(QM8|kHXxrLP&~~2v~bjGCQDSiIpuxpb@bvPF>@*CcQTuKW{;l5vdpo)`FYIF z9|e|~%AZAy#A0oYs3WJ1Xo(Tok!!Pka2PP>AlZnWlEuNEz&j8{l4&UDfzLq<^QJWr z8V0)t6?1P(reRVsyc2OJ%@Wiip_p}77WRV;!mmY)Nan-pnN7AP;!)+ii(DLzI?hfPZaeY5{(5-ov+cflgPV;FJ31>*b&gC|XFvGP z9{;XX_N6=fVbMJ|clql6p<5{}cJIxCjaM6+dB~W+JMzmoz_@bUsfa#_!xYVq_l`yt z;yqnzfq=nse?_RgG>CL%SPFfuswNs5^6TMXNH5h_%F>CYc)m;3M5jvvVSicKu3(vE z-Bm|OwidfAvm+<1;AWfE^T|~Oyr->zM+`eYgNE)+$W+s4YR}=ZZYPX~R~@l)C93h7 zs3FR@uft=GM=Kcr(d^`Pu|a0z3$c3q29AE^lg$pit25{#-+io3{r_a*rkStnA3~PJ A(f|Me From 1d11f0c3dddd4ccc2a7210606c80da5c48faa097 Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 00:18:01 -0500 Subject: [PATCH 09/33] Piped pedometer steps into goals --- MoCha/Assets/Scenes/Goals.unity | Bin 29244 -> 30804 bytes MoCha/Assets/Scripts/GetGoals.cs | 44 +++++++++++++++-------- MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 9bb606e1d60bb095a40a698b2ff1446883b4865e..167c118fddf4f319d43d1df0c388c6ccd654e8d7 100644 GIT binary patch delta 1229 zcma))Ur1A76u{4&cWdS{bN<(C`G+LtpUu)q*_xJ?Y%tnvL8eakSFhWW2^Pgxy_rva zJrq=E2t^N3T>>K^Bch0)2&tC{gP;dP=9>_-&e`sjQi9GnJLmhIKi|3E_sxCd77|=F zz=Xl>PIQg!m`f)W@9$mwnP|HGh(p@91HpbWS!v%{MO3XK*TUrma-XRf@Crt6VIpZ%v)gY8F5czlRPCYSS#B0hq&O z4k{6FNoPYm0E3f1a96CR7QiQ^s2?&Ntocy_K&&x!{0JbgH`I1AaZGphv5#Snk& z^L;!B@Vc#0RJUWbnG{p1isT#PkdS1crY6E5n|JYSzME&`y*k`Q&3?GlqP71mhXEB0 zf%CEb0}Gk*pvBA`c&DQAYa7_|piy>1!8Nzn^MNH!=CMU@F1t0xzRI8rA mf?V;hVjt5C2^$&&IMF7Qa%*!G{?8mfRuBMh1;tq`f delta 571 zcmaKoF-SsD6o$_&Eh`nXR~a@46-B1KCyEV01uaEVkf4LnqNYAU5hDn}T5CKFjV}mV zi?_PuPz^y24nmDBQA0z6L-;zEUggyAbME=>fB$>#t-rI%Gn)Vij{+3t0id7OB31B- zQqb%7ib)Atnx-+~YGP@jtH8Gms+G`4ce|R{;l2j3Wg|c@t!I5_8O~e+4Xm?}I9cXQ907Qu zmvLVgiIHAf=0{D#YGfLlk*azVwVJUMGpVKIJ;U0T0ZWM~EXHh@O;rs1RXCHbV>InX zcgBMGZ2^^(8I_y^@6vvJ%gy0aCfnUf$(~>U*X0BX@~B#qm5!dDKXIUxe)uQi+{Az1 lBl!ZjA; Date: Thu, 26 Apr 2018 00:55:51 -0500 Subject: [PATCH 10/33] Progress bar hooked up with pedometer --- MoCha/Assets/Scenes/Goals.unity | Bin 30804 -> 30460 bytes MoCha/Assets/Scripts/GetGoals.cs | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 167c118fddf4f319d43d1df0c388c6ccd654e8d7..49695b6af8339f4623430aea9f151e1bd76b86dc 100644 GIT binary patch delta 3314 zcmZ9Oe{3AZ6~|}p&Obt&-~Et%+uc;Sy&OHBs^?JwHm+Q}7zV!U@rg!(_$)ETNH~M>g;>4~1-yvF8 zhjXC$FlOMNt${EWWSsff9Qgeh1t4o7yo5&-|G^?Ypm_Zv{$s^&FLKUi{VX44EC{~IqL)e z7siy(2J|pzJjW^)WO^q!?<8lH3o>mXE~S!TIrEe#jW-r~xwQWe#*|Pigc@h%?EmNk zFs8tp2%;<${Fn0p^|9 z|3w+Gduc+-!i3t2yh5JdDHxGmJH$P_?iS<$DbZcT(dh6}Lcav3ggOZ3iTn9x#4n!G zPH=aL0;NktzGWZ|x21dEUF4iS1Lw04+TSq54d7$H2m3RGws<#jGz6CZX^V4|=^hF5 za-wvPdy3pAANV^Qk$o?O8dXNG(`$n{tDLj@{M}(Hz}QYsM}%@rb8G z4O@m~Gn*yZIMXm5(y}ov;|yzdQg>K*+AyLHo(!inGpWb-%;=^As{wQI3>(z#OgiIW zKCBr=uWe0F!Vol9f-{TEC;?al%Nz&B59%?8GF0)As_vw$_&#ky2aQ;9opssC=?NJo zmLlklGtgZJ9&teqE|PVbE<^M#+$} zmkWfcqSGGBbarbFEhp5RtGgA_6xBz)>Z0kRR0ff#lQl^1)-z5|nhYXoQ_V-TBTDNs z(n*t60P|As&i3logznf`kfC%eHLM?@$v(?YAGHpej%EzZ=yt-e4ukI3Z6_UDfcn#> z9-Y);C=~|sX`E0xRhM&T`$wL;@1bAx>~D&k45D+0q?;gJkg#UXXqh41jO(^;i;tq~3+Ed? zTgC&0KWypYysU8juD1i+U%0g60Y5J9xs0Xr@BQ^zXH8T&bU z^7m`SPJ_`0kxF^iWjXdw1!=jSQ-)uFox+%IzcY%RKo*l2V~VZK9a(`+X7LFUUk3H! zr(dlm^a&i*pXa1=;dJW)X9jaZ$GqjhIBd{*S@WKk8VxUJ$urhS-HIv9m5W=tJxPxmD|H|gCn=^ ze)7~@^Z)Xl%U_$B_cO6d@s{Air&@xz8Zv3iY~S1(qMw!^o^z&c zz1`HO9a}S6f`ilJMml!?20c4$9n#Hq6CVg!(M*%fg~=1*s&WaN#ngkVm*+d^)!L^Y z4pQaf%4maI`jydO;n;!eW!xvG#$UzXow1+c?|kgl3bp>?WIQbD^`+uk{2|e&hpN1) z>D3Tt^prSupi&%5oZ?)pNDknymi$<}8LtV@UI^nroiI{c#f8zb!jxIyV(YXaU2ohH gDhwR@8yE4z?~5}N)iwBZP0E{3B~M!>#xix^0q~2&NdN!< delta 1912 zcmZ{kZA_b06vyvv3+uKr3kBq*U^iHXrpyO)13nPP7;FO5BFquRluAq6t#6dluqCEd z=Q|&OOS10e15*=U;tTWn;*5zPk|kyznrQTc#t=U^%{DWWB`z|D|MPGk!4D2Vy()G|ykWzveI&Xqbyo?}*&Rd`pFDHnh z^Zn3?+X-TD{3yPQv6MDZvC6fHbC~eJrUjL2_>7UIkHY4V`-meO1tR{U8ivvu2!^~Zp`bq!_C;vE zC*~PkU8qg9N8^LOwy~He;yoPnCIb4BHT-~2hSnCeMk9%MbX({S?^PI*o^dKYM}4Zh z!N_yfsorukuM)HU6RC`NawE-Q|Lirq>AX%!roeE*-T*l**??qburrcPfK9`uKxZYZ z$zd!8I~QV4jiCb>%YglgJe!~|TwSJqNU=0lQO9hCEUrS90jq{>fy^EHKx>3Ku$N#X z7n_&t03w}$od@|+vMg91>@AQ5$!ZW>FXk)BGGP74&+dWainCd3lAC}**p!6TuCf5C z_#CDc!X>Lg#t>}UR>3>R=|f-{u;=lnwKmBdsKN!i08%Jf42+7gL5flmE&=wC6Qo$O zMpX7TY)afeI!~VwTLRNh>lw*zf>mRVPV4o?D+kHXfknFC83$bGe17sv4FK-L zz0jRJSby#a!FP+0RI-E04xABVpW-Y15nCfa>IeFMe!Fe?VFiQqUzVF6z)RyN3mW#2 zZh$Nu`j@z6BqVr%#nJl_jnnFV4nYgg~D$KIKN<~Y&N_ECx<>JJMU1UdGB5H332V|KV#z$i!-`lLtyT2SqB6hE@9O*O#vfm9%5|2GN-;5| Date: Thu, 26 Apr 2018 01:18:08 -0500 Subject: [PATCH 11/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 1a993e0..1ab1556 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -7,22 +7,19 @@ using UnityEngine.UI; //Pretty much a copy of GetData... namespace PedometerU.Tests { - + public class GetGoals : MonoBehaviour { 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; - public float goalValue; //Progress Bar... public float barDisplay; //current progress private Vector2 barPos; - Vector2 barSize = new Vector2(227,20); + private Vector2 barSize = new Vector2(227,20); //Pedometer private Pedometer pedometer; @@ -30,11 +27,12 @@ public class GetGoals : MonoBehaviour { double userDistance; int totalSteps = 30; public Text stepText; - + void OnStep (int steps, double distance) { userSteps = steps; - stepText.text = steps.ToString (); + stepText.text = steps.ToString (); userDistance = (distance * 3.28084); + PlayerPrefs.setInt("currentSteps",userSteps); } private void OnDisable () { @@ -47,8 +45,8 @@ public class GetGoals : MonoBehaviour { // Create a new pedometer pedometer = new Pedometer(OnStep); // Reset UI - OnStep(0, 0); - + OnStep(PlayerPrefs.getInt("currentSteps"), 0); + //goalText.text = prefKey; goalText.color = new Color(0f, 0f, 0f); @@ -103,7 +101,8 @@ public class GetGoals : MonoBehaviour { //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)totalSteps; + barDisplay = (float)userSteps/(float)totalSteps; + //failed to complete goal if(currentDayStr != goalDayStr) { @@ -137,4 +136,5 @@ public class GetGoals : MonoBehaviour { } } } -} \ No newline at end of file + +} From eb914d25def5ffb8e6a9ae324269a1b4f5875210 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 01:20:23 -0500 Subject: [PATCH 12/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 1ab1556..aab5dff 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -32,7 +32,7 @@ public class GetGoals : MonoBehaviour { userSteps = steps; stepText.text = steps.ToString (); userDistance = (distance * 3.28084); - PlayerPrefs.setInt("currentSteps",userSteps); + PlayerPrefs.SetInt("currentSteps",userSteps); } private void OnDisable () { @@ -45,7 +45,7 @@ public class GetGoals : MonoBehaviour { // Create a new pedometer pedometer = new Pedometer(OnStep); // Reset UI - OnStep(PlayerPrefs.getInt("currentSteps"), 0); + OnStep(PlayerPrefs.GetInt("currentSteps"), 0); //goalText.text = prefKey; goalText.color = new Color(0f, 0f, 0f); From f857f2f8319b94a901321185e22fc2d9ad2f69c7 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 01:27:34 -0500 Subject: [PATCH 13/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index aab5dff..db59225 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -43,7 +43,7 @@ public class GetGoals : MonoBehaviour { void Start () { // Create a new pedometer - pedometer = new Pedometer(OnStep); + pedometer = new Pedometer(OnStep(PlayerPrefs.GetInt("currentSteps"), 0)); // Reset UI OnStep(PlayerPrefs.GetInt("currentSteps"), 0); From ced7137fd0a2000a89a2f56a81a33f20bd990b19 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 01:36:56 -0500 Subject: [PATCH 14/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index db59225..ee52978 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -25,11 +25,11 @@ public class GetGoals : MonoBehaviour { private Pedometer pedometer; int userSteps; double userDistance; - int totalSteps = 30; + int totalSteps = 100; public Text stepText; void OnStep (int steps, double distance) { - userSteps = steps; + userSteps = PlayerPrefs.GetInt("lastSteps") + steps; stepText.text = steps.ToString (); userDistance = (distance * 3.28084); PlayerPrefs.SetInt("currentSteps",userSteps); @@ -41,12 +41,17 @@ public class GetGoals : MonoBehaviour { pedometer = null; } + // + void Start () { // Create a new pedometer - pedometer = new Pedometer(OnStep(PlayerPrefs.GetInt("currentSteps"), 0)); + pedometer = new Pedometer(OnStep); // Reset UI + PlayerPrefs.SetInt("lastSteps",PlayerPrefs.GetInt("currentSteps")); + OnStep(PlayerPrefs.GetInt("currentSteps"), 0); + //goalText.text = prefKey; goalText.color = new Color(0f, 0f, 0f); From 0fa4abc7979cbfc49fdaf4e37732570d704cf90a Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:09:18 -0500 Subject: [PATCH 15/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index ee52978..1b26a5b 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -27,12 +27,12 @@ public class GetGoals : MonoBehaviour { double userDistance; int totalSteps = 100; public Text stepText; + private int savedSteps = 0; void OnStep (int steps, double distance) { - userSteps = PlayerPrefs.GetInt("lastSteps") + steps; stepText.text = steps.ToString (); userDistance = (distance * 3.28084); - PlayerPrefs.SetInt("currentSteps",userSteps); + PlayerPrefs.SetInt("currentSteps",userSteps + savedSteps); } private void OnDisable () { @@ -41,15 +41,16 @@ public class GetGoals : MonoBehaviour { 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"); // Create a new pedometer pedometer = new Pedometer(OnStep); // Reset UI - PlayerPrefs.SetInt("lastSteps",PlayerPrefs.GetInt("currentSteps")); - OnStep(PlayerPrefs.GetInt("currentSteps"), 0); + OnStep(savedSteps, 0); //goalText.text = prefKey; From 5f518d40105141529997ae05dbdec443b03b8f0f Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:20:35 -0500 Subject: [PATCH 16/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 1b26a5b..089fe19 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -32,7 +32,8 @@ public class GetGoals : MonoBehaviour { void OnStep (int steps, double distance) { stepText.text = steps.ToString (); userDistance = (distance * 3.28084); - PlayerPrefs.SetInt("currentSteps",userSteps + savedSteps); + userSteps = steps + savedSteps; + PlayerPrefs.SetInt("currentSteps",userSteps); } private void OnDisable () { @@ -51,6 +52,7 @@ public class GetGoals : MonoBehaviour { // Reset UI OnStep(savedSteps, 0); + Debug.Log(savedSteps); //goalText.text = prefKey; From 37a6524ae2c1f908ec487d219916487a9b4a364b Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:35:06 -0500 Subject: [PATCH 17/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 089fe19..306811e 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -30,10 +30,10 @@ public class GetGoals : MonoBehaviour { private int savedSteps = 0; void OnStep (int steps, double distance) { - stepText.text = steps.ToString (); userDistance = (distance * 3.28084); userSteps = steps + savedSteps; PlayerPrefs.SetInt("currentSteps",userSteps); + stepText.text = userSteps.ToString (); } private void OnDisable () { From fe61c6fc4907e1b591a5c4644c4430efb7225f7a Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:39:44 -0500 Subject: [PATCH 18/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 306811e..77a47b8 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -51,7 +51,7 @@ public class GetGoals : MonoBehaviour { pedometer = new Pedometer(OnStep); // Reset UI - OnStep(savedSteps, 0); + OnStep(0, 0); Debug.Log(savedSteps); From cbc73b45460b276ee876986cf5b7318fd03f2026 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:46:35 -0500 Subject: [PATCH 19/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 77a47b8..74a5887 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -27,7 +27,7 @@ public class GetGoals : MonoBehaviour { double userDistance; int totalSteps = 100; public Text stepText; - private int savedSteps = 0; + private int savedSteps; void OnStep (int steps, double distance) { userDistance = (distance * 3.28084); @@ -51,7 +51,7 @@ public class GetGoals : MonoBehaviour { pedometer = new Pedometer(OnStep); // Reset UI - OnStep(0, 0); + //OnStep(savedSteps, 0); Debug.Log(savedSteps); From 62fbee44c8a3c685a7604b3d720f600d29a72f77 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:48:59 -0500 Subject: [PATCH 20/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 74a5887..8f8281c 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -50,6 +50,7 @@ public class GetGoals : MonoBehaviour { // Create a new pedometer pedometer = new Pedometer(OnStep); // Reset UI + stepText.text = savedSteps.ToString (); //OnStep(savedSteps, 0); Debug.Log(savedSteps); From a2d0555a526be3a95273d9d255d45a03357f9a16 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:52:47 -0500 Subject: [PATCH 21/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 8f8281c..97f2d96 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -51,6 +51,7 @@ public class GetGoals : MonoBehaviour { pedometer = new Pedometer(OnStep); // Reset UI stepText.text = savedSteps.ToString (); + userSteps = savedSteps; //OnStep(savedSteps, 0); Debug.Log(savedSteps); From 009e8ee9c968347795042e584aa1adcff3f1edf4 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 02:54:53 -0500 Subject: [PATCH 22/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 97f2d96..3ec2b29 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -130,7 +130,8 @@ public class GetGoals : MonoBehaviour { if(barDisplay >= 1.0f) { Debug.Log("Goal complete! +100pts!"); - + userSteps = 0; + PlayerPrefs.SetInt("currentSteps", userSteps); //destroy the goal and set a new one? } From 908c88ed854f6be5f213c091e6e31d5fc4727b69 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 03:03:43 -0500 Subject: [PATCH 23/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 3ec2b29..88ff3cb 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -132,6 +132,8 @@ public class GetGoals : MonoBehaviour { Debug.Log("Goal complete! +100pts!"); userSteps = 0; PlayerPrefs.SetInt("currentSteps", userSteps); + savedSteps = 0; + OnStep(0,0); //destroy the goal and set a new one? } From df378ecc505e20719794d81ac877b577e6b8386b Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 04:38:54 -0500 Subject: [PATCH 24/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 88ff3cb..deab496 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -14,7 +14,6 @@ public class GetGoals : MonoBehaviour { public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); public string prefKey; - public float goalValue; //Progress Bar... public float barDisplay; //current progress @@ -24,16 +23,23 @@ public class GetGoals : MonoBehaviour { //Pedometer private Pedometer pedometer; int userSteps; + int userPoints; double userDistance; - int totalSteps = 100; + 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 (); + + userPoints = steps*5 + savedPoints; + PlayerPrefs.SetInt("totalPoints",userPoints); + pointsText.text = "Points: " + userPoints.ToString (); } private void OnDisable () { @@ -47,11 +53,22 @@ public class GetGoals : MonoBehaviour { void Start () { savedSteps = PlayerPrefs.GetInt("currentSteps"); + savedPoints = PlayerPrefs.GetInt("totalPoints"); // Create a new pedometer pedometer = new Pedometer(OnStep); // Reset UI stepText.text = savedSteps.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); @@ -65,7 +82,6 @@ public class GetGoals : MonoBehaviour { currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); Debug.Log(goalDayStr); - Debug.Log("hauaouou"); if(prefKey == "daily") savePersistantGoalDate("daily"); @@ -111,7 +127,7 @@ public class GetGoals : MonoBehaviour { //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)totalSteps; + barDisplay = (float)userSteps/(float)stepsGoal; //failed to complete goal if(currentDayStr != goalDayStr) @@ -133,8 +149,14 @@ public class GetGoals : MonoBehaviour { userSteps = 0; PlayerPrefs.SetInt("currentSteps", userSteps); savedSteps = 0; - OnStep(0,0); + //OnStep(0,0); + stepText.text = userSteps.ToString (); + //destroy the goal and set a new one? + savedPoints += stepsGoal*10; + PlayerPrefs.SetInt("totalPoints", savedPoints); + stepText.text = PlayerPrefs.GetInt("totalPoints").ToString (); + pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); } //only applies if "daily" goal From c051a6683cf5fc186ed1caf2e9f6824cc0f5c4ff Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 04:42:59 -0500 Subject: [PATCH 25/33] playerpref steps --- MoCha/Assets/Scenes/Goals.unity | Bin 30460 -> 31216 bytes MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 49695b6af8339f4623430aea9f151e1bd76b86dc..a2ffa524ce9d36ce864635c2e078612e32a72e93 100644 GIT binary patch delta 424 zcmezKmhr=9Mi~Z%gaQVJ$`1?-41z%R1R%{|WMF8nXQF4YQD$Ncqsr!WF+}1W~ckp3Oy7cc+-!ud}H delta 122 zcmezHneoqCMi~Z%1O*0$vOf$A41z$m1CVAgGB7mPGuAWQC^IpJQDO7Cm@FpI4M1^r zAoev-uLr5w0aVShxi&sqh>>aX%R>3dbJ92_%M>|s=-SGG Date: Thu, 26 Apr 2018 04:54:43 -0500 Subject: [PATCH 26/33] playerpref steps --- MoCha/Assets/Scripts/GetGoals.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index deab496..4bd0122 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -155,7 +155,6 @@ public class GetGoals : MonoBehaviour { //destroy the goal and set a new one? savedPoints += stepsGoal*10; PlayerPrefs.SetInt("totalPoints", savedPoints); - stepText.text = PlayerPrefs.GetInt("totalPoints").ToString (); pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); } From 483a166193738de7671e60f572542c14d16290d5 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Thu, 26 Apr 2018 04:58:15 -0500 Subject: [PATCH 27/33] playerpref steps --- MoCha/Assets/Scenes/{Goals.unity => MyGoals.unity} | Bin .../Scenes/{Goals.unity.meta => MyGoals.unity.meta} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename MoCha/Assets/Scenes/{Goals.unity => MyGoals.unity} (100%) rename MoCha/Assets/Scenes/{Goals.unity.meta => MyGoals.unity.meta} (100%) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/MyGoals.unity similarity index 100% rename from MoCha/Assets/Scenes/Goals.unity rename to MoCha/Assets/Scenes/MyGoals.unity diff --git a/MoCha/Assets/Scenes/Goals.unity.meta b/MoCha/Assets/Scenes/MyGoals.unity.meta similarity index 100% rename from MoCha/Assets/Scenes/Goals.unity.meta rename to MoCha/Assets/Scenes/MyGoals.unity.meta From 53a6f8c3f14501928ae978a2135902bd47eeed46 Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 06:59:29 -0500 Subject: [PATCH 28/33] Monsters + inventory working --- .../circle_eye_sprite.png} | Bin .../circle_eye_sprite.png.meta} | 0 .../circle_head_sprite.png} | Bin .../circle_head_sprite.png.meta} | 0 .../crazy_hair_sprite.png} | Bin .../crazy_hair_sprite.png.meta} | 0 .../crown.png => Resources/crown_sprite.png} | Bin .../crown_sprite.png.meta} | 0 .../gap_mouth_sprite.png} | Bin .../gap_mouth_sprite.png.meta} | 0 .../pig_nose_sprite.png} | Bin .../pig_nose_sprite.png.meta} | 0 MoCha/Assets/Scenes/MonsterCreator.unity | Bin 91396 -> 96956 bytes MoCha/Assets/Scripts/DragAndDrop.cs | 5 +- MoCha/Assets/Scripts/Inventory.cs | 86 ++++++++++++++++-- MoCha/Assets/Scripts/ItemSlotBehavior.cs | 34 +++++++ MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta | 13 +++ MoCha/Assets/Scripts/MonsterManager.cs | 20 +++- 18 files changed, 143 insertions(+), 15 deletions(-) rename MoCha/Assets/{Sprites/Monster Parts/circle_eye.png => Resources/circle_eye_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_eye.png.meta => Resources/circle_eye_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_head.png => Resources/circle_head_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/circle_head.png.meta => Resources/circle_head_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crazy_hair.png => Resources/crazy_hair_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crazy_hair.png.meta => Resources/crazy_hair_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crown.png => Resources/crown_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/crown.png.meta => Resources/crown_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/gap_mouth.png => Resources/gap_mouth_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/gap_mouth.png.meta => Resources/gap_mouth_sprite.png.meta} (100%) rename MoCha/Assets/{Sprites/Monster Parts/pig_nose.png => Resources/pig_nose_sprite.png} (100%) rename MoCha/Assets/{Sprites/Monster Parts/pig_nose.png.meta => Resources/pig_nose_sprite.png.meta} (100%) create mode 100644 MoCha/Assets/Scripts/ItemSlotBehavior.cs create mode 100644 MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png b/MoCha/Assets/Resources/circle_eye_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_eye.png rename to MoCha/Assets/Resources/circle_eye_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta b/MoCha/Assets/Resources/circle_eye_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_eye.png.meta rename to MoCha/Assets/Resources/circle_eye_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_head.png b/MoCha/Assets/Resources/circle_head_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_head.png rename to MoCha/Assets/Resources/circle_head_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta b/MoCha/Assets/Resources/circle_head_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/circle_head.png.meta rename to MoCha/Assets/Resources/circle_head_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png b/MoCha/Assets/Resources/crazy_hair_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crazy_hair.png rename to MoCha/Assets/Resources/crazy_hair_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta b/MoCha/Assets/Resources/crazy_hair_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crazy_hair.png.meta rename to MoCha/Assets/Resources/crazy_hair_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/crown.png b/MoCha/Assets/Resources/crown_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crown.png rename to MoCha/Assets/Resources/crown_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/crown.png.meta b/MoCha/Assets/Resources/crown_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/crown.png.meta rename to MoCha/Assets/Resources/crown_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png b/MoCha/Assets/Resources/gap_mouth_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/gap_mouth.png rename to MoCha/Assets/Resources/gap_mouth_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta b/MoCha/Assets/Resources/gap_mouth_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/gap_mouth.png.meta rename to MoCha/Assets/Resources/gap_mouth_sprite.png.meta diff --git a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png b/MoCha/Assets/Resources/pig_nose_sprite.png similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/pig_nose.png rename to MoCha/Assets/Resources/pig_nose_sprite.png diff --git a/MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta b/MoCha/Assets/Resources/pig_nose_sprite.png.meta similarity index 100% rename from MoCha/Assets/Sprites/Monster Parts/pig_nose.png.meta rename to MoCha/Assets/Resources/pig_nose_sprite.png.meta diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index e8b0f3b986302ac36deef5fbf23ff3b842e97995..5b8f34c695965e1106c17e325cfe6d2a73fd4313 100644 GIT binary patch delta 11945 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 K8x$|6gZ>A9kx-@p diff --git a/MoCha/Assets/Scripts/DragAndDrop.cs b/MoCha/Assets/Scripts/DragAndDrop.cs index 18a988c..c67b20a 100644 --- a/MoCha/Assets/Scripts/DragAndDrop.cs +++ b/MoCha/Assets/Scripts/DragAndDrop.cs @@ -36,9 +36,10 @@ public class DragAndDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD public void OnEndDrag (PointerEventData eventData) { _offsetToMouse = Vector3.zero; - //Debug.Log (Input.mousePosition.y); - if (Input.mousePosition.y < 75) + if (Input.mousePosition.y < 75) { DraggedInstance.SetActive (false); + inventory.AddItem (DraggedInstance.name); + } DraggedInstance = null; } diff --git a/MoCha/Assets/Scripts/Inventory.cs b/MoCha/Assets/Scripts/Inventory.cs index 9a7ad04..b98ffc1 100644 --- a/MoCha/Assets/Scripts/Inventory.cs +++ b/MoCha/Assets/Scripts/Inventory.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; - +using System.Text; public class Inventory : MonoBehaviour { @@ -9,19 +9,32 @@ public class Inventory : MonoBehaviour public Item[] items = new Item[numItemSlots]; public const int numItemSlots = 25; - private static bool created = false; - void Awake() { - if (!created) + //PlayerPrefs.SetString("inventory", ""); + string savedString = PlayerPrefs.GetString("inventory"); + + string[] itemNames = savedString.Split(' '); + Debug.Log (itemNames [itemNames.Length-1]); + for (int i = 0; i < itemNames.Length - 1; i++) { - DontDestroyOnLoad(this.gameObject); - created = true; + Sprite sprite = (Resources.Load(itemNames[i] + "_sprite")); + Item itm = new Item (); + itm.name = itemNames [i]; + itm.sprite = sprite; + items[i] = itm; + itemImages[i].sprite = itm.sprite; + itemImages[i].enabled = true; } } public void AddItem(Item itemToAdd) { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(itemToAdd.name).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); + for (int i = 0; i < items.Length; i++) { if (items[i] == null) @@ -34,13 +47,42 @@ public class Inventory : MonoBehaviour } } - public void RemoveItem (Item itemToRemove) + public void AddItem(string itemName) { - GameObject instance = (GameObject)Instantiate(Resources.Load(itemToRemove.name)); + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(itemName).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); for (int i = 0; i < items.Length; i++) { - if (items[i] == itemToRemove) + if (items[i] == null) + { + Sprite sprite = (Resources.Load(itemName + "_sprite")); + Item itm = new Item (); + itm.name = itemName; + itm.sprite = sprite; + items[i] = itm; + itemImages[i].sprite = itm.sprite; + itemImages[i].enabled = true; + return; + } + } + } + + public void RemoveItem (Item itemToRemove) + { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + int index = invList.ToString ().IndexOf (itemToRemove.name + " "); + invList.Remove(index, (itemToRemove.name + " ").Length); + PlayerPrefs.SetString ("inventory", invList.ToString()); + GameObject instance = (GameObject)Instantiate(Resources.Load(itemToRemove.name)); + instance.name = itemToRemove.name; + + for (int i = 0; i < items.Length; i++) + { + if (items[i].name == itemToRemove.name) { items[i] = null; itemImages[i].sprite = null; @@ -49,4 +91,30 @@ public class Inventory : MonoBehaviour } } } + + public void RemoveItem (string itemName) + { + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + int index = invList.ToString ().IndexOf (itemName + " "); + invList.Remove(index, (itemName + " ").Length); + PlayerPrefs.SetString ("inventory", invList.ToString()); + GameObject instance = (GameObject)Instantiate(Resources.Load(itemName)); + instance.GetComponent ().inventory = this; + instance.name = itemName; + + for (int i = 0; i < items.Length - 1; i++) + { + if (items [i] != null) { + Debug.Log (items [i].name + " == " + itemName); + if (items [i].name == itemName) { + items [i] = null; + itemImages [i].sprite = null; + itemImages [i].enabled = false; + return; + } + } + } + + } } \ No newline at end of file diff --git a/MoCha/Assets/Scripts/ItemSlotBehavior.cs b/MoCha/Assets/Scripts/ItemSlotBehavior.cs new file mode 100644 index 0000000..e160966 --- /dev/null +++ b/MoCha/Assets/Scripts/ItemSlotBehavior.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using Image = UnityEngine.UI.Image; + +public class ItemSlotBehavior : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler +{ + public static GameObject DraggedInstance; + public Inventory inventory; + + Vector3 _startPosition; + Vector3 _offsetToMouse; + float _zDistanceToCamera; + + #region Interface Implementations + + public void OnBeginDrag (PointerEventData eventData) + { + DraggedInstance = gameObject; + Debug.Log ("Removing: " + DraggedInstance.GetComponent ().sprite.name.Remove (DraggedInstance.GetComponent ().sprite.name.Length - 7)); + inventory.RemoveItem(DraggedInstance.GetComponent().sprite.name.Remove(DraggedInstance.GetComponent().sprite.name.Length-7)); + } + + public void OnDrag (PointerEventData eventData) + { + + } + + public void OnEndDrag (PointerEventData eventData) + { + + } + + #endregion +} \ No newline at end of file diff --git a/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta b/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta new file mode 100644 index 0000000..9c6a6ac --- /dev/null +++ b/MoCha/Assets/Scripts/ItemSlotBehavior.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 062d9f417b017b445bd5b92d657b31d1 +timeCreated: 1524730867 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index 2505c60..fd158a6 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -13,8 +13,7 @@ public class MonsterManager : MonoBehaviour { void Start() { - //inv = FindObjectOfType (); - inv.AddItem (item); + loadMonster(); } public void showItems() @@ -30,13 +29,16 @@ public class MonsterManager : MonoBehaviour { StringBuilder pos = new StringBuilder (); string savedString; + string equippedString = ""; for (int i = 0; i < monsterParts.Length; i++) { pos = new StringBuilder (); pos.Append(GameObject.Find(monsterParts[i].name).transform.position.x).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.y).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.z); + equippedString = equippedString + monsterParts [i].name + " "; savedString = pos.ToString (); PlayerPrefs.SetString(SceneManager.GetActiveScene().name + monsterParts[i].name, savedString); } + PlayerPrefs.SetString ("Equipped", equippedString); /* StringBuilder eyePos = new StringBuilder(); @@ -78,8 +80,18 @@ public class MonsterManager : MonoBehaviour { public void loadMonster () { - string savedString; - string[] values; + + string equippedString = PlayerPrefs.GetString("Equipped"); + string[] equipped = equippedString.Split (' '); + + for (int i = 0; i < equipped.Length - 1; i++) { + string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + equipped[i]); + string[] values = savedString.Split (); + GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i])); + instance.name = equipped [i]; + 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"); From bb9a8117e1cf668f04efc6954df0ad09ac187a26 Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 07:02:55 -0500 Subject: [PATCH 29/33] Merged with andrew --- MoCha/Assets/Scenes/{MyGoals.unity => Goals.unity} | Bin .../Scenes/{MyGoals.unity.meta => Goals.unity.meta} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename MoCha/Assets/Scenes/{MyGoals.unity => Goals.unity} (100%) rename MoCha/Assets/Scenes/{MyGoals.unity.meta => Goals.unity.meta} (100%) diff --git a/MoCha/Assets/Scenes/MyGoals.unity b/MoCha/Assets/Scenes/Goals.unity similarity index 100% rename from MoCha/Assets/Scenes/MyGoals.unity rename to MoCha/Assets/Scenes/Goals.unity diff --git a/MoCha/Assets/Scenes/MyGoals.unity.meta b/MoCha/Assets/Scenes/Goals.unity.meta similarity index 100% rename from MoCha/Assets/Scenes/MyGoals.unity.meta rename to MoCha/Assets/Scenes/Goals.unity.meta From d4e4f8a07b7acfda2f2938fec96818856b18c794 Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 07:23:04 -0500 Subject: [PATCH 30/33] made monster manager work across scenes --- MoCha/Assets/Scripts/MonsterManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MoCha/Assets/Scripts/MonsterManager.cs b/MoCha/Assets/Scripts/MonsterManager.cs index fd158a6..24b2b2d 100644 --- a/MoCha/Assets/Scripts/MonsterManager.cs +++ b/MoCha/Assets/Scripts/MonsterManager.cs @@ -36,7 +36,7 @@ public class MonsterManager : MonoBehaviour { pos.Append(GameObject.Find(monsterParts[i].name).transform.position.x).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.y).Append(" ").Append(GameObject.Find(monsterParts[i].name).transform.position.z); equippedString = equippedString + monsterParts [i].name + " "; savedString = pos.ToString (); - PlayerPrefs.SetString(SceneManager.GetActiveScene().name + monsterParts[i].name, savedString); + PlayerPrefs.SetString(/*SceneManager.GetActiveScene().name + */monsterParts[i].name, savedString); } PlayerPrefs.SetString ("Equipped", equippedString); /* @@ -85,7 +85,7 @@ public class MonsterManager : MonoBehaviour { string[] equipped = equippedString.Split (' '); for (int i = 0; i < equipped.Length - 1; i++) { - string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + equipped[i]); + string savedString = PlayerPrefs.GetString(/*SceneManager.GetActiveScene().name + */equipped[i]); string[] values = savedString.Split (); GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i])); instance.name = equipped [i]; From e342a6a0ebf16b3266b89c3fd9e803211cabb0e4 Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Thu, 26 Apr 2018 09:37:47 -0500 Subject: [PATCH 31/33] Navigation Menu implemented. --- MoCha/Assets/Materials/Blackout.mat | Bin 0 -> 5168 bytes MoCha/Assets/Materials/Blackout.mat.meta | 10 +++++++ MoCha/Assets/Prefabs/Navigation.prefab | Bin 16972 -> 40680 bytes MoCha/Assets/Prefabs/Navigation.prefab.meta | 2 +- MoCha/Assets/Scenes/Home.unity | Bin 90388 -> 91244 bytes MoCha/Assets/Scenes/Stats.unity | Bin 91832 -> 89856 bytes MoCha/Assets/Scripts/NavigationManager.cs | 25 ++++++++++++++++++ .../Assets/Scripts/NavigationManager.cs.meta | 13 +++++++++ MoCha/Assets/Scripts/SceneLoader.cs | 8 ++++++ 9 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 MoCha/Assets/Materials/Blackout.mat create mode 100644 MoCha/Assets/Materials/Blackout.mat.meta create mode 100644 MoCha/Assets/Scripts/NavigationManager.cs create mode 100644 MoCha/Assets/Scripts/NavigationManager.cs.meta diff --git a/MoCha/Assets/Materials/Blackout.mat b/MoCha/Assets/Materials/Blackout.mat new file mode 100644 index 0000000000000000000000000000000000000000..47953a2957b73f9e512d0e7874571083df96d716 GIT binary patch literal 5168 zcmeI0&umcehd$DJUYSRPnc1D2Rwax9zrt3QLzRMdM{M-F@2~nVo57W}!VX ziHRo<8jqfgi5|Qd^$#$?10>!I@j|?NG4bX_>+`(tJ44^4hMT9p&D)vxGvD`lzdvSX z-(4ZLeJsRdM}!bVLhQsrh@(eFPmCNJ8C@C`|E#aC7YbmH^TPW2_{`Apo7exIyE*y& z&%gg7stwRHxL)REv=c(4n6j=0sSpMHebq10?+PL<0#Zu%g4l-hJKzuF*q8G@@f$P_ zU`+dd#Z%1b6C==h8RLh{HB1FBh>!Y2`jgQqDSNJA>(D=KZ|e-?ydcg&{~H+5f38tT zl}=$4{;-qN=fXI7zw&cG=FrbUa@G6ACD?v|&hhq~7X&oK7&_x+XY2Lz5yeu)H^#do z=i1M+7}K9eaYPzuZ~4hWZsz9@x$3r`yK=7U^&ZBIYd1O@^Lzm-wbeOp7)9^#4-Hqh z$++gM<7eR1*@MnToj<|9#yS0ef-ohw{ok8&JI_y&qcQ&nPiA5~wf-RL&UJa8>UC}XVcL&V%hrFETy4jTj+2+HJn%WwewM5}ykdAiuHMG^ zU3B{SDvriaRo_1he=Xot}0l8Tr0DuPX;v+=#k z_sk&^*9>7wZpX#~>tWoR`EEti-tZ zF29H_#4zm3D&FIm%y{R}3mfS7v;7nd9le zU4&E+CvMR6g5@hN)(sL~nhLwP)bLueb#@lxYBx^8&b$n;$fd6AN)aa!rd)QHYwn6@ zc`>D0dhNO!$1)ZRftRe+qi{t=$y%c=Wdfmwdrh_s^kCF+F3Z*F;F>Yl15J}|Bsrt$ z`ckZlHJr~aEyYS^#t&WPXf^c1C>D`e7K_3~AyA_2!}zb;5mv}FUdx;M)Hb6?#$h*V z%J^`XE<1}|&riI-k*i7M<}OOErrHIhgM%SoFT&HOA!AcMbtd73{WIE_viCT;qFN^-YX zZM#7reNIE$jqWs7WV7qL(K+m0eePfBl+kQN&3o~t6?I=Uuu*P$NnD@_tk7zq!s?irsk@83-ReEJIAtq`_`>7RkQ3lFgBR7p{1370sgjxNB{r; literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Materials/Blackout.mat.meta b/MoCha/Assets/Materials/Blackout.mat.meta new file mode 100644 index 0000000..80f29d7 --- /dev/null +++ b/MoCha/Assets/Materials/Blackout.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8b09d9a7c0cb3ca42a798802c96d28c8 +timeCreated: 1524748932 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab index 5ae202c03bc31e3d3d069e9d7e3dae44c7b0dbe5..b46718cb0789fc505727477d315b406555edcbca 100644 GIT binary patch literal 40680 zcmeHP3w%_?)t{T25QHkALQo(C1>|KUfQVFJLwE!TBn=PI;$xF6$;z@DH=7W!*6XX% zm!gFvzL8?JN)h`&YW)fHb00!Xxa%7c!gWzlb@$R+yY20d3GyeAC4|N?&4^hbk1E46&5tTts=u*$KFe z9XxV&mY7Aqb@0fEI!ewAQAj-Fl!rXW0=Mv62alY`0S^Gr^vKx-xQvuwvTU;HB63-gR z3*42!C=!b$rUn;>ie+U2rq!t5Y$?&3G!&+fefYjdt{uGpmLK-s-|%Ut|DYqTq?kc* z9Vz5s4bF?CWpsozICSL>#Q?>`Hzj6C936oUhB3fzs)N+P_^nL`a;Sl)1_slS21hif zBMpwk4LRTkQGE<}@W{77E6p?UVQ}&Tz?A`H0|kSVPZ2nbA`f^N9EGQg{xt9=QXcI^ zRJfW5EGG;O<9d5xa1^c#coF5H0~j0x7bC~<(CGBsz83- zaJdFY(Vs(QKpzGt8GUJR0?p|wgVUV8GC05u@hIu%Vj>IOz~CVG$AdIDvcJ>>=kcHn zjwR_}fvcpt(2r|yl-@oi{Q!r-5h5VVlP;|~${7@u!J&yf55%=NzFfn>+{=P z@C^amH8J(2IURk$hdi|uK_`bIf}c)5i8ZIAFZiHy4Mos7l_G+lPJf9tr!&C84e6Myq&)OC zkRk%c+g)^BN3oFNX%rEl&v|5renn~6ZuEtqR)8;+x1OXN=nST4X!uh$KE#JVW8*`8 zI2;zx8Rp=M@3WK#-_t23~*LVvOoI z^F7mtGvCn;uK0dPd9;`8C50TK<<;{TLUsDA=d*n{^BwEMneW#fJWclFe#%4t=TJmI zzoUP<7z!V!V8RWNP1q2M{RtcI;AvtEVN)n#d`@t1HQ#yO1qdfoK~ZhUc%965a7E{Q zn-2UE1phcMkXUm%lN?;pxx}V38AK@f=}eJWb2?KU+z^)$jUQ5keZ$-!@rh2F^lR?2 z@o5h3-H1#l+z6n&cOx;Fr#SX6gYxdKFz$sv(2|Do8!M6;c1-yf}l<+GkVt$nar@$M1ZdZlG zEQ#yw3ORTOIc}E|9ni=6rs!vSVs&Y#SSL0vlzc1mCa~W_7Y_EnA4tXvEXaV=ylW(DH0Jzs) zT@GAE?|l5Wjkk7RLfeXPB_BX|GIWR#QrnyUvqKR&C20kMD(PH;CGHrk{IZxKFpd&%SQo~!)67WX(4iC`MU^*bBo1CZKhou;~01!ifR+1 zHW_eMfoJ=0IHka`*sJoY-`V-hA)KAQa!O(m#NyTuxP>}t;(AK1p$PmGx+>fhzog`o zHh!vud!4oZ4(@f<1^}l3XAN}NS(BS-3wQ^Cjq58Eq36>mBKVy(Y^Ie{lj(7420OTN z*50B#R5&c*|5y5WAvLHV;(+F&z*Asonfz33}Q|RF_ z8<(5ud{ur2wQw8Zpd&ZabOoKe2!F-Kr-Kd!rvEPC^k2ZG5@ZzxW)QBjEPPJA3~H-jCn+ zbsStcp`mzPD8Htf_5q}Oy1Nl6AV*Gl)|63Bp8ZSy;#e);uZ$GH#a|Mxfxm}p#pD!+ zqw2PWAs%?)oRjA~yK`!|^32$8s@9!dcgMN0?GrBkeDIoW&)#w6X|K?#CeBM!qw1)q z<<7LDw=Ir(T5Ms<7lm#zZdRi9rmL}+t2=Nd_cwq3f z5O_z&p0w*}d2g4vw=LAM_M=1xo|E*nBproswQ=cb**H8fdc1{r*`8Luk_VpC8+Liu z(^7PB%ntg})6(eEV+#^zPYdk={R4#4e}NsJvKtETX0NTdZNWJB_9h(ku@gjKPc+ZQ zaoYj`_+3j*6 zU&-^cDY0l`QZRutTPLZ!N@U@{<7!`KhnGpGkdWDlr4ghjhH4U1!YD8^9JPO+8LYQc z`E&*x#rYxqF4Gg2P7TEthZ6Cngp`KMtLB92@nc~u9$rRdgOTF8P<&w|wuHcW^kf`8 zYo|j+;b>@fb+BALXd^4j6F^hEb?ubRyGkd_TJl)Vn|HnQY&fHI#tor6F8ku#c`uB- z=pX$b#z~DjEjW4tm@nt#(Gx%;U^TO2SU1$p+-t|OY`nF0Ob*L*(G;57?H`|vnLn?~ zfw4dDa@~%j!&0tVq+;*EXeUzd(P4SuKz9tYBRDL{Rlxeb?TR%;b8nsg&F@c{ciPOy z(knX?iZec})CiQeU@bYoJ4p3*K^H2N>S14;^TI1JDXLkex*g}F9qr%v91Kr^r+V0z z>2ydzC)2^zQ{br{He@=-P$>N)U^vA3#FBhm0G*UQIS;I?N7fY(=JY@4@SF8$FE(c(^~B^ z9lv&&4r>>q>95q=IBmw=4~#w`atKwvDSUIZ3x2(h7g7%Rv4FMm@U?+MS2_-#8aPI% z!ig{WxbU4p8@%=M%(t5lXTHb#aOQi0gDd(MQXceAbZ~FGFv)ekOdo5Hjx&9%JuE-o z-B?69j34+k`4+~N_fgT4fCqqkee{!oQv{B8e=ZU3yBi8ur{Mjm4D^P(PmJUAn)?xV zpA>FLI(3vsd$TDTGO9ff(@}Syq@40D4b#bS%BxfGD<}`X{UmM?Ev3)zQy%nBk@#vt zz4|=WhqFGxpS&EWJnIuyK;edXjoP(_@*OD-q$os=Q=Z4eX+E6k4{~rtXFcUX2X~*6 z(HY{yna)rLS9BhxJm?H_aBq8|Kb=0)$#rl=XFKIV2m5BdJhw~TeRA8&bn=|?iVp6= zfzAjA_sS#hK52SmI=K4;zNK^q?YtY)YGX z+Qd+ie3cH?JLyn`#txgCNuh|`G?j$wVhMo(y1MdT8M3|fM>U)tOL#Ev((GGIf!kz@ zDH;@iw`a+uv4q`AX&eFqt1>U&yKRjr22tix8@uff1LAM})D)`;yVAx^%m@#-VJnrR zO*&&;hm07v@nchLAdKlHmalkjeQvrKPU~*iu3K36=Upq8q~mbGsk>l%!R_xhq>Di` z>$vVO2Ogide|5UJm#`n&b$8V5t1{kB7h|Y}=h@gl_x$zRDgPu7moS#)rjP#d=Dxk@ zBBz6($ADDZI#fh+D*l}=mJ`NpduwvHrI(mgkyaMw`~H33d|>0C3}I>5HQ&uRFmO1P zqtVCZHlDxdzBfivIl`D;?o;ngT|PEL>?Mr#T=iLWeDv!XqKZ}{F1M#=|BtGQGQ>{8 znBLAM>tjEimmx0h6Oe6&ba>j8DfiuH7xl1 z@dF>q5CO7SEX!-6jkIaY{}t*fTXAHMpd%^6}fVJ!24 z{$1`j_GE~jw7S*W<)%OOo%>>aI*1j7aovw@JNDsM@;ivVgfWi`7uG#7`uYy^5VA|} zwVz#4cWo1uBaGYDqv@XKHm&ai6o`GQ}>!SXT{WznNyGuQIB;QJ2to zqyJ*ddmkM)Y2+%So>oEJ)~4Yl%5w9D++MWGSWYV-WAjgZ(2BRmfYFw^*{@wqqUe{m@%5mlU-83Wp z$FDUQ)r4`mLE|rOxc!|5!|LbKyJg!0r?2~r7Z zzf2pvv%b-&B8+*Iu3B5ZnTxo_J*Bt|!(t8p~;w8fDYVebxBUghv~V&9p+X zUgCTA-}#$AHX2)K72>*`-pP)A@^Pc_GOa*d_uIv@R_5(*G`i-wvUCi8)uvn*1URVld*TSi#;*+zA?|8)ns%e1I_f7ZP*gNHPK{rrDqjbf2Gfa{?w(u$rwY= zDKNdA3+k_a&}uRY=@|vacC1-Yu={(|4thR;>7CPXUuo7`Cz=;ePzO+C-o(8>d-x|g zeY=~>HEh_L1t0bp+}+%uVdMnRsDykdRA|7?P;G?@q$*)v&9&_M5fs=`8bk4O{p0Be~bVmSyhM zu$!J4F>QwEY33BT^y)_5*}3%XUS=U-O~iwiB~d+VfBDckz0IA3ZLqQRzq+pOvkQBh zD`?`cwXwRax+^Ld_BO{%cCqLkca&dwAJrv{>!v?n)%}EZRCkKYBkjqUJ#zZi^uG=5V{Raf z<=gT0vYJt2`$z;} znIGO$kZo2MyXA(ze&ED=W@no@B|_}A^}J`=B~8CB&o+C0!OS8?*8usXI z1J@2%l5JL%x;!TJd~@h;?$0&_-3?*B75Pgq2(QaFn>1|xHT!#P-z!?9 z5B`0&xrH!p?@Nzm&C7i`+pM4KmU}mN%2m5w$u_&rbIWa7f6?kwc9MLAG2g)1yYD|? zSGGC-To>EeaCJ?m%)aI>4O{oKP8;s&-q&0{-z|4?=UbM&Hn6XmbDoR6pHcL7c5z>G z6JabL)?kC;`c3Em0UJ-G-~G?HA#{=W_DprZD2?(vmp%Yk`T?9KmxNxtD4E-L(hpbO zHE6dLIBsj*<0e4yqko(>%E-HF@-6#bfBS^9?)kPt=e>W;@2*?>;^bd^t4EJ9yR$+H z{mz};rtEvXIRDRheB5eKb!rFVNVrooO`#hcf8A!VX~pf!zV^tI)7LaE&$;cTtA60si_H;z)|$Y3mM<&MdmU!Pwhi>z zx5Aj|L{WQ1LE6E&beD%7vadi{e*n*9e3>8XlWi61^SX&Nukp-#Vz7KsB|Q}%C2p|6 zE%648*6`=~it@ZhBhCH}_@`6E4XU=_3t9+l?~vy832F9wk!IfvGQh7@FA%g%`&kZN zx4@6rU8LC`MVkH9BOwQm173H)kNp#**?&G#Ydji@MGT&Y2No8DZPU(0{bOMvww{=?=g|)y&KZJ$2t_9e3?Dq z-`KwZeaw-Wp=fPe&U^M%&=&Ufk>-5~(!94kls2M1w*_eqYNYui3YS9K0t$n)iCF=eDx1%$I#Q@Z!A#(!3W1U#w|IYF%M}5j=UXfi#~b9BKaS zOM)lw3z6o%{gLMH_|?Rd_mSYwXApG~`=n9B0Tl8Z^mPtwWr zTyX$OFh3q=ygx)4-peA*=V6D^&erhdJpg#|o)>983p&#M%X>%gS;>oxZ?@3SEnpJO1+XLLuZpLw4RUVPqxG@pgGHDC6Jc;60Q ze9i}6SSyM`^geIAEEbGcw8|IfJ_9Wd+@I`+@_7e-=QAs$`AiyVKC^}#ZS4W5ua6o51(lw z?c5WfG@tE)e_M|u)-#_qfj6HKBh6>h-1fHedsxqWW(Hn-uK>JoR!yHMTu5IrY?JZC z`sQ;s@N>?yDb4pEfb-e>k<>SzlYt+fMzb}_#J`Ah03+= zucBws9RoM+*D9DQuKE8upfsqzxnww=96q3wx@ZSY~5{d{yE=A<1xthcCiK(SBIi>ekKn? z`F9>W|4aTkKL^QeOg1mtlRwJO7PCGM)eqq3eVI;s*DF6yt?Q$`*&DtOz&hYF&h~U3 z;9qwRb$;=C0j$gRKEL?g30)uUZGQ3d8LR`oSJ9s47mow>Rg%q%_T=aCdo4UBaBWZf zE%Y_+C2{+CT;Qtjv-rIkE_bMQncqQTI=K4JKiZQ&$?qPq-jnI0J?P)$H zyO)iz!TR8Ff~!71lbxfrxAmQ$17=?E zsP}{M+y%dDLdh2G8h=kf*O%Xpz`lOf?FicH4`>ti3i^G1Zl{FpKf0ag?{RQBT>biJ zkNYuQAMMSq^7|I71AdmdJ=s(;+Xq{owmH{5#6~?MHh$ zzu@obu-=mCqdnPEey&2-M|-oU{5&=5fZvsEPxjP*UytntuDU((+uc;<{C-QSa=ia% z-KQ$Y=ddl6V|&+9Ilmo9#n-=&OI6N)u9K=9KTq9~eE$2Rsp$FVZ>n8{wGyA|9zfR<^0drrYgtx(OS~8|J))KJ^yomsml59pQI}1KMzh-&i@=r zs&f8)Q>t>TKmB*?N1EsPIZpM9{!WayEa$xC8Ko;|JMRH#xW}&WbAtNsUnUpMyAb%D zNu>EbS)^MIhbJ$OFE1a^)C2Qy-!IVLq2l-Ql8sSCh3hlToF~W{KTbKRQ=rM}>h_xL z7gJEzmgUsn(d759lJRos=`;^sPJVuy=vi*mY2u@@S4`l@{ja~XtAB@pzj>hc+e%99 zFX>Oxw)?9(pH37=w}lg_jMQziw(5FiyQa~kq*q>*2j=4XyL{fdob#4vl&-Cki`N&e z9wlA=3TGbfxYXYT=Jy(t>A+i`xg30d^EWIZoEuZi$^ET=Q$_#IhW?EomP%dSwkkdB zdRz!Z^mXg|o7bo2v~@)1rEvWnV7;W9<~lB7r&`tD>}Ppvr`98v<2lXw=GViMi~UKW zYq>GCTs+qFZx^v`=if9LrEVzC*T={%QhH0iiVohQePlmSqYZIER}08@7ZIlqhtZ(rD7 z^U_W&CzsQ|VZ@mC>X*&=wN?Gf-yo)1mK#&c#dc5s_KE(TEner6>yqi>x{KzmF3mH6{Gu(EHB<8NfPXNCZJ0SL3#o0;MQgS*0QS4f4%a$yea`&$n7DCzsQ|Imnpz>er$3YpeR1 z&u^SsGLc$;Tu$E;G3LDLNqNmwk#Lh1FtN4?(pQ|a}%AScMRhf=HbfAW6WDm z&v6|clj&CVBfpYk9ASr$>HooM>8Z^vab?kNUSE^*PIW#PbSCf=`cEk&QmM^@-0_y|lgZCex$7 z#(3*;?(p=;=hjS3U0aq*Un{+JId^z+@%b`SYpq=RI_#~>xxH@4i5?4Pg{&98?i7e8OONq3+G&^W3 zih^cApe75PX+I*6pbOcB`eR6f6xlr_u(0#G@6~mA;r-s{Je+gBbIx<#-cdX}!E^w& z{Q$W|0AL{8r86?^;F@GLa;T9xWy#CF=3{E`5!WGe-d;zH zE4iCl6##bP=z&AdWh1F0-Rv+Kdh(Tsn;c3X8?Nc`u;XN<6R9NfNRr3j+Ix-#$qBj?1@@R9MuaJ<}R_?uPWpgS7N%lu5jFMFH@v3{W#8ZzE(9AZk`R$FZl zD=acD#4;6T@4m{^3(@~(PjG!RiER^cqT1wLA2f0Vo~caG$oUtrT*n{yQ%jmwOa`0m zvAE^59^32@IMAs=cdJDm(hK9yZj1?+Dl8@*D|}Hn-JZ4hvm9UAl3xEwx>#X#*E)2c S(i+3H6hbp>>M-H0PRnoGKrAW% diff --git a/MoCha/Assets/Prefabs/Navigation.prefab.meta b/MoCha/Assets/Prefabs/Navigation.prefab.meta index a619c74..c9cf27e 100644 --- a/MoCha/Assets/Prefabs/Navigation.prefab.meta +++ b/MoCha/Assets/Prefabs/Navigation.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 326b00dfcab7e8c4da45c990cef3c9b6 -timeCreated: 1524679668 +timeCreated: 1524753018 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 3751dd5b9b00b124b444682849f51966bb6cbbe0..0e6547a417ff4b2db4d3a185fec1289d58977553 100644 GIT binary patch delta 6378 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 DNd&J7 delta 5890 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 delta 6273 zcmZvgeO%N<9>-^J(IwG-gxa3ixfUq~$R=JQ4+=)cby({YahDHkrzxG{T0T%_yJ{Ml z6*|~*rL_bqmJdr?LFEHp=22*3XUVJ1ZZlKLtJbt!FFWruzx|HmAGfd9Fu!@v{JzgK zvx|36Z1bU5gR%9sj6cxK7)!u&OQUiBwBUT#r1;=N(=0sLHfLgYJ}PLh$dC2hF{LF5 z%UJ6zj7>*xK^sHNk;+&A<5;wN<~nae$3kF_pqJ~M#9V2N)nF{wjUyHTGdN>bu<^vK zLl{fJxGS3XyWBzOJj?<3M?6V^%c77~f$hRr3jFLpBjrNo%wTLKdb#d%VjW;g@jr>V z9a_n8Vl`mxc&{7U7sO`YDh>2REnK)dEDd87Lm69$UMg8cEDR>25RbN)m_L&-H^x2C zP8AIsjE)(@-~f90?rCB*V9LNwVvgTw1HbVQECo~+eoHLnHXXu*{^JpN#fLSoh;EpHJqKbUmRBlqHBf~|n62rG!y{9b#v^g>=1ma~Stw9$_f zbNoRo@epeTQ$~A~6vxeC0d$hpD z8>ge38LI+QQFxu0U7TH(=xKK9)o;*D2u!*CCb7Uc?e>Yu@1pn_YZ&$D};nUOavdn}{*L zi!mEYyeFRLlnuasVXS$EHfAod{F&OAa$+4|Dm(Ltu?Mun?y`)iz;-~Doj2QKv9WOb z%`z=C4Sb7OzL@_+VqSQ*&Rg~O%gxmlWm^4uV#b47{qw}K#6C!{{zdEa{4fuD5l+t0 z_mP)a6<7dsG9b%{<%@)si5_RUmYwbT(UedDrjE}XViB+>@bh&F~@RTp>mJP^7|LT2w)Y)3250jwcxm7ta61mFo&3ds#6B$ z5^Dfc2IdiK2U7-)B<4ptRXS2qJ$-Sap_EqX{V_N-%2J-x`{Nd39boF^RAQZ#TJg-f z(>SBB28ZNY^s+P`Al3j@kFj)k7BQzdQi&X_#<$0q=owr_GyXMN(}TnU&uC4q*Y3oD z##jd!!fR@pPR#YJ4$u9>B48>!e6Kd~A$BcFQSaT6`gGqUE-RhEYGvqq2&}I8{i6;tKwN|`_78>id)z1*i0#nI< zfB%@7QeZonGVlN~$MgDIW&dA4HrIv07Gk}0#7=Cs$EQ6RK+pyaDhf9eOZlrdrgc`r zEUDNDrV{-Du}(0R=nsiiy}(!@)?b6xMyvx&rrjg&-h%`~8?@p>#KIf3;?!3!%dNz0 zFX_WCjhG)yMJAnC*30_cA;er@YFlKydf8(NbojO6aMEsEFO22aY9(ihwSp-nKN54j zqLrK@Rtct*oF`UVr*-7#p1}pg*z9_bE}8;@t%%=IOv<9!wlxO#2V?$CFsMuPvKHkl zOcrX;d9Nmxzg4Gmd#MixJ-)Yqtwb;LzJplBtK)m{O8W z%+;usRb2>Jnm|VCpct zmst2M?MNvx)~pPK{~2S`aZ3UK&L_nVVtz2?-L1s3-o{!SDsfmll$h%sB@ma$uT`eJ zO0Z69uAx6(nVcua z4r(Po5vu`Hh5j?KhC|Rh9YVUIb$jyL$ECn_Ky_GHiIsk&1;!BzgQ+X^8e+D?+UV}Y zIu8fGf9~O!;No>3aigRy`^c`c{Ni^?djI3As*XFwsOnkbvdZr@BD~q!PyN?S z22x%ZcTZnbHf#EVvU%lv8Ha=0Cgiuqt!N*&nhJrF~9vcV(QMWM(FYn z`|?>B1z0p%wxDZoq?a&$=oehj(ac55rKfL zh!OF1)_&>-wbY<~G|OlCqgu2dF16ric$RRt_YqTTx(Z{j%_40QXMMjFdp26do*h>4 zi!V-OY_^Iv-woz!-?s7mQsT7`qMfvlomsw66g1o%l~>SU_c>#^HF)r33l}Ft$#sEK zTv$&OM(L%~plePg*M+{}B5=Amn0BTmR_yvFxz0GtMd;f?X?k$-kM1tKuQ>G6aPx0} zvFoS}PkBGf@%Eqli?mPVc>9&{26KGF1vx+ILI(cszHp-$^=WVONz%cQBw0xuNatrlTFU}?J4hkLvD*7U}t zzb_^OeK3jGHT^q@hpfKG`bzo9nD8fI0(IJyJCIXlTwRCio10k~_{Jt0_PQ+cdtY$Z z?s#rKA-T!XhYcHtS!B8YzanXRF@^us%@@9z8%=%(?-#?9n|2T7H*sH;11Oxy&vW0d zp)kvO8_Wu2l35dn^Ayep`lgTIeZ-QZ1L)D$mc`YxICHdz<gN(Ya{)%{PWCA`4)k z@5l%)NnAG1KsO?rXQG>%%}1fz9__x1cIi3hk|{YnhYu9{E~c6xI+(*-V|=a=+#&)m z+P5^1?Xk&+4L<@5>`@-Hu|5yyV4(jcGokKerlJ?`ks@&KIu79yNO4qVtc!Z?pp0 zM2jzFU5zFB?!hgE=0n}39lY1m^sSsrb@)h)B4ukhx-`CVzt1{`8^YL>6(!iuTZ+eU e3m@Jz_AdTzcQgObm+)SqVr#rviH;K9Zv7uY!466Q diff --git a/MoCha/Assets/Scripts/NavigationManager.cs b/MoCha/Assets/Scripts/NavigationManager.cs new file mode 100644 index 0000000..e255db4 --- /dev/null +++ b/MoCha/Assets/Scripts/NavigationManager.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class NavigationManager : MonoBehaviour +{ + private GameObject navMenu; + + public void Start() + { + //navMenu = GameObject.Find("Navigation Menu"); + navMenu = gameObject.transform.Find("Navigation Menu").gameObject; + } + + public void OpenNavMenu() + { + navMenu.SetActive (true); + } + + public void CloseNavMenu() + { + navMenu.SetActive (false); + } +} diff --git a/MoCha/Assets/Scripts/NavigationManager.cs.meta b/MoCha/Assets/Scripts/NavigationManager.cs.meta new file mode 100644 index 0000000..c392c20 --- /dev/null +++ b/MoCha/Assets/Scripts/NavigationManager.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 658e48ac784a5d543bc76161835f7156 +timeCreated: 1524750227 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scripts/SceneLoader.cs b/MoCha/Assets/Scripts/SceneLoader.cs index c318319..d61788b 100644 --- a/MoCha/Assets/Scripts/SceneLoader.cs +++ b/MoCha/Assets/Scripts/SceneLoader.cs @@ -26,6 +26,14 @@ public class SceneLoader : MonoBehaviour { if (!(SceneManager.GetActiveScene ().name == "StepCounter")) SceneManager.LoadScene ("StepCounter"); break; + case "Profile": + if (!(SceneManager.GetActiveScene ().name == "Stats")) + SceneManager.LoadScene ("Stats"); + break; + case "Monster Creator": + if (!(SceneManager.GetActiveScene ().name == "MonsterCreator")) + SceneManager.LoadScene ("MonsterCreator"); + break; default: if (!(SceneManager.GetActiveScene ().name == scenetext)) SceneManager.LoadScene (scenetext); From aff276ff78f7f7557c79d035782ddf80b1a95f4e Mon Sep 17 00:00:00 2001 From: Darrel Marek Date: Thu, 26 Apr 2018 09:46:58 -0500 Subject: [PATCH 32/33] Editing goals page, added monster manager to home --- MoCha/Assets/Scenes/Goals.unity | Bin 31216 -> 30908 bytes MoCha/Assets/Scenes/Home.unity | Bin 90388 -> 91500 bytes MoCha/Assets/Scenes/MonsterCreator.unity | Bin 96956 -> 97100 bytes MoCha/Assets/Scripts/GetGoals.cs | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index a2ffa524ce9d36ce864635c2e078612e32a72e93..5333b1e135f8d75df9817a9c283fa63a3904413b 100644 GIT binary patch delta 349 zcmezHnQ_lYMi~Z%1P=y=iaiVr41z#*0+41fGB7mPGuAWQC^IpJQEBtKm}iXjLd&a^ zL2?Ov3=EAxngxi3p<*w9VgVpN5Q{*?Ech813P5}y7KMtf0Ez{J_&_WM6=M)!U;tUp z4#XQBLx65!U^oC2D+SUZJ2pYYoER*C&YJ-g04dxIRd@j?ro+g z1Y%zU^?D%1paB#!*<2eh$hdi0!X%c-0mZD$2RsjNHb`Y*dj|Lo-lHN+-7E|XEwQ^OrNI`x+#L=_XOBMMS+gpTa4rP0l8! z6IylTEYHH?Cf{V`-&kr?-sxRLYj8z|c$?jWT_JiP|MgKwUTt?1Rp9bnz+o-0tjtiK z!_qxOrp!>k!*0P=WrhaYtV}9C&jye~s+rspj2^)(xExY*SlUl?fh^w%hrNQu7?BEg z=P(r$Cy>3+iWVuuNCVT{L_VBlJxZwgor)6io%J7ntgFJ%&lS}$Ix~iG@=)7U7!Mco zLN{`Zk*IG)JlrgJ2c5;B6?H<(8>Kz#09~?$MMZ9sUlwAF@v0eM1H5APqqUpA7kooO zI<6bWOB(++KPA)!6wgWVeSJ(cb{kBQOBc5J?DGDvKggeoAz>G7=62!j3?Dxn=DIcL RDRm&mll;SqiZ|=k^#`=pXR`nR diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 3751dd5b9b00b124b444682849f51966bb6cbbe0..beeefce25a07f329db1f7be624105e3d7884a637 100644 GIT binary patch delta 4009 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 delta 2261 zcmYM#ZERCj7zgm@E^O9q)a&lX8encyFcpawqcBWnszy>&vchJ9Z=@<{)d|}NpaZkp zY1HxF^^UY`M5<2H2=0YxI?bY0r>jO|6%|d?mWfG?e&`n%22K2*+vntv-JIOtd7gXD zdCuwKtBd8+7s?$(L%))?XL`cnkF0eqAi^Kb*X_Lv4SBnXmZ7b{)42E>+k&t}c`2@m z&0!5h46|vsie4QZy<2?22Xmpl0#6HD0Co`X7@O9z6=8n7Uy0}X^<#FfH>7giY@1;+ z_Xf5C47pA_+1yZn557Sy)~W%c)!(DSU*MiROb&JR9WSmE(VjhOs2Vn()i+?6arDRm z_qAR2iD>s;Rf7F&nQ-X~s0(hL(lyLl-&vi2g>6@khgKmtIo2$Jz9k?Odl_ zd;jM@w29;vt2t_zX>^U?tqRX3?g_qvPnQu@!`j)p_7UkC(Lz`UTX;XFk9Q}YTd)1c z{%R72O{Gdax3M)HAd2H%jIo++3g*_xq$R*LjCmACe$cb4XA`=}aY)r?67=c_mW-ru9b-;HR1J<2K4Ks@_aZKv*jB$^9T>TuX&g25< zqAW~ox~S$8h3 zFs16Vn=J&B^;z1PenJeKfXUnjHt&Zj_nJ<#6u22ElT*w6PmAO*2Z|NH&lZQt6@S3y z{zy&wySc5;h};nDIkaM9&af3=Gq^meVBfQi`#(l7paIYEw&JsB$o+{b*Q;z^m>l>7 zTNWmcuQb}Eu2$RA7_i_CRZHmy~&y>EVf2RDy+r#(6w0 Date: Thu, 26 Apr 2018 09:54:29 -0500 Subject: [PATCH 33/33] Navigation plbs. --- MoCha/Assets/Prefabs/Navigation.prefab | Bin 40680 -> 40680 bytes MoCha/Assets/Scenes/Home.unity | Bin 91244 -> 91940 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab index b46718cb0789fc505727477d315b406555edcbca..5f7be4ea31d1a225211558ddc0db946fff60848f 100644 GIT binary patch delta 22 ecmaE{m+8e`rVS$D>~Xg|H6K(=-z*(|)*S$PPzpl; delta 22 ecmaE{m+8e`rVS$D>?fYT<8v{dx>-8>tUCaHhYDc; diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index 0e6547a417ff4b2db4d3a185fec1289d58977553..c3bad2a1f20f7a80fa53379367a8b2fe280c673a 100644 GIT binary patch delta 6937 zcmYM14_wsc9mk&s4m(le5Yj^k(avNcawJVkQEY1GguE?ntf`=7Q6`>F4V&&z)ZC_p zKH879Y&ic6TeQ=Ijuttrwyso!g-T6}R!vqaxU^`c?(;nNeSCQFyXW`3f6w#%Jl{Xh z^Se72j@i>1<6x{lp7BRqjIjjVySF-$c*=p1pZp*=bLzUhQTe^(Q1+wcD;Jh8U$Sf!^Lm#ro8X$h zeBt7W>`{Dbpa+1KuM8ep!xQ*2vGvb`gDF$oJSLSxBG~$LT2#)+Zv%1Yu%cF&xdx#Z?wXonF zVk}JZ<;F`36<|BbLIE+S(^!~HEFjvqCi=UQjfIBtIHZR$`%uRAl7&WM0kCE;>BTF= zd?}2{bjVbMh&6%PqZpInXd>2v+&B=d{$Q^XYfDqQ^OW;N?^h||KER)1kaYfDV#UK4 z3!pEB+ulwbjE33M8QXwXj%z1Y4W@(i4`LbO@HPYq)zgNNc3d6wBz=Tg()qZTlvVdF z#_9!PO(H?Sg3AP{m!4FBX{#5Bc}5zmJ)<8$A{Z+c^I@UyR^!D*dQvyagzCS<0^c(h zz9iNn4!}b9Z6?^4Z{MYCyE7SE3k?~EuZT5)={S5%%q#fzM1RF-v*K^)i6_hGjeqZr z$co395}ZJ+6HHspC+5pGb0-q3bel-+vhGK5F;)kLRouuGl-tO6{6R+h}We;<{OhGpDgl6!<$ zKuq3|==Xfz=pCacJ}{l!R$>L?%vw)PYL^?AdGkyHI*E0H=}^5-%y*~J_<&dq7&OG$ z9dY?(cNyE|3qM4v;l+4kdkHZ%!Hio<%pr1~P4wsG8`Ts4OG8>=9c(FD8MTwdJQGc9 zP7&(^3uAxE1IRUhDALMUOMyAbMiR@L9GNSRnOligE<-NejMy$+ScSnUr@i6;5o-d|Cs!h|aG?=CaIc73;ANqKAur^|4VCT@6(R!!sDU=K% z?TtjsFNNPF*afI7@CdPrADLAjB~}Zjqjij!@5jdD9~LK~G8n7GN;aUC8Z(I5XBmyc z;zYk1SPQ6gQbYs8U|Qr}Vl}gk$h<>$poDNr+|SsrNTh^V-cO83DX}&%tudci-%tET zWC6i&u@R}uxrUNttP^h+{3}oP6U%!5)ek1a`s7D1Ohv=k&rJ3If>;HZj_PV+jya?O zeYS>RI?7zHu;cXKl|c`f4&e!6ZD88qNn&O5%-mDNs=;&wJBgK+80XgR-91g}GheCM z@9O|1>ju*zRm3XiGd7wt)(_9u6ALUb!dcVbQ*%4P^rFWQD}B(|%O=+MAojoZ*iA6~ zA+zcnV!dE`JDvFA2zEOD9%gJI8d+Q?iIsr`(2v1Yd+S&a8s>Zi7uo^1(!K90<_3$L zDe!+d!D>J~dB*R)Py-9f%voAUEDWY2Q$(y3FPRJo+<@y|Vw=Ep_-7I;e#|(su6^2c z_|I6`A``AE3GvqprbX5h+w`~**+47+rbRXqt6XeEveUl73By=*xjDGp#2ia-{%VhN z2(|#iL6(H;@~K~7r$f|dqVN^50GM82A2H8TBm51q;$>#h{@p8aO5j`oTZK3o8jx|Nf=D~SVgR6xsl4M`bwFtTVXco7-II7=IiJ1H+JGc!lngV6_IBn zhB97rfHSldAcuM!J@?E#aec#T-`ljf@!J06)^ z3#PyK^5gyptXpk_qiA5$8Y7(N^(o;lFul?4Bv$rIlbE}R$uiUBIi6Ssn2zcMVtsx< z?eW!*C*sJ&>X0gZ_FW@Z2ByE&&%OF>u^gAN&K$(^h&6%fDk&l6tul)#B~}3@7vs0% zV?II8db61HsS|PB;=KiTwa3GWbpdFR5yUDs8j)Lw)q-h{UBrA(8I8v>7x{5kqdqqo zkwuw{6tm+UqeUJkRtu)Xx|moPOpBBgtNFDNIrbyBJb75%Z;VDOG52PKUyB?k7~X6| z+KBanX_0nfE%+LtQ}@q}zrxv%F;8FLXzVnx;%AJ;8DhO)$`RwmsjjmxvluHQhc2@FLhe^0ZG#0rprV)?~%FyK=J zYXE)dJ8;eaTca{)|E&q`0%Fx*I)M)o%XrTC{SYxPnD%=ivGm`W*j`-V--lNPynEhk zs{byCuof^a@+Gn2okrvmu}Uy4a+#R-1tYTjg@^H$VXXA`W`nOF*5U`$JKXYogx3th zUu!~LL#zu-R)kE6e{C90cD%fHAxda%xGISi|H0UMy8aP0&biw}@EKyYVA46iG+0eA z56M*Z3AUA3DVX+d8!`7@T{`%in z@zTLWFl=(=T_3TG{l?%o#9F}gqW?#%8%!_yTVhQw8sTGA3s*>u@Sm^~wMZ+$;+OFC z3lE3jI!h zO~`RSuqTMs28?%qN!|Md9F8d&l@?^NI<_F8w2UZ1B|HzeWppeLwN+{^z(&Xc#6&T}T!M4Y{zkzad3bH#pVZSbQclrieb(PiP#g#wRu2 zB<41zsAo>GwP%%5^Oyqem>6M3~<;tzxIGz`5cy)A?sD0TcK7Fl__ZKaq&Ic%W1_nQFSrVmOp7my#jmL?bj|PLj@X;vp{;gJ*XgM+`;=SlT zKE?9=fZKxuj}`0qymitgx?8W0I5j0Wx~(#rER}ZH$P!Pm>eKj0@%hOID3l2z=d&5X z+|E4C2Z{WTgTeF<_Ry{Hh4X@e(=SD174@G~iLNebf6J$5mAcsU;lN<&zY6sVE`8|| z?oag!oRd)#THkBdA*}RyTM3h2*QFLw`;!$*NnAmgBiM!WTKkNK3krb5utn>1@ z?5|h-ovMH0d^TwQg%M&@!%gZ=j@o|#NxL9t?Y}S0*{8+ds%J3Y~$D?_9!pNqg6KC1ZENWtH6E zl&>8+1n&A9#hBLz23z~~$(W&TceuDq^nFM3EDz^}!N;%atXZ?7xod}q>&F!~9?5KI zJLjdaYHjJytE`G>Il@{T%g>6g5A310Z2UW=9eV2q9+tyyj>j-ZtQvMD9>X>_+e32( z@D47EDuim(8_D`KiMy=Y`0JYX!F-CeYMpcNOWYp%IDzkm(^mZuzQKyUiK9-eElwWE zd1%&PE*EbVr9sf`RDxN<_}Oi5+eF)0Tb%x>BjcB2tx4vKu)A$mcQSuT-X!RsM>yQn zU$kiN7%RH24ONGLT=nxqc>&d5s5+H5Q*3#fEL?x2XsxbM-0{b*Vcc%HGqHRrk?z7~ z$~cg$YBMw|BeKpbS#q7Xsdb(i!-JuMOx{d6wbth#6qRGHhobIwUKl!>O&;cAW?fFi z!#j9S=+f=#fy}DaF%C1^a<9+q%frmn??-0tybCk?#;KWW#`7K#zBn-Cy_4&mV!0+_ zcKZ11vpth^+8>`l%bo%go{7rDnW>SqTiYk`bE4&)R8<2<3%J{cL}Ym|vT~{#88=<0 z>FBgb`NYk{(|{^4>-D}Uji>Ad{m!zUgSyF1^CrhsK1mDs$yWjlx87A}d8RkFVdFFYWXJ)_+ z2V;M#j1_W--Rv}b)VW01bcsx*-;BaDWkk*<;%nzovbp)|ehtAYG z?!mz&}?FUu^bxGQ+3IF z8(4=*!wCQjpqC}H?~_{-(6OAsdUN*^s}m>vwsCoPYI`*_;|EildytrCi1xMp&ZkVR z`A&TY9J#wz9%fb|Qr6&X-=!1w70pzEsq_9du?8?@=_s*EQ2-6q!}R7pJN=tvsXJ%5 z_F)b&cbeAv9I+x%yT;~C7{S;atdd##@|PaiYWM`Ea&v@O=G}}{<9y2NBQdudwiQ-J z>YJ=Du_7?J){1ruG3Pyu`tBYY?Chy5^9edv{q3?diCZU(k#1pFr z+kmm$sCL0krd&~`-Y6?EYnD!Cdt#+vDw!RKg~7tmWkItAy%B{a59pj(ix;7i5XER+ z;_Zn!vbB*8#HztmiQ9scYs*27f^XqL(u&oHW5O2C)hz^ z0kAxb@lLQq#1bI%FvcCx!o>2ye!^I0>r>CmL(wtMIGwG1#2Ufm4d9i6`w133q`f{s zEC3dUj7(PzF(0g|h?6?EL$xqg{D`jd2V6FjRe~+SoQ!xhvGhlE2D4o@uPImusP<_L z39`qu;jzTRV9N014+f*u@SHx**ehgY3b8zwHsU5`8Lw^R5_63AY9mt#vI*KqY07V? zQ;h$lZ;;Kz^1!MwCo}lx6Yq?Ya?XkRM7%^S047r{3mOl4sZF~@YAf917(<&23nwvB~}Hd(*Gc_;+Z;-MYZ>3A%1u|OQ)+)Li|gb zt&J=uRt2VvEFsnari?5lR{4xJGN{KDTu&&}XBmU2nJot~XCBVKiumG@mvAL8)&N*Q zf|rQp&C$+WCT4j~8@WQv{=9b3yZ!~-9E_!dDSbX-)nHT$6IcO3_guYr5wRjL6i17G)(iZ_#{xiTB>K78e(;vixTAtPimgFmnBIx7Dbhargb)N(jxt9 z{G{twU2>)YOx?1RiRBk+^HYdf7i;rwVooq+J(rjTv8a3}j2eL}7pHWo8KT!rZZCo* zfGWn`#GEf{BYlXu!IY6iVvZthT7tgUwUMJsU%{h*7xxW) zvW^k67i%NOi3Pw^MSMf74oulNL9BFn#D=$}RQ}O(cogvG*$N%Wa$@O18(BfD4on#l z#Mnx0WF@gMnA-Q9YpSM88}&F)k=vND_t#Vj?}k`!`f7a{&%gQ&?tjJ_!4lE8K`T$~ z=#k8B=(QEZ^1(J>E*5R^^RrF41f(8E*DS3i#7e+WnyeGrQesJK7;`b!n{@_!nV=6a z599V|x&Ns!6*h|Y8*SeFH+3qWpc(61Iu+B1Il)xErxUZhty9r7brW6-gtJy3vvb5s z!BpX#Czk$>X~SziI2QF^z}o|_04~LMkr(taXug67OJA=QzP@#aDJOTOfaKmFRs^P^D<+n( zQD<;Du}m-(+zMiL?VG6U!{sYd;|7+N=%VIc+^&9|Q!J zh+bCR&);7+St-~n7<*;JmkB!G(?+fk3xg#=rUlwB#4dxWNUjpA{)cv^rf~W^h_kva zx)u%+^K8X$V3_NIcBpW=*A(;uD%6|9O?CidAzEoIOhAKu{TH*UU|6n|gIJgyztwS%f^*u5F zc3mH*iMc}heQY4+-k~$|Ut)PXDXTK#ACyAC422;YY>!HjJU9CSeW6do&lwVOv7jaIEW&|SqW`CsV4JGLoVN^~{P*Xaw~{gP*1_=~KO3d= zZQGj~!`qk>apL5O`-2GwR!aRcGi{BnkMq7_=%ERep1S>3qbiyY4=xV7D1D;ip+w>S zY$8cG!x>`uFP7kz&-0^iP;0F_AXgl(EfnsrrS$I4PMZ#HIqKxRz3D&)(}D2uS=T;u3o=OzH)5=5FcNx;I zIM7gfgIV_v&e&Lawk%@p*&!mZBSw^*?T+2=F075I=GfQR9lPIM_C}`)TLwA`?xrY3CH{B(|Q5C)Np-&~wFksH}_; zj!56)`riDDsW!iuasFnT`tw^BK+*{J>b0j-UAC^pecw@zZC67k)m5BnNA+ z*i^2=fwp4ou{OcUS2xkViN%)^MbU36{iQ!AnY;G3C;IuLga5E=6$g0pu1)(b(FjCw zTDPi*XNRsuo72XCC|+pP$I3Y)E}EYf;XRg6{}%ijJPh5|itmRv#-vyX<+m|~(r)6X zL%ZVmF|Nu!6mG}M$!X(}HayX=bWpa8{5YN=bsCS@_yyh~l+}^1r!!%kY7g1GF3qwQ z8)Oe`vxIipxjYlbna+HP@n$!UGBs+tM4aOeqbZ)xG~C_!7Fm3u1vm5b<{}T}_B36V zXU>@04f+GUn)UnRBff;L_2wV9Fao`~H55+fyU2Im(>T+g)AeOkC6n;Pf!qg=jb;6j z1b2#=gxLdlFqC&YUn#vj?!ZJ*syVScg`W)_9&EaA`YE7<}SXMJ7OaDfDtni-Z?Xy4J6&eGeQfpxJNnAF%trw(ai$REXqoG zHn+x-mW6msdR0mtI6dM4)Lk{ NqZ_VmBk&~8{y)V029*E+