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/HighScore.unity b/Assets/Scenes/HighScore.unity index 5cdfd11..7f56d8e 100644 --- a/Assets/Scenes/HighScore.unity +++ b/Assets/Scenes/HighScore.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4440218, g: 0.49316478, b: 0.5722311, a: 1} + m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -550,7 +550,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_TargetDisplay: 0 --- !u!224 &263548834 RectTransform: @@ -2113,6 +2113,7 @@ GameObject: - component: {fileID: 763363913} - component: {fileID: 763363915} - component: {fileID: 763363916} + - component: {fileID: 763363917} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2209,6 +2210,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4102586368925fe449e8d028a1fee6c2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &763363917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763363911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e14c8833040013f4f9c1d59cd1d9dd8e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1082942970 GameObject: m_ObjectHideFlags: 0 @@ -2287,7 +2300,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!224 &1082942974 RectTransform: @@ -3236,7 +3249,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1525414363} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 763363917} + m_TargetAssemblyTypeName: SceneUIManager, Assembly-CSharp + m_MethodName: LoadMenuScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1525414363 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 2ec3118..bd745f3 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.56158954, g: 0.7218083, b: 0.8178571, a: 1} + m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1001,7 +1001,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.045581315, y: -0.70516795, z: 0.04552063, 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 @@ -2052,9 +2052,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 + m_ScaleFactor: 1.5 m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -3310,7 +3310,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513686735} - m_LocalRotation: {x: 0.22590086, y: 0.0030496388, z: -0.00070720055, w: 0.9741453} + m_LocalRotation: {x: 0.22590086, y: 0.0030496013, z: -0.0007071918, 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 @@ -3521,7 +3521,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1572233530 RectTransform: m_ObjectHideFlags: 0 @@ -3539,7 +3539,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 190, y: -693} + m_AnchoredPosition: {x: 190, y: 517} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1572233531 diff --git a/Assets/Scripts/HighScoreTable/HighScoreTable.cs b/Assets/Scripts/HighScoreTable/HighScoreTable.cs index 1dce799..b1b2f31 100644 --- a/Assets/Scripts/HighScoreTable/HighScoreTable.cs +++ b/Assets/Scripts/HighScoreTable/HighScoreTable.cs @@ -12,7 +12,7 @@ public class HighScoreTable : MonoBehaviour private HighScoreTableDataContainer htdc; //A tombot tarolo osztalyhoz referencia private void Start() { - dbData.GetHighScoreData(); + //dbData.GetHighScoreData(); } public void CreateTable(HighScoreTableData[] htd){ diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index f05e193..65c75a0 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -5,6 +5,7 @@ using TMPro; using UnityEngine.Networking; using System.IO; using System.Text; +using UnityEngine.SceneManagement; public class DatabaseData : MonoBehaviour { @@ -29,12 +30,12 @@ public class DatabaseData : MonoBehaviour } private void Start() { - //GetHighScoreData(); + GetHighScoreData(); //StartCoroutine(GetCoinData(1)); } public void jsonParser(string jsondata) { //beerkezo json adat eltarolasa - players = new PlayerList(); //jatekos lista osztaly + players = new PlayerList(); //jatekos lista osztaly || lehet okozza a hibat!! players = JsonUtility.FromJson("{\"player\":" + jsondata + "}"); } @@ -117,6 +118,7 @@ public class DatabaseData : MonoBehaviour } + private IEnumerator IGetCurretPlayer(int userid){ string uri = "http://localhost:3000/currentplayer"; @@ -158,7 +160,8 @@ public class DatabaseData : MonoBehaviour //input.text = uwr.downloadHandler.text; Debug.Log(uwr.downloadHandler.text); jsonParserHighScore(uwr.downloadHandler.text); - hst.CreateTable(htdc.htd); //high score tabla letrehozasa + if(SceneManager.GetActiveScene().name.Equals("HighScore")) + hst.CreateTable(htdc.htd); //high score tabla letrehozasa } } diff --git a/Assets/Scripts/SceneUIManager.cs b/Assets/Scripts/SceneUIManager.cs index c60de35..f47837a 100644 --- a/Assets/Scripts/SceneUIManager.cs +++ b/Assets/Scripts/SceneUIManager.cs @@ -5,20 +5,14 @@ using UnityEngine.SceneManagement; public class SceneUIManager : MonoBehaviour { - private int menuSceneIndex = 0, currentSceneIndex = SceneManager.GetActiveScene().buildIndex; - public void LoadMenuScene() { - SceneManager.LoadScene(menuSceneIndex); + SceneManager.LoadScene(0); } public void LoadPauseMenu() { //to be implemented when the ui is done } - public void LoadOptionsMenu() { - //to be implemented when the ui is done - } - public void LoadNextScene() { SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); } @@ -26,4 +20,5 @@ public class SceneUIManager : MonoBehaviour public static void LoadScene(int sceneIndex) { SceneManager.LoadScene(sceneIndex); } + } \ No newline at end of file diff --git a/Assets/Scripts/UsernameHandler.cs b/Assets/Scripts/UsernameHandler.cs index bc10827..a7920ed 100644 --- a/Assets/Scripts/UsernameHandler.cs +++ b/Assets/Scripts/UsernameHandler.cs @@ -31,6 +31,7 @@ public class UsernameHandler : MonoBehaviour private void Start() { usernameCheck(); } + public void ReadUsername(string username){ //kiirja az inputbol kapott usernevet fajlba this.username = username; diff --git a/Assets/Scripts/fps.cs b/Assets/Scripts/fps.cs index 68e2a65..cf87b94 100644 --- a/Assets/Scripts/fps.cs +++ b/Assets/Scripts/fps.cs @@ -13,12 +13,10 @@ public class fps : MonoBehaviour // Update is called once per frame void Update() { - #if UNITY_EDITOR if (Time.unscaledTime > _timer) { int fps = (int)(1f / Time.unscaledDeltaTime); fpsText.text = "FPS: " + fps; _timer = Time.unscaledTime + _hudRefreshRate; } - #endif } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c360aaa..1a6ead7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,12 +8,12 @@ PlayerSettings: AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 + defaultScreenOrientation: 0 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: Ball Puzzle + companyName: Motion Games + productName: PortalRun defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -21,7 +21,7 @@ PlayerSettings: m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 1 + m_SplashScreenLogoStyle: 0 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1 @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.6 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -155,6 +155,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: + Android: com.MotionGames.PortalRun Standalone: com.DefaultCompany.Ball-Puzzle buildNumber: Standalone: 0 @@ -370,6 +371,66 @@ PlayerSettings: m_SubKind: App Store - m_BuildTarget: Android m_Icons: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: - m_Textures: [] m_Width: 432 m_Height: 432 @@ -400,66 +461,6 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -704,6 +705,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -803,6 +805,7 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -814,6 +817,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -892,6 +896,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 755e5a9..b1620db 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 0 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 2 name: Low @@ -115,17 +115,17 @@ QualitySettings: customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 1 + Android: 2 Lumin: 2 Nintendo 3DS: 2 Nintendo Switch: 2 PS4: 2 PSP2: 1 - Server: 0 + Server: 2 Stadia: 2 Standalone: 2 WebGL: 2 Windows Store Apps: 2 XboxOne: 2 - iPhone: 1 + iPhone: 2 tvOS: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7d6e6fb..d3f6a6f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -23,6 +23,9 @@ EditorUserSettings: UnityRemoteCompression: value: 337f73 flags: 0 + UnityRemoteDevice: + value: 2d5e5a03 + flags: 0 UnityRemoteResolution: value: 2d5e460b0459 flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index b411aef..0971dc9 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: 28 - width: 1366 - height: 673 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 7} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 690 + x: 969 y: 0 - width: 294 - height: 441 + width: 414 + height: 588 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} @@ -69,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 623 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 44 + controlID: 197 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -85,22 +85,21 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 984 + x: 1383 y: 0 - width: 382 - height: 623 - m_MinSize: {x: 101, y: 121} + width: 537 + height: 947 + m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - - {fileID: 18} - m_Selected: 1 + m_Selected: 0 m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: @@ -119,10 +118,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 213 - height: 441 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 226 + height: 588 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -144,16 +143,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 441 - width: 984 - height: 182 + y: 588 + width: 1383 + height: 359 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} + - {fileID: 18} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -174,8 +174,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 673 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -199,7 +199,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} @@ -220,8 +220,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 653 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -244,12 +244,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 984 - height: 623 + width: 1383 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 45 + controlID: 68 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -270,12 +270,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 984 - height: 441 + width: 1383 + height: 588 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 46 + controlID: 69 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,12 +291,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 213 + x: 226 y: 0 - width: 477 - height: 441 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 743 + height: 588 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -322,10 +322,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 690 - y: 86 - width: 292 - height: 420 + x: 969 + y: 73 + width: 412 + height: 567 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -354,7 +354,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 15 + scale: 20 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0 @@ -382,9 +382,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 527 - width: 983 - height: 161 + y: 661 + width: 1382 + height: 338 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -402,22 +402,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 53 m_LastFolders: - - Assets/Scenes + - Assets/Scripts m_LastFoldersGridSize: 53 - 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: 79} - m_SelectedIDs: a46e0000 - m_LastClickedID: 28324 - m_ExpandedIDs: 00000000946e0000a66e000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 666c0000 + m_LastClickedID: 27750 + m_ExpandedIDs: 00000000586c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,7 +445,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000946e0000 + m_ExpandedIDs: 00000000586c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -521,10 +521,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 984 - y: 86 - width: 381 - height: 602 + x: 1383 + y: 73 + width: 536 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -536,7 +536,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 399 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -563,9 +563,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 212 - height: 420 + y: 73 + width: 225 + height: 567 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -575,7 +575,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2490ffff6caaffffa0b0ffffd8b4ffff8cb7ffffdaedffff0ef4ffff4a6f000058270100e8270100c6410100 + m_ExpandedIDs: 5e2effffc22effffd82effff0837ffffb438ffff1839ffff9e3affffce42fffffc4affff604bffffe64cffff1655ffff105cffff745cfffffa5dffff2866ffff2268ffff8668ffff0c6affff3a72ffff8c82ffff9c87ffff2090ffffcc91ffff3092ffffb693ffff6ee3ffff56e4ffff80e6ffff76ecffff0cfbffffc87d0000f09c00006e9d00009a9d0000b49d0000d664010054650100c0ce010042280200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -619,10 +619,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 213 - y: 86 - width: 475 - height: 420 + x: 226 + y: 73 + width: 741 + height: 567 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -857,9 +857,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 722.77234, y: 1478.3375, z: -14.634762} + m_Target: {x: 450.9199, y: 235.10068, z: 50.936386} speed: 2 - m_Value: {x: 722.77234, y: 1478.3375, z: -14.634762} + m_Value: {x: 450.9199, y: 235.10068, z: 50.936386} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -910,9 +910,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1457.7959 + m_Target: 1203.8474 speed: 2 - m_Value: 1457.7959 + m_Value: 1203.8474 m_Ortho: m_Target: 1 speed: 2 @@ -930,7 +930,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.07115192, y: -0.84182006, z: 0.114607, w: 0.52264017} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -957,10 +957,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 984 - y: 86 - width: 381 - height: 602 + x: 0 + y: 661 + width: 1382 + height: 338 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000..dba62d5 --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": [], + "options": { + "types": true, + "properties": true, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfe..3bba45f 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,66 @@ -{} \ No newline at end of file +trackSelection = true +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + adb = { + active = false + priority = 2500 + defaultAction = null + } + asset = { + active = true + priority = 25 + defaultAction = null + } + store = { + active = true + priority = 100 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + packages = { + active = true + priority = 90 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +expandedQueries = [ +] +queryBuilder = false +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" \ No newline at end of file