修复了无数的BUG

GameClient/.idea/.idea.GameClient/.idea/workspace.xml

@@ -4,10 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="a4ba9278-cb87-4453-ad49-365f16b0a709" name="更改" comment="">
+    <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/encodings.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/StoryLevelCfgArray.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfgArray.cs" afterDir="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/Data/Cache/DropOutDataCache.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/Cache/DropOutDataCache.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Effect/EffectUIPool.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Effect/EffectUIPool.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.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/HotUpdate/Views/MainStory/StoryChapterView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,79 +29,29 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/02365bcde6734ac8ae92f51eed8d7a5a3200/58/2dcb948b/JsonUtility.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/27d9b60c5b794cb2a1577bb267b886a828600/7f/3f3ccdfb/GUIUtility.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/35/ad9431c0/MemoryStream.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/4e/aad6c3b2/IEnumerator`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/56/27c54aae/Activator.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/81/60297759/Action.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/99/0ea27859/String.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/a1/2cd9437b/SynchronizationContext.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/a3/60d291b6/List`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/a4/44ebb4e8/Task`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3789ee403a53437cbb6b5d9ab6311f51573620/b6/20ac76a5/TaskCompletionSource`1.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/5a2009c85b134970925993880e2ecb2e29fa00/c4/1c942964/WebSocket.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/1a/53ed0524/Vector3.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/3f/aa010310/MonoBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/75/d87ba9d0/LogType.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/f7/323a5d44/Application.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/01/46970b32/Action.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/20/3a0a5fc0/Activator.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/57/429a851a/NotImplementedException.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/5f/0c6d83c7/Task.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/63/e50b2d41/KeyValuePair`2.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/ba/d47fe324/Task`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/c3/83d8926e/File.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/cf/c7a06b28/Type.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/dc/a749e100/TaskCompletionSource`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/e0/4c18b32c/ArraySortHelper`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/fb/1c396fb8/CancellationTokenSource.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/8d4895b259be41298a685a0c9b42357576b400/9d/a1138e9c/AssetDatabase.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/c0c221501f3a41f8ac0af9d6a9dc9ff335fd90/1e/dd8639eb/Stack`1.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/12/1006b26e/Stopwatch.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/95/f824ec98/HttpListenerContext.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/a6/47eb89a0/IPEndPoint.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/b6/1bebb6b7/Dns.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/f3/47536ad5/ClientWebSocket.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6e153aa051345dc96d9a55ee3adc812360448/fb/90be827d/WebSocket.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/db7fe3a37f9a4b359b9caec748d31b8333e00/66/c73eee40/Syscall.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/db7fe3a37f9a4b359b9caec748d31b8333e00/91/a2dc5212/UnixStream.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/LubanConfigFiles.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/Game/HotUpdate/GameConfig.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/LauncherConfig.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/ThirdParty/FairyGUI/Scripts/UI/UIObjectFactory.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/ThirdParty/JHGame/AbJHGameSDKHandler.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/351e49e2a5bf4fd6beabb458ce2255f3ff600/4e/84b60bbd/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
   <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
   &quot;associatedIndex&quot;: 5
 }</component>
-  <component name="ProjectId" id="2gN0sA4wvEgAIbP3vtDUFqkU8QW" />
+  <component name="ProjectId" id="2zEjI2wcytafVUzcVJogQLrOSQV" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
-    "Attach to Unity Editor.Attach to Unity Editor.executor": "Debug",
     "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "XThreadsFramesViewSplitterKey": "0.50924784",
+    "XThreadsFramesViewSplitterKey": "0.6236111",
     "git-widget-placeholder": "H5sdk",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
     "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.sourceCode.XML",
     "vue.rearranger.settings.migration": "true",
     "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
   }
@@ -101,30 +59,8 @@
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
     <configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
       <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
-      <option name="PROGRAM_PARAMETERS" value="-projectPath E:\0ARsyncData\E\work\GFG\gfg\client\GameClient -debugCodeOptimization" />
-      <option name="WORKING_DIRECTORY" value="E:\0ARsyncData\E\work\GFG\gfg\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="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2020.3.33f1c2\Editor\Unity.exe" />
-      <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient -debugCodeOptimization" />
-      <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\work\GFG\gfg\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="Unit Tests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2020.3.33f1c2\Editor\Unity.exe" />
-      <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
-      <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient" />
+      <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
+      <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="" />
@@ -134,8 +70,8 @@
     </configuration>
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
       <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
-      <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath E:\0ARsyncData\E\work\GFG\gfg\client\GameClient -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
-      <option name="WORKING_DIRECTORY" value="E:\0ARsyncData\E\work\GFG\gfg\client\GameClient" />
+      <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
+      <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="" />
@@ -143,13 +79,15 @@
       <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">
+    <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="26112">
       <option name="allowRunningInParallel" value="false" />
       <option name="listenPortForConnections" value="false" />
-      <option name="pid" />
+      <option name="pid" value="26112" />
       <option name="projectPathOnTarget" />
       <option name="runtimes">
-        <list />
+        <list>
+          <MonoRuntime />
+        </list>
       </option>
       <option name="selectedOptions">
         <list />
@@ -172,172 +110,21 @@
       <method v="2" />
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
-      <changelist id="a4ba9278-cb87-4453-ad49-365f16b0a709" name="更改" comment="" />
-      <created>1715522934959</created>
+      <changelist id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="" />
+      <created>1751303043735</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1715522934959</updated>
-      <workItem from="1715522937112" duration="5653000" />
-      <workItem from="1715612240806" duration="1322000" />
-      <workItem from="1716012292391" duration="1160000" />
-      <workItem from="1716018250968" duration="531000" />
-      <workItem from="1716043342314" duration="3036000" />
-      <workItem from="1716048330884" duration="2575000" />
-      <workItem from="1716186199934" duration="811000" />
-      <workItem from="1716207203918" duration="1926000" />
-      <workItem from="1716265917110" duration="718000" />
-      <workItem from="1716267458036" duration="1558000" />
-      <workItem from="1716273591958" duration="2527000" />
-      <workItem from="1716281441007" duration="3100000" />
-      <workItem from="1716546429301" duration="760000" />
-      <workItem from="1716547612290" duration="1185000" />
-      <workItem from="1716645615573" duration="3316000" />
-      <workItem from="1716657610899" duration="761000" />
-      <workItem from="1716892421001" duration="2353000" />
-      <workItem from="1717054135770" duration="2420000" />
-      <workItem from="1717149881189" duration="1071000" />
-      <workItem from="1717240306581" duration="3519000" />
-      <workItem from="1717847834897" duration="1004000" />
-      <workItem from="1718102650498" duration="3432000" />
-      <workItem from="1718182257882" duration="2594000" />
-      <workItem from="1718371267014" duration="3888000" />
-      <workItem from="1718441655977" duration="4687000" />
-      <workItem from="1718465305279" duration="1147000" />
-      <workItem from="1718472581367" duration="288000" />
-      <workItem from="1718606627001" duration="2282000" />
-      <workItem from="1718611114327" duration="1568000" />
-      <workItem from="1718617444348" duration="5124000" />
-      <workItem from="1718623388194" duration="2119000" />
-      <workItem from="1718692441070" duration="1060000" />
-      <workItem from="1718727166400" duration="166000" />
-      <workItem from="1718813110121" duration="2591000" />
-      <workItem from="1719046359931" duration="1935000" />
-      <workItem from="1719299716048" duration="4608000" />
-      <workItem from="1719382146372" duration="3433000" />
-      <workItem from="1719479860520" duration="1643000" />
-      <workItem from="1719774778641" duration="2380000" />
-      <workItem from="1719824080269" duration="1663000" />
-      <workItem from="1719826048328" duration="1288000" />
-      <workItem from="1720001798407" duration="2987000" />
-      <workItem from="1720432947709" duration="1407000" />
-      <workItem from="1720541743628" duration="1261000" />
-      <workItem from="1720699493026" duration="4305000" />
-      <workItem from="1721145240022" duration="2021000" />
-      <workItem from="1721284828226" duration="1721000" />
-      <workItem from="1721747224054" duration="2859000" />
-      <workItem from="1721795722614" duration="1529000" />
-      <workItem from="1722256537540" duration="1224000" />
-      <workItem from="1722412652167" duration="745000" />
-      <workItem from="1722849479912" duration="2620000" />
-      <workItem from="1722944670149" duration="32000" />
-      <workItem from="1722945622269" duration="4258000" />
-      <workItem from="1723203782512" duration="343000" />
-      <workItem from="1723204611281" duration="2082000" />
-      <workItem from="1723537309656" duration="101000" />
-      <workItem from="1723808643030" duration="1652000" />
-      <workItem from="1724055969323" duration="2235000" />
-      <workItem from="1724490405860" duration="741000" />
-      <workItem from="1724492729797" duration="127000" />
-      <workItem from="1724500686653" duration="939000" />
-      <workItem from="1724519854363" duration="741000" />
-      <workItem from="1724526517259" duration="3525000" />
-      <workItem from="1724602600962" duration="487000" />
-      <workItem from="1724657612345" duration="611000" />
-      <workItem from="1724659251273" duration="1598000" />
-      <workItem from="1724661534213" duration="7184000" />
-      <workItem from="1724763752889" duration="637000" />
-      <workItem from="1724776547167" duration="1247000" />
-      <workItem from="1724779079121" duration="10833000" />
-      <workItem from="1724925232925" duration="1439000" />
-      <workItem from="1725446885131" duration="611000" />
-      <workItem from="1726056745126" duration="1061000" />
-      <workItem from="1726325740773" duration="6625000" />
-      <workItem from="1726981865113" duration="75000" />
-      <workItem from="1727161970067" duration="2125000" />
-      <workItem from="1727355968129" duration="1640000" />
-      <workItem from="1727536827972" duration="4472000" />
-      <workItem from="1727635416199" duration="3030000" />
-      <workItem from="1728472301241" duration="2088000" />
-      <workItem from="1728571497957" duration="4813000" />
-      <workItem from="1728754048473" duration="3303000" />
-      <workItem from="1729066721784" duration="1035000" />
-      <workItem from="1729655359556" duration="3543000" />
-      <workItem from="1729677801214" duration="1883000" />
-      <workItem from="1730085272492" duration="1786000" />
-      <workItem from="1730107191139" duration="1430000" />
-      <workItem from="1730810723751" duration="1135000" />
-      <workItem from="1732721828431" duration="1190000" />
-      <workItem from="1732793420286" duration="599000" />
-      <workItem from="1733205815073" duration="72000" />
-      <workItem from="1733207982515" duration="4345000" />
-      <workItem from="1735205138264" duration="907000" />
-      <workItem from="1735206071589" duration="5556000" />
-      <workItem from="1735244196870" duration="2787000" />
-      <workItem from="1735835276250" duration="1855000" />
-      <workItem from="1736167358633" duration="1326000" />
-      <workItem from="1736430369300" duration="5547000" />
-      <workItem from="1736527250272" duration="4949000" />
-      <workItem from="1736539417764" duration="14188000" />
-      <workItem from="1737378887162" duration="11644000" />
-      <workItem from="1737621882718" duration="5780000" />
-      <workItem from="1738909604253" duration="7565000" />
-      <workItem from="1738987680803" duration="2915000" />
-      <workItem from="1739763423865" duration="3380000" />
-      <workItem from="1739863468598" duration="3158000" />
-      <workItem from="1739957525149" duration="3147000" />
-      <workItem from="1739968046109" duration="6000" />
-      <workItem from="1740553871039" duration="27000" />
-      <workItem from="1742394342252" duration="10401000" />
-      <workItem from="1742925443284" duration="863000" />
-      <workItem from="1743001037166" duration="1376000" />
-      <workItem from="1744017983829" duration="1906000" />
-      <workItem from="1744035099892" duration="6382000" />
-      <workItem from="1744120024367" duration="1425000" />
-      <workItem from="1744126463471" duration="5586000" />
-      <workItem from="1744215581505" duration="1691000" />
-      <workItem from="1744260610923" duration="571000" />
-      <workItem from="1744261198764" duration="1718000" />
-      <workItem from="1744639256925" duration="10682000" />
-      <workItem from="1744689232403" duration="7426000" />
-      <workItem from="1744736680520" duration="6574000" />
-      <workItem from="1745507553032" duration="4767000" />
-      <workItem from="1745594601713" duration="1116000" />
-      <workItem from="1745934668284" duration="3651000" />
-      <workItem from="1746172267227" duration="776000" />
-      <workItem from="1746280674874" duration="4309000" />
-      <workItem from="1746718100169" duration="1587000" />
-      <workItem from="1747546968109" duration="19860000" />
-      <workItem from="1747631210299" duration="20721000" />
-      <workItem from="1747749075322" duration="10493000" />
-      <workItem from="1747835571983" duration="67733000" />
-      <workItem from="1748959873535" duration="1387000" />
-      <workItem from="1748961285774" duration="12166000" />
-      <workItem from="1749221881842" duration="3780000" />
-      <workItem from="1749361696604" duration="10805000" />
-      <workItem from="1749484582722" duration="2074000" />
-      <workItem from="1749531700334" duration="5306000" />
-      <workItem from="1749660968067" duration="4908000" />
-      <workItem from="1749968308888" duration="12498000" />
-      <workItem from="1750084197729" duration="3654000" />
-      <workItem from="1750347210288" duration="9443000" />
-      <workItem from="1750524389018" duration="1354000" />
-      <workItem from="1750526016978" duration="11807000" />
-      <workItem from="1750645527934" duration="7588000" />
-      <workItem from="1750743985189" duration="516000" />
-      <workItem from="1750773422409" duration="37455000" />
-      <workItem from="1751175348156" duration="11020000" />
-      <workItem from="1751208279732" duration="781000" />
-      <workItem from="1751219030935" duration="1974000" />
+      <updated>1751303043735</updated>
+      <workItem from="1751303045372" duration="4289000" />
+      <workItem from="1751382825616" duration="5187000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
-  <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
   <component name="UnityProjectConfiguration" hasMinimizedUI="true" />
   <component name="UnityProjectDiscoverer">
     <option name="hasUnityReference" value="true" />
@@ -351,304 +138,31 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
+          <option name="timeStamp" value="1" />
+        </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="2" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="3" />
+        </breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs</url>
-          <line>121</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient\Assets\Game\HotUpdate\Views\Studio\StudioBuyNumView.cs" containingFunctionPresentation="方法 'OnClickBtnBuy'">
-            <startOffsets>
-              <option value="4291" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4335" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="15" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs</url>
-          <line>146</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient\Assets\Game\HotUpdate\Views\Studio\StudioBuyNumView.cs" containingFunctionPresentation="方法 'OnLimitChanged'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Effect/EffectUIPool.cs</url>
+          <line>13</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Effect\EffectUIPool.cs" containingFunctionPresentation="方法 'CreateEffectUI'">
             <startOffsets>
-              <option value="5533" />
+              <option value="372" />
             </startOffsets>
             <endOffsets>
-              <option value="5577" />
+              <option value="390" />
             </endOffsets>
           </properties>
           <option name="timeStamp" value="16" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/MatchingCompetitionSproxy.cs</url>
-          <line>301</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\work\GFG\gfg\client\GameClient\Assets\Game\HotUpdate\ServerProxy\MatchingCompetitionSproxy.cs" containingFunctionPresentation="方法 'ReqBeforeRank'">
-            <startOffsets>
-              <option value="13835" />
-            </startOffsets>
-            <endOffsets>
-              <option value="13978" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="33" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_ComHolder.cs</url>
-          <line>17</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\Game\HotUpdate\FairyGUI\GenCode\Common\UI_ComHolder.cs" containingFunctionPresentation="方法 'Create'">
-            <startOffsets>
-              <option value="532" />
-            </startOffsets>
-            <endOffsets>
-              <option value="560" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="74" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_ComHolder.cs</url>
-          <line>57</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\Game\HotUpdate\FairyGUI\GenCode\Common\UI_ComHolder.cs" containingFunctionPresentation="方法 'Init'">
-            <startOffsets>
-              <option value="1595" />
-            </startOffsets>
-            <endOffsets>
-              <option value="1638" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="75" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/ThirdParty/FairyGUI/Scripts/UI/UIPackage.cs</url>
-          <line>452</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\ThirdParty\FairyGUI\Scripts\UI\UIPackage.cs" containingFunctionPresentation="方法 'CreateObject'">
-            <startOffsets>
-              <option value="16118" />
-            </startOffsets>
-            <endOffsets>
-              <option value="16153" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="79" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/ThirdParty/FairyGUI/Scripts/UI/UIPackage.cs</url>
-          <line>436</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\ThirdParty\FairyGUI\Scripts\UI\UIPackage.cs" containingFunctionPresentation="方法 'CreateObject'">
-            <startOffsets>
-              <option value="15509" />
-            </startOffsets>
-            <endOffsets>
-              <option value="15544" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="88" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs</url>
-          <line>125</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\Game\HotUpdate\UGUI\UGUIManager.cs" containingFunctionPresentation="lambda 表达式内 方法 'GetGameCfg'">
-            <startOffsets>
-              <option value="4434" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4462" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="90" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs</url>
-          <line>424</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\Game\HotUpdate\Views\ViewManager.cs" containingFunctionPresentation="方法 'Show'" />
-          <option name="timeStamp" value="91" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs</url>
-          <line>278</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\GameClient\Assets\Game\HotUpdate\Views\ViewManager.cs" containingFunctionPresentation="方法 'Show'" />
-          <option name="timeStamp" value="92" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Packages/BestHTTP/Source/WebSocket/Implementations/OverHTTP1.cs</url>
-          <line>105</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Packages\BestHTTP\Source\WebSocket\Implementations\OverHTTP1.cs" containingFunctionPresentation="方法 'InternalRequest_OnBeforeRedirection'">
-            <startOffsets>
-              <option value="5147" />
-            </startOffsets>
-            <endOffsets>
-              <option value="5332" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="199" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs</url>
-          <line>50</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Login\LoginInputView.cs" containingFunctionPresentation="方法 'OnShown'">
-            <startOffsets>
-              <option value="1338" />
-            </startOffsets>
-            <endOffsets>
-              <option value="1353" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="207" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs</url>
-          <line>52</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Login\LoginInputView.cs" containingFunctionPresentation="方法 'OnShown'">
-            <startOffsets>
-              <option value="1452" />
-            </startOffsets>
-            <endOffsets>
-              <option value="1472" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="208" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs</url>
-          <line>38</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Login\LoginInputView.cs" containingFunctionPresentation="方法 'OnInit'">
-            <startOffsets>
-              <option value="936" />
-            </startOffsets>
-            <endOffsets>
-              <option value="981" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="209" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs</url>
-          <line>105</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Login\LoginInputView.cs" containingFunctionPresentation="方法 'OnClickBtnSure'">
-            <startOffsets>
-              <option value="3034" />
-            </startOffsets>
-            <endOffsets>
-              <option value="3079" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="210" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Task/OpenBattlePassView.cs</url>
-          <line>71</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\Task\OpenBattlePassView.cs" containingFunctionPresentation="方法 'SpecialRewardRender'">
-            <startOffsets>
-              <option value="1912" />
-            </startOffsets>
-            <endOffsets>
-              <option value="2043" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="214" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
-          <line>30</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'LoginTest'">
-            <startOffsets>
-              <option value="1293" />
-            </startOffsets>
-            <endOffsets>
-              <option value="1395" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="242" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
-          <line>21</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'LoginTest'">
-            <startOffsets>
-              <option value="874" />
-            </startOffsets>
-            <endOffsets>
-              <option value="912" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="244" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/LoginController.cs</url>
-          <line>50</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\LoginController.cs" containingFunctionPresentation="方法 'Login'">
-            <startOffsets>
-              <option value="2068" />
-            </startOffsets>
-            <endOffsets>
-              <option value="2112" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="246" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs</url>
-          <line>120</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\PhotographSceneManager.cs" containingFunctionPresentation="方法 'AddItemToScene'">
-            <startOffsets>
-              <option value="4468" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4521" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="272" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs</url>
-          <line>114</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\PhotographSceneManager.cs" containingFunctionPresentation="方法 'AddItemToScene'">
-            <startOffsets>
-              <option value="4155" />
-            </startOffsets>
-            <endOffsets>
-              <option value="4230" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="275" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs</url>
-          <line>468</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\DressUp\PhotographView.cs" containingFunctionPresentation="方法 'AddSceneItem'">
-            <startOffsets>
-              <option value="18541" />
-            </startOffsets>
-            <endOffsets>
-              <option value="18586" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="276" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs</url>
-          <line>64</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\CreateRole\CreateRoleView.cs" containingFunctionPresentation="方法 'ChangeAnimationState'">
-            <startOffsets>
-              <option value="1684" />
-            </startOffsets>
-            <endOffsets>
-              <option value="1698" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="293" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs</url>
-          <line>562</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\MainStory\StoryDialogView.cs" containingFunctionPresentation="方法 'ShowDialog'">
-            <startOffsets>
-              <option value="17743" />
-            </startOffsets>
-            <endOffsets>
-              <option value="17754" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="295" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UICGView.cs</url>
           <line>184</line>
@@ -660,7 +174,7 @@
               <option value="7007" />
             </endOffsets>
           </properties>
-          <option name="timeStamp" value="296" />
+          <option name="timeStamp" value="17" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
           <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UICGView.cs</url>
@@ -673,111 +187,34 @@
               <option value="6395" />
             </endOffsets>
           </properties>
-          <option name="timeStamp" value="297" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs</url>
-          <line>198</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\GameController.cs" containingFunctionPresentation="方法 'EnterGame'">
-            <startOffsets>
-              <option value="6097" />
-            </startOffsets>
-            <endOffsets>
-              <option value="7557" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="299" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs</url>
-          <line>205</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\GameController.cs" containingFunctionPresentation="lambda 表达式内 方法 'EnterGame'">
-            <startOffsets>
-              <option value="6385" />
-            </startOffsets>
-            <endOffsets>
-              <option value="6386" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="301" />
+          <option name="timeStamp" value="18" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs</url>
-          <line>210</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Controller\GameController.cs" containingFunctionPresentation="lambda 表达式内 方法 'EnterGame'">
-            <startOffsets>
-              <option value="6516" />
-            </startOffsets>
-            <endOffsets>
-              <option value="6565" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="302" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs</url>
-          <line>297</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\InstanceZonesDataManager.cs" containingFunctionPresentation="方法 'CheckLevelPass'">
-            <startOffsets>
-              <option value="10503" />
-            </startOffsets>
-            <endOffsets>
-              <option value="10585" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="303" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs</url>
-          <line>261</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\InstanceZonesDataManager.cs" containingFunctionPresentation="方法 'GetPassLevelCfgId'">
-            <startOffsets>
-              <option value="9318" />
-            </startOffsets>
-            <endOffsets>
-              <option value="9405" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="305" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs</url>
-          <line>300</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\InstanceZonesDataManager.cs" containingFunctionPresentation="方法 'CheckLevelPass'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs</url>
+          <line>301</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\MainStory\StoryFightSingleScoreView.cs" containingFunctionPresentation="方法 'TryShowCardSkill'">
             <startOffsets>
-              <option value="10650" />
+              <option value="12954" />
             </startOffsets>
             <endOffsets>
-              <option value="10742" />
+              <option value="13148" />
             </endOffsets>
           </properties>
-          <option name="timeStamp" value="307" />
+          <option name="timeStamp" value="26" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs</url>
-          <line>277</line>
-          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\InstanceZonesDataManager.cs" containingFunctionPresentation="方法 'GetPassLevelOrder'">
+          <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs</url>
+          <line>339</line>
+          <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Data\ScoreSystemData.cs" containingFunctionPresentation="方法 'GetValidSkills'">
             <startOffsets>
-              <option value="9890" />
+              <option value="12994" />
             </startOffsets>
             <endOffsets>
-              <option value="9951" />
+              <option value="13066" />
             </endOffsets>
           </properties>
-          <option name="timeStamp" value="308" />
+          <option name="timeStamp" value="27" />
         </line-breakpoint>
-        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
-          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
-          <option name="timeStamp" value="57" />
-        </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="58" />
-        </breakpoint>
-        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
-          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
-          <option name="timeStamp" value="59" />
-        </breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -70,8 +70,10 @@ namespace GFGGame
                 // 初始化并加载Luban配置
                 CommonDataManager.InitAllAsync(() =>
                 {
+                    ItemCfgArray.Instance.InitSyntheticSuitDic();
                     // 配置加载完成后的回调
                     Debug.Log("Luban配置加载完成！");
+                    //加载一些特殊配置 自动生成
 
                     //界面
                     try
@@ -220,11 +222,11 @@ namespace GFGGame
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 
                         ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
-                        ////新玩家选择套装
-                        //if (RoleInfoManager.Instance.NewRoleSuitStatus == false)
-                        //{
-                        //ViewManager.Show<NewRoleGetSuitView>();
-                        //}
+                        // //新玩家选择套装
+                        // if (RoleInfoManager.Instance.NewRoleSuitStatus == false)
+                        // {
+                        //     ViewManager.Show<NewRoleGetSuitView>();
+                        // }
                     }
                 }
 
@@ -236,10 +238,6 @@ namespace GFGGame
         {
             if (GameGlobal.AfterDataInited) return;
 
-            //加载一些特殊配置 自动生成
-            ItemCfgArray.Instance.InitSyntheticSuitDic();
-            StoryLevelCfgArray.Instance.StartScan();
-
             await ActivitySProxy.ReqSevenDayLoginInfos();
 
             await ActivityGlobalSProxy.GetActivityInfo();

GameClient/Assets/Game/HotUpdate/Data/Cache/DropOutDataCache.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UnityEngine;
 
@@ -28,34 +29,34 @@ namespace GFGGame
             foreach (int dropId in dropIds)
             {
                 GetDropItemData(dropId, result);
-
             }
+
             return result;
         }
 
         public static List<ItemData> GetDropItemData(int dropId, List<ItemData> result)
         {
-
             List<DropOutCfg> dropOutCfgs = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(dropId);
 
             for (int i = 0; i < dropOutCfgs.Count; i++)
             {
-
-                List<DropOutCfg> _dropOutCfgs = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(dropOutCfgs[i].Item);
+                List<DropOutCfg> _dropOutCfgs = CommonDataManager.Tables.TblDropOutCfg.DataList
+                    .Where(a => a.Id == dropOutCfgs[i].Item).ToList();
                 if (_dropOutCfgs.Count > 0)
                 {
-
                     GetDropItemData(dropOutCfgs[i].Item, result);
                 }
                 else
                 {
-                    ItemData itemData = ItemUtil.createItemData(dropOutCfgs[i].Item, dropOutCfgs[i].MaxNum, dropOutCfgs[i].MinNum);// GetDropItemData(dropId, doRandome);
+                    ItemData itemData = ItemUtil.createItemData(dropOutCfgs[i].Item, dropOutCfgs[i].MaxNum,
+                        dropOutCfgs[i].MinNum); // GetDropItemData(dropId, doRandome);
                     if (dropOutCfgs[i].Item > 0 && itemData != null)
                     {
                         result.Add(itemData);
                     }
                 }
             }
+
             return result;
         }
         // public static List<ItemData> GetDropItemDatas(int dropId, int count)
@@ -141,7 +142,5 @@ namespace GFGGame
         //     }
         //     return null;
         // }
-
-
     }
 }

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -1,6 +1,7 @@
 using ET;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UnityEngine;
 
@@ -307,7 +308,7 @@ namespace GFGGame
 
 
             List<PassivitySkillCfg> targetSkillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == cardId).ToList();
             for (int i = 0; i < targetSkillCfgs.Count; i++)
             {
                 if (skillLvs.Count <= i) continue;
@@ -360,7 +361,7 @@ namespace GFGGame
                     }
                 }
             }
-            
+
             List<PassivitySkillCfg> mySkillCfgs =
                 CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
 

GameClient/Assets/Game/HotUpdate/Effect/EffectUIPool.cs

@@ -1,5 +1,6 @@
 using FairyGUI;
 using System.Collections.Generic;
+using System;
 
 namespace GFGGame
 {
@@ -7,12 +8,12 @@ namespace GFGGame
     {
         private static List<EffectUI> effectUIs = new List<EffectUI>();
 
-        public static EffectUI CreateEffectUI(GGraph holder, string uiName, string resName, float scale = 100)
+        public static EffectUI CreateEffectUI(GGraph holder, string uiName, string resName, float scale = 100,
+            Action onComplete = null)
         {
             EffectUI effectUI;
             if (effectUIs.Count > 0)
             {
-
                 int lastIndex = effectUIs.Count - 1;
                 effectUI = effectUIs[lastIndex];
                 effectUIs.RemoveAt(lastIndex);
@@ -21,7 +22,8 @@ namespace GFGGame
             {
                 effectUI = new EffectUI();
             }
-            effectUI.Reset(holder, uiName, resName, scale);
+
+            effectUI.Reset(holder, uiName, resName, scale, EffectUIType.UI, onComplete);
             return effectUI;
         }
 
@@ -33,4 +35,4 @@ namespace GFGGame
             effectUIs.Add(effect);
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Platform/QDJGameManager.cs

@@ -28,7 +28,7 @@ namespace GFGGame
             if (LauncherConfig.IsTest)
             {
                 url =
-                    "https://webgltest.goufuguiwxw.com/?user_id=1234589&user_name=1237459&timestamp=175074382&sign=88cc86dd40f78dfbbfe46add3e8eaa9dac3ba8&cp_ext=&partner=platform";
+                    "https://webgltest.goufuguiwxw.com/?user_id=143143319&user_name=12241433259&timestamp=175074382&sign=88cc86dd40f78dfbbfe46add3e8eaa9dac3ba8&cp_ext=&partner=platform";
             }
 
             Debug.Log($"unity init 2 absoluteURL:{url}");

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -24,7 +24,7 @@ namespace GFGGame
         public override void Dispose()
         {
             // Clear Effect
-            foreach(var v in _effectUIDic)
+            foreach (var v in _effectUIDic)
             {
                 EffectUIPool.Recycle(v.Value);
             }
@@ -36,6 +36,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -51,50 +52,74 @@ namespace GFGGame
             this.modal = false;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
-            _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
-            _ui.m_envelopeModel.m_btnDice.target.onClick.Add(() =>
-            {
-                RandomRoleName().Coroutine();
-            });
+
+            _effectUIDic.Add("FX_player",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_playerClickTipEffectHolder,
+                    "ui_CreateRoleUI/Before_Open", "FX_player", 100, () =>
+                    {
+                        _effectUIDic.Add("FX_TZ_DJ",
+                            EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_btnDice.m_holder,
+                                "ui_CreateRoleUI/After_Open",
+                                "FX_TZ_DJ", 100, () =>
+                                {
+                                    _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
+                                    _ui.m_envelopeModel.m_btnDice.target.onClick.Add(() =>
+                                    {
+                                        RandomRoleName().Coroutine();
+                                    });
+                                }));
+                    }));
+            _effectUIDic.Add("FX_ALL_BG",
+                EffectUIPool.CreateEffectUI(_ui.m_BgEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ALL_BG"));
+            _effectUIDic.Add("FX_Flower",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_flowerEffectHolder,
+                    "ui_CreateRoleUI/Before_Open", "FX_Flower"));
+            _effectUIDic.Add("FX_LiuSu",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_LiuSuEffectHolder,
+                    "ui_CreateRoleUI/Before_Open", "FX_LiuSu"));
+            _effectUIDic.Add("FX_taril",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_trailEffectHolder, "ui_CreateRoleUI/Before_Open",
+                    "FX_taril"));
+            _effectUIDic.Add("FX_XINF",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_XINFEffectHolder,
+                    "ui_CreateRoleUI/Before_Open", "FX_XINF"));
+            _effectUIDic.Add("FX_Text",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_TextEffectHolder, "ui_CreateRoleUI/After_Open",
+                    "FX_Text"));
+            _effectUIDic.Add("FX_ShanZi",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_ShanZiEffectHolder, "ui_CreateRoleUI/After_Open",
+                    "FX_ShanZi"));
+            _effectUIDic.Add("FX_Niao",
+                EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_NiaoEffectHolder, "ui_CreateRoleUI/After_Open",
+                    "FX_Niao"));
         }
 
         //private bool test = false;
         private Animator _btnDiceAnimator;
+
         private void ChangeAnimationState(State state)
         {
             switch (state)
             {
                 case State.IN:
-                    _effectUIDic.Add("FX_ALL_BG", EffectUIPool.CreateEffectUI(_ui.m_BgEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ALL_BG"));
-                    _effectUIDic.Add("FX_Flower", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_flowerEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_Flower"));
-                    _effectUIDic.Add("FX_LiuSu", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_LiuSuEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_LiuSu"));
-                    _effectUIDic.Add("FX_taril", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_trailEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_taril"));
-
-                    _ui.m_t_In.Play(() =>
-                    {
-                        ChangeAnimationState(State.IDLE);
-                    });
+                    _ui.m_t_In.Play(() => { ChangeAnimationState(State.IDLE); });
                     break;
                 case State.IDLE:
-                    _effectUIDic.Add("FX_XINF", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_XINFEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_XINF"));
-                    _effectUIDic.Add("FX_player", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_playerClickTipEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_player"));
+
                     _ui.m_envelopeModel.m_envelope.target.onClick.Add(OnClickBtnEnvelope);
                     _ui.m_envelopeModel.m_t_Idle.Play(-1, 0, null);
                     break;
                 case State.OPEN:
                     EffectUIPool.Recycle(_effectUIDic["FX_player"]);
                     _effectUIDic.Remove("FX_player");
-                    _effectUIDic.Add("FX_TZ_DJ", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_btnDice.m_holder, "ui_CreateRoleUI/After_Open", "FX_TZ_DJ"));
                     _btnDiceAnimator = _effectUIDic["FX_TZ_DJ"].GetObj().GetComponentInChildren<Animator>();
-                    _effectUIDic.Add("FX_Text", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_TextEffectHolder, "ui_CreateRoleUI/After_Open", "FX_Text"));
-                    _effectUIDic.Add("FX_ShanZi", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_ShanZiEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ShanZi"));
-                    _effectUIDic.Add("FX_Niao", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_NiaoEffectHolder, "ui_CreateRoleUI/After_Open", "FX_Niao"));
+
                     _ui.m_envelopeModel.m_envelope.target.touchable = false;
                     _ui.m_envelopeModel.m_t_Idle.Stop();
                     _ui.m_t_Open.Play();
                     break;
                 case State.OUT:
-                    _ui.m_t_AfterOpen.Play(()=>
+                    _ui.m_t_AfterOpen.Play(() =>
                     {
                         this.Hide();
                         StoryDialogDataManager.Instance.waiting = false;
@@ -104,7 +129,6 @@ namespace GFGGame
         }
 
 
-
         protected override void OnShown()
         {
             base.OnShown();
@@ -112,7 +136,6 @@ namespace GFGGame
             LogServerHelper.SendNodeLog((int)LogNode.ShowCreateRole);
 
             ChangeAnimationState(State.IN);
-
         }
 
         protected override void OnHide()
@@ -136,11 +159,12 @@ namespace GFGGame
                 return;
             }
 
-            if (!Regex.IsMatch(roleName, @"^[\u4e00-\u9fa5_0-9]+$"))//角色起名仅允许汉字、数字、底划线
+            if (!Regex.IsMatch(roleName, @"^[\u4e00-\u9fa5_0-9]+$")) //角色起名仅允许汉字、数字、底划线
             {
                 PromptController.Instance.ShowFloatTextPrompt("角色名仅允许汉字、数字、下划线");
                 return;
             }
+
             bool result = await RoleInfoSProxy.ReqModifyRoleName(roleName);
             if (result)
             {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -362,8 +362,9 @@ namespace GFGGame
             for (int i = 0; i < 20; i++)
             {
                 GObject obj = _ui.m_chapter.m_compChapterScroll.target.GetChild("g" + (19 - i + 1));
+                Log.Info("g" + (19 - i + 1));
                 obj.SetPosition(obj.x, starPosY - lineGap * i - 300, 0);
-                ;
+
                 StoryLevelCfg levelCfg = i < list.Count ? list[i] : null;
                 UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
                 levelItem.m_fightBg.visible = true;
@@ -462,56 +463,100 @@ namespace GFGGame
                             if (levelItem.m_c2.selectedIndex == 0)
                             {
                                 _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_jq_left").asGraph,
-                                    "ui_zj", effName);
-                                _effFirst.GetChild("effect_jq_left").rotationY = 180;
+                                    "ui_zj", effName, 100F,
+                                    () =>
+                                    {
+                                        _effFirst.GetChild("effect_jq_left").rotationY = 180;
+                                        levelItem.target.AddChild(_effFirst);
+                                        levelItem.m_fightBg.visible = false;
+                                        levelItem.m_loaDialogBg.visible = false;
+                                        levelItem.m_t0.Play();
+                                        _effFirst.visible = true;
+                                        if (levelCfg.Order > endLevel)
+                                        {
+                                            endLevel = levelCfg.Order;
+                                            _endLevelItem = levelItem.target;
+                                        }
+
+                                        //UI_CompStoryLevelItem.ProxyEnd();
+                                    });
                             }
                             else
                             {
                                 _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_jq").asGraph,
-                                    "ui_zj", effName);
-                                _effFirst.GetChild("effect_jq").rotationY = 0;
+                                    "ui_zj", effName, 100f, () =>
+                                    {
+                                        _effFirst.GetChild("effect_jq").rotationY = 0;
+                                        levelItem.target.AddChild(_effFirst);
+                                        levelItem.m_fightBg.visible = false;
+                                        levelItem.m_loaDialogBg.visible = false;
+                                        levelItem.m_t0.Play();
+                                        _effFirst.visible = true;
+                                        if (levelCfg.Order > endLevel)
+                                        {
+                                            endLevel = levelCfg.Order;
+                                            _endLevelItem = levelItem.target;
+                                        }
+
+                                       // UI_CompStoryLevelItem.ProxyEnd();
+                                    });
                             }
                         }
                         else
                         {
                             _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_zd").asGraph, "ui_zj",
-                                effName);
-                            if (levelItem.m_c2.selectedIndex == 0)
-                            {
-                                _effFirst.GetChild("effect_zd").rotationY = 0;
-                            }
-                            else
-                            {
-                                _effFirst.GetChild("effect_zd").rotationY = 180;
-                            }
+                                effName, 100F, () =>
+                                {
+                                    if (levelItem.m_c2.selectedIndex == 0)
+                                    {
+                                        _effFirst.GetChild("effect_zd").rotationY = 0;
+                                        levelItem.target.AddChild(_effFirst);
+                                        levelItem.m_fightBg.visible = false;
+                                        levelItem.m_loaDialogBg.visible = false;
+                                        levelItem.m_t0.Play();
+                                        _effFirst.visible = true;
+                                    }
+                                    else
+                                    {
+                                        _effFirst.GetChild("effect_zd").rotationY = 180;
+                                        levelItem.target.AddChild(_effFirst);
+                                        levelItem.m_fightBg.visible = false;
+                                        levelItem.m_loaDialogBg.visible = false;
+                                        levelItem.m_t0.Play();
+                                        _effFirst.visible = true;
+                                    }
+
+                                    if (levelCfg.Order > endLevel)
+                                    {
+                                        endLevel = levelCfg.Order;
+                                        _endLevelItem = levelItem.target;
+                                    }
+
+                                    //UI_CompStoryLevelItem.ProxyEnd();
+                                });
                         }
-
-                        levelItem.target.AddChild(_effFirst);
-                        levelItem.m_fightBg.visible = false;
-                        levelItem.m_loaDialogBg.visible = false;
-                        levelItem.m_t0.Play();
-                        _effFirst.visible = true;
-                        //Timers.inst.Add(1.7f, 1, HideEffect, obj);
                     }
-
-                    if (levelCfg.Order > endLevel)
+                    else
                     {
-                        endLevel = levelCfg.Order;
-                        _endLevelItem = levelItem.target;
+                        //UI_CompStoryLevelItem.ProxyEnd();
                     }
+
+                    // if (levelCfg.Order > endLevel)
+                    // {
+                    //     endLevel = levelCfg.Order;
+                    //     _endLevelItem = levelItem.target;
+                    // }
                 }
                 else
                 {
                     levelItem.target.visible = false;
+                    //UI_CompStoryLevelItem.ProxyEnd();
                 }
-
-                UI_CompStoryLevelItem.ProxyEnd();
             }
 
             yield return new WaitForEndOfFrame();
 
-            _ui.m_chapter.m_compChapterScroll.target.y =
-                0; //Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
+            _ui.m_chapter.m_compChapterScroll.target.y = 0;
 
             if (gamey != null)
                 gamey.transform.position = new Vector3(0, indexY, 0);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -419,8 +419,7 @@ namespace GFGGame
             if (clickType == 2)
             {
                 _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new",
-                    starEffectName[clickType]);
-                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+                    starEffectName[clickType], 100F, () => { _ui.m_comClick.m_comResult.m_starEffect.visible = true; });
             }
 
             if (clickType == ClickType.PERFECT_CLICK)
@@ -439,10 +438,13 @@ namespace GFGGame
             Debug.Log("_partId:" + _partId);
             // _ui.m_comClick.target.touchable = false;
             _effectUI19 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_ppEffect, "ui_fight_new",
-                ppEffectName[clickType]);
+                ppEffectName[clickType], 100f, () =>
+                {
+                    _ui.m_comClick.m_comResult.m_ppEffect.visible = true;
+                    _ui.m_comClick.m_comResult.m_paopao.visible = false;
+                });
+
 
-            _ui.m_comClick.m_comResult.m_ppEffect.visible = true;
-            _ui.m_comClick.m_comResult.m_paopao.visible = false;
             if (clickType == 2)
             {
                 _ui.m_t0.Play();
@@ -450,8 +452,7 @@ namespace GFGGame
             else
             {
                 _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new",
-                    starEffectName[clickType]);
-                _ui.m_comClick.m_comResult.m_starEffect.visible = true;
+                    starEffectName[clickType], 100f, () => { _ui.m_comClick.m_comResult.m_starEffect.visible = true; });
             }
 
             for (int i = 0; i < 3; i++)

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -75,7 +75,7 @@ namespace GFGGame
 
         public static string rechargeAddress;
         
-        public static bool IsTest = true;
+        public static bool IsTest = false;
 
         public static void InitScriptCompilation()
         {

GameClient/GameClient.sln.DotSettings.user

@@ -8,11 +8,13 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABuildResult_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003Fa9_003Fbef924de_003FBuildResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADns_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Fb6_003F1bebb6b7_003FDns_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorUtility_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003F3f_003Fa805acc1_003FEditorUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F351e49e2a5bf4fd6beabb458ce2255f3ff600_003F4e_003F84b60bbd_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003Fc3_003F83d8926e_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIBufferWriter_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa5006ea2ea344a8e8c71a2eb982aadc024518_003Fef_003F2e83f7a0_003FIBufferWriter_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIEnumerator_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F4e_003Faad6c3b2_003FIEnumerator_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIPEndPoint_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Fa6_003F47eb89a0_003FIPEndPoint_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonUtility_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F02365bcde6734ac8ae92f51eed8d7a5a3200_003F58_003F2dcb948b_003FJsonUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AKeyValuePair_00602_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003F63_003Fe50b2d41_003FKeyValuePair_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fa3_003F60d291b6_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALogType_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003F75_003Fd87ba9d0_003FLogType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMemberInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F69_003F4bdfd6bb_003FMemberInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>