Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021
This commit is contained in:
commit
8fb5f68c3a
File diff suppressed because it is too large
Load Diff
@ -2,13 +2,16 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
|
using UnityEngine.Networking;
|
||||||
|
using System.Collections;
|
||||||
|
using TMPro;
|
||||||
|
|
||||||
public class MainMenu : MonoBehaviour
|
public class MainMenu : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
public TMPro.TextMeshProUGUI ScoreText;
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
@ -24,7 +27,8 @@ public class MainMenu : MonoBehaviour
|
|||||||
|
|
||||||
public void Credits()
|
public void Credits()
|
||||||
{
|
{
|
||||||
|
StartCoroutine(GetText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php"));
|
||||||
|
ScoreText.text = "test";
|
||||||
}
|
}
|
||||||
|
|
||||||
public void QuitGame()
|
public void QuitGame()
|
||||||
@ -32,4 +36,20 @@ public class MainMenu : MonoBehaviour
|
|||||||
Debug.Log("Quit");
|
Debug.Log("Quit");
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IEnumerator GetText(string uri) {
|
||||||
|
UnityWebRequest www = UnityWebRequest.Get(uri);
|
||||||
|
yield return www.SendWebRequest();
|
||||||
|
|
||||||
|
if(www.isNetworkError || www.isHttpError) {
|
||||||
|
Debug.Log(www.error);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Show results as text
|
||||||
|
Debug.Log(www.downloadHandler.text);
|
||||||
|
ScoreText.text = www.downloadHandler.text;
|
||||||
|
// Or retrieve results as binary data
|
||||||
|
byte[] results = www.downloadHandler.data;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,10 +5,19 @@ EditorBuildSettings:
|
|||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/Scenes/Menu.unity
|
||||||
|
guid: 8650591ee4e3c1b41b0eb5a15430ded2
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/Vasek.unity
|
path: Assets/Scenes/Vasek.unity
|
||||||
guid: 127deaeaf7712824f83ee4cba639e023
|
guid: 127deaeaf7712824f83ee4cba639e023
|
||||||
- enabled: 0
|
- enabled: 1
|
||||||
|
path: Assets/Scenes/Level 2.unity
|
||||||
|
guid: 3ff2402a6d1a5b1459781b37d0f8e1c7
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/Scenes/Level 3.unity
|
||||||
|
guid: 7d7146aedfcd48445bb0d44a485249b2
|
||||||
|
- enabled: 1
|
||||||
path: Assets/Scenes/Filip.unity
|
path: Assets/Scenes/Filip.unity
|
||||||
guid: 326dea585e0ea574389529eaae8a0ab4
|
guid: 326dea585e0ea574389529eaae8a0ab4
|
||||||
m_configObjects: {}
|
m_configObjects: {}
|
||||||
|
Loading…
Reference in New Issue
Block a user