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/GameResources/Player/PlayerArmature.prefab

@@ -152,7 +152,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900362077118}
-  m_LocalRotation: {x: 0.6066471, y: 0.05249239, z: 0.006869742, w: 0.79320663}
+  m_LocalRotation: {x: 0.6067716, y: 0.05248835, z: 0.0068505565, w: 0.79311186}
   m_LocalPosition: {x: 0.000004911422, y: 0.3789641, z: 0.0000036811825}
   m_LocalScale: {x: 0.9999998, y: 1.0000001, z: 0.99999994}
   m_Children:
@@ -494,7 +494,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900721381661}
-  m_LocalRotation: {x: -0.00010196164, y: 0.10904452, z: 0.9932993, w: 0.038287476}
+  m_LocalRotation: {x: -0.00008327045, y: 0.10925094, z: 0.9932752, w: 0.038322512}
   m_LocalPosition: {x: -0.06875992, y: -0.042298637, z: 0.022966716}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001}
   m_Children:
@@ -526,7 +526,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900724448093}
-  m_LocalRotation: {x: -0.0005880058, y: 0.10917187, z: 0.99328387, w: -0.03831982}
+  m_LocalRotation: {x: -0.00060594396, y: 0.109324425, z: 0.9932661, w: -0.038345672}
   m_LocalPosition: {x: 0.06875992, y: -0.042298645, z: 0.022966715}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_Children:
@@ -1014,7 +1014,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900818529073}
-  m_LocalRotation: {x: 0.6067412, y: -0.05305401, z: -0.006486139, w: 0.79310054}
+  m_LocalRotation: {x: 0.6068329, y: -0.05305453, z: -0.0064697885, w: 0.7930303}
   m_LocalPosition: {x: -0.000004854202, y: 0.37896448, z: 0.0000036954875}
   m_LocalScale: {x: 0.99999976, y: 1, z: 0.9999999}
   m_Children:
@@ -1939,7 +1939,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901331142559}
-  m_LocalRotation: {x: -0.08467426, y: -0.0011558824, z: 0.013945349, w: 0.9963105}
+  m_LocalRotation: {x: -0.0850364, y: -0.0011557972, z: 0.014004868, w: 0.9962788}
   m_LocalPosition: {x: -0.000014133454, y: 0.28059646, z: -0.0000091815}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1.0000001}
   m_Children:
@@ -4320,7 +4320,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902218368406}
   m_LocalRotation: {x: 0.6983415, y: 0.00000003342844, z: -0.00000003777715, w: 0.71576476}
-  m_LocalPosition: {x: 0, y: 0.0000076293945, z: -75.03008}
+  m_LocalPosition: {x: 0, y: 0.0000076293945, z: -75.36346}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8762427901970835926}
@@ -4412,7 +4412,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902295418926}
-  m_LocalRotation: {x: -0.08492363, y: 0.0011545363, z: -0.01398694, w: 0.99628866}
+  m_LocalRotation: {x: -0.08519115, y: 0.0011544924, z: -0.014030898, w: 0.99626523}
   m_LocalPosition: {x: 0.000014123917, y: 0.28059638, z: -0.000009194316}
   m_LocalScale: {x: 1, y: 0.9999998, z: 1.0000001}
   m_Children:

SFGgouhuo/Assets/MyShaderVariants.json

@@ -1,6 +1,6 @@
 {
-    "ShaderTotalCount": 33,
-    "VariantTotalCount": 97,
+    "ShaderTotalCount": 36,
+    "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": [
@@ -36,7 +42,7 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Skybox/Procedural",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -46,6 +52,15 @@
                         "_SUNDISK_SIMPLE"
                     ]
                 },
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA",
+                        "_SUNDISK_SIMPLE"
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -153,7 +168,7 @@
         {
             "AssetPath": "Resources/unity_builtin_extra",
             "ShaderName": "Hidden/UIElements/EditorUIE",
-            "ShaderVariantCount": 1,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -161,13 +176,29 @@
                         "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"
+                    ]
                 }
             ]
         },
         {
             "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/Blit.shader",
             "ShaderName": "Hidden/Universal Render Pipeline/Blit",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 0,
@@ -176,6 +207,14 @@
                         "_DEPTH_NO_MSAA"
                     ]
                 },
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -196,10 +235,56 @@
                 }
             ]
         },
+        {
+            "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": 38,
+            "ShaderVariantCount": 22,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -290,254 +375,68 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "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"
-                    ]
-                },
-                {
-                    "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"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_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": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_DETAIL_MULX2",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
-                    ]
-                },
-                {
-                    "PassType": 13,
-                    "Keywords": [
-                        "_RECEIVE_SHADOWS_OFF"
+                        "_PARALLAXMAP"
                     ]
                 },
                 {
                     "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": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "_DEPTH_NO_MSAA",
-                        "_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": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_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"
                     ]
                 }
             ]
@@ -561,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,
@@ -569,6 +468,20 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
+                        "_DEPTH_NO_MSAA"
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -597,7 +510,7 @@
         {
             "AssetPath": "Assets/GameResources/Player/Skin.shadergraph",
             "ShaderName": "Shader Graphs/Skin",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -605,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"
                     ]
                 }
             ]
@@ -647,12 +566,7 @@
                 {
                     "PassType": 13,
                     "Keywords": [
-                        "BILLBOARD_FACE_CAMERA_POS",
-                        "LIGHTPROBE_SH",
-                        "_DEPTH_NO_MSAA",
-                        "_MAIN_LIGHT_SHADOWS",
-                        "_MAIN_LIGHT_SHADOWS_CASCADE",
-                        "_SHADOWS_SOFT"
+                        ""
                     ]
                 }
             ]
@@ -672,6 +586,7 @@
                     "PassType": 8,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA"
                     ]
                 },
@@ -686,6 +601,7 @@
                     "PassType": 8,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA",
                         "_SHOWTHUNDER_ON"
                     ]
@@ -712,7 +628,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Models/Hand/Line/LineLight.shader",
             "ShaderName": "Custom/LineLight",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -720,6 +636,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -749,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"
                     ]
                 }
             ]
@@ -764,7 +680,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/handside/Magnetism/Magnetism.shader",
             "ShaderName": "Custom/Magnetism",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -772,6 +688,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -788,8 +710,14 @@
         {
             "AssetPath": "Assets/Plugins/Bakery/ftLight.shader",
             "ShaderName": "Bakery/Light",
-            "ShaderVariantCount": 1,
+            "ShaderVariantCount": 2,
             "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 0,
                     "Keywords": [
@@ -839,18 +767,14 @@
                     "PassType": 8,
                     "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"
+                        ""
                     ]
                 }
             ]
@@ -858,7 +782,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/FX/VFXAssets/Portal/Portal.shader",
             "ShaderName": "Custom/Portal",
-            "ShaderVariantCount": 2,
+            "ShaderVariantCount": 3,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -866,6 +790,12 @@
                         ""
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -898,7 +828,7 @@
         {
             "AssetPath": "Assets/GameResources/Street/Temp/street/主建筑/floor/standard/PlanarUV.shader",
             "ShaderName": "Custom/PlanarUV",
-            "ShaderVariantCount": 3,
+            "ShaderVariantCount": 4,
             "ShaderVariantElements": [
                 {
                     "PassType": 8,
@@ -910,10 +840,17 @@
                     "PassType": 8,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
+                        "UNITY_HDR_ON",
                         "_DEPTH_NO_MSAA",
                         "_NORMALMAP"
                     ]
                 },
+                {
+                    "PassType": 13,
+                    "Keywords": [
+                        ""
+                    ]
+                },
                 {
                     "PassType": 13,
                     "Keywords": [
@@ -931,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": [
@@ -954,8 +897,15 @@
                     "PassType": 8,
                     "Keywords": [
                         "BILLBOARD_FACE_CAMERA_POS",
+                        "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
@@ -24,6 +26,8 @@ ShaderVariantCollection:
       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
         passType: 0
@@ -67,16 +71,37 @@ 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 _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 _SHADOWS_SOFT
         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
+        passType: 0
+  - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
+    second:
+      variants:
+      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA _HDR_GRADING
+        passType: 0
   - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
     second:
       variants:
@@ -104,72 +129,25 @@ ShaderVariantCollection:
         passType: 8
       - keywords: 
         passType: 13
-      - keywords: _SHADOWS_SOFT
-        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
-        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
-        passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
-          _PARALLAXMAP _SHADOWS_SOFT
-        passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE
+      - keywords: _NORMALMAP
         passType: 13
-      - keywords: _DETAIL_MULX2 _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _SHADOWS_SOFT
+      - keywords: _PARALLAXMAP
         passType: 13
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _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: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _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: BILLBOARD_FACE_CAMERA_POS LIGHTPROBE_SH _DEPTH_NO_MSAA _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:
@@ -181,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
@@ -192,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:
@@ -205,19 +188,18 @@ 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:
       variants:
       - keywords: INSTANCING_ON
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
+      - keywords: BILLBOARD_FACE_CAMERA_POS UNITY_HDR_ON _DEPTH_NO_MSAA
         passType: 8
       - keywords: INSTANCING_ON _SHOWTHUNDER_ON
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _SHOWTHUNDER_ON
+      - 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
         passType: 13
@@ -228,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
@@ -236,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
@@ -265,16 +252,17 @@ ShaderVariantCollection:
       variants:
       - keywords: INSTANCING_ON
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
+      - 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
@@ -288,21 +276,27 @@ ShaderVariantCollection:
       variants:
       - keywords: _NORMALMAP
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA _NORMALMAP
+      - 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
       - keywords: INSTANCING_ON
         passType: 8
-      - keywords: BILLBOARD_FACE_CAMERA_POS _DEPTH_NO_MSAA
+      - 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/Manager/StepManager.cs

@@ -1,6 +1,8 @@
 
+using RootMotion.FinalIK;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
 using UnityEditor;
 using UnityEngine;
 
@@ -54,6 +56,7 @@ public class StepManager : MonoBehaviour
         initRot = player_dress.transform.rotation;
         CharacterManager.Inst.MatchCharacterRender(player_dress.GetComponent<CharacterRender>());
         faceBuildLight = GameObject.Find("FaceBuild Light").GetComponent<Light>();
+        CharacterManager.Inst.GoodsReadFromFile(player_dress.GetComponent<CharacterRender>());
         //Debug.Log(faceBuildLight);
     }
 
@@ -83,6 +86,15 @@ public class StepManager : MonoBehaviour
     {
         if (player) 
         {
+            CharacterManager.Inst.MatchCharacterRender(player_dress.GetComponent<CharacterRender>());
+
+            List<string> strs=new List<string>(player.transform.GetChild(0).GetComponent<CharacterRender>().dressRenders.Keys);
+            for (int i = 0; i < strs.Count; i++) 
+            {
+                string key = strs[i];
+                player.transform.GetChild(0).GetComponent<CharacterRender>().dressRenders[key].Dispose();
+            }
+            player.transform.GetChild(0).GetComponent<CharacterRender>().dressRenders.Clear();
             player_dress.transform.rotation= initRot;
             CharacterManager.Inst.CharacterClothReMatch(player.transform.GetChild(0).GetComponent<CharacterRender>());
         }

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/Component/FaceBuildPanel.cs

@@ -49,7 +49,7 @@ public class FaceBuildPanel : BasePanel
         StepManager.isFaceBuidling = false;
         StepManager.faceBuildLight.enabled = false;
         StepManager.Instance.CharacterDataReMatch();
-        
+        CharacterManager.Inst.GoodsSaveToFile();
     }
 
 }

SFGgouhuo/Assets/Scripts/UI/FaceBuild/CharacterManager.cs

@@ -1,6 +1,8 @@
 using Cysharp.Threading.Tasks;
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using UnityEngine;
 
@@ -43,9 +45,38 @@ public class CharacterManager : MonoBehaviour
             foreach (var item in selfRender.dressRenders)
             {
                 await ChangePlayerTex(cr, item.Value.good);
+                //Debug.Log(cr.gameObject.name+"/"+item.Value.good.name);
             }
         }
     }
+
+    /// <summary>
+    /// 将玩家换装数据保存到本地Json
+    /// </summary>
+    public void GoodsSaveToFile()
+    {
+        List<Good> goods = new List<Good>();
+        foreach(var item in selfRender.dressRenders)
+        {
+            goods.Add(item.Value.good);
+        }
+        string jsonStr=JsonMapper.ToJson(goods);
+        File.WriteAllText(Application.persistentDataPath + "/PlayerGoods.json", jsonStr);
+    }
+
+    /// <summary>
+    /// 将玩家换装数据从本地Json读取
+    /// </summary>
+    /// <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)
+        {
+            await ChangePlayerTex(cr, item);
+        }
+    }
     public async UniTask ChangePlayerTex (CharacterRender cr, Good config)
     {
         //Debug.Log(config.id);

SFGgouhuo/Assets/Scripts/UI/FaceBuild/CharacterRender.cs

@@ -116,10 +116,8 @@ public class CharacterRender : MonoBehaviour
             if (type == 17)
             {
                 isShowFoot = false;
-                defaultTop.SetActive(false);
-                defaultBottom.SetActive(false);
             }
-            if(type == 12)
+            if (type == 12)
             {
                 for (int i = 0;i < shoesShow.Count;i++)
                 {
@@ -186,6 +184,20 @@ public class CharacterRender : MonoBehaviour
             transform.Find("body").GetComponent<Renderer>().materials = faceMaterial;
         }
 
+
+        List<int> goodID = new List<int>();
+        foreach (var item in dressRenders)
+        {
+            int type = item.Value.good.id / 10000;
+            goodID.Add(type);
+        }
+        if(!goodID.Contains(10)) defaultTop.SetActive(true);
+        if (!goodID.Contains(11)) defaultBottom.SetActive(true);
+        if (goodID.Contains(17))
+        {
+            defaultTop.SetActive(false);
+            defaultBottom.SetActive(false);
+        } 
         //if (CharacterManager.Inst.selfRender == self)
         //{
         //    //UI

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/ProjectSettings.asset

@@ -134,8 +134,9 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
-  preloadedAssets: []
+  bundleVersion: 1.3
+  preloadedAssets:
+  - {fileID: 11400000, guid: 4b8185399a4cfc5428357ac6a5795f11, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

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