This commit is contained in:
2023-03-17 10:46:50 +01:00
parent 58cd788642
commit 0c48594b23
5 changed files with 92 additions and 66 deletions

View File

@@ -926,7 +926,6 @@ GameObject:
- component: {fileID: 1201779184}
- component: {fileID: 1201779185}
- component: {fileID: 1201779186}
- component: {fileID: 1201779187}
m_Layer: 0
m_Name: Manager
m_TagString: Untagged
@@ -1026,20 +1025,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
fpsText: {fileID: 1572233531}
_hudRefreshRate: 1
--- !u!114 &1201779187
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1201779180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d858282f94188744f80e5d0e2883a3a1, type: 3}
m_Name:
m_EditorClassIdentifier:
score: 0
scoreUI: {fileID: 834582560}
--- !u!1 &1219467652
GameObject:
m_ObjectHideFlags: 0
@@ -11249,7 +11234,7 @@ Rigidbody:
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0
m_UseGravity: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
@@ -11263,7 +11248,7 @@ CapsuleCollider:
m_GameObject: {fileID: 7398140401948337837}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Enabled: 0
m_Radius: 1.7212968
m_Height: 6.3698125
m_Direction: 1

View File

@@ -7,14 +7,17 @@ using System.Text;
public class CoinCounter : MonoBehaviour
{
public ulong coin; //szedje le db-bol a playerhez a coint
public ulong coin = ulong.MaxValue; //szedje le db-bol a playerhez a coint
public TMP_Text coinCounterUI;
private string path;
private StreamWriter writer;
private StreamReader reader;
private DatabaseData db;
private void Awake() {
path = Application.persistentDataPath + "/coins.txt";
db = FindObjectOfType<DatabaseData>();
/*path = Application.persistentDataPath + "/coins.txt";
if(!File.Exists(path)){ //ha nincs meg ilyen fajl hozza letre
writer = new StreamWriter(path, false, Encoding.Default);
@@ -25,11 +28,16 @@ public class CoinCounter : MonoBehaviour
reader = new StreamReader(path);
coin = ulong.Parse(reader.ReadLine());
reader.Close();
Debug.Log("Coins at start: " + coin);
Debug.Log("Coins at start: " + coin);*/
coinCounterUI.text = "Coins: " + coin.ToString();
/*Debug.Log("coin 1: " + coin);
coin = db.GetCoins(1);
Debug.Log("itt van coin");
Debug.Log("coin 2: " + coin);
coinCounterUI.text = "Coins: " + coin.ToString();*/
}
public void AddCoin(ulong number){
coin += number;
coinCounterUI.text = "Coins: " + coin.ToString();

View File

@@ -6,7 +6,7 @@ using UnityEngine.Networking;
public class DatabaseData : MonoBehaviour
{
public TMP_InputField input; //szoveg megjelenitese
//public TMP_InputField input; //szoveg megjelenitese
public PlayerList players; //jatekos adatok
public HighScoreTableDataContainer htdc; //itt van a tomb
public HighScoreTable hst; //high score table ui
@@ -14,6 +14,8 @@ public class DatabaseData : MonoBehaviour
private CoinCounter coinc;
private ulong coins = 0;
private void Awake() {
hst = FindObjectOfType<HighScoreTable>(); //High Score Table referencia
htdc = new HighScoreTableDataContainer(); //High Score Table Container objektum
@@ -22,7 +24,8 @@ public class DatabaseData : MonoBehaviour
}
private void Start() {
GetHighScoreData(2);
//GetHighScoreData(2);
//StartCoroutine(GetCoinData(1));
}
public void jsonParser(string jsondata) { //beerkezo json adat eltarolasa
@@ -33,6 +36,11 @@ public class DatabaseData : MonoBehaviour
htdc = JsonUtility.FromJson<HighScoreTableDataContainer>("{\"htd\":" + jsondata + "}");
}
public void jsonParserCoin(string jsondata){
coins = ulong.Parse(jsondata.Substring(14,2));
Debug.Log(jsondata.Substring(14,2));
}
//fuggvenyek amik meghivjak a rutint
public void GetPlayerData() => StartCoroutine(IGetPlayerData());
public void GetHighScoreData(int palya_id) => StartCoroutine(IGetHighScoreData(palya_id));
@@ -40,10 +48,35 @@ public class DatabaseData : MonoBehaviour
public void PostNewScoreData() => StartCoroutine(IPostNewScoreData());
public void PostNewPalyaData() => StartCoroutine(IPostNewPalyaData());
public void GetCoinData(string username) => StartCoroutine(IGetPlayerCoins(username));
public ulong GetCoins(int userid){
StartCoroutine(GetCoinData(userid));
return coins;
}
private IEnumerator GetCoinData(int userid){
string uri = "http://localhost:3000/coinget";
var uwr = new UnityWebRequest(uri, "GET");
byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+userid+"}");
uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend);
uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
uwr.SetRequestHeader("Content-Type", "application/json");
yield return uwr.SendWebRequest();
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
jsondata = uwr.downloadHandler.text; //json szoveg eltarolasa
Debug.Log(jsondata);
jsonParserCoin(jsondata);
}
}
private IEnumerator IGetPlayerData() {
input.text = "Loading..."; //ideiglenes szoveg amig nem jelenik meg az adat szoveg
//input.text = "Loading..."; //ideiglenes szoveg amig nem jelenik meg az adat szoveg
string uri = "http://localhost:3000/player"; //backend vegpont linkje
@@ -51,7 +84,7 @@ public class DatabaseData : MonoBehaviour
yield return request.SendWebRequest(); //amig be nem fejezodik az fv ide fog visszaterni
if(request.isNetworkError || request.isHttpError) { //ha valami hiba tortent kiirjuk a kepernyore
input.text = request.error;
//input.text = request.error;
} else {
jsondata = request.downloadHandler.text; //json szoveg eltarolasa
jsonParser(jsondata); //json adat atalakitasa
@@ -60,11 +93,11 @@ public class DatabaseData : MonoBehaviour
Debug.Log("p_id: " + p.player_id + " username: " + p.player_name + " join date: " + p.joindate.printDate() + "\n");
}
input.text = "";
//input.text = "";
foreach(var p in players.player) {
p.ConvertDate();
//adatok kiirasa kepernyore
input.text += "p_id: " + p.player_id + " username: " + p.player_name + " join date: " + p.joindate.printDate() + "\n";
//input.text += "p_id: " + p.player_id + " username: " + p.player_name + " join date: " + p.joindate.printDate() + "\n";
}
}
}
@@ -85,14 +118,14 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
jsondata = uwr.downloadHandler.text; //json szoveg eltarolasa
Debug.Log("current player json: " + jsondata);
jsonParser(jsondata); //json adat atalakitasa
foreach(var p in players.player) {
p.ConvertDate(); //datum eltarolasa es atalakitasa datum tipussa
Debug.Log("p_id: " + p.player_id + " username: " + p.player_name + " join date: " + p.joindate.printDate() + "\n");
}
jsondata = uwr.downloadHandler.text; //json szoveg eltarolasa
Debug.Log("current player json: " + jsondata);
jsonParser(jsondata); //json adat atalakitasa
foreach(var p in players.player) {
p.ConvertDate(); //datum eltarolasa es atalakitasa datum tipussa
Debug.Log("p_id: " + p.player_id + " username: " + p.player_name + " join date: " + p.joindate.printDate() + "\n");
}
}
}
private IEnumerator IGetHighScoreData(int palya_id){
@@ -109,7 +142,7 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
input.text = uwr.downloadHandler.text;
//input.text = uwr.downloadHandler.text;
Debug.Log(uwr.downloadHandler.text);
jsonParserHighScore(uwr.downloadHandler.text);
hst.CreateTable(htdc.htd); //high score tabla letrehozasa
@@ -129,7 +162,7 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
input.text = uwr.downloadHandler.text;
//input.text = uwr.downloadHandler.text;
Debug.Log(uwr.downloadHandler.text);
jsonParserHighScore(uwr.downloadHandler.text);
hst.CreateTable(htdc.htd); //high score tabla letrehozasa
@@ -160,7 +193,7 @@ public class DatabaseData : MonoBehaviour
private IEnumerator IPostNewPlayerData() {
input.text = "loading...";
//input.text = "loading...";
string uri = "http://localhost:3000/newplayer";
@@ -175,13 +208,13 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
input.text = uwr.downloadHandler.text; //vissza erzkezes arrol hogy sikeres a felvitel vagy nem
//input.text = uwr.downloadHandler.text; //vissza erzkezes arrol hogy sikeres a felvitel vagy nem
Debug.Log(uwr.downloadHandler.text);
}
}
private IEnumerator IPostNewScoreData() {
input.text = "loading...";
//input.text = "loading...";
string uri = "http://localhost:3000/newscore";
@@ -197,13 +230,13 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
input.text = uwr.downloadHandler.text;
//input.text = uwr.downloadHandler.text;
Debug.Log(uwr.downloadHandler.text);
}
}
private IEnumerator IPostNewPalyaData() {
input.text = "loading...";
//input.text = "loading...";
string uri = "http://localhost:3000/newpalya";
@@ -218,7 +251,7 @@ public class DatabaseData : MonoBehaviour
if (uwr.isNetworkError) {
Debug.Log(uwr.error);
} else {
input.text = uwr.downloadHandler.text;
//input.text = uwr.downloadHandler.text;
Debug.Log(uwr.downloadHandler.text);
}
}

View File

@@ -9,7 +9,7 @@ public class ScoreTrigger : MonoBehaviour
score = FindObjectOfType<Score>();
}
private void OnTriggerEnter(Collider other) {
Debug.Log("score triggered");
//Debug.Log("score triggered");
if(other.gameObject.tag == "Player"){
score.addScore(1);
}