From f6349b46e54f11a2d1febb102c228e0ea5271cc6 Mon Sep 17 00:00:00 2001 From: Jonasmortensen Date: Mon, 20 Sep 2021 11:43:07 +0200 Subject: [PATCH 1/2] Backport of 5552 --- .../Materials/DryWallPainted_Mat.mat | 2 +- .../ExampleAssets/Materials/DryWall_Mat.mat | 2 +- .../ExampleAssets/Materials/Liquid_Mat.mat | 3 +- .../Materials/Metal_Blue_Simple_Mat.mat | 2 +- .../ExampleAssets/Materials/OBS_Mat.mat | 2 +- .../Materials/Paint1G_WAnim_Material.mat | 45 +++++++++++++++++++ .../Materials/Plastic_Black_Mat.mat | 2 +- .../Materials/Plastic_Gray_Mat.mat | 2 +- .../Materials/Plastic_Transparent.mat | 3 +- .../Materials/Plastic_Yellow_Mat.mat | 2 +- .../ExampleAssets/Materials/Stud_Mat.mat | 2 +- .../Settings/UniversalRP-HighQuality.asset | 3 ++ .../Settings/UniversalRP-LowQuality.asset | 3 ++ .../Settings/UniversalRP-MediumQuality.asset | 3 ++ .../Assets/Settings/UniversalRenderer.asset | 9 +++- .../Packages/manifest.json | 23 +++++----- .../ProjectSettings/GraphicsSettings.asset | 16 ++++--- .../ProjectSettings/QualitySettings.asset | 2 +- .../ProjectSettings/ShaderGraphSettings.asset | 16 +++++++ 19 files changed, 112 insertions(+), 30 deletions(-) create mode 100644 com.unity.template-universal/ProjectSettings/ShaderGraphSettings.asset diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat index 69a3085e533..3450bdc3ee7 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 + m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWall_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWall_Mat.mat index 38f347f81cb..477eab1d818 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWall_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/DryWall_Mat.mat @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 + m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Liquid_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Liquid_Mat.mat index a1212ac2922..dadfe3e70df 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Liquid_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Liquid_Mat.mat @@ -31,6 +31,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,7 +123,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.95283014, g: 0.9241496, b: 0.34607506, a: 0.4627451} - - _Color: {r: 0.9528302, g: 0.9241496, b: 0.3460751, a: 0.4627451} + - _Color: {r: 0.95283014, g: 0.9241496, b: 0.34607503, a: 0.4627451} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat index 19d5f5e0189..2a72fd57f35 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat @@ -108,7 +108,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.20990562, g: 0.41062784, b: 0.8396226, a: 1} - - _Color: {r: 0.20990565, g: 0.41062787, b: 0.8396226, a: 1} + - _Color: {r: 0.20990556, g: 0.4106278, b: 0.8396226, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/OBS_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/OBS_Mat.mat index 4c53f22ce69..1f197ce537a 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/OBS_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/OBS_Mat.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 + m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Paint1G_WAnim_Material.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Paint1G_WAnim_Material.mat index 9ba1fef0a4a..8451486cf9a 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Paint1G_WAnim_Material.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Paint1G_WAnim_Material.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7228319139545256619 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -23,6 +36,10 @@ Material: m_Texture: {fileID: 2800000, guid: e5c37ab0c7b37af4f981195d3caaf4b4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_3ec74a86d8c1488d8ce597f8156fb7ab_Texture_1: + m_Texture: {fileID: 2800000, guid: 2de0d72a6700bd94ea57111b29e246fc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SampleTexture2D_72715EE4_Texture: m_Texture: {fileID: 2800000, guid: ca084ebab0cef7c4ba746cdb442f9c1e, type: 3} m_Scale: {x: 1, y: 1} @@ -55,9 +72,37 @@ Material: m_Texture: {fileID: 2800000, guid: ac80c335ebd6dde4fa54a82050064545, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_ae061cbc8301d686a4cbfc6826975296_Texture_1: + m_Texture: {fileID: 2800000, guid: ca084ebab0cef7c4ba746cdb442f9c1e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SampleTexture2D_aef34a082e463b8992e5f66de0345979_Texture_1: + m_Texture: {fileID: 2800000, guid: ac80c335ebd6dde4fa54a82050064545, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SampleTexture2D_e60950bba990008885c246fd6823bc78_Texture_1: + m_Texture: {fileID: 2800000, guid: 5e98de278b2ccc14f89b76b85596a3f3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_2EE2CB80: 0.01 + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_23C9B10D: {r: 0, g: 0.61, b: 0.85, a: 0} - Color_A2AAE5B5: {r: 0.78999996, g: 0.8399999, b: 0.96999997, a: 0} - Vector2_C848BFFB: {r: 0.3, g: 0.8, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat index 7cc9cc33946..7b0e83482e5 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.17647055, g: 0.17647055, b: 0.17647055, a: 1} - - _Color: {r: 0.1764706, g: 0.1764706, b: 0.1764706, a: 1} + - _Color: {r: 0.17647052, g: 0.17647052, b: 0.17647052, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat index f967d4083af..f706ab4f12e 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.39215684, g: 0.39215684, b: 0.39215684, a: 1} - - _Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1} + - _Color: {r: 0.3921568, g: 0.3921568, b: 0.3921568, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Transparent.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Transparent.mat index f9a3ec64e32..838655359cd 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Transparent.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Transparent.mat @@ -31,6 +31,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,7 +123,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.41509423, g: 0.41509423, b: 0.41509423, a: 0.6} - - _Color: {r: 0.41509426, g: 0.41509426, b: 0.41509426, a: 0.6} + - _Color: {r: 0.4150942, g: 0.4150942, b: 0.4150942, a: 0.6} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat index 8dfd7c3af4f..8ae927cc894 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.8687334, b: 0.06274507, a: 1} - - _Color: {r: 1, g: 0.8687334, b: 0.062745094, a: 1} + - _Color: {r: 1, g: 0.8687334, b: 0.06274505, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/com.unity.template-universal/Assets/ExampleAssets/Materials/Stud_Mat.mat b/com.unity.template-universal/Assets/ExampleAssets/Materials/Stud_Mat.mat index e531314250a..cd861cf1160 100644 --- a/com.unity.template-universal/Assets/ExampleAssets/Materials/Stud_Mat.mat +++ b/com.unity.template-universal/Assets/ExampleAssets/Materials/Stud_Mat.mat @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 + m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque diff --git a/com.unity.template-universal/Assets/Settings/UniversalRP-HighQuality.asset b/com.unity.template-universal/Assets/Settings/UniversalRP-HighQuality.asset index d357a351359..d133c360842 100644 --- a/com.unity.template-universal/Assets/Settings/UniversalRP-HighQuality.asset +++ b/com.unity.template-universal/Assets/Settings/UniversalRP-HighQuality.asset @@ -48,6 +48,8 @@ MonoBehaviour: m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 1 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 @@ -63,4 +65,5 @@ MonoBehaviour: m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 m_ShadowCascades: 1 diff --git a/com.unity.template-universal/Assets/Settings/UniversalRP-LowQuality.asset b/com.unity.template-universal/Assets/Settings/UniversalRP-LowQuality.asset index fc84f26e005..4337839a76d 100644 --- a/com.unity.template-universal/Assets/Settings/UniversalRP-LowQuality.asset +++ b/com.unity.template-universal/Assets/Settings/UniversalRP-LowQuality.asset @@ -48,6 +48,8 @@ MonoBehaviour: m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 0 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 @@ -63,4 +65,5 @@ MonoBehaviour: m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 m_ShadowCascades: 0 diff --git a/com.unity.template-universal/Assets/Settings/UniversalRP-MediumQuality.asset b/com.unity.template-universal/Assets/Settings/UniversalRP-MediumQuality.asset index b7d2dd0e9c1..1dbd358bf98 100644 --- a/com.unity.template-universal/Assets/Settings/UniversalRP-MediumQuality.asset +++ b/com.unity.template-universal/Assets/Settings/UniversalRP-MediumQuality.asset @@ -48,6 +48,8 @@ MonoBehaviour: m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 0 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 @@ -63,4 +65,5 @@ MonoBehaviour: m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 m_ShadowCascades: 0 diff --git a/com.unity.template-universal/Assets/Settings/UniversalRenderer.asset b/com.unity.template-universal/Assets/Settings/UniversalRenderer.asset index 14042ff2793..dc1852ae1a5 100644 --- a/com.unity.template-universal/Assets/Settings/UniversalRenderer.asset +++ b/com.unity.template-universal/Assets/Settings/UniversalRenderer.asset @@ -9,9 +9,11 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f971995892640ec4f807ef396269e91e, type: 3} + m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: UniversalRenderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -27,6 +29,8 @@ MonoBehaviour: 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_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -42,4 +46,7 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 1 m_RenderingMode: 0 + m_DepthPrimingMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 7aef4d0c9e9..ac273e581b3 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -2,19 +2,20 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.3.1", - "com.unity.analytics": "3.3.5", - "com.unity.collab-proxy": "1.3.7", - "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "1.2.1", - "com.unity.ide.visualstudio": "2.0.0", - "com.unity.ide.vscode": "1.1.4", - "com.unity.purchasing": "2.0.6", + "com.unity.ads": "3.7.1", + "com.unity.analytics": "3.6.11", + "com.unity.collab-proxy": "1.7.1", + "com.unity.ext.nunit": "1.0.6", + "com.unity.ide.rider": "3.0.7", + "com.unity.ide.visualstudio": "2.0.9", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "3.2.2", "com.unity.render-pipelines.universal": "12.0.0", - "com.unity.test-framework": "1.1.18", - "com.unity.textmeshpro": "3.0.0-preview.4", - "com.unity.timeline": "1.2.11", + "com.unity.test-framework": "1.1.27", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.1", "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/com.unity.template-universal/ProjectSettings/GraphicsSettings.asset b/com.unity.template-universal/ProjectSettings/GraphicsSettings.asset index db10dd6de06..4452e4e8bc3 100644 --- a/com.unity.template-universal/ProjectSettings/GraphicsSettings.asset +++ b/com.unity.template-universal/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} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -40,10 +41,9 @@ GraphicsSettings: - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0, - type: 2} + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: 19ba41d7c0026c3459d37c2fe90c55a0, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -63,6 +63,8 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 1 - m_LightsUseColorTemperature: 0 + m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 1 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 38b35347542e5af4c9b140950c5b18db, type: 2} diff --git a/com.unity.template-universal/ProjectSettings/QualitySettings.asset b/com.unity.template-universal/ProjectSettings/QualitySettings.asset index f77e364f4bc..9157a1ac8c9 100644 --- a/com.unity.template-universal/ProjectSettings/QualitySettings.asset +++ b/com.unity.template-universal/ProjectSettings/QualitySettings.asset @@ -93,7 +93,7 @@ QualitySettings: skinWeights: 255 textureQuality: 0 anisotropicTextures: 1 - antiAliasing: 0 + antiAliasing: 2 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 diff --git a/com.unity.template-universal/ProjectSettings/ShaderGraphSettings.asset b/com.unity.template-universal/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 00000000000..9b28428b92b --- /dev/null +++ b/com.unity.template-universal/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 From ebaaebce140fb60de2fe671a7a26c0a3b15990a2 Mon Sep 17 00:00:00 2001 From: Jonasmortensen Date: Mon, 20 Sep 2021 13:20:56 +0200 Subject: [PATCH 2/2] Updated dependencies for 2021.2 release --- com.unity.template-universal/Packages/manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index ac273e581b3..c3585b9fb55 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -2,18 +2,18 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.7.1", + "com.unity.ads": "3.7.5", "com.unity.analytics": "3.6.11", - "com.unity.collab-proxy": "1.7.1", + "com.unity.collab-proxy": "1.9.0", "com.unity.ext.nunit": "1.0.6", "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.9", - "com.unity.ide.vscode": "1.2.3", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.4", "com.unity.purchasing": "3.2.2", "com.unity.render-pipelines.universal": "12.0.0", - "com.unity.test-framework": "1.1.27", + "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.1", + "com.unity.timeline": "1.6.2", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.8", "com.unity.modules.ai": "1.0.0",