Skip to content

[Backport] 2021.2/universal/backport/template update #5729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2021
Merged

[Backport] 2021.2/universal/backport/template update #5729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6349b4
Backport of 5552
Jonasmortensen Sep 20, 2021
ebaaebc
Updated dependencies for 2021.2 release
Jonasmortensen Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/DryWall_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Liquid_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Metal_Blue_Simple_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/OBS_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
45 changes: 45 additions & 0 deletions com.unity.template-universal/Assets/ExampleAssets/Materials/Paint1G_WAnim_Material.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Black_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Gray_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
3 changes: 2 additions & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Transparent.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
- DepthOnly
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Plastic_Yellow_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion com.unity.template-universal/Assets/ExampleAssets/Materials/Stud_Mat.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions com.unity.template-universal/Assets/Settings/UniversalRP-HighQuality.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -63,4 +65,5 @@ MonoBehaviour:
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 1
3 changes: 3 additions & 0 deletions com.unity.template-universal/Assets/Settings/UniversalRP-LowQuality.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -63,4 +65,5 @@ MonoBehaviour:
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0
3 changes: 3 additions & 0 deletions com.unity.template-universal/Assets/Settings/UniversalRP-MediumQuality.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -63,4 +65,5 @@ MonoBehaviour:
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0
9 changes: 8 additions & 1 deletion com.unity.template-universal/Assets/Settings/UniversalRenderer.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
23 changes: 12 additions & 11 deletions com.unity.template-universal/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5",
"com.unity.analytics": "3.6.11",
"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.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.18",
"com.unity.textmeshpro": "3.0.0-preview.4",
"com.unity.timeline": "1.2.11",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.2",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
Comment on lines -5 to +18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems different than what the original PR has...

    "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.27",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.6.1",
    "com.unity.xr.legacyinputhelpers": "2.1.8",

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These version numbers get automatically bumped when opening the project. I'm going to keep as is as these are more recent number and because the numbers, in any case, can become dated quickly.

"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
16 changes: 9 additions & 7 deletions com.unity.template-universal/ProjectSettings/GraphicsSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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
Expand All @@ -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}
2 changes: 1 addition & 1 deletion com.unity.template-universal/ProjectSettings/QualitySettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ QualitySettings:
skinWeights: 255
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 0
antiAliasing: 2
softParticles: 0
softVegetation: 1
realtimeReflectionProbes: 1
Expand Down
16 changes: 16 additions & 0 deletions com.unity.template-universal/ProjectSettings/ShaderGraphSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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