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 deleted file mode 100644 index 9a23bc2..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 552dc86..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index f481ade..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 88c6da05db186cb44a4453fd624b31b2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 9ba4a99..3bbbe1c 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -1389,7 +1389,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601898925} - m_LocalRotation: {x: 0.045581307, y: -0.70516795, z: 0.045520626, w: 0.7061079} + m_LocalRotation: {x: 0.045581326, y: -0.70516795, z: 0.045520645, w: 0.7061079} m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3717,7 +3717,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513686735} - m_LocalRotation: {x: 0.22590086, y: 0.0030496013, z: -0.0007071918, w: 0.9741453} + m_LocalRotation: {x: 0.22590086, y: 0.0030496388, z: -0.00070720055, w: 0.9741453} m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.6748314} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 06ae439..a029454 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -26,16 +26,16 @@ public class DatabaseData : MonoBehaviour private const int PORT = 24002; #if UNITY_EDITOR || UNITY_EDITOR_64 - private string url = "http://localhost:" + PORT.ToString(); + private string url = "localhost:" + PORT.ToString(); #else - private string url = "http://nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + private string url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); #endif private void Awake() { hst = FindObjectOfType(); //High Score Table referencia - htdc = new HighScoreTableDataContainer(); //High Score Table Container objektum - + htdc = new HighScoreTableDataContainer(); //High Score Table Container objektum 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){ @@ -47,7 +47,8 @@ public class DatabaseData : MonoBehaviour url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); }*/ - url = "http://nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + Debug.Log("url: " + url); } private void Start() { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 66b7765..bcbf8c7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,19 +6,19 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a - flags: 0 - RecentlyUsedSceneGuid-1: value: 5401000201035c0f5d5e582648710644464f4f2f7a7d24607c2f1b36bab66468 flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 5357075101505a0f5b5e0f7745740d4446161a7d79787035287f4a32b3e3303e flags: 0 + RecentlyUsedSceneGuid-2: + value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b + flags: 0 RecentlyUsedSceneGuid-3: - value: 51520d5f55010c0f085d5f7142770e424216487e7b2e2035752b4864b1e36d3d + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-4: - value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b + value: 51520d5f55010c0f085d5f7142770e424216487e7b2e2035752b4864b1e36d3d flags: 0 UnityRemoteCompression: value: 337f73 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 4a77e0e..139adcf 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 680 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Console + m_Title: Simulator m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 551 + x: 703 y: 0 - width: 471 - height: 192 + width: 605 + height: 257 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -68,13 +68,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 438 - width: 1022 - height: 192 + y: 690 + width: 1308 + height: 257 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 76 + controlID: 70 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 339 - height: 438 + width: 421 + height: 690 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: 628 + x: 723 y: 0 - width: 394 - height: 438 + width: 585 + height: 690 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: 1366 - height: 630 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 108 + controlID: 59 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,10 +167,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1022 + x: 1308 y: 0 - width: 344 - height: 630 + width: 612 + height: 947 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: 551 - height: 192 + width: 703 + height: 257 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: 1366 - height: 680 + width: 1920 + height: 997 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: 1366 + width: 1920 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: 660 - width: 1366 + y: 977 + width: 1920 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: 1022 - height: 630 + width: 1308 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 109 + controlID: 16 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -320,12 +320,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1022 - height: 438 + width: 1308 + height: 690 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 110 + controlID: 17 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -341,10 +341,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 339 + x: 421 y: 0 - width: 289 - height: 438 + width: 302 + height: 690 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: 628 - y: 86 - width: 392 - height: 417 + x: 723 + y: 73 + width: 583 + height: 669 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -404,7 +404,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 14 + scale: 24 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0 @@ -432,9 +432,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 524 - width: 550 - height: 171 + y: 763 + width: 702 + height: 236 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -452,22 +452,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Network + - Assets/Resources/Materials m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 74 m_LastFolders: - - Assets/Scripts/Network + - Assets/Resources/Materials m_LastFoldersGridSize: 74 - m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner + m_LastProjectPath: E:\dev\zarodolgozat\ColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 153} - m_SelectedIDs: a6600000 - m_LastClickedID: 24742 - m_ExpandedIDs: 000000007e6000008060000082600000846000009860000000ca9a3b + scrollPos: {x: 0, y: 40} + m_SelectedIDs: 42620000 + m_LastClickedID: 25154 + m_ExpandedIDs: 00000000965f0000a65f0000aa5f000044620000466200005c620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -495,7 +495,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007e600000806000008260000084600000 + m_ExpandedIDs: 00000000965f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -571,10 +571,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1022 - y: 86 - width: 343 - height: 609 + x: 1308 + y: 73 + width: 611 + height: 926 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: 212 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -612,10 +612,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 551 - y: 524 - width: 469 - height: 171 + x: 703 + y: 763 + width: 603 + height: 236 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: a6510000 - m_LastClickedID: 20902 - m_ExpandedIDs: f4faffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 16b2ffff80b2ffff92b3ffffc4bbffff1ef4ffff44f4ffff18fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -641,7 +641,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 2} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -669,10 +669,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 339 - y: 86 - width: 287 - height: 417 + x: 421 + y: 73 + width: 300 + height: 669 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -907,9 +907,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.0000005, y: 0, z: 37.199997} + m_Target: {x: -58.036957, y: 2.245201, z: 218.33162} speed: 2 - m_Value: {x: -3.0000005, y: 0, z: 37.199997} + m_Value: {x: -58.036957, y: 2.245201, z: 218.33162} 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.058660932, y: 0.9411822, z: -0.22614713, w: 0.2441374} + m_Target: {x: 0.13453877, y: -0.16241452, z: 0.022367312, w: 0.9772662} speed: 2 - m_Value: {x: 0.058660623, y: 0.94117725, z: -0.22614594, w: 0.24413612} + m_Value: {x: 0.13453685, y: -0.1624122, z: 0.022366991, w: 0.9772522} m_Size: - m_Target: 20.056421 + m_Target: 115.895386 speed: 2 - m_Value: 20.056421 + m_Value: 115.895386 m_Ortho: m_Target: 0 speed: 2 @@ -1008,9 +1008,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 338 - height: 417 + y: 73 + width: 420 + height: 669 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default