From 50ed817e690dbe6f2b08fdbdb40298a756897bff Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Tue, 19 Apr 2022 13:50:42 +0200 Subject: [PATCH] Upgraded project to Unity 2021.3 LTS, including upgrade of URP package to version 12.1 --- Assets/Rendering/QuakeRenderPipeline.asset | 21 ++++- .../QuakeRenderPipeline_Renderer.asset | 18 +++- Assets/Shaders/QuakeForwardPass.hlsl | 2 + .../Original/Materials/Quake_Liquid.mat | 12 ++- .../Original/Particles/RoundParticle.mat | 11 ++- .../Original/Particles/SquareParticle.mat | 8 +- Packages/manifest.json | 18 ++-- Packages/packages-lock.json | 93 +++++++++++-------- ProjectSettings/GraphicsSettings.asset | 8 +- ProjectSettings/ProjectSettings.asset | 26 +++++- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/URPProjectSettings.asset | 2 +- 12 files changed, 151 insertions(+), 72 deletions(-) diff --git a/Assets/Rendering/QuakeRenderPipeline.asset b/Assets/Rendering/QuakeRenderPipeline.asset index 4716735..3224e12 100644 --- a/Assets/Rendering/QuakeRenderPipeline.asset +++ b/Assets/Rendering/QuakeRenderPipeline.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: QuakeRenderPipeline m_EditorClassIdentifier: - k_AssetVersion: 6 - k_AssetPreviousVersion: 5 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,9 +23,13 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 0 + m_StoreActionsOptimization: 0 m_SupportsHDR: 0 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 @@ -33,25 +37,38 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + 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.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 0 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 + 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/Rendering/QuakeRenderPipeline_Renderer.asset b/Assets/Rendering/QuakeRenderPipeline_Renderer.asset index 01c6067..a2c2b1d 100644 --- a/Assets/Rendering/QuakeRenderPipeline_Renderer.asset +++ b/Assets/Rendering/QuakeRenderPipeline_Renderer.asset @@ -12,8 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: QuakeRenderPipeline_Renderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -22,11 +26,17 @@ MonoBehaviour: screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - tileDepthInfoPS: {fileID: 0} - tileDeferredPS: {fileID: 0} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + m_AssetVersion: 1 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -42,4 +52,8 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 0 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 + m_IntermediateTextureMode: 1 diff --git a/Assets/Shaders/QuakeForwardPass.hlsl b/Assets/Shaders/QuakeForwardPass.hlsl index 690b240..9031351 100644 --- a/Assets/Shaders/QuakeForwardPass.hlsl +++ b/Assets/Shaders/QuakeForwardPass.hlsl @@ -42,6 +42,8 @@ struct Varyings void InitializeInputData(Varyings input, out InputData inputData) { + inputData = (InputData)0; + inputData.positionWS = input.posWS; half3 viewDirWS = input.viewDir; diff --git a/Assets/Styles/Original/Materials/Quake_Liquid.mat b/Assets/Styles/Original/Materials/Quake_Liquid.mat index 144cbb8..6a271ef 100644 --- a/Assets/Styles/Original/Materials/Quake_Liquid.mat +++ b/Assets/Styles/Original/Materials/Quake_Liquid.mat @@ -12,17 +12,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Quake_Liquid m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} - m_ShaderKeywords: _EMISSION _RECEIVE_SHADOWS_OFF + m_ValidKeywords: + - _EMISSION + - _RECEIVE_SHADOWS_OFF + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -31,6 +35,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -94,6 +99,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 diff --git a/Assets/Styles/Original/Particles/RoundParticle.mat b/Assets/Styles/Original/Particles/RoundParticle.mat index eeb907e..422b755 100644 --- a/Assets/Styles/Original/Particles/RoundParticle.mat +++ b/Assets/Styles/Original/Particles/RoundParticle.mat @@ -12,17 +12,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: RoundParticle m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: + - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -31,6 +34,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -90,6 +94,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 diff --git a/Assets/Styles/Original/Particles/SquareParticle.mat b/Assets/Styles/Original/Particles/SquareParticle.mat index 4582f67..6f69c38 100644 --- a/Assets/Styles/Original/Particles/SquareParticle.mat +++ b/Assets/Styles/Original/Particles/SquareParticle.mat @@ -12,17 +12,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SquareParticle m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -89,6 +90,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index c6af662..68e8e07 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,15 +1,15 @@ { "dependencies": { - "com.unity.collab-proxy": "1.7.1", - "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", - "com.unity.inputsystem": "1.0.2", - "com.unity.render-pipelines.universal": "10.5.1", - "com.unity.test-framework": "1.1.27", + "com.unity.collab-proxy": "1.15.16", + "com.unity.ide.rider": "3.0.13", + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.3.0", + "com.unity.render-pipelines.universal": "12.1.6", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.1", - "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview", + "com.unity.timeline": "1.6.4", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.0", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index bbe9e2e..e25cae8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,20 @@ { "dependencies": { + "com.unity.burst": { + "version": "1.6.5", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { - "version": "1.7.1", + "version": "1.15.16", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0" + "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.com" }, @@ -17,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.7", + "version": "3.0.13", "depth": 0, "source": "registry", "dependencies": { @@ -26,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.15", "depth": 0, "source": "registry", "dependencies": { @@ -35,88 +44,92 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.0.2", + "version": "1.3.0", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.1.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.5.1", + "version": "12.1.6", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" + "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": "10.5.1", + "version": "12.1.6", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.5.1", - "com.unity.shadergraph": "10.5.1" - }, - "url": "https://packages.unity.com" + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.5.0", + "com.unity.render-pipelines.core": "12.1.6", + "com.unity.shadergraph": "12.1.6" + } }, "com.unity.searcher": { - "version": "4.3.2", + "version": "4.9.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.shadergraph": { - "version": "10.5.1", + "com.unity.services.core": { + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "10.5.1", - "com.unity.searcher": "4.3.2" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.shadergraph": { + "version": "12.1.6", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "12.1.6", + "com.unity.searcher": "4.9.1" + } + }, "com.unity.sysroot": { - "version": "0.1.19-preview", + "version": "2.0.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "0.1.14-preview", + "version": "2.0.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "0.1.18-preview" + "com.unity.sysroot": "2.0.0" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.27", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -136,7 +149,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.1", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { @@ -148,12 +161,12 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "0.1.21-preview", + "version": "2.0.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.sysroot": "0.1.19-preview", - "com.unity.sysroot.linux-x86_64": "0.1.14-preview" + "com.unity.sysroot": "2.0.0", + "com.unity.sysroot.linux-x86_64": "2.0.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index c5d384e..edad1f7 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,6 +38,7 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: - {fileID: 20000000, guid: 0bce72ddc4b3a52428a360db52c20c96, type: 2} + m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: c24e2c2de0e0d4d4ba09c317ce83dea9, @@ -61,6 +62,9 @@ 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: 54f39fd374ced2b45bd3a98872f637ba, + type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ebbe776..afecec7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: 0e4b390fda9a46e48a2866abe81989a3 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -68,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -121,6 +127,7 @@ PlayerSettings: vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -156,7 +163,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -212,6 +219,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -239,6 +247,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -255,6 +264,7 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 @@ -313,7 +323,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -346,6 +356,7 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -355,6 +366,7 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -363,6 +375,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -493,7 +506,9 @@ PlayerSettings: switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -564,7 +579,6 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 - ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: @@ -611,7 +625,6 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 @@ -648,6 +661,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -698,4 +712,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5ac0724..3384268 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.15f2 -m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498) +m_EditorVersion: 2021.3.0f1 +m_EditorVersionWithRevision: 2021.3.0f1 (6eacc8284459) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 3077404..c1f118a 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 4 + m_LastMaterialVersion: 5