From 34bfdeb04390ebe82d01166174fb074e20de250d Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Fri, 11 Nov 2022 19:19:54 +0100 Subject: [PATCH] switched to URP --- Assets/Scenes/MainScene.unity | 11 +- Assets/Scripts/fps.cs | 14 +- Assets/Urp.meta | 8 + .../New Universal Render Pipeline Asset.asset | 74 ++++++++ ...Universal Render Pipeline Asset.asset.meta | 8 + ...ersal Render Pipeline Asset_Renderer.asset | 60 ++++++ ... Render Pipeline Asset_Renderer.asset.meta | 8 + ...niversalRenderPipelineGlobalSettings.asset | 27 +++ ...salRenderPipelineGlobalSettings.asset.meta | 8 + Packages/manifest.json | 1 + Packages/packages-lock.json | 43 ++++- ProjectSettings/GraphicsSettings.asset | 9 +- ProjectSettings/QualitySettings.asset | 4 +- ProjectSettings/ShaderGraphSettings.asset | 16 ++ ProjectSettings/URPProjectSettings.asset | 15 ++ .../Layouts/CurrentMaximizeLayout.dwlt | 154 +++++++-------- UserSettings/Layouts/default-2021.dwlt | 176 +++++++++--------- 17 files changed, 456 insertions(+), 180 deletions(-) create mode 100644 Assets/Urp.meta create mode 100644 Assets/Urp/New Universal Render Pipeline Asset.asset create mode 100644 Assets/Urp/New Universal Render Pipeline Asset.asset.meta create mode 100644 Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset create mode 100644 Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset.meta create mode 100644 Assets/Urp/UniversalRenderPipelineGlobalSettings.asset create mode 100644 Assets/Urp/UniversalRenderPipelineGlobalSettings.asset.meta create mode 100644 ProjectSettings/ShaderGraphSettings.asset create mode 100644 ProjectSettings/URPProjectSettings.asset diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 3fe06e5..d3fa120 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -2750,6 +2750,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fpsText: {fileID: 947787407} + _hudRefreshRate: 1 --- !u!1 &245385154 GameObject: m_ObjectHideFlags: 0 @@ -13706,7 +13707,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -15065,7 +15066,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -20725,7 +20726,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -25002,7 +25003,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -26242,7 +26243,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scripts/fps.cs b/Assets/Scripts/fps.cs index adfc813..c5a97be 100644 --- a/Assets/Scripts/fps.cs +++ b/Assets/Scripts/fps.cs @@ -2,15 +2,25 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using TMPro; +using System.Threading; public class fps : MonoBehaviour { public TMP_Text fpsText; + [SerializeField] private float _hudRefreshRate = 1f; + private float _timer; // Update is called once per frame void Update() { - int current = (int)(1f / Time.unscaledDeltaTime); - fpsText.text = "Fps: " + current.ToString(); + /*int current = (int)(1f / Time.unscaledDeltaTime); + fpsText.text = "Fps: " + current.ToString();*/ + + if (Time.unscaledTime > _timer) { + int fps = (int)(1f / Time.unscaledDeltaTime); + fpsText.text = "FPS: " + fps; + _timer = Time.unscaledTime + _hudRefreshRate; + } + } } diff --git a/Assets/Urp.meta b/Assets/Urp.meta new file mode 100644 index 0000000..d94f0ac --- /dev/null +++ b/Assets/Urp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5f424265c046d64e9515f15255ade37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Urp/New Universal Render Pipeline Asset.asset b/Assets/Urp/New Universal Render Pipeline Asset.asset new file mode 100644 index 0000000..76ede63 --- /dev/null +++ b/Assets/Urp/New Universal Render Pipeline Asset.asset @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: New Universal Render Pipeline Asset + m_EditorClassIdentifier: + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 3dca9460d8d6cef4d9f7f8ed871b66ae, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_StoreActionsOptimization: 0 + m_SupportsHDR: 1 + m_MSAA: 1 + m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 2048 + m_AdditionalLightsShadowResolutionTierLow: 256 + m_AdditionalLightsShadowResolutionTierMedium: 512 + m_AdditionalLightsShadowResolutionTierHigh: 1024 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 1 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.2 + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 1 + m_NumIterationsEnclosingSphere: 64 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_SupportsLightLayers: 0 + m_DebugLevel: 0 + m_UseAdaptivePerformance: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 + m_ShadowCascades: 0 diff --git a/Assets/Urp/New Universal Render Pipeline Asset.asset.meta b/Assets/Urp/New Universal Render Pipeline Asset.asset.meta new file mode 100644 index 0000000..d596e65 --- /dev/null +++ b/Assets/Urp/New Universal Render Pipeline Asset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f14ceadaeba9f6c47ae9db7e84441a57 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset b/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset new file mode 100644 index 0000000..c4d8f12 --- /dev/null +++ b/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} + m_Name: New Universal Render Pipeline Asset_Renderer + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + m_RendererFeatures: [] + m_RendererFeatureMap: + m_UseNativeRenderPass: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 1, z: 0} + m_HDREmulationScale: 1 + m_LightRenderTextureScale: 0.5 + m_LightBlendStyles: + - name: Multiply + maskTextureChannel: 0 + blendMode: 1 + - name: Additive + maskTextureChannel: 0 + blendMode: 0 + - name: Multiply with Mask + maskTextureChannel: 1 + blendMode: 1 + - name: Additive with Mask + maskTextureChannel: 1 + blendMode: 0 + m_UseDepthStencilBuffer: 1 + m_UseCameraSortingLayersTexture: 0 + m_CameraSortingLayersTextureBound: 0 + m_CameraSortingLayerDownsamplingMethod: 0 + m_MaxLightRenderTextureCount: 16 + m_MaxShadowRenderTextureCount: 1 + m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} + m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} + m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} + m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} + m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_DefaultMaterialType: 0 + m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} diff --git a/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset.meta b/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset.meta new file mode 100644 index 0000000..e782407 --- /dev/null +++ b/Assets/Urp/New Universal Render Pipeline Asset_Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3dca9460d8d6cef4d9f7f8ed871b66ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset b/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset new file mode 100644 index 0000000..a996a2e --- /dev/null +++ b/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} + m_Name: UniversalRenderPipelineGlobalSettings + m_EditorClassIdentifier: + k_AssetVersion: 2 + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + supportRuntimeDebugDisplay: 0 diff --git a/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 0000000..8e44122 --- /dev/null +++ b/Assets/Urp/UniversalRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4304f722bfdb79a43b26bc2a4323123d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index d22362a..a25f00e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,6 +4,7 @@ "com.unity.feature.2d": "1.0.0", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", + "com.unity.render-pipelines.universal": "12.1.7", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 879e436..30961a6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -86,8 +86,8 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.6.6", - "depth": 3, + "version": "1.7.3", + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1" @@ -142,7 +142,7 @@ }, "com.unity.mathematics": { "version": "1.2.6", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -154,6 +154,34 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.core": { + "version": "12.1.7", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.universal": { + "version": "12.1.7", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.7.3", + "com.unity.render-pipelines.core": "12.1.7", + "com.unity.shadergraph": "12.1.7" + } + }, + "com.unity.searcher": { + "version": "4.9.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.services.core": { "version": "1.4.3", "depth": 1, @@ -165,6 +193,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.shadergraph": { + "version": "12.1.7", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "12.1.7", + "com.unity.searcher": "4.9.1" + } + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index c165afb..ea7bf11 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -38,8 +38,9 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -59,6 +60,8 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 + m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 4304f722bfdb79a43b26bc2a4323123d, type: 2} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index ba65bb1..d1e9968 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -201,7 +201,7 @@ QualitySettings: skinWeights: 255 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 0 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -220,7 +220,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} + customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 0000000..9b28428 --- /dev/null +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 0000000..c1f118a --- /dev/null +++ b/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 5 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 7447e13..5a58ce4 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,12 +19,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 635 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 2441 + controlID: 131 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 234 + x: 329 y: 73 - width: 790 - height: 376 + width: 1111 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 790, y: 355} + m_TargetSize: {x: 1111, y: 550} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -67,17 +67,17 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 0 + m_Stats: 1 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -395 - m_HBaseRangeMax: 395 - m_VBaseRangeMin: -177.5 - m_VBaseRangeMax: 177.5 + m_HBaseRangeMin: -555.5 + m_HBaseRangeMax: 555.5 + m_VBaseRangeMin: -275 + m_VBaseRangeMax: 275 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 790 - height: 355 + width: 1111 + height: 550 m_Scale: {x: 1, y: 1} - m_Translation: {x: 395, y: 177.5} + m_Translation: {x: 555.5, y: 275} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -395 - y: -177.5 - width: 790 - height: 355 + x: -555.5 + y: -275 + width: 1111 + height: 550 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 790, y: 376} + m_LastWindowPixelSize: {x: 1111, y: 571} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1026 - height: 635 + width: 1442 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 2442 + controlID: 132 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1026 - height: 397 + width: 1442 + height: 592 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2443 + controlID: 133 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,8 +184,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 234 - height: 397 + width: 329 + height: 592 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -215,18 +215,18 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 233 - height: 376 + width: 328 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 157} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: a2e6ffffe2e6ffffb6e9ffff20fbffff3a5f00005c5f00005860000068620000ae630000266400002a64000068640000da640000cc6500000866000078660000e0660000e8660000ec670000fcac000074b20000 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 234 + x: 329 y: 0 - width: 792 - height: 397 + width: 1113 + height: 592 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 234 + x: 329 y: 73 - width: 790 - height: 376 + width: 1111 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 7.5735636, y: -5.465334, z: -0.085131764} + m_Target: {x: -5.871439, y: -0.70468926, z: -0.28832665} speed: 2 - m_Value: {x: 7.5735636, y: -5.465334, z: -0.085131764} + m_Value: {x: -5.871439, y: -0.70468926, z: -0.28832665} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 5.522076 + m_Target: 19.80472 speed: 2 - m_Value: 5.522076 + m_Value: 19.80472 m_Ortho: m_Target: 1 speed: 2 @@ -655,13 +655,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 397 - width: 1026 - height: 238 + y: 592 + width: 1442 + height: 355 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2368 + controlID: 93 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -679,8 +679,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 562 - height: 238 + width: 790 + height: 355 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 11} @@ -709,9 +709,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 470 - width: 561 - height: 217 + y: 665 + width: 789 + height: 334 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -729,22 +729,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 55 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 55 - m_LastProjectPath: C:\dev\find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 90680000 - m_LastClickedID: 26768 - m_ExpandedIDs: 000000007c68000000ca9a3bffffff7f + m_SelectedIDs: 86750000 + m_LastClickedID: 30086 + m_ExpandedIDs: 0000000086750000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -772,7 +772,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007c68000000ca9a3bffffff7f + m_ExpandedIDs: 0000000086750000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -797,8 +797,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 46aa0000 - m_LastClickedInstanceID: 43590 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -824,7 +824,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 19} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 55 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -843,10 +843,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 562 + x: 790 y: 0 - width: 464 - height: 238 + width: 652 + height: 355 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} @@ -874,10 +874,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 562 - y: 470 - width: 462 - height: 217 + x: 790 + y: 665 + width: 650 + height: 334 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -897,12 +897,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1026 + x: 1442 y: 0 - width: 340 - height: 635 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 478 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -928,10 +928,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1026 + x: 1442 y: 73 - width: 339 - height: 614 + width: 477 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -942,7 +942,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 43590 + m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index f1f7821..600e6a8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -16,8 +16,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 43 - width: 1366 - height: 685 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 685 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,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} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 665 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 635 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4229 + controlID: 675 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1026 - height: 635 + width: 1471 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4234 + controlID: 740 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1026 - height: 397 + width: 1471 + height: 592 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4235 + controlID: 741 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 234 - height: 397 + width: 307 + height: 592 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -206,23 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 234 + x: 307 y: 0 - width: 792 - height: 397 + width: 1164 + height: 592 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 16} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -241,13 +241,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 397 - width: 1026 - height: 238 + y: 592 + width: 1471 + height: 355 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4258 + controlID: 634 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,8 +265,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 562 - height: 238 + width: 807 + height: 355 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 17} @@ -289,10 +289,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 562 + x: 807 y: 0 - width: 464 - height: 238 + width: 664 + height: 355 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -315,10 +315,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1026 + x: 1471 y: 0 - width: 340 - height: 635 + width: 449 + height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} @@ -346,10 +346,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 235 - y: 19 - width: 790 - height: 376 + x: 307 + y: 73 + width: 1162 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -360,7 +360,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 790, y: 355} + m_TargetSize: {x: 1162, y: 550} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -368,17 +368,17 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 0 + m_Stats: 1 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -395 - m_HBaseRangeMax: 395 - m_VBaseRangeMin: -177.5 - m_VBaseRangeMax: 177.5 + m_HBaseRangeMin: -581 + m_HBaseRangeMax: 581 + m_VBaseRangeMin: -275 + m_VBaseRangeMax: 275 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -387,7 +387,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -396,23 +396,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 790 - height: 355 + width: 1162 + height: 550 m_Scale: {x: 1, y: 1} - m_Translation: {x: 395, y: 177.5} + m_Translation: {x: 581, y: 275} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -395 - y: -177.5 - width: 790 - height: 355 + x: -581 + y: -275 + width: 1162 + height: 550 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 790, y: 376} + m_LastWindowPixelSize: {x: 1162, y: 571} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -440,18 +440,18 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 233 - height: 376 + width: 306 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 157} - m_SelectedIDs: 3aaf0000 - m_LastClickedID: 44858 - m_ExpandedIDs: a2e6ffffe2e6ffffb6e9ffff20fbffff3a5f00005c5f00005860000068620000ae630000266400002a64000068640000da640000cc6500000866000078660000e0660000e8660000ec670000fcac000074b20000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -495,10 +495,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 234 + x: 329 y: 73 - width: 790 - height: 376 + width: 1111 + height: 571 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -755,9 +755,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 7.5735636, y: -5.465334, z: -0.085131764} + m_Target: {x: -5.871439, y: -0.70468926, z: -0.28832665} speed: 2 - m_Value: {x: 7.5735636, y: -5.465334, z: -0.085131764} + m_Value: {x: -5.871439, y: -0.70468926, z: -0.28832665} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -808,9 +808,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 5.522076 + m_Target: 19.80472 speed: 2 - m_Value: 5.522076 + m_Value: 19.80472 m_Ortho: m_Target: 1 speed: 2 @@ -856,9 +856,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 470 - width: 561 - height: 217 + y: 665 + width: 806 + height: 334 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -876,22 +876,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 55 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 55 - m_LastProjectPath: C:\dev\find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 90680000 - m_LastClickedID: 26768 - m_ExpandedIDs: 000000007c68000000ca9a3bffffff7f + m_SelectedIDs: 86750000 + m_LastClickedID: 30086 + m_ExpandedIDs: 0000000086750000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -919,7 +919,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007c68000000ca9a3bffffff7f + m_ExpandedIDs: 0000000086750000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -946,7 +946,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -971,7 +971,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 19} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 55 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -995,10 +995,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 562 - y: 470 - width: 462 - height: 217 + x: 807 + y: 665 + width: 662 + height: 334 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1023,10 +1023,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1026 + x: 1471 y: 73 - width: 339 - height: 614 + width: 448 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default