Przeglądaj źródła

优化进入游戏

hexiaojie 6 miesięcy temu
rodzic
commit
a4615253e9
29 zmienionych plików z 192 dodań i 129 usunięć
  1. 3 1
      GameClient/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml
  2. 63 42
      GameClient/.idea/.idea.GameClient/.idea/workspace.xml
  3. 47 42
      GameClient/Assets/AssetBundleCollectorSetting.asset
  4. 60 25
      GameClient/Assets/Game/HotUpdate/ETCodes/PreGeneratedTypes.cs
  5. 5 5
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  6. 0 8
      GameClient/Assets/ResIn/Font/5.meta
  7. 1 1
      GameClient/Assets/ResIn/Font/GameFont1.meta
  8. 0 0
      GameClient/Assets/ResIn/Font/GameFont1/FangZhengHeiTiJianTi-1.ttf
  9. 0 0
      GameClient/Assets/ResIn/Font/GameFont1/FangZhengHeiTiJianTi-1.ttf.meta
  10. 1 1
      GameClient/Assets/ResIn/Font/GameFont2.meta
  11. 0 0
      GameClient/Assets/ResIn/Font/GameFont2/FZKTJW--GB1-0.ttf
  12. 1 1
      GameClient/Assets/ResIn/Font/GameFont2/FZKTJW--GB1-0.ttf.meta
  13. 0 0
      GameClient/Assets/ResIn/Font/GameFont2/SourceHanSerifCN-Bold-2.otf
  14. 1 1
      GameClient/Assets/ResIn/Font/GameFont2/SourceHanSerifCN-Bold-2.otf.meta
  15. 1 1
      GameClient/Assets/ResIn/Font/GameFont3.meta
  16. 0 0
      GameClient/Assets/ResIn/Font/GameFont3/SourceHanSerifCN-ExtraLight-3.otf
  17. 0 0
      GameClient/Assets/ResIn/Font/GameFont3/SourceHanSerifCN-ExtraLight-3.otf.meta
  18. 1 1
      GameClient/Assets/ResIn/Font/GameFont4.meta
  19. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Heavy-4.otf
  20. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Heavy-4.otf.meta
  21. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Light-5.otf
  22. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Light-5.otf.meta
  23. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Medium-6.otf
  24. 0 0
      GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Medium-6.otf.meta
  25. 8 0
      GameClient/Assets/ResIn/Font/GameFont5.meta
  26. 0 0
      GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-Regular-1.otf
  27. 0 0
      GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-Regular-1.otf.meta
  28. 0 0
      GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-SemiBold-7.otf
  29. 0 0
      GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-SemiBold-7.otf.meta

+ 3 - 1
GameClient/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
+    <option name="vcsConfiguration" value="3" />
   </component>
 </project>

+ 63 - 42
GameClient/.idea/.idea.GameClient/.idea/workspace.xml

@@ -5,20 +5,33 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/SuitCfgArray.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/SuitCfgArray.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/Tables.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/Tables.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/cfg/GlobalCfg.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/cfg/TblGlobalCfg.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanConfigFiles.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanConfigFiles.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanData/cfg_tblglobalcfg.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/LubanManager/CommonDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/LubanManager/CommonDataManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/AssetBundleCollectorSetting.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AssetBundleCollectorSetting.asset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Utils/ResPathUtil.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Utils/ResPathUtil.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/Launcher/LauncherConfig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/Launcher/LauncherConfig.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf.meta" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf.meta" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,9 +45,10 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/4f/417455e8/GameObject.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/8d4895b259be41298a685a0c9b42357576b400/ca/169fde64/TagManagerInspector.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/351e49e2a5bf4fd6beabb458ce2255f3ff600/4e/84b60bbd/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/InputField.cs" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="ProjectColorInfo">{
@@ -62,13 +76,6 @@
     "nodejs_package_manager_path": "npm",
     "vue.rearranger.settings.migration": "true",
     "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
-  },
-  "keyToStringList": {
-    "rider.external.source.directories": [
-      "C:\\Users\\ss510\\AppData\\Roaming\\JetBrains\\Rider2023.2\\resharper-host\\DecompilerCache",
-      "C:\\Users\\ss510\\AppData\\Roaming\\JetBrains\\Rider2023.2\\resharper-host\\SourcesCache",
-      "C:\\Users\\ss510\\AppData\\Local\\Symbols\\src"
-    ]
   }
 }]]></component>
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
@@ -78,6 +85,9 @@
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
       <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="ENV_FILE_PATHS" value="" />
+      <option name="REDIRECT_INPUT_PATH" value="" />
+      <option name="PTY_MODE" value="Auto" />
       <method v="2" />
     </configuration>
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
@@ -86,16 +96,23 @@
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
       <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="ENV_FILE_PATHS" value="" />
+      <option name="REDIRECT_INPUT_PATH" value="" />
+      <option name="PTY_MODE" value="Auto" />
       <method v="2" />
     </configuration>
-    <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="39156">
+    <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
       <option name="allowRunningInParallel" value="false" />
       <option name="listenPortForConnections" value="false" />
-      <option name="pid" value="39156" />
+      <option name="pid" />
       <option name="projectPathOnTarget" />
+      <option name="runtimes">
+        <list />
+      </option>
       <option name="selectedOptions">
         <list />
       </option>
+      <option name="useMixedMode" value="false" />
       <method v="2" />
     </configuration>
     <configuration name="附加到 Unity 编辑器并运行" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
@@ -103,9 +120,13 @@
       <option name="listenPortForConnections" value="false" />
       <option name="pid" />
       <option name="projectPathOnTarget" />
+      <option name="runtimes">
+        <list />
+      </option>
       <option name="selectedOptions">
         <list />
       </option>
+      <option name="useMixedMode" value="false" />
       <method v="2" />
     </configuration>
   </component>
@@ -120,7 +141,8 @@
       <workItem from="1751303045372" duration="4289000" />
       <workItem from="1751382825616" duration="6005000" />
       <workItem from="1751703018450" duration="3653000" />
-      <workItem from="1751735130352" duration="23591000" />
+      <workItem from="1751735130352" duration="28306000" />
+      <workItem from="1751800911301" duration="700000" />
     </task>
     <servers />
   </component>
@@ -166,32 +188,31 @@
           </properties>
           <option name="timeStamp" value="27" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs</url>
-          <line>74</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Loading\LoadingView.cs" initialLine="74" containingFunctionPresentation="方法 'OnShown'">
-            <startOffsets>
-              <option value="2019" />
-            </startOffsets>
-            <endOffsets>
-              <option value="2098" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="39" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
-          <line>284</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" initialLine="284" containingFunctionPresentation="方法 'ReqEnterGame'">
+          <line>320</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'OnLoadConfigsEnterGame'">
             <startOffsets>
-              <option value="11489" />
+              <option value="13083" />
             </startOffsets>
             <endOffsets>
-              <option value="11536" />
+              <option value="13102" />
             </endOffsets>
           </properties>
-          <option name="timeStamp" value="40" />
+          <option name="timeStamp" value="46" />
         </line-breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
+          <option name="timeStamp" value="48" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
+          <option name="timeStamp" value="49" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="50" />
+        </breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

+ 47 - 42
GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -161,98 +161,103 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Font/1
-        CollectorGUID: cf1684410a1be93488aa69fb1d60894c
+      - CollectPath: Assets/ResIn/Dll
+        CollectorGUID: 245d660d0740f254aa5fbfc8ad44f173
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
+        PackRuleName: PackTopDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Dll
-        CollectorGUID: 245d660d0740f254aa5fbfc8ad44f173
+    - GroupName: scene
+      GroupDesc: 
+      AssetTags: preload
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/ResIn/Scene
+        CollectorGUID: 95e5901e274f74f419ed53268ff767ba
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackTopDirectory
+        PackRuleName: PackSeparately
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanData
-        CollectorGUID: 4c3156d3772f9344a90455ef1e9a93ba
+    - GroupName: scenebg
+      GroupDesc: 
+      AssetTags: dynamic
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/Res/Texture/SceneBg
+        CollectorGUID: 3800eeb86dfe6154a81435999b1708b7
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
+        PackRuleName: PackArt
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Font/2
-        CollectorGUID: 
+    - GroupName: video
+      GroupDesc: 
+      AssetTags: dynamic
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/Res/video
+        CollectorGUID: 75ef5add5a95a8c459409ffa4c638de9
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
+        PackRuleName: PackVideo
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Font/3
-        CollectorGUID: 
+    - GroupName: gamefont
+      GroupDesc: 
+      AssetTags: dynamic
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/ResIn/Font/GameFont1
+        CollectorGUID: 36d5a074a2920124590b00f3b24350c3
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Font/4
-        CollectorGUID: 
+      - CollectPath: Assets/ResIn/Font/GameFont2
+        CollectorGUID: d98be5d53e8eb594d8d512b4d4756ba7
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/ResIn/Font/5
-        CollectorGUID: 
+      - CollectPath: Assets/ResIn/Font/GameFont3
+        CollectorGUID: 7dc764fb74cd01e4a8918b93faa5e7e6
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-    - GroupName: scene
-      GroupDesc: 
-      AssetTags: preload
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/ResIn/Scene
-        CollectorGUID: 95e5901e274f74f419ed53268ff767ba
+      - CollectPath: Assets/ResIn/Font/GameFont4
+        CollectorGUID: 9d9fa12371b1ed74aa7e1d473b1dd9ce
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackSeparately
+        PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-    - GroupName: scenebg
-      GroupDesc: 
-      AssetTags: dynamic
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/Texture/SceneBg
-        CollectorGUID: 3800eeb86dfe6154a81435999b1708b7
+      - CollectPath: Assets/ResIn/Font/GameFont5
+        CollectorGUID: c598897a97f00b84eb208a2dbd784dae
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackArt
+        PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-    - GroupName: video
-      GroupDesc: 
-      AssetTags: dynamic
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/video
-        CollectorGUID: 75ef5add5a95a8c459409ffa4c638de9
+      - CollectPath: Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanData
+        CollectorGUID: 4c3156d3772f9344a90455ef1e9a93ba
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackVideo
+        PackRuleName: PackDirectory
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 

+ 60 - 25
GameClient/Assets/Game/HotUpdate/ETCodes/PreGeneratedTypes.cs

@@ -1007,9 +1007,10 @@ namespace GFGGame.HotUpdate
             "cfg.vector2, Game.HotUpdate",
             "cfg.vector3, Game.HotUpdate",
             "cfg.vector4, Game.HotUpdate",
-            "cfg.cfg.GlobalCfg, Game.HotUpdate",
-            "cfg.cfg.TblGlobalCfg, Game.HotUpdate",
+            "cfg.GfgCfg.ItemCfg, Game.HotUpdate",
             "cfg.GfgCfg.ShopCfg, Game.HotUpdate",
+            "cfg.GfgCfg.StoryLevelCfg, Game.HotUpdate",
+            "cfg.GfgCfg.SuitCfg, Game.HotUpdate",
             "cfg.GfgCfg.Activity7DaysCfg, Game.HotUpdate",
             "cfg.GfgCfg.Activity7DaysTaskCfg, Game.HotUpdate",
             "cfg.GfgCfg.ActivityDressCfg, Game.HotUpdate",
@@ -1075,12 +1076,12 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.GameFunctionCfg, Game.HotUpdate",
             "cfg.GfgCfg.GeneralMaterialCfg, Game.HotUpdate",
             "cfg.GfgCfg.GiftBagCfg, Game.HotUpdate",
+            "cfg.GfgCfg.GlobalCfg, Game.HotUpdate",
             "cfg.GfgCfg.GrowthFundCfg, Game.HotUpdate",
             "cfg.GfgCfg.GuideCfg, Game.HotUpdate",
             "cfg.GfgCfg.HeadAniCfg, Game.HotUpdate",
             "cfg.GfgCfg.HuarongRoadCfg, Game.HotUpdate",
             "cfg.GfgCfg.HuarongRoadGame, Game.HotUpdate",
-            "cfg.GfgCfg.ItemCfg, Game.HotUpdate",
             "cfg.GfgCfg.ItemExchangeCfg, Game.HotUpdate",
             "cfg.GfgCfg.ItemInitCfg, Game.HotUpdate",
             "cfg.GfgCfg.ItemTypeCfg, Game.HotUpdate",
@@ -1124,9 +1125,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.StoryChapterCfg, Game.HotUpdate",
             "cfg.GfgCfg.StoryDialogCfg, Game.HotUpdate",
             "cfg.GfgCfg.StoryFightCfg, Game.HotUpdate",
-            "cfg.GfgCfg.StoryLevelCfg, Game.HotUpdate",
             "cfg.GfgCfg.StudioCfg, Game.HotUpdate",
-            "cfg.GfgCfg.SuitCfg, Game.HotUpdate",
             "cfg.GfgCfg.SuitFosterCfg, Game.HotUpdate",
             "cfg.GfgCfg.SuitFosterListCfg, Game.HotUpdate",
             "cfg.GfgCfg.SuitGuideMenuCfg, Game.HotUpdate",
@@ -1199,6 +1198,7 @@ namespace GFGGame.HotUpdate
             "cfg.GfgCfg.TblGameFunctionCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGeneralMaterialCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGiftBagCfg, Game.HotUpdate",
+            "cfg.GfgCfg.TblGlobalCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGrowthFundCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblGuideCfg, Game.HotUpdate",
             "cfg.GfgCfg.TblHeadAniCfg, Game.HotUpdate",
@@ -2346,6 +2346,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.ItemTypeCfgArray, Game.HotUpdate",
             "GFGGame.LimitCfgArray, Game.HotUpdate",
             "GFGGame.ShopConfigManager, Game.HotUpdate",
+            "GFGGame.StoryLevelCfgArray, Game.HotUpdate",
             "GFGGame.SuitCfgArray, Game.HotUpdate",
             "GFGGame.TaskCfgArray, Game.HotUpdate",
             "GFGGame.TeapartyRewardLeagueCfgArray, Game.HotUpdate",
@@ -2556,6 +2557,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.GameGlobal, Game.HotUpdate",
             "GFGGame.HotUpdateDriver, Game.HotUpdate",
             "GFGGame.OperationSystem, Game.HotUpdate",
+            "GFGGame.JGameUrlParamsDto, Game.HotUpdate",
             "GFGGame.QDJGameManager, Game.HotUpdate",
             "GFGGame.JHGameSDKListener, Game.HotUpdate",
             "GFGGame.QDManager, Game.HotUpdate",
@@ -2977,7 +2979,10 @@ namespace GFGGame.HotUpdate
             "BillItem+BILL_TYPE, Game.HotUpdate",
             "CommonDataManager+<>c__DisplayClass4_0, Game.HotUpdate",
             "CommonDataManager+<>c__DisplayClass5_0, Game.HotUpdate",
-            "CommonDataManager+<>c__DisplayClass6_0, Game.HotUpdate",
+            "CommonDataManager+<LoadConfigAsync>d__7, Game.HotUpdate",
+            "CommonDataManager+<LoadConfigTextAsset>d__8, Game.HotUpdate",
+            "cfg.GfgCfg.StoryLevelCfg+<>c, Game.HotUpdate",
+            "cfg.GfgCfg.SuitCfg+<>c, Game.HotUpdate",
             "ET.ConfigComponentSystem+<>c__DisplayClass2_0, Game.HotUpdate",
             "ET.ConfigComponentSystem+<>c__DisplayClass2_1, Game.HotUpdate",
             "ET.ConfigComponentSystem+<LoadAsync>d__2, Game.HotUpdate",
@@ -3030,19 +3035,18 @@ namespace GFGGame.HotUpdate
             "ET.M2C_NoticeUnitItemAttributeHandler+<Run>d__0, Game.HotUpdate",
             "ET.M2C_NoticeUnitItemHandler+<Run>d__0, Game.HotUpdate",
             "ET.LoginHelper+<H5Login>d__0, Game.HotUpdate",
-            "ET.LoginHelper+<LoginTest>d__1, Game.HotUpdate",
-            "ET.LoginHelper+<Login>d__2, Game.HotUpdate",
-            "ET.LoginHelper+<Register>d__4, Game.HotUpdate",
-            "ET.LoginHelper+<GetServerInfos>d__5, Game.HotUpdate",
-            "ET.LoginHelper+<GetRoles>d__6, Game.HotUpdate",
-            "ET.LoginHelper+<CreateRole>d__7, Game.HotUpdate",
-            "ET.LoginHelper+<>c__DisplayClass8_0, Game.HotUpdate",
-            "ET.LoginHelper+<DeleteRole>d__8, Game.HotUpdate",
-            "ET.LoginHelper+<GetRealmKey>d__9, Game.HotUpdate",
-            "ET.LoginHelper+<EnterGame>d__10, Game.HotUpdate",
-            "ET.LoginHelper+<ReqGetLatestNotice>d__11, Game.HotUpdate",
-            "ET.LoginHelper+<ReqRandomRoleName>d__12, Game.HotUpdate",
-            "ET.LoginHelper+<RegisterRoleInfo>d__13, Game.HotUpdate",
+            "ET.LoginHelper+<Login>d__1, Game.HotUpdate",
+            "ET.LoginHelper+<Register>d__3, Game.HotUpdate",
+            "ET.LoginHelper+<GetServerInfos>d__4, Game.HotUpdate",
+            "ET.LoginHelper+<GetRoles>d__5, Game.HotUpdate",
+            "ET.LoginHelper+<CreateRole>d__6, Game.HotUpdate",
+            "ET.LoginHelper+<>c__DisplayClass7_0, Game.HotUpdate",
+            "ET.LoginHelper+<DeleteRole>d__7, Game.HotUpdate",
+            "ET.LoginHelper+<GetRealmKey>d__8, Game.HotUpdate",
+            "ET.LoginHelper+<EnterGame>d__9, Game.HotUpdate",
+            "ET.LoginHelper+<ReqGetLatestNotice>d__10, Game.HotUpdate",
+            "ET.LoginHelper+<ReqRandomRoleName>d__11, Game.HotUpdate",
+            "ET.LoginHelper+<RegisterRoleInfo>d__12, Game.HotUpdate",
             "ET.NumericHelper+<TestUpdateNumeric>d__0, Game.HotUpdate",
             "ET.NumericHelper+<RequestAddAttributePoint>d__1, Game.HotUpdate",
             "ET.CurrentScenesComponentSystem+CurrentScenesComponentAwakeSystem, Game.HotUpdate",
@@ -3107,6 +3111,8 @@ namespace GFGGame.HotUpdate
             "GFGGame.CollegeBoostCfgArray+<>c, Game.HotUpdate",
             "GFGGame.CollegeBoostCfgArray+<>c__DisplayClass2_0, Game.HotUpdate",
             "GFGGame.CollegeBoostCfgArray+<>c__DisplayClass3_0, Game.HotUpdate",
+            "GFGGame.ItemCfgArray+<>c__DisplayClass2_0, Game.HotUpdate",
+            "GFGGame.ShopConfigManager+<>c__DisplayClass1_0, Game.HotUpdate",
             "GFGGame.TaskCfgArray+<>c__DisplayClass0_0, Game.HotUpdate",
             "GFGGame.TaskCfgArray+<>c, Game.HotUpdate",
             "GFGGame.ListUtil+NavigateType, Game.HotUpdate",
@@ -3154,10 +3160,11 @@ namespace GFGGame.HotUpdate
             "GFGGame.LoginController+<GetRoles>d__10, Game.HotUpdate",
             "GFGGame.LoginController+<ReqRandomRoleName>d__11, Game.HotUpdate",
             "GFGGame.LoginController+<ReqCreateRole>d__12, Game.HotUpdate",
-            "GFGGame.LoginController+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.LoginController+<ReqEnterGame>d__13, Game.HotUpdate",
-            "GFGGame.LoginController+<ReqReConnectGate>d__14, Game.HotUpdate",
-            "GFGGame.LoginController+<RegisterRoleInfo>d__15, Game.HotUpdate",
+            "GFGGame.LoginController+<OnLoadConfigsEnterGame>d__14, Game.HotUpdate",
+            "GFGGame.LoginController+<ReqReConnectGate>d__15, Game.HotUpdate",
+            "GFGGame.LoginController+<RegisterRoleInfo>d__16, Game.HotUpdate",
+            "GFGGame.MainControllerr+<>c__DisplayClass0_0, Game.HotUpdate",
             "GFGGame.PromptController+<>c__DisplayClass3_0, Game.HotUpdate",
             "GFGGame.ActivityDataManager+<>c__DisplayClass52_0, Game.HotUpdate",
             "GFGGame.ActivityGlobalDataManager+<>c, Game.HotUpdate",
@@ -3166,12 +3173,15 @@ namespace GFGGame.HotUpdate
             "GFGGame.ArenaDataManager+<ReqArenaInfo>d__57, Game.HotUpdate",
             "GFGGame.BagDataManager+<>c, Game.HotUpdate",
             "GFGGame.BattlePassTaskDataManager+<>c, Game.HotUpdate",
+            "GFGGame.DropOutDataCache+<>c__DisplayClass2_0, Game.HotUpdate",
+            "GFGGame.DropOutDataCache+<>c__DisplayClass2_1, Game.HotUpdate",
             "GFGGame.CardDataManager+<>c, Game.HotUpdate",
             "GFGGame.ChatDataManager+<>c, Game.HotUpdate",
             "GFGGame.DressUpMenuItemDataManager+<>c__DisplayClass19_0, Game.HotUpdate",
             "GFGGame.DressUpMenuItemDataManager+<>c, Game.HotUpdate",
             "GFGGame.DressUpMenuItemDataManager+<>c__DisplayClass21_0, Game.HotUpdate",
             "GFGGame.DressUpMenuItemDataManager+<GetAllDressUpGuideIdListBySubTypeAsync>d__51, Game.HotUpdate",
+            "GFGGame.DressUpMenuSuitDataManager+<>c, Game.HotUpdate",
             "GFGGame.FightDataManager+<>c__DisplayClass28_0, Game.HotUpdate",
             "GFGGame.FunctionOpenDataManager+<CheckHasSpecialFunOpen>d__4, Game.HotUpdate",
             "GFGGame.GuideDataManager+<TryCompleteGuide>d__6, Game.HotUpdate",
@@ -3208,11 +3218,18 @@ namespace GFGGame.HotUpdate
             "GFGGame.PictureDataManager+<>c, Game.HotUpdate",
             "GFGGame.RedDotDataManager+<GetCardTimers>d__37, Game.HotUpdate",
             "GFGGame.RedDotDataManager+<>c, Game.HotUpdate",
+            "GFGGame.RedDotDataManager+<>c__DisplayClass58_0, Game.HotUpdate",
+            "GFGGame.RedDotDataManager+<>c__DisplayClass58_1, Game.HotUpdate",
+            "GFGGame.RedDotDataManager+<>c__DisplayClass58_2, Game.HotUpdate",
+            "GFGGame.RedDotDataManager+<>c__DisplayClass74_0, Game.HotUpdate",
+            "GFGGame.ScoreSystemData+<>c__DisplayClass10_0, Game.HotUpdate",
             "GFGGame.ShareDataManager+<CaptureCameraImage>d__5, Game.HotUpdate",
             "GFGGame.ShopDataManager+<>c__DisplayClass7_0, Game.HotUpdate",
             "GFGGame.ShopViewManager+<>c, Game.HotUpdate",
+            "GFGGame.StudioDataManager+<>c__DisplayClass15_0, Game.HotUpdate",
             "GFGGame.SuitFosterDataManager+<>c__DisplayClass12_0, Game.HotUpdate",
             "GFGGame.TaskDataManager+<>c, Game.HotUpdate",
+            "GFGGame.TimeTracingDataManager+<>c__DisplayClass17_0, Game.HotUpdate",
             "GFGGame.DressUpLayerOperation+EAction, Game.HotUpdate",
             "GFGGame.DressUpLayerOperation+<>c__DisplayClass25_0, Game.HotUpdate",
             "GFGGame.DressUpLayerOperation+<>c__DisplayClass26_0, Game.HotUpdate",
@@ -3615,7 +3632,9 @@ namespace GFGGame.HotUpdate
             "GFGGame.ActivityHuaRongDaoView+<Win>d__30, Game.HotUpdate",
             "GFGGame.ActivityHuaRongDaoView+<StartAnimation>d__32, Game.HotUpdate",
             "GFGGame.ActivityMainTipsView+<OnHide>d__6, Game.HotUpdate",
+            "GFGGame.ActivityZCJBChapterView+<>c__DisplayClass21_0, Game.HotUpdate",
             "GFGGame.ActivityZCJBChapterView+<>c, Game.HotUpdate",
+            "GFGGame.ActivityZCJBChapterView+<>c__DisplayClass26_0, Game.HotUpdate",
             "GFGGame.ActivityZCJBChapterView+<InitChapter>d__26, Game.HotUpdate",
             "GFGGame.ActivityZCJBRewardView+<OnClickRewardBtn>d__8, Game.HotUpdate",
             "GFGGame.ActivityZCJBView+<ReqInfo>d__13, Game.HotUpdate",
@@ -3693,8 +3712,9 @@ namespace GFGGame.HotUpdate
             "GFGGame.GetSuitItemVIew+<>c, Game.HotUpdate",
             "GFGGame.GetSuitItemVIew+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.CreateRoleView+State, Game.HotUpdate",
-            "GFGGame.CreateRoleView+<OnClickBtnSure>d__9, Game.HotUpdate",
-            "GFGGame.CreateRoleView+<RandomRoleName>d__10, Game.HotUpdate",
+            "GFGGame.CreateRoleView+<>c__DisplayClass7_0, Game.HotUpdate",
+            "GFGGame.CreateRoleView+<OnClickBtnSure>d__12, Game.HotUpdate",
+            "GFGGame.CreateRoleView+<RandomRoleName>d__13, Game.HotUpdate",
             "GFGGame.NewRoleGetSuitView+<>c, Game.HotUpdate",
             "GFGGame.NewRoleGetSuitView+<<OnClickTip>b__11_1>d, Game.HotUpdate",
             "GFGGame.DailySignView+<>c, Game.HotUpdate",
@@ -3732,9 +3752,11 @@ namespace GFGGame.HotUpdate
             "GFGGame.EnduringGiftBoxView+<OnClickBtnSure>d__26, Game.HotUpdate",
             "GFGGame.RushSaleGiftBoxView+<>c, Game.HotUpdate",
             "GFGGame.SpecialOfferGiftBoxView+<>c, Game.HotUpdate",
+            "GFGGame.FieldFightInfoView+<>c__DisplayClass5_0, Game.HotUpdate",
             "GFGGame.FieldFightInfoView+<<OnBtnStopClick>b__7_1>d, Game.HotUpdate",
             "GFGGame.FieldTaskView+<OnBtnGetClick>d__9, Game.HotUpdate",
             "GFGGame.FieldView+<>c__DisplayClass13_0, Game.HotUpdate",
+            "GFGGame.FieldView+<>c__DisplayClass13_1, Game.HotUpdate",
             "GFGGame.FieldView+<UpdateStroyFightResult>d__13, Game.HotUpdate",
             "GFGGame.DressUpGuideView+LastClickIndex, Game.HotUpdate",
             "GFGGame.DressUpGuideView+<>c, Game.HotUpdate",
@@ -3803,6 +3825,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.LeagueView+<OnShowOhterInfo>d__19, Game.HotUpdate",
             "GFGGame.LeagueView+<GetTeapartyMatchingInfos>d__37, Game.HotUpdate",
             "GFGGame.LoginView+<>c, Game.HotUpdate",
+            "GFGGame.LoginView+<>c__DisplayClass17_0, Game.HotUpdate",
             "GFGGame.RegisterView+<>c, Game.HotUpdate",
             "GFGGame.LuckyBoxActivityView+<>c, Game.HotUpdate",
             "GFGGame.LuckyBoxActivityView+<GetWishingPoolInfo>d__31, Game.HotUpdate",
@@ -3824,15 +3847,22 @@ namespace GFGGame.HotUpdate
             "GFGGame.MailView+<OnClickBtnLook>d__16, Game.HotUpdate",
             "GFGGame.MailView+<RefreshMailInfo>d__17, Game.HotUpdate",
             "GFGGame.ActivityStoryChapterView+<>c, Game.HotUpdate",
+            "GFGGame.ActivityStoryChapterView+<>c__DisplayClass26_0, Game.HotUpdate",
+            "GFGGame.ActivityStoryChapterView+<>c__DisplayClass28_0, Game.HotUpdate",
             "GFGGame.ActivityStoryChapterView+<InitChapter>d__28, Game.HotUpdate",
             "GFGGame.ArenaFightResultView+<>c__DisplayClass14_0, Game.HotUpdate",
             "GFGGame.InstanceZonesController+OnFinishStoryLevelCall, Game.HotUpdate",
             "GFGGame.InstanceZonesController+<CheckStoryFightResult>d__3, Game.HotUpdate",
             "GFGGame.StoryCardChoose+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.StoryChapterListView+<OnClickReward>d__18, Game.HotUpdate",
+            "GFGGame.StoryChapterListView+<>c__DisplayClass24_0, Game.HotUpdate",
             "GFGGame.StoryChapterView+<>c, Game.HotUpdate",
+            "GFGGame.StoryChapterView+<>c__DisplayClass28_0, Game.HotUpdate",
+            "GFGGame.StoryChapterView+<>c__DisplayClass33_0, Game.HotUpdate",
+            "GFGGame.StoryChapterView+<>c__DisplayClass33_1, Game.HotUpdate",
             "GFGGame.StoryChapterView+<InitChapter>d__33, Game.HotUpdate",
             "GFGGame.StoryChapterView+<OnClickBonusBox>d__40, Game.HotUpdate",
+            "GFGGame.StoryController+<>c__DisplayClass1_0, Game.HotUpdate",
             "GFGGame.StoryDialogView+<InitStepContent>d__48, Game.HotUpdate",
             "GFGGame.StoryDialogView+<>c__DisplayClass49_0, Game.HotUpdate",
             "GFGGame.StoryDialogView+<>c, Game.HotUpdate",
@@ -3897,6 +3927,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.NewYearRedEnvelopeView+<BuyDoubleRedPacket>d__14, Game.HotUpdate",
             "GFGGame.NewYearRedEnvelopeView+<ReqLeagueList>d__16, Game.HotUpdate",
             "GFGGame.NoticeView+<OnListNoticeBtnGoClick>d__17, Game.HotUpdate",
+            "GFGGame.OpenServerStoryView+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.PoemGalleryPreviewView+<UpdateView>d__7, Game.HotUpdate",
             "GFGGame.PoemGalleryPreviewView+<OnBtnCollectClick>d__11, Game.HotUpdate",
             "GFGGame.PoemGalleryPreviewView+<OnBtnVoteClick>d__12, Game.HotUpdate",
@@ -3933,6 +3964,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.ChangeNameView+<RandomRoleName>d__12, Game.HotUpdate",
             "GFGGame.ChangeThemeView+<OnClickBtnSure>d__14, Game.HotUpdate",
             "GFGGame.ChangeThemeView+<OnClickBtnClear>d__15, Game.HotUpdate",
+            "GFGGame.GMPanelView+<>c__DisplayClass14_0, Game.HotUpdate",
             "GFGGame.GMPanelView+<SkipAllChapter>d__14, Game.HotUpdate",
             "GFGGame.GMPanelView+<OnClickBtnSkipCheckOpen>d__15, Game.HotUpdate",
             "GFGGame.GMPanelView+<OnClickBtnArenaGrade>d__16, Game.HotUpdate",
@@ -3958,6 +3990,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.StoreBrocadeWeavView+<OnBtnGetClick>d__13, Game.HotUpdate",
             "GFGGame.StoreBrocadeWeavView+<OnBtnGetAllClick>d__16, Game.HotUpdate",
             "GFGGame.StoreChargeAddUpView+<>c__DisplayClass14_0, Game.HotUpdate",
+            "GFGGame.StoreChargeView+<>c, Game.HotUpdate",
             "GFGGame.StoreGrowthFundView+<OnBtnGetClick>d__15, Game.HotUpdate",
             "GFGGame.StoreMonthView+<OnBtnGetClick>d__15, Game.HotUpdate",
             "GFGGame.StoreMonthView+<OnClickBtnBuy>d__17, Game.HotUpdate",
@@ -3966,6 +3999,8 @@ namespace GFGGame.HotUpdate
             "GFGGame.StorePayPropView+<OnCloseClick>d__10, Game.HotUpdate",
             "GFGGame.StoreSummerGiftView+<OnBtnOpenClick>d__9, Game.HotUpdate",
             "GFGGame.StoreSummerGiftView+<OnBtnGetAllClick>d__10, Game.HotUpdate",
+            "GFGGame.StoreView+<>c__DisplayClass9_0, Game.HotUpdate",
+            "GFGGame.StoreView+<>c, Game.HotUpdate",
             "GFGGame.WeekGiftView+<GetVipWeekGiftBag>d__8, Game.HotUpdate",
             "GFGGame.BattlePassTaskView+<>c, Game.HotUpdate",
             "GFGGame.BattlePassTaskView+<OnBtnGetClick>d__12, Game.HotUpdate",
@@ -3984,6 +4019,7 @@ namespace GFGGame.HotUpdate
             "GFGGame.TimeTracingLevelRankView+<ReqGetLevelRank>d__18, Game.HotUpdate",
             "GFGGame.TimeTracingLevelRewardView+<GetLevelRewardBtn>d__10, Game.HotUpdate",
             "GFGGame.TimeTracingLevelRewardView+<OnBtnGetClcik>d__11, Game.HotUpdate",
+            "GFGGame.TimeTracingLevelView+<>c__DisplayClass13_0, Game.HotUpdate",
             "GFGGame.TimeTracingLevelView+<OnBtnGetProBonus>d__18, Game.HotUpdate",
             "GFGGame.TimeTracingLevelView+<OnClickRankBtn>d__19, Game.HotUpdate",
             "GFGGame.TimeTracingShowView+<>c__DisplayClass11_0, Game.HotUpdate",
@@ -4021,7 +4057,6 @@ namespace GFGGame.HotUpdate
             "ET.ETTaskHelper+<>c__DisplayClass5_0+<<WaitAll>g__RunOneTask|0>d, Game.HotUpdate",
             "ET.ETTaskHelper+<>c__DisplayClass6_0+<<WaitAll>g__RunOneTask|0>d, Game.HotUpdate",
             "ET.M2C_TaskResetHandler+M2C_AchievementTaskTypeChangeHandler+<Run>d__0, Game.HotUpdate",
-            "GFGGame.LoginController+<>c__DisplayClass13_0+<<ReqEnterGame>b__0>d, Game.HotUpdate",
             "GFGGame.PhotographSceneManager+<>c__DisplayClass7_0+<<UpdatePhotographBody>b__0>d, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass1_1+<<UpdateDialogBg>g__LastBgFadeOut|0>d, Game.HotUpdate",
             "GFGGame.SceneController+<>c__DisplayClass4_0+<<UpdateDialogPic>g__UpdateDialogPicAlpha|0>d, Game.HotUpdate",

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -182,27 +182,27 @@ namespace GFGGame
 
         public static string GetFontPath1(string res, string extName = "TTF")
         {
-            return $"{FONT_DIR_PATH}/1/{res}.{extName}";
+            return $"{FONT_DIR_PATH}/GameFont1/{res}.{extName}";
         }
 
         public static string GetFontPath2(string res, string extName = "TTF")
         {
-            return $"{FONT_DIR_PATH}/2/{res}.{extName}";
+            return $"{FONT_DIR_PATH}/GameFont2/{res}.{extName}";
         }
 
         public static string GetFontPath3(string res, string extName = "TTF")
         {
-            return $"{FONT_DIR_PATH}/3/{res}.{extName}";
+            return $"{FONT_DIR_PATH}/GameFont3/{res}.{extName}";
         }
 
         public static string GetFontPath4(string res, string extName = "TTF")
         {
-            return $"{FONT_DIR_PATH}/4/{res}.{extName}";
+            return $"{FONT_DIR_PATH}/GameFont4/{res}.{extName}";
         }
 
         public static string GetFontPath5(string res, string extName = "TTF")
         {
-            return $"{FONT_DIR_PATH}/5/{res}.{extName}";
+            return $"{FONT_DIR_PATH}/GameFont5/{res}.{extName}";
         }
 
         public static string GetPrefabPath(string res, string extName = "prefab")

+ 0 - 8
GameClient/Assets/ResIn/Font/5.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 48e81af75a3919d40a654462c71041c3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
GameClient/Assets/ResIn/Font/1.meta → GameClient/Assets/ResIn/Font/GameFont1.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c8a0016f9f436bb4ca0628ae23d7e15c
+guid: 36d5a074a2920124590b00f3b24350c3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
GameClient/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf → GameClient/Assets/ResIn/Font/GameFont1/FangZhengHeiTiJianTi-1.ttf


+ 0 - 0
GameClient/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf.meta → GameClient/Assets/ResIn/Font/GameFont1/FangZhengHeiTiJianTi-1.ttf.meta


+ 1 - 1
GameClient/Assets/ResIn/Font/2.meta → GameClient/Assets/ResIn/Font/GameFont2.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c41ccb52c096fc5459cc796913a310a9
+guid: d98be5d53e8eb594d8d512b4d4756ba7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
GameClient/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf → GameClient/Assets/ResIn/Font/GameFont2/FZKTJW--GB1-0.ttf


+ 1 - 1
GameClient/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf.meta → GameClient/Assets/ResIn/Font/GameFont2/FZKTJW--GB1-0.ttf.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4ec98f09765768b49a2fee6aa2f5ca26
+guid: 43654315a4880284d953d51925d473f5
 TrueTypeFontImporter:
   externalObjects: {}
   serializedVersion: 4

+ 0 - 0
GameClient/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf → GameClient/Assets/ResIn/Font/GameFont2/SourceHanSerifCN-Bold-2.otf


+ 1 - 1
GameClient/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf.meta → GameClient/Assets/ResIn/Font/GameFont2/SourceHanSerifCN-Bold-2.otf.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dda08ca85d91b0b408c17b707c507911
+guid: 1830fa1341ef57c47bb2053797338e7e
 TrueTypeFontImporter:
   externalObjects: {}
   serializedVersion: 4

+ 1 - 1
GameClient/Assets/ResIn/Font/3.meta → GameClient/Assets/ResIn/Font/GameFont3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7c3f10c71abfbb34ebb95a2448b31e0d
+guid: 7dc764fb74cd01e4a8918b93faa5e7e6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
GameClient/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf → GameClient/Assets/ResIn/Font/GameFont3/SourceHanSerifCN-ExtraLight-3.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf.meta → GameClient/Assets/ResIn/Font/GameFont3/SourceHanSerifCN-ExtraLight-3.otf.meta


+ 1 - 1
GameClient/Assets/ResIn/Font/4.meta → GameClient/Assets/ResIn/Font/GameFont4.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fdac4e7f5455e3744b6dc1665404049f
+guid: 9d9fa12371b1ed74aa7e1d473b1dd9ce
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Heavy-4.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf.meta → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Heavy-4.otf.meta


+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Light-5.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf.meta → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Light-5.otf.meta


+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Medium-6.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf.meta → GameClient/Assets/ResIn/Font/GameFont4/SourceHanSerifCN-Medium-6.otf.meta


+ 8 - 0
GameClient/Assets/ResIn/Font/GameFont5.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c598897a97f00b84eb208a2dbd784dae
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
GameClient/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf → GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-Regular-1.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf.meta → GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-Regular-1.otf.meta


+ 0 - 0
GameClient/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf → GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-SemiBold-7.otf


+ 0 - 0
GameClient/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf.meta → GameClient/Assets/ResIn/Font/GameFont5/SourceHanSerifCN-SemiBold-7.otf.meta