1
0

3 Ревизии 1813ec5c6b ... 5a7104a354

Автор SHA1 Съобщение Дата
  DESKTOP-5BUCSUT\LSR 5a7104a354 v1.3发布版本 преди 1 година
  DESKTOP-5BUCSUT\LSR c2f6d9da2e Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo преди 1 година
  DESKTOP-5BUCSUT\LSR 2ed4052926 保存逻辑修改 преди 1 година

BIN
SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx


+ 384 - 185
SFGgouhuo/Assets/MyShaderVariants.json

@@ -1,6 +1,6 @@
 {
     "ShaderTotalCount": 36,
-    "VariantTotalCount": 99,
+    "VariantTotalCount": 132,
     "ShaderVariantInfos": [
         {
             "AssetPath": "Resources/unity_builtin_extra",
@@ -18,24 +18,13 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Skybox/Cubemap",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 1,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
                     "Keywords": [
                         ""
                     ]
-                },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
                 }
             ]
         },
@@ -47,16 +36,12 @@
                 {
                     "PassType": 0,
                     "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"
                     ]
@@ -64,11 +49,8 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT",
                         "_SUNDISK_SIMPLE"
                     ]
                 }
@@ -173,24 +155,20 @@
                 {
                     "PassType": 0,
                     "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",
-                        "_SHADOWS_SOFT"
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
                     ]
                 }
             ]
@@ -198,39 +176,25 @@
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/Blit.shader",
             "ShaderName": "Hidden/Universal Render Pipeline/Blit",
-            "ShaderVariantCount": 4,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
                     "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",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
                     ]
                 }
             ]
@@ -243,7 +207,6 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
                         "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA"
                     ]
@@ -258,7 +221,6 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
                         "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA"
                     ]
@@ -273,7 +235,6 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
                         "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA",
                         "_HDR_GRADING"
@@ -284,7 +245,7 @@
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader",
             "ShaderName": "Universal Render Pipeline/Lit",
-            "ShaderVariantCount": 22,
+            "ShaderVariantCount": 54,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -375,39 +336,202 @@
                 {
                     "PassType": 13,
                     "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_NORMALMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_NORMALMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_PARALLAXMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_PARALLAXMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_PARALLAXMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_DETAIL_MULX2"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_DETAIL_MULX2",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_DETAIL_MULX2",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_RECEIVE_SHADOWS_OFF"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_RECEIVE_SHADOWS_OFF"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_RECEIVE_SHADOWS_OFF",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_ALPHATEST_ON"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_NORMALMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_EMISSION"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_NORMALMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_RECEIVE_SHADOWS_OFF"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_RECEIVE_SHADOWS_OFF",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -415,6 +539,35 @@
                         "_NORMALMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -422,6 +575,16 @@
                         "_METALLICSPECGLOSSMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -434,25 +597,112 @@
                     "PassType": 13,
                     "Keywords": [
                         "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_NORMALMAP",
                         "_OCCLUSIONMAP"
                     ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP",
+                        "_SHADOWS_SOFT"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_EMISSION",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_ALPHATEST_ON",
+                        "_EMISSION",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_METALLICSPECGLOSSMAP",
+                        "_NORMALMAP",
+                        "_OCCLUSIONMAP",
+                        "_SHADOWS_SOFT"
+                    ]
                 }
             ]
         },
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader",
             "ShaderName": "Universal Render Pipeline/Particles/Unlit",
-            "ShaderVariantCount": 1,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_EMISSION",
-                        "_SHADOWS_SOFT"
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "_EMISSION"
                     ]
                 }
             ]
@@ -460,7 +710,7 @@
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader",
             "ShaderName": "Universal Render Pipeline/Complex Lit",
-            "ShaderVariantCount": 5,
+            "ShaderVariantCount": 6,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -477,17 +727,13 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "_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"
@@ -496,9 +742,12 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
+                        "_EMISSION"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_EMISSION",
                         "_MAIN_LIGHT_SHADOWS",
                         "_MAIN_LIGHT_SHADOWS_CASCADE",
@@ -510,7 +759,7 @@
         {
             "AssetPath": "Assets/GameResources/Player/Skin.shadergraph",
             "ShaderName": "Shader Graphs/Skin",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -521,18 +770,9 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
                     ]
                 }
             ]
@@ -545,9 +785,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 }
             ]
@@ -574,20 +812,18 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Battery/Battery.shader",
             "ShaderName": "Custom/Battery",
-            "ShaderVariantCount": 6,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "INSTANCING_ON"
+                        ""
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "INSTANCING_ON"
                     ]
                 },
                 {
@@ -597,30 +833,16 @@
                         "_SHOWTHUNDER_ON"
                     ]
                 },
-                {
-                    "PassType": 8,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA",
-                        "_SHOWTHUNDER_ON"
-                    ]
-                },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT",
-                        "_SHOWTHUNDER_ON"
+                        "_SHADOWS_SOFT"
                     ]
                 }
             ]
@@ -628,7 +850,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Line/LineLight.shader",
             "ShaderName": "Custom/LineLight",
-            "ShaderVariantCount": 4,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -645,17 +867,19 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "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"
@@ -680,7 +904,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/handside/Magnetism/Magnetism.shader",
             "ShaderName": "Custom/Magnetism",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -697,9 +921,13 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_MAIN_LIGHT_SHADOWS",
                         "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_SHADOWS_SOFT"
@@ -710,31 +938,20 @@
         {
             "AssetPath": "Assets/Plugins/Bakery/ftLight.shader",
             "ShaderName": "Bakery/Light",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 1,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
                     "Keywords": [
                         ""
                     ]
-                },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
                 }
             ]
         },
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/handside/Magnetism/Crystal/Crystal.shader",
             "ShaderName": "Custom/Crystal",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -745,8 +962,12 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -755,20 +976,18 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Line/TreeLight.shader",
             "ShaderName": "Custom/TreeLight",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "INSTANCING_ON"
+                        ""
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "INSTANCING_ON"
                     ]
                 },
                 {
@@ -776,13 +995,28 @@
                     "Keywords": [
                         ""
                     ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE",
+                        "_SHADOWS_SOFT"
+                    ]
                 }
             ]
         },
         {
             "AssetPath": "Assets/GameResources/Street/FX/VFXAssets/Portal/Portal.shader",
             "ShaderName": "Custom/Portal",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -795,17 +1029,6 @@
                     "Keywords": [
                         ""
                     ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
                 }
             ]
         },
@@ -817,10 +1040,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 }
             ]
@@ -828,20 +1048,17 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/floor/standard/PlanarUV.shader",
             "ShaderName": "Custom/PlanarUV",
-            "ShaderVariantCount": 4,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "_NORMALMAP"
+                        ""
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA",
                         "_NORMALMAP"
                     ]
                 },
@@ -854,12 +1071,15 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
+                        "_MAIN_LIGHT_SHADOWS",
+                        "_MAIN_LIGHT_SHADOWS_CASCADE"
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
                         "_MAIN_LIGHT_SHADOWS",
                         "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_NORMALMAP",
                         "_SHADOWS_SOFT"
                     ]
                 }
@@ -868,7 +1088,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Item/arrow/arrow.shadergraph",
             "ShaderName": "Shader Graphs/arrow",
-            "ShaderVariantCount": 5,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -876,29 +1096,16 @@
                         ""
                     ]
                 },
-                {
-                    "PassType": 0,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "INSTANCING_ON"
+                        ""
                     ]
                 },
                 {
                     "PassType": 8,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "UNITY_HDR_ON",
-                        "_DEPTH_NO_MSAA"
+                        "INSTANCING_ON"
                     ]
                 },
                 {
@@ -917,9 +1124,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 },
                 {
@@ -938,9 +1143,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 },
                 {
@@ -959,9 +1162,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 },
                 {
@@ -980,9 +1181,7 @@
                 {
                     "PassType": 0,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 },
                 {

+ 129 - 63
SFGgouhuo/Assets/MyShaderVariants.shadervariants

@@ -18,18 +18,14 @@ ShaderVariantCollection:
       variants:
       - keywords: 
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        passType: 0
   - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SUNDISK_SIMPLE
+      - keywords: _SUNDISK_SIMPLE
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _SUNDISK_SIMPLE
+      - keywords: _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: UNITY_HDR_ON _DEPTH_NO_MSAA _SUNDISK_SIMPLE
         passType: 0
   - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
     second:
@@ -69,38 +65,35 @@ ShaderVariantCollection:
   - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
+      - keywords: 
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: _DEPTH_NO_MSAA
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: UNITY_HDR_ON _DEPTH_NO_MSAA
         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
+      - keywords: 
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: _DEPTH_NO_MSAA
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _SHADOWS_SOFT
+      - keywords: UNITY_HDR_ON _DEPTH_NO_MSAA
         passType: 0
   - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: 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: UNITY_HDR_ON _DEPTH_NO_MSAA
         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: UNITY_HDR_ON _DEPTH_NO_MSAA _HDR_GRADING
         passType: 0
   - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
     second:
@@ -129,30 +122,107 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        passType: 13
+      - keywords: _SHADOWS_SOFT
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+        passType: 13
       - keywords: _NORMALMAP
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT
+        passType: 13
       - keywords: _PARALLAXMAP
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _PARALLAXMAP
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _PARALLAXMAP _SHADOWS_SOFT
+        passType: 13
       - keywords: _DETAIL_MULX2
         passType: 13
+      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        passType: 13
+      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+        passType: 13
       - keywords: _RECEIVE_SHADOWS_OFF
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
+        passType: 13
+      - keywords: _RECEIVE_SHADOWS_OFF _SHADOWS_SOFT
+        passType: 13
       - keywords: _ALPHATEST_ON
         passType: 13
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+        passType: 13
+      - keywords: _ALPHATEST_ON _NORMALMAP
+        passType: 13
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
+          _SHADOWS_SOFT
+        passType: 13
       - keywords: _EMISSION
         passType: 13
+      - keywords: _EMISSION _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _NORMALMAP
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
+          _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _RECEIVE_SHADOWS_OFF
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
+          _SHADOWS_SOFT
+        passType: 13
       - keywords: _METALLICSPECGLOSSMAP _NORMALMAP
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _NORMALMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP
+        passType: 13
+      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _NORMALMAP _SHADOWS_SOFT
+        passType: 13
       - keywords: _EMISSION _METALLICSPECGLOSSMAP
         passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _SHADOWS_SOFT
+        passType: 13
       - keywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP
         passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _NORMALMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _EMISSION _NORMALMAP _OCCLUSIONMAP
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
+          _OCCLUSIONMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+        passType: 13
       - keywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
         passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
+          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+        passType: 13
+      - keywords: _ALPHATEST_ON _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
+        passType: 13
+      - keywords: _ALPHATEST_ON _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+          _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 _SHADOWS_SOFT
+      - keywords: 
+        passType: 0
+      - keywords: _EMISSION
         passType: 0
   - first: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
     second:
@@ -161,27 +231,25 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - 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
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _EMISSION
-          _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _EMISSION
+        passType: 13
+      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: 0d808c8fa52a4af4d81474904c8eabb6, type: 3}
     second:
       variants:
       - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
-        passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: 50f27db3bc3f95e499b63606cfa9abf6, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
   - first: {fileID: 4800000, guid: 1025b31568a64d3498f20a3bfdbbc055, type: 3}
     second:
@@ -193,17 +261,15 @@ ShaderVariantCollection:
   - first: {fileID: 4800000, guid: 30fdee58649e9b741964c940519dbe51, type: 3}
     second:
       variants:
-      - keywords: INSTANCING_ON
+      - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: INSTANCING_ON
         passType: 8
       - keywords: INSTANCING_ON _SHOWTHUNDER_ON
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _SHOWTHUNDER_ON
-        passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT _SHOWTHUNDER_ON
+      - keywords: _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 52a3866ead6b0474dafa217a7fc53e19, type: 3}
     second:
@@ -212,10 +278,11 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        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
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 82881a2d011b0964696411c822cdd00b, type: 3}
     second:
@@ -229,33 +296,37 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 44078aff4de957844a86ead7ad169295, type: 3}
     second:
       variants:
       - keywords: 
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        passType: 0
   - first: {fileID: 4800000, guid: 4681b8f89bcf2874baf933f008097a52, type: 3}
     second:
       variants:
       - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
+        passType: 13
+      - keywords: _SHADOWS_SOFT
         passType: 13
   - first: {fileID: 4800000, guid: 87be84199b4f4704cb2acaa3db2e6960, type: 3}
     second:
       variants:
-      - keywords: INSTANCING_ON
+      - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: INSTANCING_ON
         passType: 8
       - keywords: 
         passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+        passType: 13
   - first: {fileID: 4800000, guid: 1aef06fde7c7fcc4fa2e7f69d4acb9cc, type: 3}
     second:
       variants:
@@ -263,65 +334,60 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        passType: 13
   - first: {fileID: 4800000, guid: 8eeb6772416504849bae66a0cb8ea1e9, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
   - first: {fileID: 4800000, guid: 7fdc8eabcb575e144a061d6275647a48, type: 3}
     second:
       variants:
-      - keywords: _NORMALMAP
+      - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _NORMALMAP
+      - keywords: _NORMALMAP
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP _SHADOWS_SOFT
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+        passType: 13
+      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
   - first: {fileID: -6465566751694194690, guid: ffa49d7c380711442a37103077de0fa8, type: 3}
     second:
       variants:
       - keywords: 
         passType: 0
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        passType: 0
-      - keywords: INSTANCING_ON
+      - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+      - keywords: INSTANCING_ON
         passType: 8
       - keywords: 
         passType: 13
   - first: {fileID: -6465566751694194690, guid: b59f111e98592c44bbf4c06a9af258bc, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: 6df5e214b1ea9af47ad136832f65664c, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: a8e95bd088c85ed4e8914d97ddb0e750, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
       - keywords: 
         passType: 8
   - first: {fileID: -6465566751694194690, guid: 528ad68c70d9b3d45b96a876c5361208, type: 3}
     second:
       variants:
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
+      - keywords: 
         passType: 0
       - keywords: 
         passType: 8

+ 2 - 2
SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -171,7 +171,7 @@ MonoBehaviour:
       languageType: 5
   - name: HashFailed
     content:
-    - content: Token invalid, please verify
+    - content: Token invalid, please verify.
       languageType: 1
     - content: "\u8CEC\u865F\u9A57\u8B49\u5931\u6557"
       languageType: 2
@@ -195,7 +195,7 @@ MonoBehaviour:
       languageType: 5
   - name: URLFailed
     content:
-    - content: Internet Faild
+    - content: Network error, please try again
       languageType: 1
     - content: "\u7DB2\u7D61\u93C8\u63A5\u5931\u6557"
       languageType: 2

+ 3 - 3
SFGgouhuo/Assets/Scripts/LoginRequest.cs

@@ -83,7 +83,7 @@ namespace Assets
         /// <returns></returns>
         IEnumerator Login(string account)
         {
-            string url = "http://api.starmelody.art/api/Account/Login1";
+            string url = "http://api.starmelody.art/api/Account/Login";
             Userdata userInfo = new Userdata();
             userInfo.account = account;
             userInfo.mac = GetMacAddress();
@@ -150,8 +150,8 @@ namespace Assets
                 }
             }
             Debug.Log("Mac地址:" + physicalAddress);
-            //return physicalAddress;
-            return "00E26965E9E4";
+            return physicalAddress;
+            //return "00E26965E9E4";
 #endif
         }
     }

+ 10 - 4
SFGgouhuo/Assets/Scripts/UI/FaceBuild/CharacterManager.cs

@@ -70,12 +70,18 @@ public class CharacterManager : MonoBehaviour
     /// <param name="cr"></param>
     public async void GoodsReadFromFile(CharacterRender cr)
     {
-        string jsonStr = File.ReadAllText(Application.persistentDataPath + "/PlayerGoods.json");
-        List<Good> goods = JsonMapper.ToObject<List<Good>>(jsonStr);
-        foreach(var item in goods)
+        string path = Application.persistentDataPath + "/PlayerGoods.json";
+
+        if (File.Exists(path))
         {
-            await ChangePlayerTex(cr, item);
+            string jsonStr = File.ReadAllText(path);
+            List<Good> goods = JsonMapper.ToObject<List<Good>>(jsonStr);
+            foreach (var item in goods)
+            {
+                await ChangePlayerTex(cr, item);
+            }
         }
+        else Debug.Log("ûÓÐÕÒµ½PlayerGoods.jsonÎļþ!");
     }
     public async UniTask ChangePlayerTex (CharacterRender cr, Good config)
     {

+ 2 - 2
SFGgouhuo/ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 3
+  m_CurrentQuality: 2
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low
@@ -223,7 +223,7 @@ QualitySettings:
     customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality:
-    Android: 2
+    Android: 3
     GameCoreScarlett: 5
     GameCoreXboxOne: 5
     Lumin: 5