From dff6f9036b7db42ed50fc8e67a9d25b185ebef54 Mon Sep 17 00:00:00 2001 From: asleal2 Date: Fri, 4 May 2018 02:59:27 -0500 Subject: [PATCH] extra fixes to pedometer/fitbit behavior --- MoCha/Assets/Scenes/Goals.unity | Bin 50248 -> 54320 bytes MoCha/Assets/Scenes/Stats.unity | Bin 96816 -> 97528 bytes MoCha/Assets/Scripts/GetGoals.cs | 55 +++++++++++++++++++++---------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 4f0e9c5c65b92ab0c7f2e15342b8a1c571dbcf01..ae30587a221b1dfb3e3675fcb6caf5eb2893ae07 100644 GIT binary patch delta 3525 zcmY+Ge^6A{702(xMHd3Nuz+h&L4&wP8drgezse6Cq$&-@*btkJ#Ds|B4^~|#{=h6G zDkOml9F5DMLJEYfMp<}Zhz*ftbrQ`urA;z16HRcETK-VG&D4oA)wJKUdmoR!nRo9! zpL^~(_nvd#z35 zM860V-l~W8fB(?A)Zv>K;;mTK7y8VqBPFNy|NPu<|C+YpPVxl{w5)1V;j$3&m0Q(+ z{BAH&2@jZ|*Rm$4{_;L$>fX+Kv23mSF(HysN8xSXa6X=yhq_)fFSSMp;er&7w?p;} zfSD8_BEj5}4MDI%MwiGKNq!uactDENywnb(nuP_j$2d{9kSUo3>(?y2Qe;kG3)!^B zX?A+h&pZ|M^?qG*n^;j16)uA4+D86T$)+m5Axs_XH}D z4WSY>PtYvcr(lJUIp(pFSs?IaCgF|ia0Ulg1Fi*Nqw!L480-#Yj?7!P(`TX*Lm0IK zH9L7*vV06`gUot0lKH{3EY?aUkT)#{&p$f+B-Dj97H}^bY;e7VZn{-rc9tUSntJDt zKhI(HIPoA=NG8Nbui8QOOh2K>do+DUuo?C%sUzJxC1uaPk4LNW$u; zbSLK1q50?%9x!by#!6>{A{WHX*O62WB8xjb<8TjwxQ<8ERxI*)&@Bo?_$YZ z=}z5X^3`=k=o16!LX3H;Natw5zbKb56I)RWSFdS#F}g%CSS4yUcwVv*Fc)NA$p?~EEYZW?Cz)rdZg1v} z4_}13xDNI_YPOdG#{Na-uk=lGaO0#sw-%2L3^)!7anJGtieCV5p zcD9!ZrtPD{l6i7O-snoIB+SpnU?sSbswJ~8(+z%AvvnUEbb(p03_h?Qqq7J1NAkHp zytk7(#Uz@2=mpd1zZc#9aL=B+{!i+EY<)86Rn>WDnv%Un^c~&O(vy2^{=qlP{**KW zxyEz2IXds5_vsw>)y>Bf9w1Y7Dgny8?5CsvxY8wWiVcm;X-tih=kHa|7K#fv3* z$=_iO(-al@7hR-bcLbeiT@tBL9%`fmZJf17ZHS_Jww)tQ{qJSbowtm++8x1)+L_O7 z?M~pfc4zQZ`KN4js=FPIvh6%w!wnANl=k%L+R4h}#x7m^Nf=M{G(9SNK!^*=Qjh-A zhlBePuOncgwdS-kTk{;;%=*6$r*U=Jrp?=*Ez8^N*tpq2UA1PqbS8B+`{F0K(ebs* zA4&fG+Zhb&T1Sa}mqNW~7L)CiC3;LxAvA(Le3A%yaHb`USHl9wG(m|DG$Y8q{CPHAvk!n9jVkoWv7vR!m36X?pt1>t;D;%QLMN#5uTi1d>nMfxFENI;f$OYYr6yasLpqu+y zE)U540r`IST+rXEGbnK|F3@7FD{2CHR33FjO+z`aCxQHfEYIr+$`(4%lMs+C)D>u5 z>tRcedeWlt|M-6&YCPriPMXYg{e*8CKdXBuaExfT+jwfq_J->9Pbq`ig;cSx=#dlKCa`4@{x0 z-9f!#Z%~if4atVQsXVq}FwoU7m`KkdCPsR9kfULsn!(tBl!kJL&q8;>`KWdH;%K@r zAwUzTq9^FV;j@9X`{ttj(l@gaKSnT4hyrS&It!VT9$*|dMl++j-G4_o6AM_4B ABme*a delta 2460 zcmYk6e@s(X6vyv_D(DIpXti1#=tObqr~w3>21vv-&TJ%;q&gSf9HN_ONk-x(%cT16gowl3dDvoACU>MBJDF}nw*D`Yc!Izfn3?1#A6;7)MRSvzjC36?S{W>y8(4xcjG$SfN-y(ffMKv!HX zYz-fd7orkA9qwl42ipT5u|yBE)C3{i@S!UL%*w$$@W!@yYPW+ zhb6t$%=*5T`hB)Ab0!;sw=(Mo z(*-@uZcj6k&Mb;uN_t|t@xm4`s{+##%r5eVH)i7vm?MNhFT_IL=t9r*Ad8r}XBt61 zeDq{F#V7~UlU~nE%rcVxh?x&e*DGSy;ze8ZkLvmo&pRX-1kj)7!fEzGV#8o1u+-^A z%-pk$m-8kwfp?+n&G@;{O=nZVh9mLRF;8J;c_SRdOW(jueIwuu_!NA5S;lG@Q2_Qi zECt@dEC{B*g`LbcrU{XO{~Y{9iCxV6cqMu=7c5KHVM+9Z>EGE!%Tlif3+5Yw-}A;{ zu(>SQ$;_T^2&R-?`hWy;!B)Xif-{-^Vkt$}lvssTyeXDx&4iXd#QF>g1`ZQi% z+P_n=%De+>RP}&ekulX<t9OH$fIm$RW(9)=km!)-cK>Ci+o{?i)F}{EN+cA_zl+5&f z2EWaRGiv@<6BL-juN@K6bH*ht-8rOqM?&PB_D6LYm| zxlerx@qtrxt+LZON{p6xtX$PZiB~pJ;%!a1oI0<$K{4)i=1*E^rCZNyLw@SrHoAcv z`7TEuI&4zQ&o5S#2_z=nt!8!e#eNf3>#t~K>e9;8^+1WE0-2+bX70y({w@B|7AdcG z*`fCMhffqGUe6$kJ=J8KoP|-@RQ&~o? zQ&}o+xq?{2G9ic=zt?a87n((?!@xEV3yW5XE0H=cH6bNKbWCe%V45R>iC=b2=XCbEs>~hJFgNaR+ e4mm(;hSD%z(Z-P>M-)|JzSAii8g1s6i}gQ*S2W20 diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 8180af63afa11cde5de29689b333e0e884606e5a..4486b219fd160f70a1fa9ec858bf6aed78b1ae82 100644 GIT binary patch delta 5474 zcmYk=dvsLA9S87POybf*agj$>+H+i9VU;4OL|qXyD20V0tSE79p~SXGuqX=#2#;_# zAyB}!1_DiZW_caA6zxJFgz{QMG%Am+MzW=cx>AHK71*}6uI;hycW%DpuYb(B+)w7t zZ{|0Td)e4$x!EsrT}nj{E60+oQmPyNo!IN@x5`n{RJ3YVp0%y$l>u;7c%M@9aLqy4 zPK&}CaG#5^gI0XMQr~hYl?U5N3q7Ee7x%ZKoS#}yfQxE?O~qBW*G|jAcH&;QcO&_- zu4k!;PXgcUK;?c=sRaJ&M9I+7un_LMqRd;J(eYGpm^?e5mVm|ZH;hy*poJfjXB$>b zyjwq;fh|XTyN4Ty6~kr38)>c)GP+GPAIx-cGtK$1QZ8hsvkrdeq(M4}`w^v{#Z_nF zc3K$LhI^fbMb^}rcEw<^Qk4K*aWO3kGwEMK3yqZYSJEPnN(W!MQhE=XP_3|MaMkUV z)4Y!u42Vy#EMZ8xQ6EXjs#gw^TA9OR?wWIB@0^*?y-Zo$0)Us zF&b$NFl5WJ(-k2`{SsswEdeuG`1lsz5VWJp#wxX*4PK(DaWcBgv^dP&NvW@)?kBY5 zcp1hx}w9EIVM6_mmK ztGv>(A9f*v-q890sr-C|4;STwnY1pY#bIW|7A^QaJj)S>Y2oindnc=AJ*eA@!j|Kz zJNPE8a0>RnY48-Wb&5Rv7A*ra)ATkij^oYj_g=BM9VGDsrCwl=d|L4|iQ%RtVdbcI zJL0R$)z@*HC>1D`5r0BU!b}IR&_d739ABkHekh$zCFVb(+iQiH5r0ez{7Bln1k>?V z8feo0CsuU*SVnxAmV%iP_dk_0NybDr-@P#*c@DQP^xL}7bP>xwCViEfM(Cu zuwrVq^tw576vqzUhKOo*#6emu%&dPRqwF3=h;g8K zNnF_)z)_@B_$7IlU!|pBCjD#I48>8T)JiPrg}CYw*U_9f6if%#(IPN@Ls)7(F)?3y zc)hvtN!?%;X13D}TG;|wm^W#@3Yn6gy?ad7&qiV9#ny}FL+?yy@@+%@6F{^2-K>~} zCD4cy^{Qt&5i_;MgK7*@H_0zNlSPb{N-s$TTarolB5tcP`hL(VtELdlW zWms8e(VU}IR7+;AZfFnc1|u*We0Jb8O)Zna-a)-}zf=r{X}0U#Mf29knz_5fu>XN3 z@E}%9VRM=(*?-bwH|Sg;^Lc>Q05ckT%@csdg))f8m|YW z6)UFWU{Go-Ee@9Xb(eq0Qa_5)tPuD>T>t!K% zXi=ESRv%gbQB4Q?(n>c-V9(_JcrD?Of|)a=&t$6uv%nbssMFs%qZ{5;I6yW^3g4j> zZjyTM(NeH3oTk&X%ogd)8JcR8&Ma=*XUFhbKr>HEh%uN+VI|EUk%yPkLNGH;7Oi-j z1m521uQT;P0^4QF?x4kBI$M?=amjxs;l-&`e8>MCDl`xBY%;U-^jW<75EN$KY!=PG zOFA8z}l80xiXzo{KAm=Y!vvfPE7-+K4e&L#JtuT{?B&{?m5C5LF5@xb+ffoFg zWFfM#5U(ois@+QU$JLFpscmn$w%Xm61l~+^|5^fXp~YZki*2PPVJ2`RExJbnj~;$b zAAqXmHHk5XR{T0+AinYwlRy(>EKU7Jf{ddjU}mMCxERJe68jxsrQls9O_d*xL= zS7tZBXpk0+cC_!GNgvN(1+CMD9MI}$j5j=nvctbi}Kug2SlnkV0PfDkEcA39e zx955DtHo-mUBoaDi`WkQ_u=#L5rsKAB_EWZ(PA)@{(sQ?Z%N>P(t>YG;3Ffysb^7z zVJ2HgZA1Q@tsF`L5iM}iQy^U7*p2YZ&)(Z0? zzWu-6^TZ6$1Zk(mPfL))yNmEOh&pHFYv>5A^sEFqO3T8`K#tKo=Ol)8oR|Tcx!ac* zuluFc?_?xRw3RTE{{1x1`x4{;%?~pJX{Nb9kQiOiyhEv`S9c5;Rv+l@a1J)VI_kjY zmqq<=^UI@Nk-ChYH+SyBx)beVa`bPP^-FRcMLGK0yS}uyqrXdq-+fG}zF15iTr(r< zBKy3Z&5xXp`flSLAJrA@?p1eePo8ta^aY-$rdO2Lb!+NxH->+B>cX!(o7yg39_7fb kKh)RpK#uNLeY&rstj_gXPJN)Cqc}%*>EOD4j?E?i0~}GmDF6Tf delta 5234 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 CMvdtJ diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index b34f334..1febe08 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -85,6 +85,7 @@ namespace PedometerU.Tests void Start () { + //PlayerPrefs.SetInt("currentGoals", 0); //PlayerPrefs.DeleteAll(); //danger!! if(prefKey == "daily") { @@ -106,6 +107,12 @@ namespace PedometerU.Tests // Reset UI stepText.text = savedSteps.ToString () + "/" + stepsGoal.ToString(); + if(!PlayerPrefs.HasKey("goalComplete")) + { + PlayerPrefs.SetInt("goalComplete", 0); + } + + if(PlayerPrefs.HasKey(totalPointsKey)) { pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); @@ -223,6 +230,12 @@ namespace PedometerU.Tests rivalText.text = "You are being chased by " + mp.players [0].username; } + public void refreshSteps() + { + int fitbitSteps = PlayerPrefs.GetInt("fitbitSteps"); + PlayerPrefs.SetInt(currentStepsKey, fitbitSteps); + } + void Update() { updateTimeRemaining (); @@ -236,9 +249,10 @@ namespace PedometerU.Tests currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); } - //userSteps = (int)(Time.time*10.0f); - //barDisplay = Time.time*0.05f; + userSteps = PlayerPrefs.GetInt(currentStepsKey); barDisplay = (float)userSteps/(float)stepsGoal; + if(barDisplay > 1.0f) + barDisplay = 1.0f; stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString(); //check if the current date matches the goal date @@ -249,6 +263,7 @@ namespace PedometerU.Tests Debug.Log(prefKey + "...DAY HAS PASSED!! SETTING GOAL TO NEXT DAY!!"); PlayerPrefs.SetString("goalDate", System.DateTime.Now.AddDays(1).ToString("MM/dd/yyyy")); + PlayerPrefs.SetInt("goalComplete", 0); goalDayStr = PlayerPrefs.GetString("goalDate"); Debug.Log("new goal: " + goalDayStr); @@ -259,24 +274,28 @@ namespace PedometerU.Tests //goal complete else if(barDisplay >= 1.0f) { - Debug.Log(prefKey + "... Goal complete! +100pts!"); - userSteps = 0; - PlayerPrefs.SetInt(currentStepsKey, userSteps); - savedSteps = 0; - //OnStep(0,0); + if(PlayerPrefs.GetInt("goalComplete") == 0) + { + Debug.Log(prefKey + "... Goal complete! +100pts!"); + userSteps = 0; + PlayerPrefs.SetInt(currentStepsKey, userSteps); + savedSteps = 0; + //OnStep(0,0); - //destroy the goal and set a new one? - savedPoints += stepsGoal*10; - PlayerPrefs.SetInt(totalPointsKey, savedPoints); - pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); + //destroy the goal and set a new one? + savedPoints += stepsGoal*10; + PlayerPrefs.SetInt(totalPointsKey, savedPoints); + pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString (); - //Random item - if(!PlayerPrefs.HasKey("inventory")) - PlayerPrefs.SetString("inventory", ""); - StringBuilder invList = new StringBuilder (); - invList.Append(PlayerPrefs.GetString ("inventory")); - invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); - PlayerPrefs.SetString ("inventory", invList.ToString()); + //Random item + if(!PlayerPrefs.HasKey("inventory")) + PlayerPrefs.SetString("inventory", ""); + StringBuilder invList = new StringBuilder (); + invList.Append(PlayerPrefs.GetString ("inventory")); + invList.Append(items[(int)Math.Round(UnityEngine.Random.value*6.0f)]).Append(" "); + PlayerPrefs.SetString ("inventory", invList.ToString()); + PlayerPrefs.SetInt("goalComplete", 1); + } } } }