Merge branch 'maint/dev-update-to-6.2' into dev

2025-08-31 17:47:31 -04:00
parent d6973f70b9 f6b63ee49c
commit 1297903c03
9 changed files with 13 additions and 8 deletions
--- a/Assets/Map/Materials/AdvertisementBlueMat.mat
+++ b/Assets/Map/Materials/AdvertisementBlueMat.mat
@@ -114,6 +114,7 @@ Material:
    - _SrcBlendAlpha: 1
    - _Surface: 0
    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
@@ -134,4 +135,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
--- a/Assets/Map/Materials/AdvertisementMAt.mat
+++ b/Assets/Map/Materials/AdvertisementMAt.mat
@@ -114,6 +114,7 @@ Material:
    - _SrcBlendAlpha: 1
    - _Surface: 0
    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
@@ -134,4 +135,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
--- a/Assets/Map/Materials/DullWarmLightMat.mat
+++ b/Assets/Map/Materials/DullWarmLightMat.mat
@@ -114,6 +114,7 @@ Material:
    - _SrcBlendAlpha: 1
    - _Surface: 0
    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
@@ -134,4 +135,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
--- a/Assets/Map/Materials/GroundFloorMat.mat
+++ b/Assets/Map/Materials/GroundFloorMat.mat
@@ -41,7 +41,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/Assets/Map/Materials/LargePlatformMat.mat
+++ b/Assets/Map/Materials/LargePlatformMat.mat
@@ -41,7 +41,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/Assets/Map/Materials/LargeWallMat.mat
+++ b/Assets/Map/Materials/LargeWallMat.mat
@@ -41,7 +41,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/Assets/Map/Materials/StructureMat.mat
+++ b/Assets/Map/Materials/StructureMat.mat
@@ -133,4 +133,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
--- a/Assets/Map/Materials/WarmLightMat.mat
+++ b/Assets/Map/Materials/WarmLightMat.mat
@@ -114,6 +114,7 @@ Material:
    - _SrcBlendAlpha: 1
    - _Surface: 0
    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
@@ -134,4 +135,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 9
+  version: 10
--- a/ProjectSettings/ShaderGraphSettings.asset
+++ b/ProjectSettings/ShaderGraphSettings.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  shaderVariantLimit: 128
+  overrideShaderVariantLimit: 0
  customInterpolatorErrorThreshold: 32
  customInterpolatorWarningThreshold: 16
  customHeatmapValues: {fileID: 0}