From 2f0ae77e35dc430bb5f0419904c1ccd438b2277a Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Thu, 4 May 2023 12:56:56 +0200 Subject: [PATCH] update --- ...rePack_HDRP_2018.4_v1.22.unitypackage.meta | 7 + ...rePack_LWRP_2018.4_v1.22.unitypackage.meta | 7 + ...urePack_URP_2019.3_v1.22.unitypackage.meta | 7 + Assets/Scripts/Network/DatabaseData.cs | 17 +- UserSettings/Layouts/default-2021.dwlt | 162 +++++++++--------- 5 files changed, 113 insertions(+), 87 deletions(-) create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..9a23bc2 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b4dc5f685f8edc4bbba6fb0c8ea39ba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..552dc86 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8851c5995be5f704babebf752d60b4e2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta new file mode 100644 index 0000000..f481ade --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88c6da05db186cb44a4453fd624b31b2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 9bedea9..06ae439 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -21,10 +21,16 @@ public class DatabaseData : MonoBehaviour public ulong coins = 0; - private string url; + private bool forceLocalUrl = true; private const int PORT = 24002; + #if UNITY_EDITOR || UNITY_EDITOR_64 + private string url = "http://localhost:" + PORT.ToString(); + #else + private string url = "http://nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + #endif + private void Awake() { hst = FindObjectOfType(); //High Score Table referencia htdc = new HighScoreTableDataContainer(); //High Score Table Container objektum @@ -32,21 +38,20 @@ public class DatabaseData : MonoBehaviour coinc = FindObjectOfType(); //writer = new StreamWriter(Application.persistentDataPath + "/coins.txt", false, Encoding.Default); - if((Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.LinuxEditor || Application.platform == RuntimePlatform.OSXEditor) && forceLocalUrl){ + /*if((Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.LinuxEditor || Application.platform == RuntimePlatform.OSXEditor) && forceLocalUrl){ //ha az editorba van url = "http://localhost:" + PORT.ToString(); }else if(!forceLocalUrl){ url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); }else{ url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); - } + }*/ - //url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + url = "http://nodejs.dszcbaross.edu.hu:" + PORT.ToString(); } private void Start() { - GetHighScoreData(); - //StartCoroutine(GetCoinData(1)); + GetHighScoreData(); //highscore scenehez } public void jsonParser(string jsondata) { //beerkezo json adat eltarolasa diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 8f6a1f1..4a77e0e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 1920 - height: 997 + y: 28 + width: 1366 + height: 680 m_ShowMode: 4 m_Title: Console m_RootView: {fileID: 9} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 775 + x: 551 y: 0 - width: 662 - height: 290 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 471 + height: 192 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -68,13 +68,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 657 - width: 1437 - height: 290 + y: 438 + width: 1022 + height: 192 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 63 + controlID: 76 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 470 - height: 657 + width: 339 + height: 438 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 20} @@ -116,10 +116,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 884 + x: 628 y: 0 - width: 553 - height: 657 + width: 394 + height: 438 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -146,12 +146,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 630 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 151 + controlID: 108 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,10 +167,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1437 + x: 1022 y: 0 - width: 483 - height: 947 + width: 344 + height: 630 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -195,8 +195,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 775 - height: 290 + width: 551 + height: 192 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 16} @@ -224,8 +224,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 680 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -249,7 +249,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1366 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -270,8 +270,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 660 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -294,12 +294,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1437 - height: 947 + width: 1022 + height: 630 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 55 + controlID: 109 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -320,12 +320,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1437 - height: 657 + width: 1022 + height: 438 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 56 + controlID: 110 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -341,10 +341,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 470 + x: 339 y: 0 - width: 414 - height: 657 + width: 289 + height: 438 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} @@ -372,10 +372,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 884 - y: 73 - width: 551 - height: 636 + x: 628 + y: 86 + width: 392 + height: 417 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -404,7 +404,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 23 + scale: 14 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0 @@ -432,9 +432,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 730 - width: 774 - height: 269 + y: 524 + width: 550 + height: 171 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -452,22 +452,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts/Network m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 74 m_LastFolders: - - Assets/Scenes + - Assets/Scripts/Network m_LastFoldersGridSize: 74 - m_LastProjectPath: E:\dev\zarodolgozat\ColorBall + m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: a65f0000 - m_LastClickedID: 24486 - m_ExpandedIDs: 00000000965f0000a45f0000ae5f0000b05f0000 + scrollPos: {x: 0, y: 153} + m_SelectedIDs: a6600000 + m_LastClickedID: 24742 + m_ExpandedIDs: 000000007e6000008060000082600000846000009860000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -495,7 +495,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000965f0000 + m_ExpandedIDs: 000000007e600000806000008260000084600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -571,10 +571,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1437 - y: 73 - width: 482 - height: 926 + x: 1022 + y: 86 + width: 343 + height: 609 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -586,7 +586,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 212 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -612,10 +612,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 775 - y: 730 - width: 660 - height: 269 + x: 551 + y: 524 + width: 469 + height: 171 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -623,9 +623,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 82490100 - m_LastClickedID: 84354 - m_ExpandedIDs: 8eccffff18fbffff + m_SelectedIDs: a6510000 + m_LastClickedID: 20902 + m_ExpandedIDs: f4faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -669,10 +669,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 470 - y: 73 - width: 412 - height: 636 + x: 339 + y: 86 + width: 287 + height: 417 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -769,7 +769,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -907,9 +907,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -42.686497, y: 5.8833237, z: 31.033562} + m_Target: {x: -3.0000005, y: 0, z: 37.199997} speed: 2 - m_Value: {x: -42.686497, y: 5.8833237, z: 31.033562} + m_Value: {x: -3.0000005, y: 0, z: 37.199997} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -956,13 +956,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.03978299, y: -0.8525561, z: 0.06561682, w: 0.51698434} + m_Target: {x: 0.058660932, y: 0.9411822, z: -0.22614713, w: 0.2441374} speed: 2 - m_Value: {x: 0.039782733, y: -0.8525506, z: 0.06561639, w: 0.516981} + m_Value: {x: 0.058660623, y: 0.94117725, z: -0.22614594, w: 0.24413612} m_Size: - m_Target: 35.189785 + m_Target: 20.056421 speed: 2 - m_Value: 35.189785 + m_Value: 20.056421 m_Ortho: m_Target: 0 speed: 2 @@ -1008,9 +1008,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 469 - height: 636 + y: 86 + width: 338 + height: 417 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default