diff --git a/MoCha/Assets/Scenes/Testing.unity b/MoCha/Assets/Scenes/Leaderboard.unity similarity index 56% rename from MoCha/Assets/Scenes/Testing.unity rename to MoCha/Assets/Scenes/Leaderboard.unity index 7f5561a..3577974 100644 Binary files a/MoCha/Assets/Scenes/Testing.unity and b/MoCha/Assets/Scenes/Leaderboard.unity differ diff --git a/MoCha/Assets/Scenes/Testing.unity.meta b/MoCha/Assets/Scenes/Leaderboard.unity.meta similarity index 58% rename from MoCha/Assets/Scenes/Testing.unity.meta rename to MoCha/Assets/Scenes/Leaderboard.unity.meta index 0dfb9e0..f7db7a5 100644 --- a/MoCha/Assets/Scenes/Testing.unity.meta +++ b/MoCha/Assets/Scenes/Leaderboard.unity.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: f9d68b692a268dd4ba72bf2d814a1204 +guid: b6e77f2ba4a9de64fa14948947b5767e +timeCreated: 1524106311 +licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index fd4428e..dfea7e8 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scripts/GetData.cs b/MoCha/Assets/Scripts/GetData.cs index ed3a068..f0b58a2 100644 --- a/MoCha/Assets/Scripts/GetData.cs +++ b/MoCha/Assets/Scripts/GetData.cs @@ -1,44 +1,29 @@ using UnityEngine; -using UnityEngine.Networking; using System.Collections; using UnityEngine.UI; public class GetData : MonoBehaviour { - //string displayText = ""; - Text objectText; + public Button thisbutton; + public Text objectText; - void Start() - { - objectText = GetComponentInParent (); - } + public string request = "http://corder.tech/mocha/users/*"; - public void DisplayStuff() + void Start() { - StartCoroutine (MakeRequest ()); - //Debug.Log (displayText); - //objectText.text = displayText; + thisbutton = GetComponent