Merge pull request #6 from shadow8t4/darrel

Darrel

MoCha/Assets/Scenes/FitbitLogin.unity.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e4e05e44213ffe141906009c29238b2e
+timeCreated: 1525379963
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Scripts/FitBitAPI.cs

@@ -18,7 +18,7 @@ namespace Assets.Scripts.Fitbit
         private const string _consumerSecret = "69307b9f332caf9946ef4e23cabde2e4";
         private const string _clientId = "22CX4L";
         private const string _callbackURL = "http://localhost/callback";
-        private const string CustomAndroidScheme = "mocha://";
+        private const string CustomAndroidScheme = "http://localhost/callback";
 
         private const string _tokenUrl = "https://api.fitbit.com/oauth2/token";
         private const string _baseGetUrl = "https://api.fitbit.com/1/user/-/";
@@ -73,6 +73,7 @@ namespace Assets.Scripts.Fitbit
             {
                 _bFirstFire = false;
             }
+            GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories);
         }
 
         public void LoginToFitbit()

MoCha/Assets/Scripts/GetGoals.cs

@@ -60,14 +60,17 @@ namespace PedometerU.Tests
 		private int savedSteps;
 		private int savedPoints;
 
+		public string currentStepsKey;
+		public string totalPointsKey;
+
 		void OnStep (int steps, double distance) {
 			//userDistance = (distance * 3.28084);
 			userSteps = steps + savedSteps;
-			PlayerPrefs.SetInt("currentSteps",userSteps);
+			PlayerPrefs.SetInt(currentStepsKey,userSteps);
 				stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
 
 			userPoints = steps*5 + savedPoints;
-			PlayerPrefs.SetInt("totalPoints",userPoints);
+			PlayerPrefs.SetInt(totalPointsKey,userPoints);
 			pointsText.text = "Points: " + userPoints.ToString ();
 		}
 
@@ -82,30 +85,38 @@ namespace PedometerU.Tests
 
 		void Start ()
 		{
+			//PlayerPrefs.DeleteAll(); //danger!!
 			if(prefKey == "daily")
 			{
 				// This should later only get called per goal
 				StartCoroutine(updateRival());
+				currentStepsKey = "currentSteps";
+				totalPointsKey = "totalPoints";
+			}
+			else
+			{
+				currentStepsKey = "currentSteps_p";
+				totalPointsKey = "totalPoints_p";
 			}
 
-			savedSteps = PlayerPrefs.GetInt("currentSteps");
+			savedSteps = PlayerPrefs.GetInt(currentStepsKey);
-			savedPoints = PlayerPrefs.GetInt("totalPoints");
+			savedPoints = PlayerPrefs.GetInt(totalPointsKey);
 			// Create a new pedometer
 			pedometer = new Pedometer(OnStep);
 			// Reset UI
 			stepText.text = savedSteps.ToString () + "/" + stepsGoal.ToString();
 
-			if(prefKey == "daily")
+			if(PlayerPrefs.HasKey(totalPointsKey))
-				if(PlayerPrefs.HasKey("totalPoints"))
+			{
-				{
+				pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString ();
-					pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString ();
+			}
-				}
+			else
-				else
+			{
-				{
+				PlayerPrefs.SetInt(totalPointsKey, 0);
-					PlayerPrefs.SetInt("totalPoints", 0);
+				pointsText.text = "Points: " + PlayerPrefs.GetInt(totalPointsKey).ToString ();
-					pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString ();
+			}
-				}
 
+			if(prefKey == "daily")
 				{
 				if(PlayerPrefs.HasKey("goalDate"))
 				{
@@ -123,9 +134,9 @@ namespace PedometerU.Tests
 			userPoints = savedPoints;
 
 			//OnStep(savedSteps, 0); //necessary?
-			Debug.Log(savedSteps);
+			//Debug.Log(savedSteps);
 
-			Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString());
+			//Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString());
 
 			//barPos = new Vector2(pbbg.transform.position.x, 1895 - pbbg.transform.position.y);
 
@@ -216,8 +227,7 @@ namespace PedometerU.Tests
 		{
 			updateTimeRemaining ();
 			updateProgressBar ();
-
+			//updateMyGoalProgressBar ();
-			updateMyGoalProgressBar ();
 
 			if(prefKey == "daily")
 			{
@@ -226,9 +236,10 @@ namespace PedometerU.Tests
 				currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 			}
 
-			//userSteps = (int)(Time.time);
+			//userSteps = (int)(Time.time*10.0f);
 			//barDisplay = Time.time*0.05f;
 			barDisplay = (float)userSteps/(float)stepsGoal;
+			stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
 
 			//check if the current date matches the goal date
 			if(prefKey == "daily" && currentDayStr == goalDayStr)
@@ -243,24 +254,25 @@ namespace PedometerU.Tests
 
 				//reset steps...
 				userSteps = 0;
-				PlayerPrefs.SetInt("currentSteps", userSteps);
+				PlayerPrefs.SetInt(currentStepsKey, userSteps);
 			}
 			//goal complete
-			if(barDisplay >= 1.0f)
+			else if(barDisplay >= 1.0f)
 			{
-				Debug.Log("Goal complete! +100pts!");
+				Debug.Log(prefKey + "... Goal complete! +100pts!");
 				userSteps = 0;
-				PlayerPrefs.SetInt("currentSteps", userSteps);
+				PlayerPrefs.SetInt(currentStepsKey, userSteps);
 				savedSteps = 0;
 				//OnStep(0,0);
-				stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
 
 				//destroy the goal and set a new one?
 				savedPoints += stepsGoal*10;
-				PlayerPrefs.SetInt("totalPoints", savedPoints);
+				PlayerPrefs.SetInt(totalPointsKey, savedPoints);
-				pointsText.text = "Points: " + PlayerPrefs.GetInt("totalPoints").ToString ();
+				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(" ");

MoCha/Assets/Scripts/MonsterDraw.cs

@@ -6,13 +6,13 @@ using UnityEngine.UI;
 public class MonsterDraw : MonoBehaviour {
 	
 	public GameObject anchorPoint;
-
+	public float scale;
 
 	private Vector2 anchorPos;
 
 	void Start() 
 	{
-		anchorPos = new Vector2 (anchorPoint.transform.position.x, anchorPoint.transform.position.y);
+		anchorPos = new Vector3 (anchorPoint.transform.position.x, anchorPoint.transform.position.y, anchorPoint.transform.position.z);
 		loadMonster();
 	}
 
@@ -25,10 +25,11 @@ public class MonsterDraw : MonoBehaviour {
 			string savedString = PlayerPrefs.GetString(equipped[i]);
 			string[] values = savedString.Split ();
 			GameObject instance = (GameObject)Instantiate(Resources.Load(equipped[i]));
-			//instance.rectTransform.anchoredPosition = new Vector2(float.Parse(values[0]), float.Parse(values[1]));
 			instance.name = equipped [i];
 			//instance.GetComponent<DragAndDrop> ().inventory = inv;
-			instance.transform.position = new Vector2(float.Parse(values[0]), float.Parse(values[1]));
+			instance.transform.position = new Vector3(float.Parse(values[0]), float.Parse(values[1]), float.Parse(values[2]));
+			instance.transform.localScale -= new Vector3(scale, scale, 0);
+
 		}
 	}
 }

MoCha/Assets/Scripts/MonsterManager.cs

@@ -39,43 +39,6 @@ public class MonsterManager : MonoBehaviour {
 			PlayerPrefs.SetString(/*SceneManager.GetActiveScene().name + */monsterParts[i].name, savedString);
 		}
 		PlayerPrefs.SetString ("Equipped", equippedString);
-		/*
-		StringBuilder eyePos = new StringBuilder();
-
-		eyePos.Append(GameObject.Find("circle_eye").transform.position.x).Append(" ").Append(GameObject.Find("circle_eye").transform.position.y).Append(" ").Append(GameObject.Find("circle_eye").transform.position.z);
-		string savedString = eyePos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "eyePosition", savedString);
-
-		StringBuilder hairPos = new StringBuilder();
-
-		hairPos.Append(GameObject.Find("crazy_hair").transform.position.x).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.y).Append(" ").Append(GameObject.Find("crazy_hair").transform.position.z);
-		savedString = hairPos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hairPosition", savedString);
-
-		StringBuilder headPos = new StringBuilder();
-
-		headPos.Append(GameObject.Find("circle_head").transform.position.x).Append(" ").Append(GameObject.Find("circle_head").transform.position.y).Append(" ").Append(GameObject.Find("circle_head").transform.position.z);
-		savedString = headPos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "headPosition", savedString);
-
-		StringBuilder hatPos = new StringBuilder();
-
-		hatPos.Append(GameObject.Find("crown").transform.position.x).Append(" ").Append(GameObject.Find("crown").transform.position.y).Append(" ").Append(GameObject.Find("crown").transform.position.z);
-		savedString = hatPos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "hatPosition", savedString);
-
-		StringBuilder mouthPos = new StringBuilder();
-
-		mouthPos.Append(GameObject.Find("gap_mouth").transform.position.x).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.y).Append(" ").Append(GameObject.Find("gap_mouth").transform.position.z);
-		savedString = mouthPos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "mouthPosition", savedString);
-
-		StringBuilder nosePos = new StringBuilder();
-
-		nosePos.Append(GameObject.Find("pig_nose").transform.position.x).Append(" ").Append(GameObject.Find("pig_nose").transform.position.y).Append(" ").Append(GameObject.Find("pig_nose").transform.position.z);
-		savedString = nosePos.ToString();
-		PlayerPrefs.SetString(SceneManager.GetActiveScene().name + "nosePosition", savedString);
-		*/
 	}
 
 	public void loadMonster () 
@@ -92,37 +55,5 @@ public class MonsterManager : MonoBehaviour {
 			instance.GetComponent<DragAndDrop> ().inventory = inv;
 			instance.transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
 		}
-
-		/*
-		string savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "eyePosition");
-		string[] values = savedString.Split(' ');
-
-		GameObject.Find("circle_eye").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-
-		savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hairPosition");
-		values = savedString.Split(' ');
-
-		GameObject.Find("crazy_hair").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-
-		savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "headPosition");
-		values = savedString.Split(' ');
-
-		GameObject.Find("circle_head").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-	
-		savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "hatPosition");
-		values = savedString.Split(' ');
-
-		GameObject.Find("crown").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-
-		savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "mouthPosition");
-		values = savedString.Split(' ');
-
-		GameObject.Find("gap_mouth").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-
-		savedString = PlayerPrefs.GetString(SceneManager.GetActiveScene().name + "nosePosition");
-		values = savedString.Split(' ');
-
-		GameObject.Find("pig_nose").transform.position = new Vector3(float.Parse(values[0]),float.Parse(values[1]),float.Parse(values[2]));
-		*/
 	}
 }

MoCha/ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.4.0f1
+m_EditorVersion: 2017.3.1f1