From fab7144d87b3273aeb47beefaff63cb23a962817 Mon Sep 17 00:00:00 2001 From: Naliwe GS Date: Thu, 27 Oct 2016 23:32:14 +0200 Subject: [PATCH] Added scores menu --- Assets/Scenes/Main.unity | Bin 48536 -> 0 bytes Assets/Scenes/Win.unity | Bin 26560 -> 0 bytes Assets/Scenes/Win.unity.meta | 8 -------- Assets/Scripts/API/Server.cs | 6 ++++-- Assets/Scripts/Menu.cs | 5 +++++ Assets/Scripts/Player.cs | 4 +--- 6 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 Assets/Scenes/Win.unity delete mode 100644 Assets/Scenes/Win.unity.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 2e46b1c..02ee0cb 100644 Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ diff --git a/Assets/Scenes/Win.unity b/Assets/Scenes/Win.unity deleted file mode 100644 index 3ad2e3e..0000000 Binary files a/Assets/Scenes/Win.unity and /dev/null differ diff --git a/Assets/Scenes/Win.unity.meta b/Assets/Scenes/Win.unity.meta deleted file mode 100644 index 954f954..0000000 --- a/Assets/Scenes/Win.unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d2eeb02c17ea7447842a1ccbba338a9 -timeCreated: 1477408964 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/API/Server.cs b/Assets/Scripts/API/Server.cs index 651fc44..4daa49f 100644 --- a/Assets/Scripts/API/Server.cs +++ b/Assets/Scripts/API/Server.cs @@ -12,6 +12,8 @@ namespace Assets.Scripts.API public static string HOST_PROD = "https://quantifly.plnech.fr"; public static string HOST = "http://localhost:8990"; + public ScoresRes Scores; + public Server () { } @@ -35,8 +37,8 @@ namespace Assets.Scripts.API Debug.LogError ("Error:" + www.error); } else { Debug.Log ("Got response: " + www.downloadHandler.text); - ScoresRes res = ScoresRes.CreateFromJson (www.downloadHandler.text); - Debug.Log ("Got scores: " + res); + Scores = ScoresRes.CreateFromJson (www.downloadHandler.text); + Debug.Log ("Got scores: " + Scores); } } diff --git a/Assets/Scripts/Menu.cs b/Assets/Scripts/Menu.cs index 116d1ee..8f77bfe 100644 --- a/Assets/Scripts/Menu.cs +++ b/Assets/Scripts/Menu.cs @@ -18,4 +18,9 @@ public class Menu : MonoBehaviour { { SceneManager.LoadScene("Main"); } + + public void OnButtonScoresClicked() + { + SceneManager.LoadScene("Scores"); + } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index e9e1ca4..741309c 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -38,9 +38,7 @@ namespace Assets.Scripts } if (Progression == 25) { - if (PlayerPrefs.GetInt("highscore") < Score) - PlayerPrefs.SetInt("highscore", Score); - SceneManager.LoadScene("Win"); + Score += 200; } } -- libgit2 0.27.0