ada/mochapine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I think I successfully merged Darrel's changes.

Browse source
This commit is contained in:
shadow8t4 2018-04-26 09:52:31 -05:00
commit 3fcdf5b9e1
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
MoCha/Assets/Scenes/Goals.unity
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/MonsterCreator.unity
View file

Binary file not shown.

10
MoCha/Assets/Scripts/GetGoals.cs
View file

@ -35,7 +35,7 @@ public class GetGoals : MonoBehaviour {
userDistance = (distance * 3.28084);
userSteps = steps + savedSteps;
PlayerPrefs.SetInt("currentSteps",userSteps);
stepText.text = userSteps.ToString ();
stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
userPoints = steps*5 + savedPoints;
PlayerPrefs.SetInt("totalPoints",userPoints);
@ -57,7 +57,7 @@ public class GetGoals : MonoBehaviour {
// Create a new pedometer
pedometer = new Pedometer(OnStep);
// Reset UI
stepText.text = savedSteps.ToString ();
stepText.text = savedSteps.ToString () + "/" + stepsGoal.ToString();
if(PlayerPrefs.HasKey("totalPoints"))
{
pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString ();
@ -76,8 +76,8 @@ public class GetGoals : MonoBehaviour {
//goalText.text = prefKey;
goalText.color = new Color(0f, 0f, 0f);
barPos = new Vector2(goalText.transform.position.x - 105, goalText.transform.position.y - 30);
Debug.Log(goalText.transform.position.x.ToString() + " " + goalText.transform.position.y.ToString());
barPos = new Vector2(goalText.transform.position.x, goalText.transform.position.y);
currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
@ -150,7 +150,7 @@ public class GetGoals : MonoBehaviour {
PlayerPrefs.SetInt("currentSteps", userSteps);
savedSteps = 0;
//OnStep(0,0);
stepText.text = userSteps.ToString ();
stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
//destroy the goal and set a new one?
savedPoints += stepsGoal*10;