From 0d383b6c9926f5bd19bb652c7a6b58b80fe3f9b9 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Fri, 2 Dec 2022 11:16:01 +0100 Subject: [PATCH] Get player data from db base --- Assets/Scripts/Date.cs | 20 +++++++ Assets/Scripts/Date.cs.meta | 11 ++++ Assets/Scripts/Network/DatabaseData.cs | 28 +++++----- Assets/Scripts/Player.cs | 12 +++++ Assets/Scripts/Player.cs.meta | 11 ++++ Assets/Scripts/PlayerList.cs | 15 ++++++ Assets/Scripts/PlayerList.cs.meta | 11 ++++ UserSettings/Layouts/default-2021.dwlt | 72 +++++++++++++------------- 8 files changed, 132 insertions(+), 48 deletions(-) create mode 100644 Assets/Scripts/Date.cs create mode 100644 Assets/Scripts/Date.cs.meta create mode 100644 Assets/Scripts/Player.cs create mode 100644 Assets/Scripts/Player.cs.meta create mode 100644 Assets/Scripts/PlayerList.cs create mode 100644 Assets/Scripts/PlayerList.cs.meta diff --git a/Assets/Scripts/Date.cs b/Assets/Scripts/Date.cs new file mode 100644 index 0000000..c87730d --- /dev/null +++ b/Assets/Scripts/Date.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Date +{ + private int year; + private int month; + private int day; + + public int getYear() { + return year; + } + public int getMonth() { + return month; + } + public int getDay() { + return day; + } +} diff --git a/Assets/Scripts/Date.cs.meta b/Assets/Scripts/Date.cs.meta new file mode 100644 index 0000000..e10ced6 --- /dev/null +++ b/Assets/Scripts/Date.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a87342cb0cedca24aacb6c119e810285 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 3459c87..643e4f1 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -4,13 +4,22 @@ using UnityEngine; using TMPro; using UnityEngine.Networking; + public class DatabaseData : MonoBehaviour { public TMP_InputField input; private WriteFile wf; + private PlayerList pl; + protected string jsondata; private void Start() { wf = FindObjectOfType(); + pl = new PlayerList(); + } + + public void jsonParser(string jsondata) { + pl = JsonUtility.FromJson(jsondata); + pl.kiir(); } public void GetPlayerData() => StartCoroutine(IGetPlayerData()); @@ -29,7 +38,10 @@ public class DatabaseData : MonoBehaviour if(request.isNetworkError || request.isHttpError) { //lecserelni majd input.text = request.error; } else { - input.text = request.downloadHandler.text; + jsondata = request.downloadHandler.text; + jsonParser(jsondata); + Debug.Log(jsondata); + input.text = jsondata; } } } @@ -39,13 +51,9 @@ public class DatabaseData : MonoBehaviour string uri = "http://localhost:3000/newplayer"; - /*List formData = new List(); - formData.Add(new MultipartFormDataSection("field1=player_name")); - formData.Add(new MultipartFormFileSection("bevitel1", "thewarrior1210"));*/ - wf.writeUserName("newtesztUsername"); - WWWForm form = new WWWForm(); + //WWWForm form = new WWWForm(); //form.AddField("bevitel1",""); using(UnityWebRequest request = UnityWebRequest.Post(uri, "")) { @@ -65,16 +73,12 @@ public class DatabaseData : MonoBehaviour string uri = "http://localhost:3000/newscore"; - /*List formData = new List(); - formData.Add(new MultipartFormDataSection("field1=player_name")); - formData.Add(new MultipartFormFileSection("bevitel1", "thewarrior1210"));*/ - wf.WritePlayerid(2); wf.WritePalyaid(1); wf.WriteScore(10); wf.WriteTime("00:01:24"); - WWWForm form = new WWWForm(); + //WWWForm form = new WWWForm(); //form.AddField("bevitel1", ""); using (UnityWebRequest request = UnityWebRequest.Post(uri, "")) { @@ -99,7 +103,7 @@ public class DatabaseData : MonoBehaviour wf.WritePalyaNev("Easy2"); - WWWForm form = new WWWForm(); + //WWWForm form = new WWWForm(); //form.AddField("bevitel1", ""); using (UnityWebRequest request = UnityWebRequest.Post(uri, "")) { diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs new file mode 100644 index 0000000..7d883fe --- /dev/null +++ b/Assets/Scripts/Player.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[System.Serializable] +public class Player { + public int playerid; + public string username; + public Date joindate; +} + + diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player.cs.meta new file mode 100644 index 0000000..821cab3 --- /dev/null +++ b/Assets/Scripts/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 116c950ce7ddb3a45a8bd98db5e9df3e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerList.cs b/Assets/Scripts/PlayerList.cs new file mode 100644 index 0000000..8227119 --- /dev/null +++ b/Assets/Scripts/PlayerList.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[System.Serializable] +public class PlayerList +{ + public Player[] players; + + public void kiir() { + foreach(Player p in players) { + Debug.Log("p_id: " + p.playerid + " username" + p.username); + } + } +} diff --git a/Assets/Scripts/PlayerList.cs.meta b/Assets/Scripts/PlayerList.cs.meta new file mode 100644 index 0000000..fe65130 --- /dev/null +++ b/Assets/Scripts/PlayerList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9614c9a6f88618d45894435f3135734d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 22f85a5..098ed9e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1366 height: 685 m_ShowMode: 4 - m_Title: Game + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 421} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 21 + controlID: 15 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,7 +93,7 @@ MonoBehaviour: x: 0 y: 0 width: 206 - height: 376 + height: 342 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 376 + y: 342 width: 1030 - height: 259 + height: 293 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 62 + controlID: 16 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,11 +244,11 @@ MonoBehaviour: x: 0 y: 0 width: 1030 - height: 376 + height: 342 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 63 + controlID: 17 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,7 +267,7 @@ MonoBehaviour: x: 206 y: 0 width: 824 - height: 376 + height: 342 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -297,9 +297,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 449 + y: 415 width: 1029 - height: 238 + height: 272 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -317,22 +317,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Network + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Network + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: C:\dev\zarodolgozat\BallPuzzle m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 425b0000 - m_LastClickedID: 23362 - m_ExpandedIDs: 00000000065b0000145b000000ca9a3bffffff7f + m_SelectedIDs: 125b0000 + m_LastClickedID: 23314 + m_ExpandedIDs: 00000000025b0000125b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000065b0000 + m_ExpandedIDs: 00000000025b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -385,8 +385,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9e5a0000 - m_LastClickedInstanceID: 23198 + m_SelectedInstanceIDs: 52600000 + m_LastClickedInstanceID: 24658 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -451,7 +451,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 518 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -480,7 +480,7 @@ MonoBehaviour: x: 0 y: 73 width: 205 - height: 355 + height: 321 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 225a0000 - m_LastClickedID: 23074 - m_ExpandedIDs: 2efbffff7a5a0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -537,7 +537,7 @@ MonoBehaviour: x: 206 y: 73 width: 822 - height: 355 + height: 321 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -842,7 +842,7 @@ MonoBehaviour: x: 206 y: 73 width: 822 - height: 355 + height: 321 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -853,7 +853,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 822, y: 334} + m_TargetSize: {x: 822, y: 300} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -870,8 +870,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -411 m_HBaseRangeMax: 411 - m_VBaseRangeMin: -167 - m_VBaseRangeMax: 167 + m_VBaseRangeMin: -150 + m_VBaseRangeMax: 150 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -890,9 +890,9 @@ MonoBehaviour: x: 0 y: 21 width: 822 - height: 334 + height: 300 m_Scale: {x: 1, y: 1} - m_Translation: {x: 411, y: 167} + m_Translation: {x: 411, y: 150} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -900,12 +900,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -411 - y: -167 + y: -150 width: 822 - height: 334 + height: 300 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 822, y: 355} + m_LastWindowPixelSize: {x: 822, y: 321} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -932,9 +932,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 449 + y: 415 width: 1029 - height: 238 + height: 272 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default