LoadingPanel进度条修改

SFGgouhuo/Assets/Bundles/UI/Prefab/LoadingPanel.prefab

@@ -391,7 +391,7 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 0
-  m_FillAmount: 0
+  m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0

SFGgouhuo/Assets/MyShaderVariants.json

@@ -1,6 +1,6 @@
 {
     "ShaderTotalCount": 36,
-    "VariantTotalCount": 104,
+    "VariantTotalCount": 99,
     "ShaderVariantInfos": [
         {
             "AssetPath": "Resources/unity_builtin_extra",
@@ -18,8 +18,14 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Skybox/Cubemap",
-            "ShaderVariantCount": 1,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -278,7 +284,7 @@
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader",
             "ShaderName": "Universal Render Pipeline/Lit",
-            "ShaderVariantCount": 38,
+            "ShaderVariantCount": 22,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -369,238 +375,68 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "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": [
-                        "_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",
-                        "_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": [
-                        "_RECEIVE_SHADOWS_OFF",
-                        "_SHADOWS_SOFT"
+                        "_DETAIL_MULX2"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_RECEIVE_SHADOWS_OFF"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_ALPHATEST_ON",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "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"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_NORMALMAP",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_RECEIVE_SHADOWS_OFF",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_METALLICSPECGLOSSMAP",
-                        "_NORMALMAP",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_ALPHATEST_ON",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_METALLICSPECGLOSSMAP",
-                        "_NORMALMAP",
-                        "_SHADOWS_SOFT"
+                        "_ALPHATEST_ON"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_METALLICSPECGLOSSMAP",
-                        "_SHADOWS_SOFT"
+                        "_EMISSION"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
-                        "_NORMALMAP",
-                        "_SHADOWS_SOFT"
+                        "_NORMALMAP"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_NORMALMAP",
-                        "_OCCLUSIONMAP",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_METALLICSPECGLOSSMAP",
-                        "_NORMALMAP",
-                        "_OCCLUSIONMAP",
-                        "_SHADOWS_SOFT"
+                        "_METALLICSPECGLOSSMAP"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
-                        "_NORMALMAP",
-                        "_OCCLUSIONMAP",
-                        "_SHADOWS_SOFT"
+                        "_NORMALMAP"
                     ]
                 },
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_ALPHATEST_ON",
                         "_EMISSION",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
                         "_METALLICSPECGLOSSMAP",
                         "_NORMALMAP",
-                        "_OCCLUSIONMAP",
-                        "_SHADOWS_SOFT"
+                        "_OCCLUSIONMAP"
                     ]
                 }
             ]
@@ -624,7 +460,7 @@
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader",
             "ShaderName": "Universal Render Pipeline/Complex Lit",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -632,6 +468,20 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -660,7 +510,7 @@
         {
             "AssetPath": "Assets/GameResources/Player/Skin.shadergraph",
             "ShaderName": "Shader Graphs/Skin",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -668,15 +518,21 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
                         "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
                     ]
                 }
             ]
@@ -710,12 +566,7 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 }
             ]
@@ -777,7 +628,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Line/LineLight.shader",
             "ShaderName": "Custom/LineLight",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -785,6 +636,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -814,14 +671,8 @@
                 {
                     "PassType": 0,
                     "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"
                     ]
                 }
             ]
@@ -829,7 +680,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/handside/Magnetism/Magnetism.shader",
             "ShaderName": "Custom/Magnetism",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -837,6 +688,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -853,8 +710,14 @@
         {
             "AssetPath": "Assets/Plugins/Bakery/ftLight.shader",
             "ShaderName": "Bakery/Light",
-            "ShaderVariantCount": 1,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -911,12 +774,7 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 }
             ]
@@ -924,7 +782,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/FX/VFXAssets/Portal/Portal.shader",
             "ShaderName": "Custom/Portal",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -932,6 +790,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -964,7 +828,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/floor/standard/PlanarUV.shader",
             "ShaderName": "Custom/PlanarUV",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -981,6 +845,12 @@
                         "_NORMALMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -998,8 +868,14 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Item/arrow/arrow.shadergraph",
             "ShaderName": "Shader Graphs/arrow",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 5,
             "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -1024,6 +900,12 @@
                         "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA"
                     ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
                 }
             ]
         },

SFGgouhuo/Assets/MyShaderVariants.shadervariants

@@ -16,6 +16,8 @@ ShaderVariantCollection:
   - first: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
     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
@@ -127,68 +129,25 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: _SHADOWS_SOFT
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        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: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _PARALLAXMAP
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _PARALLAXMAP _SHADOWS_SOFT
+      - keywords: _NORMALMAP
         passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: _PARALLAXMAP
         passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _DETAIL_MULX2
         passType: 13
       - keywords: _RECEIVE_SHADOWS_OFF
         passType: 13
-      - keywords: _RECEIVE_SHADOWS_OFF _SHADOWS_SOFT
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
-        passType: 13
-      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
-        passType: 13
-      - 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
-        passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
-          _SHADOWS_SOFT
-        passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _RECEIVE_SHADOWS_OFF
-          _SHADOWS_SOFT
-        passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
-        passType: 13
-      - keywords: _ALPHATEST_ON _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
-        passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _SHADOWS_SOFT
+      - keywords: _ALPHATEST_ON
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _SHADOWS_SOFT
+      - keywords: _EMISSION
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _NORMALMAP
-          _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _METALLICSPECGLOSSMAP _NORMALMAP
         passType: 13
-      - keywords: _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _METALLICSPECGLOSSMAP
         passType: 13
-      - keywords: _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _METALLICSPECGLOSSMAP
-          _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP
         passType: 13
-      - keywords: _ALPHATEST_ON _EMISSION _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SHADOWS_SOFT
+      - keywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
         passType: 13
   - first: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
     second:
@@ -200,6 +159,10 @@ ShaderVariantCollection:
       variants:
       - keywords: 
         passType: 8
+      - keywords: 
+        passType: 13
+      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
+        passType: 13
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
           _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
         passType: 13
@@ -211,8 +174,9 @@ ShaderVariantCollection:
       variants:
       - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - 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
         passType: 13
   - first: {fileID: -6465566751694194690, guid: 50f27db3bc3f95e499b63606cfa9abf6, type: 3}
     second:
@@ -224,8 +188,7 @@ ShaderVariantCollection:
       variants:
       - keywords: 
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: 
         passType: 13
   - first: {fileID: 4800000, guid: 30fdee58649e9b741964c940519dbe51, type: 3}
     second:
@@ -247,6 +210,8 @@ ShaderVariantCollection:
       variants:
       - keywords: 
         passType: 8
+      - keywords: 
+        passType: 13
       - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHADOWS_SOFT
         passType: 13
       - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
@@ -255,20 +220,23 @@ ShaderVariantCollection:
   - 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
+      - keywords: _ENABLEFOG_ON _ENABLEROTATION_ON
         passType: 0
   - first: {fileID: 4800000, guid: 4342622947299d84196e637a7baa8f6d, type: 3}
     second:
       variants:
       - keywords: 
         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: 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
@@ -286,14 +254,15 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS
-          _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: 
         passType: 13
   - first: {fileID: 4800000, guid: 1aef06fde7c7fcc4fa2e7f69d4acb9cc, type: 3}
     second:
       variants:
       - keywords: 
         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
@@ -309,12 +278,16 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _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
         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
@@ -322,6 +295,8 @@ ShaderVariantCollection:
         passType: 8
       - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
         passType: 8
+      - keywords: 
+        passType: 13
   - first: {fileID: -6465566751694194690, guid: b59f111e98592c44bbf4c06a9af258bc, type: 3}
     second:
       variants:

SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -195,9 +195,9 @@ MonoBehaviour:
       languageType: 5
   - name: MacFailed
     content:
-    - content: Token has been used
+    - content: Token and MAC address mismatch
       languageType: 1
-    - content: "Token\u5DF2\u88AB\u4F7F\u7528"
+    - content: "Token \u548C MAC\u5730\u5740\u4E0D\u5339\u914D"
       languageType: 2
     - content: 
       languageType: 3

SFGgouhuo/Assets/Scripts/TimeCounting.cs

@@ -25,7 +25,8 @@ public class TimeCounting : MonoBehaviour
         //nowTime = (long)st.TotalMilliseconds;
         //sum = finishTime - nowTime;
         Debug.Log(StepManager.timeStamp);
-        finishTime = StepManager.timeStamp;
+        //finishTime =long.Parse(StepManager.timeStamp);
+        finishTime =(StepManager.timeStamp);
         //finishTime = 1709168400;
         nowTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
         sum = finishTime - nowTime;

SFGgouhuo/Assets/Scripts/UI/Loading/DlgLogin.cs

@@ -42,7 +42,7 @@ namespace Assets
 
         public override void OnInitWindow()
         {
-            //PlayerPrefs.DeleteKey("account");
+            PlayerPrefs.DeleteKey("account");
 
             confirmBtn.onClick.AddListener(async () =>
             {
@@ -120,20 +120,20 @@ namespace Assets
             UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
             request.uploadHandler =new UploadHandlerRaw(postBytes);
             request.SetRequestHeader("Content-Type", "application/json");
-            request.timeout = 5;
             yield return request.SendWebRequest();
             if (request.result == UnityWebRequest.Result.Success)
             {
                 Debug.Log(request.downloadHandler.text);
-                GetSecretKeyResult result = JsonMapper.ToObject<GetSecretKeyResult>(request.downloadHandler.text);
-                if (result.code==0)
+                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+                int code = (int)data["code"];
+                if (code == 0)
                 {
-                    StartCoroutine(Login(result.message));
+                    StartCoroutine(Login((string)data["message"]));
                 }
                 else
                 {
-                    Debug.Log($"获取秘钥失败：{result.message}");
-                    StepManager.requestCode = result.code;
+                    Debug.Log($"获取秘钥失败：{(string)data["message"]}");
+                    StepManager.requestCode = code;
                     yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }
@@ -165,49 +165,19 @@ namespace Assets
             if (request.result == UnityWebRequest.Result.Success)
             {
                 Debug.Log(request.downloadHandler.text);
-                LoginResult loginResult = JsonMapper.ToObject<LoginResult>(request.downloadHandler.text);
-
-                //switch (loginResult.code)
-                //{
-                //    case 0:
-                //        PlayerPrefs.SetString("account", inputField.text);
-                //        PlayerPrefs.Save();
-                //        StepManager.timeStamp = loginResult.data;
-                //        UIManager.Instance.HideUI(WindowID.DlgLogin);
-                //        yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-                //        break;
-                //    case 1001:
-                //        //Mac地址错误
-                //        StepManager.requestState = StepManager.RequestState.MacFailed;
-                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                //        break;
-                //    case 1002:
-                //        //登录超时
-                //        StepManager.requestState = StepManager.RequestState.TimeOut;
-                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                //        break;
-                //    case 1003:
-                //        //频繁请求，请求超限制
-                //        StepManager.requestState = StepManager.RequestState.Frequently;
-                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                //        break;
-                //    case 1004:
-                //        //不在白名单
-                //        StepManager.requestState = StepManager.RequestState.HashFailed;
-                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                //        break;
-                //}
-                if (loginResult.code == 0)
+                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+                int code = (int)data["code"];
+                if (code==0)
                 {
                     PlayerPrefs.SetString("account", inputField.text);
                     PlayerPrefs.Save();
-                    StepManager.timeStamp = loginResult.data;
+                    StepManager.timeStamp = (long)data["data"];
                     UIManager.Instance.HideUI(WindowID.DlgLogin);
                     yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
                 }
                 else
                 {
-                    StepManager.requestCode = loginResult.code;
+                    StepManager.requestCode = code;
                     yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }

SFGgouhuo/ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 3
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low
@@ -126,7 +126,7 @@ QualitySettings:
     shadowCascade2Split: 0.33333334
     shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
     shadowmaskMode: 1
-    skinWeights: 2
+    skinWeights: 255
     textureQuality: 0
     anisotropicTextures: 1
     antiAliasing: 0
@@ -148,7 +148,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
+    customRenderPipeline: {fileID: 11400000, guid: a069ea2694d9e89469bf78e517fdc515, type: 2}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Very High