2 Commity 1dd162bcd9 ... 86a5c47fd3

Autor SHA1 Wiadomość Data
  DESKTOP-5BUCSUT\LSR 86a5c47fd3 Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo 1 rok temu
  DESKTOP-5BUCSUT\LSR 9d3e1977d4 场景修改 1 rok temu

BIN
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_371857150_probes.asset


+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LM0_final.hdr.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LM0_mask.tga.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LMA1_final.hdr.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LMA1_mask.tga.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LMA2_final.hdr.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 12 - 0
SFGgouhuo/Assets/Bundles/Scenes/MainScene/MainScene_LMA2_mask.tga.meta

@@ -92,6 +92,18 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 1 - 1
SFGgouhuo/Assets/GameResources/URPSetting/UniversalRenderPipelineAsset.asset

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_StoreActionsOptimization: 0
   m_SupportsHDR: 1
   m_MSAA: 1
-  m_RenderScale: 1
+  m_RenderScale: 0.6
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 512

+ 84 - 170
SFGgouhuo/Assets/MyShaderVariants.json

@@ -1,6 +1,6 @@
 {
-    "ShaderTotalCount": 36,
-    "VariantTotalCount": 98,
+    "ShaderTotalCount": 33,
+    "VariantTotalCount": 96,
     "ShaderVariantInfos": [
         {
             "AssetPath": "Resources/unity_builtin_extra",
@@ -27,7 +27,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -36,7 +35,7 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Skybox/Procedural",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -46,22 +45,12 @@
                         "_SUNDISK_SIMPLE"
                     ]
                 },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA",
-                        "_SUNDISK_SIMPLE"
-                    ]
-                },
                 {
                     "PassType": 0,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT",
                         "_SUNDISK_SIMPLE"
                     ]
@@ -162,7 +151,7 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Hidden/UIElements/EditorUIE",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -171,21 +160,11 @@
                         "_DEPTH_NO_MSAA"
                     ]
                 },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
-                    ]
-                },
                 {
                     "PassType": 0,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -207,8 +186,8 @@
                     "PassType": 0,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "_DEPTH_NO_MSAA",
+                        "_SHADOWS_SOFT"
                     ]
                 },
                 {
@@ -217,62 +196,15 @@
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
             ]
         },
-        {
-            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepth.shader",
-            "ShaderName": "Hidden/Universal Render Pipeline/CopyDepth",
-            "ShaderVariantCount": 1,
-            "ShaderVariantElements": [
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
-                    ]
-                }
-            ]
-        },
-        {
-            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/LutBuilderHdr.shader",
-            "ShaderName": "Hidden/Universal Render Pipeline/LutBuilderHdr",
-            "ShaderVariantCount": 1,
-            "ShaderVariantElements": [
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
-                    ]
-                }
-            ]
-        },
-        {
-            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader",
-            "ShaderName": "Hidden/Universal Render Pipeline/UberPost",
-            "ShaderVariantCount": 1,
-            "ShaderVariantElements": [
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA",
-                        "_HDR_GRADING"
-                    ]
-                }
-            ]
-        },
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader",
             "ShaderName": "Universal Render Pipeline/Lit",
-            "ShaderVariantCount": 28,
+            "ShaderVariantCount": 35,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -298,6 +230,13 @@
                         "_ALPHATEST_ON"
                     ]
                 },
+                {
+                    "PassType": 8,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_NORMALMAP"
+                    ]
+                },
                 {
                     "PassType": 8,
                     "Keywords": [
@@ -329,15 +268,28 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_SHADOWS_SOFT"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -345,15 +297,16 @@
                     "PassType": 13,
                     "Keywords": [
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
                     ]
@@ -361,25 +314,36 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_DETAIL_MULX2",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                        "_PARALLAXMAP"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_DETAIL_MULX2",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_PARALLAXMAP",
                         "_SHADOWS_SOFT"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "_DETAIL_MULX2",
+                        "_MAIN_LIGHT_SHADOWS"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_DETAIL_MULX2",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_RECEIVE_SHADOWS_OFF"
                     ]
                 },
@@ -387,7 +351,12 @@
                     "PassType": 13,
                     "Keywords": [
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_RECEIVE_SHADOWS_OFF"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_RECEIVE_SHADOWS_OFF",
                         "_SHADOWS_SOFT"
                     ]
@@ -397,7 +366,6 @@
                     "Keywords": [
                         "_ALPHATEST_ON",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -406,17 +374,22 @@
                     "Keywords": [
                         "_ALPHATEST_ON",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -425,7 +398,6 @@
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
                     ]
@@ -435,7 +407,6 @@
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_RECEIVE_SHADOWS_OFF",
                         "_SHADOWS_SOFT"
                     ]
@@ -443,8 +414,10 @@
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
@@ -455,7 +428,6 @@
                     "Keywords": [
                         "_ALPHATEST_ON",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
@@ -464,9 +436,11 @@
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_SHADOWS_SOFT"
                     ]
@@ -476,7 +450,6 @@
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
@@ -487,7 +460,6 @@
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP",
                         "_OCCLUSIONMAP",
                         "_SHADOWS_SOFT"
@@ -497,7 +469,6 @@
                     "PassType": 13,
                     "Keywords": [
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_OCCLUSIONMAP",
@@ -509,7 +480,6 @@
                     "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_OCCLUSIONMAP",
@@ -522,7 +492,6 @@
                         "_ALPHATEST_ON",
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
                         "_OCCLUSIONMAP",
@@ -542,8 +511,6 @@
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
                         "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -567,7 +534,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -579,7 +545,6 @@
                         "_DEPTH_NO_MSAA",
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -603,7 +568,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -619,8 +583,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -644,7 +606,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -653,14 +614,8 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Battery/Battery.shader",
             "ShaderName": "Custom/Battery",
-            "ShaderVariantCount": 8,
+            "ShaderVariantCount": 7,
             "ShaderVariantElements": [
-                {
-                    "PassType": 8,
-                    "Keywords": [
-                        ""
-                    ]
-                },
                 {
                     "PassType": 8,
                     "Keywords": [
@@ -692,15 +647,12 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                        ""
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -709,8 +661,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT",
                         "_SHOWTHUNDER_ON"
                     ]
@@ -731,15 +681,18 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "_DEPTH_NO_MSAA",
+                        "_SHADOWS_SOFT"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -759,7 +712,6 @@
                         "_ENABLEFOG_ON",
                         "_ENABLEROTATION_ON",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -783,7 +735,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -801,7 +752,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -823,8 +773,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -833,7 +781,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Line/TreeLight.shader",
             "ShaderName": "Custom/TreeLight",
-            "ShaderVariantCount": 5,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -848,26 +796,13 @@
                         "_DEPTH_NO_MSAA"
                     ]
                 },
-                {
-                    "PassType": 8,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
-                    ]
-                },
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "LIGHTPROBE_SH",
+                        "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -891,7 +826,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -908,8 +842,6 @@
                         "BILLBOARD_FACE_CAMERA_POS",
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -918,7 +850,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/floor/standard/PlanarUV.shader",
             "ShaderName": "Custom/PlanarUV",
-            "ShaderVariantCount": 4,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -934,15 +866,6 @@
                         "_NORMALMAP"
                     ]
                 },
-                {
-                    "PassType": 8,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA",
-                        "_NORMALMAP"
-                    ]
-                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -950,7 +873,6 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP",
                         "_SHADOWS_SOFT"
                     ]
@@ -969,20 +891,20 @@
                         "LIGHTPROBE_SH",
                         "_DEPTH_NO_MSAA",
                         "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        ""
+                        "INSTANCING_ON"
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "INSTANCING_ON"
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "_DEPTH_NO_MSAA"
                     ]
                 }
             ]
@@ -997,8 +919,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -1020,8 +940,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -1043,8 +961,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },
@@ -1066,8 +982,6 @@
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
                     ]
                 },

+ 77 - 102
SFGgouhuo/Assets/MyShaderVariants.shadervariants

@@ -17,17 +17,15 @@ ShaderVariantCollection:
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SUNDISK_SIMPLE
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _SUNDISK_SIMPLE
-        passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT _SUNDISK_SIMPLE
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
+          _SUNDISK_SIMPLE
         passType: 0
   - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
     second:
@@ -69,35 +67,16 @@ ShaderVariantCollection:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
-        passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
-        passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
-        passType: 0
-  - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    second:
-      variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
-        passType: 0
-  - first: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
-    second:
-      variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
-  - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
-    second:
-      variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _HDR_GRADING
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
     second:
@@ -110,71 +89,81 @@ ShaderVariantCollection:
         passType: 8
       - keywords: _ALPHATEST_ON
         passType: 8
+      - keywords: _EMISSION _NORMALMAP
+        passType: 8
       - keywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP
         passType: 8
       - keywords: INSTANCING_ON _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
         passType: 8
       - keywords: _ALPHATEST_ON _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
         passType: 8
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: 
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS
+        passType: 13
+      - keywords: _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
+          _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
+      - keywords: _MAIN_LIGHT_SHADOWS _NORMALMAP
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
+          _NORMALMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: _MAIN_LIGHT_SHADOWS _PARALLAXMAP
         passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _PARALLAXMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
+      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
-          _SHADOWS_SOFT
+      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
         passType: 13
-      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _RECEIVE_SHADOWS_OFF
         passType: 13
-      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
-          _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _RECEIVE_SHADOWS_OFF _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
-          _SHADOWS_SOFT
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
-          _SHADOWS_SOFT
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _NORMALMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _SHADOWS_SOFT
         passType: 13
-      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _NORMALMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _RECEIVE_SHADOWS_OFF _SHADOWS_SOFT
+        passType: 13
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
+          _METALLICSPECGLOSSMAP _NORMALMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP _NORMALMAP
           _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _EMISSION
+          _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
-          _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP _NORMALMAP
+          _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+          _SHADOWS_SOFT
         passType: 13
-      - keywords: _ALPHATEST_ON _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP _NORMALMAP
+          _OCCLUSIONMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _ALPHATEST_ON _EMISSION _MAIN_LIGHT_SHADOWS _METALLICSPECGLOSSMAP
+          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _EMISSION _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _EMISSION _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
     second:
@@ -182,10 +171,10 @@ ShaderVariantCollection:
       - keywords: 
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 13
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _EMISSION
-          _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: 0d808c8fa52a4af4d81474904c8eabb6, type: 3}
     second:
@@ -193,13 +182,12 @@ ShaderVariantCollection:
       - keywords: 
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: 50f27db3bc3f95e499b63606cfa9abf6, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: 1025b31568a64d3498f20a3bfdbbc055, type: 3}
     second:
@@ -207,13 +195,11 @@ ShaderVariantCollection:
       - keywords: 
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 30fdee58649e9b741964c940519dbe51, type: 3}
     second:
       variants:
-      - keywords: 
-        passType: 8
       - keywords: INSTANCING_ON
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
@@ -222,27 +208,27 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHOWTHUNDER_ON
         passType: 8
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: 
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _SHADOWS_SOFT
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT _SHOWTHUNDER_ON
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT _SHOWTHUNDER_ON
         passType: 13
   - first: {fileID: 4800000, guid: 52a3866ead6b0474dafa217a7fc53e19, type: 3}
     second:
       variants:
       - keywords: 
         passType: 8
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 82881a2d011b0964696411c822cdd00b, type: 3}
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _ENABLEFOG_ON
-          _ENABLEROTATION_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _ENABLEROTATION_ON _MAIN_LIGHT_SHADOWS _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: 4342622947299d84196e637a7baa8f6d, type: 3}
     second:
@@ -250,21 +236,20 @@ ShaderVariantCollection:
       - keywords: 
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 44078aff4de957844a86ead7ad169295, type: 3}
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: 4681b8f89bcf2874baf933f008097a52, type: 3}
     second:
       variants:
       - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 87be84199b4f4704cb2acaa3db2e6960, type: 3}
     second:
@@ -273,11 +258,8 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
-        passType: 8
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 1aef06fde7c7fcc4fa2e7f69d4acb9cc, type: 3}
     second:
@@ -285,13 +267,12 @@ ShaderVariantCollection:
       - keywords: 
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 8eeb6772416504849bae66a0cb8ea1e9, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
   - first: {fileID: 4800000, guid: 7fdc8eabcb575e144a061d6275647a48, type: 3}
     second:
@@ -300,50 +281,44 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _NORMALMAP
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _NORMALMAP
-        passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT
+          _NORMALMAP _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: ffa49d7c380711442a37103077de0fa8, type: 3}
     second:
       variants:
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+          _SHADOWS_SOFT
         passType: 0
-      - keywords: 
-        passType: 8
       - keywords: INSTANCING_ON
         passType: 8
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
+        passType: 8
   - first: {fileID: -6465566751694194690, guid: b59f111e98592c44bbf4c06a9af258bc, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: 6df5e214b1ea9af47ad136832f65664c, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: a8e95bd088c85ed4e8914d97ddb0e750, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: 528ad68c70d9b3d45b96a876c5361208, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 0
       - keywords: 
         passType: 8

+ 5 - 5
SFGgouhuo/ProjectSettings/GraphicsSettings.asset

@@ -45,15 +45,15 @@ GraphicsSettings:
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []
-  m_LightmapStripping: 0
+  m_LightmapStripping: 1
   m_FogStripping: 0
   m_InstancingStripping: 0
   m_LightmapKeepPlain: 1
-  m_LightmapKeepDirCombined: 1
-  m_LightmapKeepDynamicPlain: 1
-  m_LightmapKeepDynamicDirCombined: 1
+  m_LightmapKeepDirCombined: 0
+  m_LightmapKeepDynamicPlain: 0
+  m_LightmapKeepDynamicDirCombined: 0
   m_LightmapKeepShadowMask: 1
-  m_LightmapKeepSubtractive: 1
+  m_LightmapKeepSubtractive: 0
   m_FogKeepLinear: 1
   m_FogKeepExp: 1
   m_FogKeepExp2: 1