diff --git a/Assets/Scripts/CoinCounter.cs b/Assets/Scripts/CoinCounter.cs index 78499df..ec998e2 100644 --- a/Assets/Scripts/CoinCounter.cs +++ b/Assets/Scripts/CoinCounter.cs @@ -4,7 +4,7 @@ using UnityEngine; public class CoinCounter : MonoBehaviour { - public ulong coin = 0; + public ulong coin = 0; //szedje le db-bol a playerhez a coint public void AddCoin(ulong number){ coin += number; diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 99010c6..9583a19 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -87,6 +87,29 @@ public class DatabaseData : MonoBehaviour } } + + + private IEnumerator IGetPlayerCoins(string username){ + string uri = "http://localhost:3000/coinget"; + + var uwr = new UnityWebRequest(uri, "POST"); + byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+username+"}"); //palya id megadasa + uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend); //felkuldi a palya id-t + uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); + uwr.SetRequestHeader("Content-Type", "application/json"); + + yield return uwr.SendWebRequest(); + + if (uwr.isNetworkError) { + Debug.Log(uwr.error); + } else { + Debug.Log(uwr.downloadHandler.text); + + } + } + + + private IEnumerator IPostNewPlayerData() { input.text = "loading..."; diff --git a/Assets/Scripts/WallCollision.cs b/Assets/Scripts/WallCollision.cs index 35d36ea..924039e 100644 --- a/Assets/Scripts/WallCollision.cs +++ b/Assets/Scripts/WallCollision.cs @@ -1,13 +1,19 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEditor; public class WallCollision : MonoBehaviour { private void OnTriggerEnter(Collider other) { if(other.gameObject.tag == "Player"){ Debug.Log("neki ment a falnak"); - Application.Quit(); + + #if UNITY_EDITOR + EditorApplication.isPlaying = false; + #else + Application.Quit(); + #endif } } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 48aeb14..88bc245 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,11 +19,11 @@ MonoBehaviour: width: 1366 height: 673 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 67 + controlID: 173 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 68 + controlID: 174 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -196,7 +196,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 21 + controlID: 175 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -268,14 +268,14 @@ MonoBehaviour: y: 354 width: 1020 height: 269 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -335,7 +335,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 96c0feff84f8ffff32fbffff34fbffff + m_ExpandedIDs: b8faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -668,11 +668,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: -0.20257631, y: 0.2837753, z: -0.061466984, w: -0.9352343} speed: 2 - m_Value: {x: -0.20257561, y: 0.28377432, z: -0.061466772, w: -0.9352311} + m_Value: {x: -0.20257631, y: 0.2837753, z: -0.06146699, w: -0.93523437} m_Size: - m_Target: 9.598886 + m_Target: 11.961957 speed: 2 - m_Value: 9.598886 + m_Value: 11.961957 m_Ortho: m_Target: 0 speed: 2 @@ -738,22 +738,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts/Network m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts/Network m_LastFoldersGridSize: -1 m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 60} - m_SelectedIDs: 08620000 - m_LastClickedID: 25096 - m_ExpandedIDs: 0000000008620000a0640000f2c30000f4c3000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 80670000 + m_LastClickedID: 26496 + m_ExpandedIDs: 000000004c59000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000008620000 + m_ExpandedIDs: 000000004c59000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: