Merge pull request #52 from iamtomhewitt/develop

2.9 Beta

.gitignore

@@ -41,3 +41,4 @@ Logs/
 .vs/vr-pacman/v15/Server/
 .vs/vr-pacman/DesignTimeBuild/
 /.vscode/settings.json
+/ProjectSettings/ProBuilderSettings.json

Assembly-CSharp.csproj

@@ -229,6 +229,7 @@
     <Compile Include="Assets\Scripts\Manager\AudioManager.cs" />
     <Compile Include="Assets\Scripts\Manager\GameEventManager.cs" />
     <Compile Include="Assets\Scripts\Manager\GameObjectManager.cs" />
+    <Compile Include="Assets\Scripts\Manager\GameSettingsManager.cs" />
     <Compile Include="Assets\Scripts\Manager\HighscoreManager.cs" />
     <Compile Include="Assets\Scripts\Pacman\MinimapPacmanIcon.cs" />
     <Compile Include="Assets\Scripts\Pacman\PacmanCollision.cs" />
@@ -240,6 +241,7 @@
     <Compile Include="Assets\Scripts\Utility\Debugger.cs" />
     <Compile Include="Assets\Scripts\Utility\Highscore\HighscoreDisplayHelper.cs" />
     <Compile Include="Assets\Scripts\Utility\Highscore\HighscoreEntry.cs" />
+    <Compile Include="Assets\Scripts\Utility\JsonHelper.cs" />
     <Compile Include="Assets\Scripts\Utility\Powerup.cs" />
     <Compile Include="Assets\Scripts\Utility\Utilities.cs" />
     <None Include="Assets\Graphics\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />

Assets/Scripts/Manager/GameObjectManager.cs

@@ -181,7 +181,8 @@ private void SpawnCherry()
 
         public int CountFood()
         {
-            return GameObject.FindGameObjectsWithTag("Food").Length;
+            foodCount = GameObject.FindGameObjectsWithTag("Food").Length;
+			return foodCount;
         }
 
         public int GetNumberOfFood()

Assets/Scripts/Manager/GameSettingsManager.cs

@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Manager
+{
+	public class GameSettingsManager : MonoBehaviour
+	{
+		[SerializeField] private float accelerometerSensitivity;
+
+		public static GameSettingsManager instance;
+
+		private void Awake()
+		{
+			if (instance)
+			{
+				DestroyImmediate(this.gameObject);
+			}
+			else
+			{
+				DontDestroyOnLoad(this.gameObject);
+				instance = this;
+			}
+		}
+
+		public void SetAccelerometerSensitivity(float sensitivity)
+		{
+			accelerometerSensitivity = sensitivity;
+		}
+
+		public float GetAccelerometerSensitivity()
+		{
+			return accelerometerSensitivity;
+		}
+	}
+}

Assets/Scripts/Manager/HighscoreManager.cs

@@ -2,15 +2,18 @@
 using UnityEngine;
 using Utility;
 using UnityEngine.Networking;
+using System;
 
 namespace Manager
 {
 	public class HighscoreManager : MonoBehaviour
     {
         private Highscore[] highscoresList;
 
-        private const string privateCode    = "YHc0fAncbE-2ieJokE0NIAB9ZEzv8l10WovytuLwzMAw";
-        private const string publicCode     = "5ad0d623d6024519e0be327e";
+		private Leaderboard leaderboard;
+
+        private const string privateCode    = "hERKFM6pT0qBOb8ZvypNDQmyok7nHxTkWkM2BFIe7hxQ";
+        private const string publicCode     = "5d810f91d1041303ecafee9f";
         private const string url            = "http://dreamlo.com/lb/";
 
         public static HighscoreManager instance;
@@ -27,7 +30,7 @@ private void Awake()
 				instance = this;
 			}
 
-			//UploadNewHighscore("Tom (The Developer)", 4500);
+			// UploadNewHighscore("Tom (The Developer)", 4500);
 		}
 
 		/// <summary>
@@ -65,8 +68,7 @@ public void UploadNewHighscore(string username, int score)
 		/// </summary>
         private IEnumerator UploadNewHighscoreRoutine(string username, int score)
         {
-            string id = System.DateTime.Now.ToString("MMddyyyyhhmmss");
-			UnityWebRequest request = UnityWebRequest.Post(url + privateCode + "/add/" + UnityWebRequest.EscapeURL(id+username) + "/" + score, "");
+			UnityWebRequest request = UnityWebRequest.Post(url + privateCode + "/add/" + username + "/" + score, "");
             yield return request.SendWebRequest();
 
 			if (!request.downloadHandler.text.StartsWith("ERROR"))
@@ -76,7 +78,9 @@ private IEnumerator UploadNewHighscoreRoutine(string username, int score)
             }
             else
             {
-                Debug.Log("Error uploading: " + request.error);
+                Debug.Log("Error uploading: " + request.downloadHandler.text);
+				FindObjectOfType<HighscoreDisplayHelper>().ClearEntries();
+				FindObjectOfType<HighscoreDisplayHelper>().DisplayError("Could not upload score. Please try again later.\n\n" + request.downloadHandler.text);
             }
         }
 
@@ -92,54 +96,42 @@ public IEnumerator DownloadHighscores()
         {
             if (Application.internetReachability == NetworkReachability.NotReachable)
             {
-				FindObjectOfType<HighscoreDisplayHelper>().ShowNoInternetConnection();
+				FindObjectOfType<HighscoreDisplayHelper>().DisplayError("No internet connection.");
                 yield break;
             }
 
-			UnityWebRequest request = UnityWebRequest.Get(url + publicCode + "/pipe/0/10");
+			UnityWebRequest request = UnityWebRequest.Get(url + publicCode + "/json/0/10");
 			yield return request.SendWebRequest();
 
 			if (!request.downloadHandler.text.StartsWith("ERROR"))
 			{
-				highscoresList = ToHighScoreList(request.downloadHandler.text);
+				string json = JsonHelper.StripParentFromJson(request.downloadHandler.text, 2);
+				leaderboard = JsonUtility.FromJson<Leaderboard>(json);
+				highscoresList = ToHighScoreList();
 			}
 			else
 			{
-				Debug.Log("Error downloading: " + request.error);
+				Debug.Log("Error downloading: " + request.downloadHandler.text);
+				FindObjectOfType<HighscoreDisplayHelper>().DisplayError("Could not download highscores. Please try again later.\n\n" + request.downloadHandler.text);
 			}
         }
 
 		/// <summary>
-		/// Coverts a text stream into an array of Highscores.
+		/// Converts the leaderboard object created by a Json request into a highscore list.
 		/// </summary>
-        private Highscore[] ToHighScoreList(string textStream)
-        {
-            string[] entries = textStream.Split(new char[] { '\n' }, System.StringSplitOptions.RemoveEmptyEntries);
-
-			Highscore[] list = new Highscore[entries.Length];
-
-            for (int i = 0; i < entries.Length; i++)
-            {
-                string[] entryInfo = entries[i].Split(new char[] { '|' });
-
-                // Get the username from online
-                string usr = entryInfo[0];
-
-                // Replace with spaces
-                string username = usr.Replace('+', ' ');
-
-                // Dont want the date included in the username, so substring itself to show only the username
-                username = username.Substring(14, (username.Length-14));
-
-                int score = int.Parse(entryInfo[1]);
-
-                list[i] = new Highscore(username, score);
+		/// <returns></returns>
+		private Highscore[] ToHighScoreList()
+		{
+			Highscore[] list = new Highscore[leaderboard.entry.Length];
 
-                //print(highscoresList[i].username + ": " + highscoresList[i].score + " Date: "+date);
-            }
+			for (int i = 0; i < leaderboard.entry.Length; i++)
+			{
+				list[i].username = leaderboard.entry[i].name;
+				list[i].score = leaderboard.entry[i].score;
+			}
 
 			return list;
-        }
+		}
     }
 
 	/// <summary>
@@ -156,4 +148,26 @@ public Highscore(string username, int score)
             this.score = score;
         }
     }
+
+	/// <summary>
+	/// Data classes used to map the JSON response onto variables.
+	/// </summary>
+	[System.Serializable]
+	public class Leaderboard
+	{
+		public HighscoreData[] entry;
+	}
+
+	/// <summary>
+	/// A data class to hold information retrived from the Dreamlo leaderboard.
+	/// </summary>
+	[System.Serializable]
+	public class HighscoreData
+	{
+		public string name;
+		public int score;
+		public int seconds;
+		public string text;
+		public DateTime date;
+	}
 }

Assets/Scripts/Pacman/PacmanCollision.cs

@@ -15,10 +15,11 @@ public class PacmanCollision : MonoBehaviour
 
         public int currentLives = 3;
 
-		private static PacmanCollision instance;
-
+		private Rigidbody rb;
 		private Debugger debugger;
 
+		private static PacmanCollision instance;
+
 		private void Awake()
 		{
 			instance = this;
@@ -27,6 +28,7 @@ private void Awake()
 		private void Start()
 		{
 			debugger = GetComponent<Debugger>();
+			rb = GetComponent<Rigidbody>();
 		}
 
 		private void OnCollisionEnter(Collision other)
@@ -80,6 +82,9 @@ private void OnTriggerEnter(Collider other)
 						return;
 					}
 
+					// Reset the velocity to stop pacman drifting away
+					rb.velocity = Vector3.zero; 
+
                     if (ghost.IsEdible())
                     {
                         ghost.RunHome();

Assets/Scripts/Pacman/PacmanMovement.cs

@@ -1,11 +1,11 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using Utility;
+using Manager;
 
 namespace Pacman
 {
-    public class PacmanMovement : MonoBehaviour
+	public class PacmanMovement : MonoBehaviour
     {
 		[SerializeField] private bool useAccelerometer;
 		[SerializeField] private bool debug = false;
@@ -16,6 +16,7 @@ public class PacmanMovement : MonoBehaviour
 		[SerializeField] private float boostSpeed;
 		[SerializeField] private float accelerometerSensitivity;
 
+		private Rigidbody rb;
 		private Debugger debugger;
 
 		public static PacmanMovement instance;
@@ -28,6 +29,7 @@ private void Awake()
 		private void Start()
         {
 			debugger = GetComponent<Debugger>();
+			rb = GetComponent<Rigidbody>();
 
             if (!SystemInfo.supportsGyroscope)
             {
@@ -37,6 +39,11 @@ private void Start()
 
             originalSpeed = speed;
             speed = 0f;
+
+			if (GameSettingsManager.instance)
+			{
+				accelerometerSensitivity = GameSettingsManager.instance.GetAccelerometerSensitivity();
+			}
         }
 
         private void Update()
@@ -55,7 +62,10 @@ private void Update()
 
 			// Even though rigidbody is checked to lock the y-pos, just ensure here
 			transform.position = new Vector3(transform.position.x, 0f, transform.position.z);
-        }
+
+			// Reset the velocity to stop pacman drifting away
+			rb.velocity = Vector3.zero;
+		}
 
 		/// <summary>
 		/// Boosts Pacmans speed for an amount of time.

Assets/Scripts/Utility/Highscore/HighscoreDisplayHelper.cs

@@ -31,24 +31,31 @@ private void Start()
 		/// </summary>
         public void PopulateEntries(Highscore[] highscoreList)
         {
-            for (int i = 0; i < highscoreEntries.Length; i++)
-            {
-				highscoreEntries[i].Populate(i + 1 + ".", "", "");
+			if (highscoreList == null)
+			{
+				ClearEntries();
+			}
+			else
+			{
+				for (int i = 0; i < highscoreEntries.Length; i++)
+				{
+					highscoreEntries[i].Populate(i + 1 + ".", "", "");
 
-                if (highscoreList.Length > i)
-                {
-                    highscoreEntries[i].Populate(i + 1 + ".", highscoreList[i].username, highscoreList[i].score.ToString());
-                }
-            }
+					if (highscoreList.Length > i)
+					{
+						highscoreEntries[i].Populate(i + 1 + ".", highscoreList[i].username, highscoreList[i].score.ToString());
+					}
+				}
+			}
         }
 
 		/// <summary>
 		/// Updates the status text.
 		/// </summary>
-        public void ShowNoInternetConnection()
-        {
-            statusText.text = "No Internet Connection.";
-        }
+        public void DisplayError(string message)
+		{
+			statusText.text = message;
+		}
 
 		/// <summary>
 		/// Invoked every x seconds in the start menu to pull new highscores.
@@ -95,5 +102,13 @@ public void Upload(InputField usernameInputField)
 				placeholderText.text = "Uploaded!";
 			}
         }
+
+		public void ClearEntries()
+		{
+			for (int i = 0; i < highscoreEntries.Length; i++)
+			{
+				highscoreEntries[i].Populate("", "", "");
+			}
+		}
     }
 }