Skip to content

Commit de9670b

Browse files
committed
deps: Upgrade materials to HDRP 17 and Unity to 6.0.
1 parent a86ffe7 commit de9670b

29 files changed

+857
-93
lines changed

Assets/Art/Materials/Default/Plastic/Plastics Edges.mat

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Material:
3232
RenderType: Transparent
3333
disabledShaderPasses:
3434
- MOTIONVECTORS
35-
- TransparentDepthPrepass
3635
- TransparentDepthPostpass
3736
m_LockedProperties:
3837
m_SavedProperties:
@@ -323,6 +322,7 @@ Material:
323322
- _DoubleSidedGIMode: 0
324323
- _DoubleSidedNormalMode: 1
325324
- _DstBlend: 10
325+
- _DstBlend2: 10
326326
- _EmissiveColorMode: 1
327327
- _EmissiveExposureWeight: 1
328328
- _EmissiveIntensity: 1
@@ -374,6 +374,7 @@ Material:
374374
- _PPDPrimitiveLength: 1
375375
- _PPDPrimitiveWidth: 1
376376
- _Parallax: 0.02
377+
- _PerPixelSorting: 0
377378
- _PlanarSpace: 0
378379
- _RayTracing: 1
379380
- _RayTracingTexFilteringScale: 0.07
@@ -408,12 +409,12 @@ Material:
408409
- _SpecularShift: 0.5
409410
- _SrcBlend: 1
410411
- _StencilRef: 0
411-
- _StencilRefDepth: 0
412+
- _StencilRefDepth: 16
412413
- _StencilRefDistortionVec: 4
413414
- _StencilRefGBuffer: 2
414415
- _StencilRefMV: 32
415416
- _StencilWriteMask: 6
416-
- _StencilWriteMaskDepth: 9
417+
- _StencilWriteMaskDepth: 25
417418
- _StencilWriteMaskDistortionVec: 4
418419
- _StencilWriteMaskGBuffer: 15
419420
- _StencilWriteMaskMV: 41
@@ -462,8 +463,7 @@ Material:
462463
- _CarPaint2_CTSpreads: {r: 1, g: 1, b: 1, a: 1}
463464
- _ClearcoatNormalMap_SO: {r: 1, g: 1, b: 0, a: 0}
464465
- _Color: {r: 0.968, g: 0.968, b: 0.968, a: 1}
465-
- _DiffusionProfileAsset: {r: 1.9919765e+26, g: 6.519066e-17, b: -1.06316796e-10,
466-
a: 4.0993775e-12}
466+
- _DiffusionProfileAsset: {r: 1.9919765e+26, g: 6.519066e-17, b: -1.06316796e-10, a: 4.0993775e-12}
467467
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
468468
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
469469
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
@@ -495,6 +495,7 @@ Material:
495495
- _uvThreadMask: {r: 1, g: 0, b: 0, a: 0}
496496
- _uvThreadST: {r: 1, g: 1, b: 0, a: 0}
497497
m_BuildTextureStacks: []
498+
m_AllowLocking: 1
498499
--- !u!114 &690636052690670611
499500
MonoBehaviour:
500501
m_ObjectHideFlags: 11

Assets/Art/Materials/Default/Plastic/Plastics Top.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ Material:
322322
- _DoubleSidedGIMode: 0
323323
- _DoubleSidedNormalMode: 1
324324
- _DstBlend: 10
325+
- _DstBlend2: 10
325326
- _EmissiveColorMode: 1
326327
- _EmissiveExposureWeight: 1
327328
- _EmissiveIntensity: 1
@@ -373,6 +374,7 @@ Material:
373374
- _PPDPrimitiveLength: 1
374375
- _PPDPrimitiveWidth: 1
375376
- _Parallax: 0.02
377+
- _PerPixelSorting: 0
376378
- _PlanarSpace: 0
377379
- _RayTracing: 1
378380
- _RayTracingTexFilteringScale: 0.07
@@ -461,8 +463,7 @@ Material:
461463
- _CarPaint2_CTSpreads: {r: 1, g: 1, b: 1, a: 1}
462464
- _ClearcoatNormalMap_SO: {r: 1, g: 1, b: 0, a: 0}
463465
- _Color: {r: 1, g: 1, b: 1, a: 1}
464-
- _DiffusionProfileAsset: {r: 1.9919765e+26, g: 6.519066e-17, b: -1.06316796e-10,
465-
a: 4.0993775e-12}
466+
- _DiffusionProfileAsset: {r: 1.9919765e+26, g: 6.519066e-17, b: -1.06316796e-10, a: 4.0993775e-12}
466467
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
467468
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
468469
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
@@ -494,6 +495,7 @@ Material:
494495
- _uvThreadMask: {r: 1, g: 0, b: 0, a: 0}
495496
- _uvThreadST: {r: 1, g: 1, b: 0, a: 0}
496497
m_BuildTextureStacks: []
498+
m_AllowLocking: 1
497499
--- !u!114 &690636052690670611
498500
MonoBehaviour:
499501
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Blue.mat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 1
@@ -233,11 +235,11 @@ Material:
233235
- _SpecularOcclusionMode: 1
234236
- _SrcBlend: 1
235237
- _StencilRef: 0
236-
- _StencilRefDepth: 8
238+
- _StencilRefDepth: 24
237239
- _StencilRefGBuffer: 10
238240
- _StencilRefMV: 40
239241
- _StencilWriteMask: 6
240-
- _StencilWriteMaskDepth: 9
242+
- _StencilWriteMaskDepth: 25
241243
- _StencilWriteMaskGBuffer: 15
242244
- _StencilWriteMaskMV: 41
243245
- _SubsurfaceMask: 1
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3409344546083851097
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Blue_Hat.mat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 0
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3426349332633250363
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Green.mat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 1
@@ -233,11 +235,11 @@ Material:
233235
- _SpecularOcclusionMode: 1
234236
- _SrcBlend: 1
235237
- _StencilRef: 0
236-
- _StencilRefDepth: 8
238+
- _StencilRefDepth: 24
237239
- _StencilRefGBuffer: 10
238240
- _StencilRefMV: 40
239241
- _StencilWriteMask: 6
240-
- _StencilWriteMaskDepth: 9
242+
- _StencilWriteMaskDepth: 25
241243
- _StencilWriteMaskGBuffer: 15
242244
- _StencilWriteMaskMV: 41
243245
- _SubsurfaceMask: 1
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3409344546083851097
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Green_Hat.mat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 0
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3426349332633250363
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Red.mat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 1
@@ -233,11 +235,11 @@ Material:
233235
- _SpecularOcclusionMode: 1
234236
- _SrcBlend: 1
235237
- _StencilRef: 0
236-
- _StencilRefDepth: 8
238+
- _StencilRefDepth: 24
237239
- _StencilRefGBuffer: 10
238240
- _StencilRefMV: 40
239241
- _StencilWriteMask: 6
240-
- _StencilWriteMaskDepth: 9
242+
- _StencilWriteMaskDepth: 25
241243
- _StencilWriteMaskGBuffer: 15
242244
- _StencilWriteMaskMV: 41
243245
- _SubsurfaceMask: 1
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3409344546083851097
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_Red_Hat.mat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 0
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3426349332633250363
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_White.mat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 1
@@ -233,11 +235,11 @@ Material:
233235
- _SpecularOcclusionMode: 1
234236
- _SrcBlend: 1
235237
- _StencilRef: 0
236-
- _StencilRefDepth: 8
238+
- _StencilRefDepth: 24
237239
- _StencilRefGBuffer: 10
238240
- _StencilRefMV: 40
239241
- _StencilWriteMask: 6
240-
- _StencilWriteMaskDepth: 9
242+
- _StencilWriteMaskDepth: 25
241243
- _StencilWriteMaskGBuffer: 15
242244
- _StencilWriteMaskMV: 41
243245
- _SubsurfaceMask: 1
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3409344546083851097
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

Assets/Art/Materials/Inserts/InsertArrow2In_White_Hat.mat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ Material:
185185
- _DoubleSidedGIMode: 0
186186
- _DoubleSidedNormalMode: 1
187187
- _DstBlend: 10
188+
- _DstBlend2: 10
188189
- _EmissiveColorMode: 1
189190
- _EmissiveExposureWeight: 1
190191
- _EmissiveIntensity: 1
@@ -221,6 +222,7 @@ Material:
221222
- _PPDMinSamples: 5
222223
- _PPDPrimitiveLength: 1
223224
- _PPDPrimitiveWidth: 1
225+
- _PerPixelSorting: 0
224226
- _RayTracing: 0
225227
- _ReceivesSSR: 1
226228
- _ReceivesSSRTransparent: 0
@@ -282,6 +284,7 @@ Material:
282284
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
283285
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
284286
m_BuildTextureStacks: []
287+
m_AllowLocking: 1
285288
--- !u!114 &3426349332633250363
286289
MonoBehaviour:
287290
m_ObjectHideFlags: 11

0 commit comments

Comments
 (0)