Upgrade to 2020.3.48f1

* Tweaked materials
Unity-Technologies · Jan 2, 2024 · 6ef322b · 6ef322b
1 parent 47c4c97
commit 6ef322b
Show file tree

Hide file tree

Showing 29 changed files with 185 additions and 68 deletions.
diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Blue.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Blue.mat
@@ -28,7 +28,8 @@ Material:
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 2225
-  stringTagMap: {}
+  stringTagMap:
+    MotionVector: User
   disabledShaderPasses:
   - DistortionVectors
   - TransparentDepthPrepass
@@ -590,7 +591,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Green.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Green.mat
@@ -28,7 +28,8 @@ Material:
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 2225
-  stringTagMap: {}
+  stringTagMap:
+    MotionVector: User
   disabledShaderPasses:
   - DistortionVectors
   - TransparentDepthPrepass
@@ -585,7 +586,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Red.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Curtain_Layered_Red.mat
@@ -15,7 +15,8 @@ Material:
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 2225
-  stringTagMap: {}
+  stringTagMap:
+    MotionVector: User
   disabledShaderPasses:
   - DistortionVectors
   - TransparentDepthPrepass
@@ -573,7 +574,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Details.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Details.mat
@@ -22,8 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Details
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _DETAIL_MAP _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _MASKMAP
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _DISABLE_DECALS _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -212,7 +212,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
-    - _MetallicRemapMax: 0
+    - _MetallicRemapMax: 1
     - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Blue.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Blue.mat
@@ -586,7 +586,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Green.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Green.mat
@@ -28,7 +28,8 @@ Material:
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 2225
-  stringTagMap: {}
+  stringTagMap:
+    MotionVector: User
   disabledShaderPasses:
   - DistortionVectors
   - TransparentDepthPrepass
@@ -585,7 +586,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Red.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Fabric_Round_Layered_Red.mat
@@ -28,7 +28,8 @@ Material:
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 2225
-  stringTagMap: {}
+  stringTagMap:
+    MotionVector: User
   disabledShaderPasses:
   - DistortionVectors
   - TransparentDepthPrepass
@@ -585,7 +586,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor1: {r: 1, g: 0.882353, b: 0.60784316, a: 1}
+    - _BaseColor1: {r: 0.9764706, g: 0.89411765, b: 0.6431373, a: 1}
     - _BaseColor2: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor3: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap0_MipInfo: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/ClassicSponza/Art/Sponza/Materials/Flagpoles.mat b/Assets/ClassicSponza/Art/Sponza/Materials/Flagpoles.mat
@@ -198,7 +198,7 @@ Material:
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 1
-    - _MetallicRemapMax: 1
+    - _MetallicRemapMax: 0.97815764
     - _MetallicRemapMin: 0
     - _NormalMapSpace: 0
     - _NormalScale: 1

diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details.psd b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details.psd
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Diffuse.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Diffuse.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_MaskMap.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_MaskMap.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic_Smoothness.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic_Smoothness.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic_Smoothness.tif.meta b/Assets/ClassicSponza/Art/Sponza/Textures/Details/Details_Metallic_Smoothness.tif.meta
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain.psd b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain.psd
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Blue.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Blue.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Green.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Green.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Red.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Curtain_Diffuse_Red.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round.psd b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round.psd
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Blue.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Blue.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Green.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Green.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Red.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Fabrics/Fabric_Round_Diffuse_Red.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Flagpoles/Flagpoles.psd b/Assets/ClassicSponza/Art/Sponza/Textures/Flagpoles/Flagpoles.psd
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Flagpoles/Flagpoles_Diffuse_B.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Flagpoles/Flagpoles_Diffuse_B.tif
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Vase_Hanging/Vase_Hanging.psd b/Assets/ClassicSponza/Art/Sponza/Textures/Vase_Hanging/Vase_Hanging.psd
diff --git a/Assets/ClassicSponza/Art/Sponza/Textures/Vase_Hanging/Vase_Hanging_Diffuse.tif b/Assets/ClassicSponza/Art/Sponza/Textures/Vase_Hanging/Vase_Hanging_Diffuse.tif
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "com.unity.ide.rider": "3.0.15",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.rider": "3.0.21",
+    "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.recorder": "2.5.7",
-    "com.unity.render-pipelines.high-definition": "10.10.0",
+    "com.unity.render-pipelines.high-definition": "10.10.1",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",