From 83fbdcd8edecdc8212804a688fd7b799b5023808 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Mon, 30 Apr 2018 18:48:10 -0500 Subject: [PATCH] fixed daily goal, added personal progress bar --- MoCha/Assets/Scenes/Goals.unity | Bin 40160 -> 48672 bytes MoCha/Assets/Scripts/GetGoals.cs | 79 ++++++++++++----------- MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 6820354d19ef641e738a6a22cdb820bd5f9af72d..2516d160cd8acf20f7b56ea633e9c690d73a78da 100644 GIT binary patch delta 5778 zcmZu#4N%iZ7T-Sx2^jg3k04;86+sCQzJ%*pK;cBG*7RDgRBZ)q#IzD(fDRdeD%N=YupO;B?Tz)OJ<8ef>h(nLz0GbCjsKZ{cK5e$ z-@bkC?R)Q^Ywrj2-w8+}q%Dw;<7z@k1oW{bS=!9J^qh3<%1msCYHV?lt^u4L-==rsmBl1@K>G7}f zfy&`*E+`EMOo480_sn9t>kkS#cYc1bL?nV>0ZmVgrD3^pNkzkRV&l|+NyHAXd%gt5 z3V0`X=f+A?7|A0(B=ezP&Pk>sNfINO_5jH;PLd2H^sF(2#^r>@O@DxB6(^d3d{P-7 z%>yKBI7u3kq%)F?2S}PZi55vRk%S(t4GELTyfMVy0h6HBd)d@g6ia`s4WWkIP$`!d z!6@E@R96VGcLS9S-aPtxd4^4=t2fV@I=`l>T3Qf&q`9mdholFxCx%tH`W&r zv*G2c)z~G~wY*bTuQxHoRBJHS*RifyUsGi;8jRKM3A29X z7GNRp9^%*uz%&ve;{ZF%v5_Fc+yNQgv;J*7G(;))@*~Y|tOu|jm_vS&8?zB@Fd^Z< z5LX3o!XltR|3Ze=p-;k~A*%p0K#RI<=GfPO?T0Zk+_UVx7-&d4NY(%?((UCKG7=lV z&9NT9!X=w~;{gs1fD~fm+#6FTB10Eog5gY#%?tH1%;VTKz{ElFIW_{K3w|prCd4B@ zWw`es)iw^c11L_iieve3uTQ`N;7d-FzsnZi#=8zuK^41CEQj;X&& z)55WNU>LDUE5|BS-c4%CR7J?p4wyKdkz+*d-ME%xJ%AxU8(upT2L~p58RqIkOJIt) z022;3lVcTAyaMKPOb#BQ2p|M3Lw?6GB^Xc${V2y$rg`^RetpP!Gvltq34X{_BMY~%#R+;7%(8{sffaQQ%F*-JLOq<~qFlo*ERWL;=0DBf% z8SGD{aqtL$!tR$R9>-uuR)L!c&3wzT8-Vq|9D4s1j@dK4nz_oct}O4yZI|wtklzu& z#BJID*g^!g*Q}p-oN2E3P%|!wCYqCjY#v zxP&Pa`#U4^ilAXS6f}V_7JZBu#HK4(m2BR&JLQ(WDD=~pPvSyCibi@n;#80S{MyYu zB?Z4M_?3<}y+ZF=Vj>>9{rQOWbn2pGfxXZEwzxB94Bc(Xq!x>&^hnoh7R9ksWpC_k zS3ACH?F85KdBS}9W_?|4gL#F%E~CL{sBc=fyuq-#-e6n?dDvVqQyuYLf+R39G*PUinyB*dCoFGA)WDvMKgOwnhD*nV-VsuEu;%KkGTDQlIdzn|pZ6~^MhgiaMZG)gcYdpt=HMvEb~(b?8`des_KN($Ws{e$k-GzVJ5 zI8F%elcKt~|M`781UEM+{EEUsq8D~1Q=K)G4sYt1EXR4>DMrN%3O!tk>c>kZ(E~lP zrAVdC$kb}ITJUA}gL^Ig;hi&QK8b$lnSANaTyn$*%#fi96GU-=^P+yhJ{B1CNJj}% z*3G?>Q$L^OuPm%qP+4^UTDc6X3Q*1@n!ZC$Et@8?l`;GFAG@I2?st5)@=l9d3a0;R ze^UyfCtFjq@eIR1-2VRH45i;0L}7%oAzjDje-9`9Lq@MQM^6#;44NAgae1BItk#)p ztHC$x)N`uL#AEh~C28?rFZDkOmPv3DwKjy<3&rbkdR|unYa+4?_N$@Npk3>jJ4_d5 zx45lGPNO^E!`uNyzP?!HC~FEtwNLi-Dp5Tlu_&(s>G+mBroqN<->)pMO!QL-7HqU~ zQw+7VOp@V65W4rcU*{llgvaBQD8+H3NqZ`Or=LYc0Z6FS`XNe^+_pX^^qw6Rk`hg#>&!Tlaxvu??6FJa{OK0>jmK!J*~ z4ULE;*1{&N#yy7nI79!}Wefcchh-reF720lwnFg={&-&nf8iuJj-it`CekZbxy@~z zU2%)RYN)T65}3YEU#(Bobxtbo@za;6N5us0DPl41As&%pa4d=~F-K@F7$vslj_!nwOGC;-1b*yE{UV8s0O(8gvKM=uYYO}5CHH)=#-h$}?#hkYS0+5~r=YgoOS zx;iw>CFDQ#d^78<1V6{b%9A^0j3vc8Ev4Y?n$mIpaguSvKrtQz zMI09Mz1*g#dGQjuwR3_E{Y`WBXXmXcF%K0BrrCpZm91@Z=g#}d9_BZqo<$u%(M`}R z)$@%jYt1!P^@ds_ODlkb@#yCr)7fF3Pn&u8<6(c*U=a<@nv>w0xI{q&Jlq!I31*_( zH_r`e=HL_|JBr~4eA8YCuA!DOX5Opk@PyK>ul_g=PnbTT__61XFbn7ShAmM5BTrEv zyC<+vyi6IUu0u@gUz?j`sv-aM$Heq1O6GKQkQ6rwqVu<=N|E$0TUAukt7N@AK6bEiVmFQxyH!-N3+Fd` z#?5Rz+O3L!lJ>qQlBQ8yl}4vfRbMppF3@yy!AG>VO~;dl2oB~9EG&wEeuUOZJh zaG%}Vkmk#68SoppJ$pKShV)neiZ);mj!jRDu1I~_ee1+$OC+t@9vg&Y7&T{GlSHD* z_q}%FTLW2%ZxLJ*4zD{8sqrr*bv;&)u8tBJe%N@DFRKc>*2U77tm7g{;klvYQ|E@> z01w9!;Pf2oYDozeUqbhld-L(%08#F-zYcH=PXN3rtmhNq_!wOtzdCh1QK(s(oNY~Z z3x$3@(jlksZa+jzw#3jab_H$SF_8s?$OyIeqob^JPVl|5;)@4&z;xxQ`v#whe&}S>N89!`czRW_7!<5g+Vbj#ch*)Aj61 zkg{k?+l1~u6!#vxBW5!)C1Z{mjhKm&__C5{+#seZ z)HU%X)3c2>u%wG3l2F?EFs0HOP~sMs#m*4-0T=tl1fwR4niwN5{_peLN1L2`?)lww zU;gLbr|}g-A!G0`Hn5qo(E?+v9DOf5yVL6nH2NET&-mEd`uaL|q&>ZUWpHngMXA2; zIOiLbzYl$Hzg$9 zY-|(jMZxqd*(F)18uC*Z6iRkWmNw$Ruc`x|~< zvo7INTSsZw@TNek$bu|ZIF%G#^@w`EjJ6MMrH;W@sCuZL{v52Qb3^qzFTM7t+h*A3 zdMDHT)z4l3{)BZ7GLg9;TuM34Lhh1H7j;nBUUB5^>|&Ui%!Hm zpf{6u(B)*M+7t5+rkvzWiTr~pKiV|ns2Znb?4Z?@Qyp=TFD-iQ=_a(Vrv2q&{rIzg z;qOfQmC<~9i(SyiOiQt=XU^m9@yhVx$QARF_boGxPEVtD9hdH*?3h;UmCqJAYIQv` z0Iltx2h>(mX{DSRH_U1(t<*3p#zibtTIs@Upj7-7e%;iQd$N5SR94c{NgGC5vYJxS ubHAUm15IR|bS5jNO=SIO%X6Ao(bHm0tcV@-Ue1Y}M6L<#&77a2G26dxdV?we diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 580c9eb..4b26139 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -33,8 +33,8 @@ namespace PedometerU.Tests public Text remainingText; // Goal information. - public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + private string currentDayStr; + private string goalDayStr; public string prefKey; // Used for time calculation. @@ -43,7 +43,7 @@ namespace PedometerU.Tests private const int secondsperday = 86400; //Progress Bar... - public float barDisplay; //current progress + private float barDisplay; //current progress //private Vector2 barPos; // This gets overwritten later by the background's size values. private Vector2 barSize = new Vector2(5000, 10); @@ -52,7 +52,7 @@ namespace PedometerU.Tests private Pedometer pedometer; int userSteps; int userPoints; - int stepsGoal = 100; + public int stepsGoal; private int savedSteps; private int savedPoints; @@ -78,8 +78,11 @@ namespace PedometerU.Tests void Start () { - // This should later only get called per goal - StartCoroutine(updateRival()); + if(prefKey == "daily") + { + // This should later only get called per goal + StartCoroutine(updateRival()); + } savedSteps = PlayerPrefs.GetInt("currentSteps"); savedPoints = PlayerPrefs.GetInt("totalPoints"); @@ -97,15 +100,18 @@ namespace PedometerU.Tests pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); } - if(PlayerPrefs.HasKey("goalDate")) - { - goalDayStr = PlayerPrefs.GetString("goalDate"); - } - else - { - PlayerPrefs.SetString("goalDate", - System.DateTime.Now.AddMinutes(1).ToString("MM/dd/yyyy")); - goalDayStr = PlayerPrefs.GetString("goalDate"); + if(prefKey == "daily") + { + if(PlayerPrefs.HasKey("goalDate")) + { + goalDayStr = PlayerPrefs.GetString("goalDate"); + } + else + { + PlayerPrefs.SetString("goalDate", + System.DateTime.Now.AddDays(1).ToString("MM/dd/yyyy")); + goalDayStr = PlayerPrefs.GetString("goalDate"); + } } userSteps = savedSteps; userPoints = savedPoints; @@ -121,7 +127,6 @@ namespace PedometerU.Tests //barPos = new Vector2(pbbg.transform.position.x, 1895 - pbbg.transform.position.y); currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); } // Was used for testing. @@ -193,27 +198,31 @@ namespace PedometerU.Tests { updateTimeRemaining (); updateProgressBar (); - updateMonsterProgressBar (); + if(prefKey == "daily") + { + updateMonsterProgressBar (); + remainingText.text = formatTimeRemaining (); + currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); + } - //needs current points counting toward this goal (daily?) - //needs the total required points for this goal - currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); - - remainingText.text = formatTimeRemaining (); - - //barDisplay = Time.time*0.05f; //put actual progress here (current/total) + userSteps = (int)(Time.time*10.0f); + //barDisplay = Time.time*0.05f; barDisplay = (float)userSteps/(float)stepsGoal; //check if the current date matches the goal date - if(currentDayStr == goalDayStr) + if(prefKey == "daily" && currentDayStr == goalDayStr) { Debug.Log("current: " + currentDayStr); Debug.Log("goal: " + goalDayStr); - Debug.Log("DAY HAS PASSED!! SETTING GOAL TO NEXT DAY!!"); + Debug.Log(prefKey + "...DAY HAS PASSED!! SETTING GOAL TO NEXT DAY!!"); PlayerPrefs.SetString("goalDate", - System.DateTime.Now.AddMinutes(1).ToString("MM/dd/yyyy")); + System.DateTime.Now.AddDays(1).ToString("MM/dd/yyyy")); goalDayStr = PlayerPrefs.GetString("goalDate"); Debug.Log("new goal: " + goalDayStr); + + //reset steps... + userSteps = 0; + PlayerPrefs.SetInt("currentSteps", userSteps); } //goal complete if(barDisplay >= 1.0f) @@ -230,18 +239,12 @@ namespace PedometerU.Tests PlayerPrefs.SetInt("totalPoints", savedPoints); pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString (); - //Random item - StringBuilder invList = new StringBuilder (); - invList.Append(PlayerPrefs.GetString ("inventory")); - invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); - PlayerPrefs.SetString ("inventory", invList.ToString()); - } - - //only applies if "daily" goal - if(prefKey == "daily") - { + //Random item + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); } } } - } 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