Merge remote-tracking branch 'remotes/origin/master' into douYouTap

GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/xd.lck

@@ -0,0 +1,78 @@
+Private property of Exodus: 32556@DESKTOP-8ILLQSI
+
+jetbrains.exodus.io.LockingManager.lock(LockingManager.kt:88)
+jetbrains.exodus.io.LockingManager.lock(LockingManager.kt:39)
+jetbrains.exodus.io.FileDataWriter.lock(FileDataWriter.kt:70)
+jetbrains.exodus.log.Log.tryLock(Log.kt:804)
+jetbrains.exodus.log.Log.<init>(Log.kt:117)
+jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:117)
+jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:81)
+jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:77)
+jetbrains.exodus.env.Environments$newInstance$4.invoke(Environments.kt:46)
+jetbrains.exodus.env.Environments$newInstance$4.invoke(Environments.kt:46)
+jetbrains.exodus.env.Environments.prepare(Environments.kt:120)
+jetbrains.exodus.env.Environments.newInstance(Environments.kt:46)
+kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore(EntityStoreHelper.kt:40)
+kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore(EntityStoreHelper.kt:31)
+kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore$default(EntityStoreHelper.kt:30)
+com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.initStore(XdChatSessionPersistenceService.kt:115)
+com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.<init>(XdChatSessionPersistenceService.kt:22)
+com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.<init>(XdChatSessionPersistenceService.kt:15)
+com.github.copilot.chat.session.persistence.ChatSessionPersistenceServiceKt.ChatSessionPersistenceService(ChatSessionPersistenceService.kt:43)
+com.github.copilot.chat.session.persistence.ChatSessionPersistenceServiceKt.chatSessionsPersistenceService(ChatSessionPersistenceService.kt:53)
+com.github.copilot.chat.session.ChatSessionManager.<init>(ChatSessionManager.kt:45)
+com.github.copilot.chat.session.ChatSessionManager.<init>(ChatSessionManager.kt:25)
+com.github.copilot.chat.window.CopilotChatToolWindow.onCopilotReady(CopilotChatToolWindow.kt:133)
+com.github.copilot.chat.window.CopilotChatToolWindow.access$onCopilotReady(CopilotChatToolWindow.kt:40)
+com.github.copilot.chat.window.CopilotChatToolWindow$initCopilotStatusListener$1.invoke(CopilotChatToolWindow.kt:118)
+com.github.copilot.chat.window.CopilotChatToolWindow$initCopilotStatusListener$1.invoke(CopilotChatToolWindow.kt:115)
+com.github.copilot.status.CopilotAuthStatusKt.subscribeToCopilotAuthStatus(CopilotAuthStatus.kt:27)
+com.github.copilot.chat.window.CopilotChatToolWindow.initCopilotStatusListener(CopilotChatToolWindow.kt:115)
+com.github.copilot.chat.window.CopilotChatToolWindow.<init>(CopilotChatToolWindow.kt:59)
+com.github.copilot.chat.window.CopilotChatToolWindow.<init>(CopilotChatToolWindow.kt:40)
+com.github.copilot.chat.window.CopilotChatToolWindowFactory.init(CopilotChatToolWindowFactory.kt:18)
+com.intellij.openapi.wm.impl.ToolWindowManagerImpl.registerToolWindow$intellij_platform_ide_impl(ToolWindowManagerImpl.kt:1083)
+com.intellij.toolWindow.ToolWindowSetInitializerKt.registerToolWindows(ToolWindowSetInitializer.kt:181)
+com.intellij.toolWindow.ToolWindowSetInitializerKt.access$registerToolWindows(ToolWindowSetInitializer.kt:1)
+com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1$1.invoke(ToolWindowSetInitializer.kt:129)
+com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1$1.invoke(ToolWindowSetInitializer.kt:121)
+com.intellij.openapi.progress.CoroutinesKt.blockingContext(coroutines.kt:248)
+com.intellij.openapi.progress.CoroutinesKt.blockingContext(coroutines.kt:199)
+com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1.invokeSuspend(ToolWindowSetInitializer.kt:121)
+kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
+kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:106)
+com.intellij.openapi.application.TransactionGuardImpl$1.run(TransactionGuardImpl.java:193)
+com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:861)
+com.intellij.openapi.application.impl.ApplicationImpl$4.run(ApplicationImpl.java:478)
+com.intellij.openapi.application.impl.FlushQueue.doRun(FlushQueue.java:79)
+com.intellij.openapi.application.impl.FlushQueue.runNextEvent(FlushQueue.java:121)
+com.intellij.openapi.application.impl.FlushQueue.flushNow(FlushQueue.java:41)
+java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318)
+java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:789)
+java.desktop/java.awt.EventQueue$3.run(EventQueue.java:740)
+java.desktop/java.awt.EventQueue$3.run(EventQueue.java:734)
+java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
+java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86)
+java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:759)
+com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.kt:685)
+com.intellij.ide.IdeEventQueue._dispatchEvent$lambda$10(IdeEventQueue.kt:589)
+com.intellij.openapi.application.impl.ApplicationImpl.runWithoutImplicitRead(ApplicationImpl.java:1485)
+com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.kt:589)
+com.intellij.ide.IdeEventQueue.access$_dispatchEvent(IdeEventQueue.kt:67)
+com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1$1.compute(IdeEventQueue.kt:369)
+com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1$1.compute(IdeEventQueue.kt:368)
+com.intellij.openapi.progress.impl.CoreProgressManager.computePrioritized(CoreProgressManager.java:787)
+com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1.invoke(IdeEventQueue.kt:368)
+com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1.invoke(IdeEventQueue.kt:363)
+com.intellij.ide.IdeEventQueueKt.performActivity$lambda$1(IdeEventQueue.kt:992)
+com.intellij.openapi.application.TransactionGuardImpl.performActivity(TransactionGuardImpl.java:105)
+com.intellij.ide.IdeEventQueueKt.performActivity(IdeEventQueue.kt:992)
+com.intellij.ide.IdeEventQueue.dispatchEvent$lambda$7(IdeEventQueue.kt:363)
+com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:861)
+com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.kt:405)
+java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:207)
+java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:128)
+java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:117)
+java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:113)
+java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:105)
+java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:92)

GameClient/Assets/Editor/ToolsMenu.cs

@@ -32,7 +32,6 @@ namespace GFGEditor
         [MenuItem("外网DEV/")]
         public static void VersionTag()
         {
-            
         }
 #elif PT_DouYouDev
         [MenuItem("PT_DouYouDev/")]
@@ -65,12 +64,13 @@ namespace GFGEditor
             
         }
 #else
-
         [MenuItem("内网/")]
         public static void VersionTag()
         {
 
         }
+
+#endif
         [MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
         static void UpdateAndImportAll()
         {
@@ -152,7 +152,6 @@ namespace GFGEditor
         {
             DeleteUnnecessaryImage();
         }
-#endif
 
         private static void UpdateProjectRes()
         {
@@ -175,6 +174,7 @@ namespace GFGEditor
             {
                 ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
             }
+
             EditorUtility.ClearProgressBar();
         }
 
@@ -192,12 +192,14 @@ namespace GFGEditor
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
             EditorUtility.ClearProgressBar();
         }
+
         public static void ImportArtRes()
         {
             EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
             ImportArtResTool.Import();
             EditorUtility.ClearProgressBar();
         }
+
         public static void ImportExcel()
         {
             Log.ILog = new UnityLogger();
@@ -207,6 +209,13 @@ namespace GFGEditor
                 File.Delete(ExcelConfig.excelsCacheFolderPath);
             }
             ET.Options.Instance = new ET.Options();
+            //清除缓存  
+            
+            if (File.Exists(ExcelConfig.excelsCacheFolderPath))
+            {
+                File.Delete(ExcelConfig.excelsCacheFolderPath);
+            }
+            
             EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
             SqliteController.Instance.Init(false, null);
             SQLiteHelper.Instance.OpenConnection();
@@ -220,6 +229,7 @@ namespace GFGEditor
             {
                 Directory.CreateDirectory(ExcelConfig.configCodePath);
             }
+
             if (!Directory.Exists(ExcelConfig.configArrayCodePath))
             {
                 Directory.CreateDirectory(ExcelConfig.configArrayCodePath);
@@ -242,6 +252,7 @@ namespace GFGEditor
             EditorUtility.ClearProgressBar();
             SQLiteHelper.Instance.CloseConnection();
         }
+
         static void UpdateAndImportArtRes()
         {
             UpdateArtRes();
@@ -250,7 +261,6 @@ namespace GFGEditor
 
         static void UpdateAndImportExcel()
         {
-
             UpdateExcel();
             ImportExcel();
         }
@@ -260,6 +270,7 @@ namespace GFGEditor
         {
             ImportArtResTool.Test();
         }
+
         [MenuItem("Tools/ImageClip/ReadImagePosition")]
         public static void ReadImagePosition()
         {
@@ -277,51 +288,77 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "开始清除资源", 1);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.FieldGuideIconTargetPath, new string[] { ImportArtResTool.FieldGuideIconMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ChapterGuideIconTargetPath, new string[] { ImportArtResTool.ChapterGuideIconMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.FieldGuideIconTargetPath,
+                new string[] { ImportArtResTool.FieldGuideIconMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ChapterGuideIconTargetPath,
+                new string[] { ImportArtResTool.ChapterGuideIconMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MusicTargetPath, new string[] { ImportArtResTool.MusicMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MusicTargetPath,
+                new string[] { ImportArtResTool.MusicMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardMusicTargetPath, new string[] { ImportArtResTool.CardMusicMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardMusicTargetPath,
+                new string[] { ImportArtResTool.CardMusicMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ItemIconTargetPath, new string[] { ImportArtResTool.IconMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ItemIconTargetPath,
+                new string[] { ImportArtResTool.IconMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath, new string[] { ImportArtResTool.BgMd5FileSaveName, ImportArtResTool.DressUpMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath,
+                new string[] { ImportArtResTool.BgMd5FileSaveName, ImportArtResTool.DressUpMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath, new string[] { ImportArtResTool.NPCHeadMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath,
+                new string[] { ImportArtResTool.NPCHeadMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath, new string[] { ImportArtResTool.PicFMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath,
+                new string[] { ImportArtResTool.PicFMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicSTargetPath, new string[] { ImportArtResTool.PicSMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicSTargetPath,
+                new string[] { ImportArtResTool.PicSMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath, new string[] { ImportArtResTool.CardBgMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath,
+                new string[] { ImportArtResTool.CardBgMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath, new string[] { ImportArtResTool.CardMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardSkillTargetPath, new string[] { ImportArtResTool.CardSkillMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath,
+                new string[] { ImportArtResTool.CardMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardSkillTargetPath,
+                new string[] { ImportArtResTool.CardSkillMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityTargetPath, new string[] { ImportArtResTool.ActivityMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow1TargetPath, new string[] { ImportArtResTool.ActivityShow1Md5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityTargetPath,
+                new string[] { ImportArtResTool.ActivityMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow1TargetPath,
+                new string[] { ImportArtResTool.ActivityShow1Md5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.PhotoGraphBorderTargetPath, new string[] { ImportArtResTool.PhotoGraphBorderMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.PhotoGraphBorderTargetPath,
+                new string[] { ImportArtResTool.PhotoGraphBorderMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.UIBgTargetPath, new string[] { ImportArtResTool.UIBgMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelBgTargetPath, new string[] { ImportArtResTool.TravelBgMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath, new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath, new string[] { ImportArtResTool.HeadMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath, new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LeagueIconTargetPath, new string[] { ImportArtResTool.LeagueIconMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.UIBgTargetPath,
+                new string[] { ImportArtResTool.UIBgMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelBgTargetPath,
+                new string[] { ImportArtResTool.TravelBgMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath,
+                new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath,
+                new string[] { ImportArtResTool.HeadMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath,
+                new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LeagueIconTargetPath,
+                new string[] { ImportArtResTool.LeagueIconMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath, new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath,
+                new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MaterialTargetPath, new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath, new string[] { ImportArtResTool.ShaderMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MaterialTargetPath,
+                new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath,
+                new string[] { ImportArtResTool.ShaderMd5FileSaveName });
             // FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath,
+                new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
+
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LuckyBoxTitleImgTargetPath,
+                new string[] { ImportArtResTool.LuckyBoxTitleImgMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LuckyBoxTitleImgTargetPath, new string[] { ImportArtResTool.LuckyBoxTitleImgMd5FileSaveName });
 
-            
             DeleteFileHelper.TrySvnRemoveDeleteFile();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/HotUpdate/Constant/ConstCardRarity.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ConstCardRarity 
+    public class ConstCardRarity_Type 
     {
 
         public const int Rarity_TIAN = 4;
@@ -22,15 +22,15 @@ namespace GFGGame
 
         public static SortedList CardRarityList()
         {
-            if (ConstCardRarity._cardRarityList == null)
+            if (ConstCardRarity_Type._cardRarityList == null)
             {
-                ConstCardRarity._cardRarityList = new SortedList();
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_HUANG, ConstCardRarity.TITLE_HUANG);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_XUAN, ConstCardRarity.TITLE_XUAN);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_DI, ConstCardRarity.TITLE_DI);
-                ConstCardRarity._cardRarityList.Add(ConstCardRarity.Rarity_TIAN, ConstCardRarity.TITLE_TIAN);
+                ConstCardRarity_Type._cardRarityList = new SortedList();
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_HUANG, ConstCardRarity_Type.TITLE_HUANG);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_XUAN, ConstCardRarity_Type.TITLE_XUAN);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_DI, ConstCardRarity_Type.TITLE_DI);
+                ConstCardRarity_Type._cardRarityList.Add(ConstCardRarity_Type.Rarity_TIAN, ConstCardRarity_Type.TITLE_TIAN);
             }
-            return ConstCardRarity._cardRarityList;
+            return ConstCardRarity_Type._cardRarityList;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstFightRoleType.cs

@@ -3,4 +3,5 @@ public class FightRoleType
 
     public const int MINE = 0;//自己
     public const int TAEGET = 1;//对手
+    public const int FieldWork = 2;//田野调查
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -262,5 +262,11 @@ namespace GFGGame
         public const string FieldWork_STARTCHANGE = "FieldWork_STARTCHANGE";
         //奖励界面关闭
         public const string REWARDVIEW_CLOTHER = "REWARDVIEW_CLOTHER";
+        //关卡排行榜数据加载完毕
+        public const string REQ_CURRENT_RANK = "REQ_CURRENT_RANK";
+        //爬塔状态改变
+        public const string FieldWork_StateCHANGE = "FieldWork_StateCHANGE";
+        //转盘数据改变
+        public const string TurnTable_DateCHANGE = "TurnTable_DateCHANGE";
     }
 }

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

@@ -241,6 +241,7 @@ namespace GFGGame
             GameGlobal.AfterDataInited = true;
             EventAgent.DispatchEvent(ConstMessage.AFTER_DATA_INITED);
 
+            ActivitySProxy.ReqGetTurnTableInfo().Coroutine();
             ItemProxy.GetItemAttributeInfos().Coroutine();
             ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
@@ -268,6 +269,7 @@ namespace GFGGame
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
             ArenaDataManager.Instance.ReqArenaInfo();
+            FieldWorkSproxy.ReqFieldWorkInfos().Coroutine();
             SkillSProxy.ReqGetSkillList(SkillType.LeagueSkill).Coroutine();
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
@@ -283,6 +285,7 @@ namespace GFGGame
             ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
             ActivityAfuGiftSProxy.GetSummerGiftInfo().Coroutine();
             //RoleInfoSProxy.ReqNewRoleGetSuitStatus().Coroutine();
+            MatchingCompetitionSproxy.ReqCurrentRank().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;
@@ -370,6 +373,7 @@ namespace GFGGame
             NewYearRedEnvelopeDataManager.Instance.Clear();
             MatchingCompetitionDataManager.Instance.MyNtextture = null;
             MatchingCompetitionDataManager.Instance.MathingDressDate.bgId = 0;
+            FieldWorkDataManager.Instance.IsAutoStart = false;
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -415,5 +415,31 @@ namespace GFGGame
             }
             return false;
         }
+        /***************************转盘活动*******************************/
+        public bool CHECK_TIPS_OPEN = false;
+        public int TurnTableActivityType = 102; 
+        public int TurnTableTimes = 300;
+        public int TipsDropId = 0;
+        public int StartDropId = 40000002;
+        public List<int> GiftBagIdList = new List<int>() { };
+        //奖励状态
+        public Dictionary<int, int> TurnRewardStateDic = new Dictionary<int, int>();
+        //抽奖结果
+        public Dictionary<int, List<ItemInfoProto>> threeTurnResult = new Dictionary<int, List<ItemInfoProto>>() {};
+        public List<ItemInfoProto> TurnRewardList = new List<ItemInfoProto>();
+        public List<ItemInfoProto> TurnSpecialRewardList = new List<ItemInfoProto>();
+        public bool TurnTableRewardRed()
+        {
+            foreach(var item in TurnRewardStateDic)
+            {
+                if(item.Value == 1)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /*****************************************************************/
+        public string PhoneNum = "";
     }
 }

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

@@ -162,8 +162,32 @@ namespace GFGGame
         public int GetRecommentCardId(int scoreType, List<int> itemList, List<int> wearCardIds)
         {
             float dressListAllAcore = FightDataManager.Instance.GetDressListAllScore(itemList, scoreType);
-            List<CardData> cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRoleType(0),
+            List<CardData> cardDatas = new List<CardData>();// = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRoleType(0),dressListAllAcore, scoreType);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+            {
+                cardDatas = CardDataManager.GetCardListByRoleType(0).ToList();
+                int limitTims = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+                foreach (var item in FieldWorkDataManager.Instance.CardAbrasionInfoList)
+                {
+                    if (item.UseNum >= limitTims)
+                    {
+                        for(int i = 0;i< cardDatas.Count;i++)
+                        {
+                            if(cardDatas[i].id == item.Card)
+                            {
+                                cardDatas.RemoveAt(i);
+                                break;
+                            }
+                        }
+                    }
+                }
+                cardDatas = FightDataManager.Instance.SortCardList(cardDatas,dressListAllAcore, scoreType).ToList();
+            }
+            else
+            {
+                cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRoleType(0),
                 dressListAllAcore, scoreType);
+            }
             cardDatas = cardDatas.Where(a => !wearCardIds.Contains(a.id)).ToList();
             if (cardDatas.Count == 0) return 0;
             wearCardIds.Add(cardDatas[0].itemCfg.id);
@@ -187,7 +211,19 @@ namespace GFGGame
                 int key = subType;
                 if (itemDatasDic.Count == 0) continue;
                 if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneTypeBySubType(subType)) continue;
-                List<int> dressList = SortDressList(itemDatasDic[subType], scoreType, tags);
+                List<int> dressList = new List<int>();//= SortDressList(itemDatasDic[subType], scoreType, tags);
+                if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+                {
+                    dressList = SortDressList(itemDatasDic[subType], scoreType, tags).ToList();
+                    foreach(var item in FieldWorkDataManager.Instance.HistoryDressupList)
+                    {
+                        dressList.Remove(item);
+                    }
+                }
+                else
+                {
+                    dressList = SortDressList(itemDatasDic[subType], scoreType, tags).ToList();
+                }
                 int max = subType == (int)ConstDressUpItemType.TE_SHU ? 3 : 1;
                 max = Math.Min(max, dressList.Count);
                 if (DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsTypeBySubType(subType))
@@ -283,6 +319,130 @@ namespace GFGGame
             return itemList;
         }
 
+        /// <summary>
+        /// 爬塔获取推荐列表
+        /// </summary>
+        /// <param name="scoreType"></param>
+        /// <param name="tags"></param>
+        /// <returns></returns>
+        public List<int> GetFieldRecommentItemList(int scoreType, string[] tags)
+        {
+            Dictionary<int, List<int>> itemListDic = new Dictionary<int, List<int>>();
+            Dictionary<int, List<int>> itemDatasDic = DressUpMenuItemDataManager.ItemDatasBySubTypeDic;
+
+
+            foreach (int subType in itemDatasDic.Keys)
+            {
+                int key = subType;
+                if (itemDatasDic.Count == 0) continue;
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneTypeBySubType(subType)) continue;
+                List<int> dressList = new List<int>();//= SortDressList(itemDatasDic[subType], scoreType, tags);
+                if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+                {
+                    dressList = SortDressList(itemDatasDic[subType], scoreType, tags).ToList();
+                    foreach (var item in FieldWorkDataManager.Instance.HistoryDressupList)
+                    {
+                        dressList.Remove(item);
+                    }
+                }
+                else
+                {
+                    dressList = SortDressList(itemDatasDic[subType], scoreType, tags).ToList();
+                }
+                int max = subType == (int)ConstDressUpItemType.TE_SHU ? 3 : 1;
+                max = Math.Min(max, dressList.Count);
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsTypeBySubType(subType))
+                {
+                    key = ConstDressUpItemType.TE_SHU; //饰品全放在一个列表里
+                }
+
+                if (!itemListDic.ContainsKey(key))
+                {
+                    itemListDic[key] = new List<int>();
+                }
+
+                itemListDic[key].AddRange(dressList.GetRange(0, max));
+            }
+
+            bool isHasLYQ = itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemListDic[ConstDressUpItemType.LIAN_YI_QUN].Count >0;
+            bool isHasSY = itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemListDic[ConstDressUpItemType.SHANG_YI].Count > 0; ;
+            bool isHasXZ = itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemListDic[ConstDressUpItemType.XIA_ZHUANG].Count > 0; ;
+            bool isHasND = itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA) && itemListDic[ConstDressUpItemType.NEI_DA].Count > 0; ;
+
+            int countTagLYQ =
+                isHasLYQ && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], tags)
+                    ? 1
+                    : 0;
+            int countTagSY =
+                isHasSY && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.SHANG_YI][0], tags)
+                    ? 1
+                    : 0;
+            int countTagXZ =
+                isHasXZ && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], tags)
+                    ? 1
+                    : 0;
+            int countTagND =
+                isHasND && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.NEI_DA][0], tags)
+                    ? 1
+                    : 0;
+
+            if (countTagLYQ > countTagSY + countTagXZ + countTagND)
+            {
+                itemListDic.Remove(ConstDressUpItemType.NEI_DA);
+                itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
+                itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
+            }
+            else if (countTagLYQ < countTagSY + countTagXZ + countTagND)
+            {
+                itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
+            }
+            else
+            {
+                int scoreLYQ = !isHasLYQ
+                    ? 0
+                    : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], scoreType,
+                        tags);
+                int scoreSY = !isHasSY
+                    ? 0
+                    : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.SHANG_YI][0], scoreType,
+                        tags);
+                int scoreXZ = !isHasXZ
+                    ? 0
+                    : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], scoreType,
+                        tags);
+                int scoreND = !isHasND
+                    ? 0
+                    : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.NEI_DA][0], scoreType,
+                        tags);
+                if (scoreLYQ > scoreSY + scoreXZ + scoreND)
+                {
+                    itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
+                    itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
+                    itemListDic.Remove(ConstDressUpItemType.NEI_DA);
+                }
+                else
+                {
+                    itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
+                }
+            }
+
+            List<int> itemList = new List<int>();
+            foreach (int subType in itemListDic.Keys)
+            {
+                //DressUpMenuItemDataManager.SortItemListByHighScore(itemListDic[subType]);
+                if (subType == ConstDressUpItemType.TE_SHU)
+                {
+                    int max = Math.Min(itemListDic[subType].Count, 5);
+                    itemList.AddRange(itemListDic[subType].GetRange(0, max));
+                }
+                else
+                {
+                    itemList.AddRange(itemListDic[subType]);
+                }
+            }
+
+            return itemList;
+        }
         private List<int> SortDressList(List<int> dressList, int scoreType, string[] tags)
         {
             dressList.Sort((int a, int b) =>

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

@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using UnityEngine;
+using UI.FieldWork;
+using FairyGUI;
+
+namespace GFGGame
+{
+    class FieldWorkDataManager : SingletonBase<FieldWorkDataManager>
+    {
+        public long LastFightTime = 0; //上次战斗时间，时间为0，说明未战斗过，则没有段位奖励
+        public List<int> ThemeList = new List<int>() { 1, 2, 3 };
+        public List<string> Tag = new List<string> { "艳丽", "志怪" }; //本周标签
+        public int SeasonId = 1; // 赛季id
+        public List<FightData> DressupList = new List<FightData>(); //我的搭配列表
+        public List<int> HistoryDressupList = new List<int>();//本周通过关的服装列表
+        public List<CardAbrasionInfo> CardAbrasionInfoList = new List<CardAbrasionInfo>();
+        public Dictionary<int,CimbingTowerLevelInfoProto> CimbingTowerLevelInfoList = new Dictionary<int, CimbingTowerLevelInfoProto>();
+
+        public List<int> roundTime = new List<int>();
+        public OtherRoleInfoData roleInfo = new OtherRoleInfoData() { 
+            roleName = RoleDataManager.roleName,
+            roleLv = RoleDataManager.lvl,
+            headId = RoleDataManager.headId};
+        //Dictionary<回合下标, Dictionary<partId, Dictionary<战斗节点, List<PassivitySkillLvlCfg>>>>
+        public Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>> vaildSkills =
+            new Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>>();
+
+        public Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>> targetVaildSkills =
+            new Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>>();
+
+        public int SelectThemeIndex = 0; //当前选中换装主题（ThemeList）的下标
+        public int SelectTargetIndex = -1; //当前选中挑战对象的下标
+        public int CurFightIndex = 0; //当前挑战场次下标
+        public List<long> myScore = new List<long>(); //对战数据，三轮分数
+
+        public List<ItemInfoProto> BonusList = new List<ItemInfoProto>(); //战斗结算奖励
+
+        public int targetWinScore = 10000;
+
+        //战斗关卡
+        public int currentLevelID = 0;
+        public List<string> nameList = new List<string>() 
+        {"壹","贰","叄","肆","伍","陆","柒","捌","玖","拾","拾壹","终"};
+        public int guideLevelID = 100005009;
+        public int MaxLevelId = 0;
+        public bool IsAutoStart = false;
+        /// <summary>
+        /// 更新战斗结算总分，含胜负
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="myScores"></param>
+        /// <param name="targetScore"></param>
+        public void UpdateAllScoreResult(GObject obj, List<long> myScores,int targetScore)
+        {
+            UI_ComAllScoreResult com = UI_ComAllScoreResult.Proxy(obj);
+            bool isWin = UpdateAllScore(com.m_comResult.target, myScores, targetScore);
+            //_ui.m_loaResule.url = isWin ? "ui://FieldWork/kstzjj_slsl" : "ui://FieldWork/kstzjj_shib";
+            UI_ComAllScoreResult.ProxyEnd();
+        }
+
+        public bool UpdateAllScore(GObject obj, List<long> myScores, int targetScore)
+        {
+            long myAllScore = 0;
+            long targetAllScore = 0;
+            for (int i = 0; i < myScores.Count; i++)
+            {
+                myAllScore += myScores[i];
+            }
+            UI_ComAllScore com = UI_ComAllScore.Proxy(obj);
+            com.m_txtMyFightScore.text = myAllScore.ToString();
+            UI_ComAllScore.ProxyEnd();
+            bool isWin = myAllScore > targetAllScore;
+            return isWin;
+        }
+
+        /// <summary>
+        /// 更新标签、战力、属性分数值
+        /// </summary>
+        public void UpdateValue(GObject obj, int index, List<FightData> roleDatas)
+        {
+            UI.Arena.UI_ComFIeldValueInfo com = UI.Arena.UI_ComFIeldValueInfo.Proxy(obj);
+            com.m_scoreType.url = ResPathUtil.GetScorePath(FieldWorkDataManager.Instance.ThemeList[index]);
+            com.m_txtScore.text = FightDataManager.Instance.GetScore(roleDatas[index]).ToString();
+            long fightScore = ArenaDataManager.Instance.GetAllFightScore(roleDatas);
+            com.m_txtFightScore.SetVar("value", fightScore.ToString()).FlushVars(); ;
+            com.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(roleDatas[index].itemList, roleDatas[index].tags).ToString();
+            int count = ArenaDataManager.Instance.GetTagsCount(roleDatas[index].itemList, roleDatas[index].tags);
+            com.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
+            com.m_c3.selectedIndex = roleDatas[index].tags.Length > 0 ? 1 : 0;
+            UpdateFightScore(com.m_comFightScore.target, roleDatas);
+
+                ItemUtil.UpdateTag(com.m_comTag, roleDatas[index].tags[0]);
+                ItemUtil.UpdateTag(com.m_comTag1, roleDatas[index].tags[1]);
+            
+            if (com.m_btnTagRule.data == null)
+            {
+                com.m_btnTagRule.onClick.Add(RuleController.ShowRuleView);
+                com.m_btnTagRule.data = 300034;
+            }
+            UI.Arena.UI_ComFIeldValueInfo.ProxyEnd();
+        }
+        /// <summary>
+        /// 更新战力值
+        /// </summary>
+        public void UpdateFightScore(GObject obj, List<FightData> roleDatas)
+        {
+            List<long> fightScore = ArenaDataManager.Instance.GetFightScoreList(roleDatas);
+            UI.Arena.UI_ComFieldFightScore com = UI.Arena.UI_ComFieldFightScore.Proxy(obj);
+            com.m_txtSuitScore.SetVar("value", fightScore[0].ToString()).FlushVars(); ;
+            com.m_txtClickScore.SetVar("value", fightScore[1].ToString()).FlushVars(); ;
+            com.m_txtCardScore.SetVar("value", fightScore[2].ToString()).FlushVars(); ;
+            UI.Arena.UI_ComFieldFightScore.ProxyEnd();
+        }
+        public void GetFightResult()
+        {
+            myScore.Clear();
+            long allScore = 0;
+            for (int i = 0; i < DressupList.Count; i++)
+            {
+                FieldWorkDataManager.Instance.GetQuickFightResult(i, DressupList[i], out long score);
+                allScore += score;
+                myScore.Add(score);
+            }
+        }
+        public int GetTargetWinScore(int levelID)
+        {
+            targetWinScore = 10000;
+            return targetWinScore;
+        }
+        public string GetHeihtScore(int levelID)
+        {
+            if(CimbingTowerLevelInfoList.ContainsKey(levelID))
+            {
+                long score = CimbingTowerLevelInfoList[levelID].WeekMaxScore;
+                return score.ToString();
+            }
+            else
+            {
+                return "";
+            }    
+        }
+        public List<List<int>> GetDressAndCard()
+        {
+            List<List<int>> dress = new List<List<int>>();
+            for (int i=0;i< FieldWorkDataManager.Instance.DressupList.Count;i++)
+            {
+                List<int> dressA = new List<int>();
+                dressA = FieldWorkDataManager.Instance.DressupList[i].itemList.ToList();
+                //去除默认
+                dressA.Remove(10000);
+                dressA.Remove(20000);
+                dressA.Remove(30000);
+                dressA.Remove(50000);
+                dressA.Remove(60000);
+                if (FieldWorkDataManager.Instance.DressupList[i].cardId > 0)
+                {
+                    dressA.Add(FieldWorkDataManager.Instance.DressupList[i].cardId);
+                }
+                dress.Add(dressA);
+            }
+            return dress;
+        }
+        public float GetCardAbrasion(int cardID)
+        {
+            float abrasion = 0;
+            float UseNum = 0;
+            float cardTimes = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardID);
+            if(itemCfg == null)
+            {
+                return 100;
+            }
+            foreach (var item in CardAbrasionInfoList)
+            {
+                if(item.Card == cardID)
+                {
+                    UseNum = item.UseNum;
+                    abrasion = UseNum / cardTimes;
+                    if(abrasion >= 1)
+                    {
+                        abrasion = 1;
+                    }
+                    break;
+                }
+            }
+            return abrasion * 100;
+        }
+        //输入属性类型，获取联盟技能该属性加成总值
+        public int GetAllSkillScore(int scoreType)
+        {
+            int score = 0;
+            if(scoreType == 0)
+            {
+                return score;
+            }
+            foreach (int key in SkillDataManager.Instance.LeagueSkillScoreDatas.Keys)
+            {
+                score += SkillDataManager.Instance.LeagueSkillScoreDatas[key][scoreType];
+            }
+            return score;
+        }
+        public void SetDataScoreType()
+        {
+            for(int i = 0;i<DressupList.Count;i++)
+            {
+                DressupList[i].scoreType = ThemeList[i];
+            }
+        }
+        public bool SetCanStart()
+        {
+            int i = 0;
+            foreach(var item in DressupList)
+            {
+                bool isDress = false;
+                for(int j= 0;j<item.itemList.Count;j++)
+                {
+                    if(item.itemList.Count > 0)
+                    {
+                        if(item.itemList[j] != 10000  && item.itemList[j] != 20000
+                            && item.itemList[j] != 30000 && item.itemList[j] != 50000 && item.itemList[j] != 60000)
+                        {
+                            isDress = true;
+                        }
+                    }
+                }
+                if(item.cardId > 0 && isDress)
+                {
+                    i++;    
+                }
+            }
+            if(i>=3)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        public bool CheckLevelPass(int LevelID)
+        {
+            CimbingTowerLevelCfg levelCfg = CimbingTowerLevelCfgArray.Instance.dataArray[0];
+            if(LevelID == levelCfg.id)
+            {
+                return true;
+            }
+            int levelBefore = LevelID - 1;
+            if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(levelBefore))
+            {
+               if( FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[levelBefore].IsPass)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 词牌如果磨损达到上限就放到最后
+        /// </summary>
+        /// <param name="arrayList"></param>
+        /// <returns></returns>
+        public List<CardData> SortCardList(List<CardData> cardList)
+        {
+            List<CardData> card = new List<CardData>();
+            int limitNum = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+            card = cardList.ToList();
+            for(int i = 0;i<card.Count;i++)
+            {
+                foreach(var item in CardAbrasionInfoList)
+                {
+                    if(item.Card == card[i].id)
+                    {
+                        if(item.UseNum >= limitNum)
+                        {
+                            // 添加到列表末尾
+                            card.Add(card[i]);
+                            // 移除元素
+                            card.RemoveAt(i);
+                        }
+                        break;
+                    }
+                }
+            }
+            return card;
+        }
+
+
+        /// <summary>
+        /// 获取快速挑战结果
+        /// </summary>
+        /// <param name="myRoleData"></param>
+        /// <param name="_score"></param>
+
+        public void GetQuickFightResult(int roundIndex, FightData myRoleData, out long _score)
+        {
+            double score = 0;
+
+            int cardId = myRoleData.cardId;
+            double mainScore = ScoreSystemData.Instance.GetMainScore(myRoleData);
+            List<int> skillLvs = myRoleData.skillLvs;
+
+            List<int> roundTime = ScoreSystemData.Instance.GetRoundTime(myRoleData.cardId, myRoleData.skillLvs);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+            {
+                FieldWorkDataManager.Instance.roundTime = roundTime;
+                if (!FieldWorkDataManager.Instance.vaildSkills.ContainsKey(roundIndex)) FieldWorkDataManager.Instance.vaildSkills[roundIndex] = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
+            }
+
+            int roundId = 0;
+            int currentTime = SkillBeginTime.FIGHT_BEGIN;
+            GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score);
+            for (int i = 0; i < FightScoreCfgArray.Instance.dataArray.Length; i++)
+            {
+                roundId++;
+                currentTime = SkillBeginTime.ERVERY_ROUND_BEGIN;
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score);            
+                score += ScoreSystemData.Instance.GetRoundScore(myRoleData, roundId, ClickType.PERFECT_CLICK, 0);
+                currentTime = SkillBeginTime.PERFECT_CLICK;
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score);
+                currentTime = SkillBeginTime.ERVERY_ROUND_END;
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score);
+                // Debug.Log(" targetScore444:" + targetScore);
+            }
+            roundId++;
+            currentTime = SkillBeginTime.ALL_PERFECT_START;
+            GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score);
+            score += ScoreSystemData.Instance.GetAllCircleAddScore(myRoleData);
+            _score = Mathf.CeilToInt((float)score);
+        }
+
+        private void GetSkillScore(int roleType, int roundIndex, int currentTime, int partId, double mainScore, int cardId, List<int> skillLvs, List<int> roundTime, ref double score)
+        {
+            List<int> targetSkillLvs = new List<int>();
+            List<int> targetRoundTime = new List<int>();
+            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(currentTime, partId, cardId, skillLvs, 0, targetSkillLvs, roundTime, targetRoundTime);
+            ScoreSystemData.Instance.GetRoundItemSkillScore(vaildSkills, mainScore, 0, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic);
+
+            score += skillScore;
+
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+            {
+                FieldWorkDataManager dataManager = FieldWorkDataManager.Instance;
+                if (roleType == FightRoleType.MINE)
+                {
+                    if (!dataManager.vaildSkills[roundIndex].ContainsKey(partId)) dataManager.vaildSkills[roundIndex][partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
+                    dataManager.vaildSkills[roundIndex][partId][currentTime] = vaildSkills;
+
+                }
+                else
+                {
+                    if (!dataManager.targetVaildSkills[roundIndex].ContainsKey(partId)) dataManager.targetVaildSkills[roundIndex][partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
+                    dataManager.targetVaildSkills[roundIndex][partId][currentTime] = vaildSkills;
+                }
+            }
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/FieldWorkDataManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bd855039bf3f13743b31f2700247da8d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -43,7 +43,7 @@ namespace GFGGame
             {
                 score += ItemDataManager.GetArenaScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
             }
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 int tagCount = ArenaDataManager.Instance.GetTagsCount(roleData.itemList, roleData.tags); ;
                 tagCount = Math.Min(ArenaTagCfgArray.Instance.dataArray.Length, tagCount);
@@ -331,7 +331,7 @@ namespace GFGGame
             {
                 targetMainScore = ScoreSystemData.Instance.GetRobotMainScore(targetRoleData);
             }
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 ArenaDataManager.Instance.roundTime = roundTime;
                 ArenaDataManager.Instance.targetRoundTime = targetRoundTime;
@@ -386,7 +386,7 @@ namespace GFGGame
             score += skillScore;
             targetScore += targetSkillScore;
 
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
                 if (roleType == FightRoleType.MINE)

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

@@ -393,6 +393,10 @@ namespace GFGGame
         public static bool CheckItemTagsRight(int itemId, string[] tags)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if(itemCfg == null)
+            {
+                return false;
+            }
             for (int i = 0; i < itemCfg.tagsArr.Length; i++)
             {
                 for (int j = 0; j < tags.Length; j++)

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

@@ -1,4 +1,5 @@
-using ET;
+
+using ET;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -7,6 +8,7 @@ using UnityEngine;
 using Live2D.Cubism.Rendering;
 using FairyGUI;
 using UI.MatchingCompetition;
+using System.IO;
 
 namespace GFGGame
 {
@@ -19,7 +21,7 @@ namespace GFGGame
         //人物位置信息
         public TransformData roleTransFormData = new TransformData();
         public GameObject roleGameobj;
-        public int roleID = -1;
+        public string roleID = "Role";
         //*********************搭配数据*********************************
         //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
         public DressUpData MathingDressDate = DressUpData.CreateDefault();
@@ -34,7 +36,11 @@ namespace GFGGame
         //场景名字，自己搭配的数据
         public List<string> DressPropNameList = new List<string>();
         //道具id
-        public List<int> DressPropIdList = new List<int>();
+        //public List<int> DressPropIdList = new List<int>();
+        //道具索引
+        public int DressPropIndex = 0;
+        //道具索引字典
+        public Dictionary<string, TransformData> DressPropTransInfoDic = new Dictionary<string, TransformData>();
         //道具位置信息
         public List<TransformData> TransformDataList = new List<TransformData>();
         public List<GameObject> itemGameObjs = new List<GameObject>();
@@ -64,7 +70,11 @@ namespace GFGGame
         public NTexture MyNtextture;
         public byte[] MyBytes;
         //本期排行榜数据
-        public List<MatchingPhotoWorksData> _currentRankList = new List<MatchingPhotoWorksData>();
+        public List<CurRanMatchingPhotoWorksData> _currentRankList = new List<CurRanMatchingPhotoWorksData>();
+        //本期排行榜数据--协程锁变量
+        public bool IsWork = false;
+        //本期排行榜数据--协程消息队列
+        public Queue<int> _coroutineQueue = new Queue<int>();
         //往期作品集
         public List<MatchingWorksData> _BeforeWorksList = new List<MatchingWorksData>();
         //往期排行榜数据
@@ -116,28 +126,40 @@ namespace GFGGame
             foreach(var item in MathingDressDate.itemList)
             {
                 CollocationInfo itemInfo = new CollocationInfo();
-                itemInfo.ItemId = item;
+                itemInfo.ItemId = item.ToString();
                 itemInfo.ClientPosition = "";
                 AllDressIDInfoList.Add(itemInfo);
             }
-            for(int i = 0;i< DressPropIdList.Count;i++)
+            foreach (var item in DressPropTransInfoDic)
             {
                 CollocationInfo itemInfo = new CollocationInfo();
-                itemInfo.ItemId = DressPropIdList[i];
-                string transStr = TransformDataList[i].position.x.ToString()+"_" + TransformDataList[i].position.y.ToString() + "_" 
-                    + TransformDataList[i].position.z.ToString()
-                   + "_" + TransformDataList[i].rotationZ.ToString()
-                   + "_" + TransformDataList[i].scale.x.ToString() + "_" + 
-                   TransformDataList[i].scale.y.ToString() + "_" + TransformDataList[i].scale.z.ToString();
+                itemInfo.ItemId = item.Key;
+                string transStr = item.Value.position.x.ToString() + "_" + item.Value.position.y.ToString() + "_"
+                    + item.Value.position.z.ToString()
+                   + "_" + item.Value.rotationZ.ToString()
+                   + "_" + item.Value.scale.x.ToString() + "_" +
+                   item.Value.scale.y.ToString() + "_" + item.Value.scale.z.ToString();
                 itemInfo.ClientPosition = transStr;
                 AllDressIDInfoList.Add(itemInfo);
             }
+            //for(int i = 0;i< DressPropIdList.Count;i++)
+            //{
+            //    CollocationInfo itemInfo = new CollocationInfo();
+            //    itemInfo.ItemId = DressPropIdList[i];
+            //    string transStr = TransformDataList[i].position.x.ToString()+"_" + TransformDataList[i].position.y.ToString() + "_" 
+            //        + TransformDataList[i].position.z.ToString()
+            //       + "_" + TransformDataList[i].rotationZ.ToString()
+            //       + "_" + TransformDataList[i].scale.x.ToString() + "_" + 
+            //       TransformDataList[i].scale.y.ToString() + "_" + TransformDataList[i].scale.z.ToString();
+            //    itemInfo.ClientPosition = transStr;
+            //    AllDressIDInfoList.Add(itemInfo);
+            //}
             CollocationInfo itemBgInfo = new CollocationInfo();
-            itemBgInfo.ItemId = MatchingCompetitionDataManager.Instance.DressUpBgID;
+            itemBgInfo.ItemId = MatchingCompetitionDataManager.Instance.DressUpBgID.ToString();
             itemBgInfo.ClientPosition = "";
             AllDressIDInfoList.Add(itemBgInfo);
             CollocationInfo itemActionInfo = new CollocationInfo();
-            itemActionInfo.ItemId = MatchingCompetitionDataManager.Instance.MathingDressDate.actionId;
+            itemActionInfo.ItemId = MatchingCompetitionDataManager.Instance.MathingDressDate.actionId.ToString();
             itemActionInfo.ClientPosition = "";
             AllDressIDInfoList.Add(itemActionInfo);
         }
@@ -147,59 +169,72 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
-            DressUpBgID = 0;
+            DressUpBgID = 180001;
+            MathingDressDate.bgId = 180001;
             MathingDressDate.actionId = 0;
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < AllDressIDInfoList.Count; i++)
             {
                 if(AllDressIDInfoList[i].ItemId == roleID)
                 {
-                    propIDList.Add(AllDressIDInfoList[i].ItemId);
-                    transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                    //propIDList.Add(AllDressIDInfoList[i].ItemId);
+                    //transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                    if (!DressPropTransInfoDic.ContainsKey(AllDressIDInfoList[i].ItemId))
+                    {
+                        DressPropTransInfoDic.Add(AllDressIDInfoList[i].ItemId.ToString(), AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                    }
                 }
                 else
                 {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(AllDressIDInfoList[i].ItemId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GetIDByString(AllDressIDInfoList[i].ItemId));
                     if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
                     {
                         if(itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21|| itemCfg.subType == 22)
                         {
                             //记录道具和位置信息
-                            propIDList.Add(AllDressIDInfoList[i].ItemId);
-                            transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
-                            if (itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            //propIDList.Add(GetIDByString(AllDressIDInfoList[i].ItemId));
+                            //transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                            if(GetIDListByString(AllDressIDInfoList[i].ItemId).Count > 1)
                             {
-                                propIDList.Add(-3);
-                                transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
-                            }
+                                if (!DressPropTransInfoDic.ContainsKey(AllDressIDInfoList[i].ItemId))
+                                {
+                                    DressPropTransInfoDic.Add(AllDressIDInfoList[i].ItemId.ToString(), AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                                }
+                            }                           
                         }
                         else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
                         {
                             DressUpBgID = itemCfg.id;
+                            MathingDressDate.bgId = itemCfg.id;
                         }
                         else
                         {
-                            dressitemIDList.Add(AllDressIDInfoList[i].ItemId);
+                            dressitemIDList.Add(GetIDByString(AllDressIDInfoList[i].ItemId));
                         }    
                     }
                     else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
                         //记录道具和位置信息
-                        propIDList.Add(AllDressIDInfoList[i].ItemId);
-                        transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                        //propIDList.Add(GetIDByString(AllDressIDInfoList[i].ItemId));
+                        //transDataList.Add(AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                        if (!DressPropTransInfoDic.ContainsKey(AllDressIDInfoList[i].ItemId))
+                        {
+                            DressPropTransInfoDic.Add(AllDressIDInfoList[i].ItemId.ToString(), AnalysisStringToTransform(AllDressIDInfoList[i].ClientPosition));
+                        }
                     }
                     else if(itemCfg == null)
                     {
-                        SuitCfg actionId = SuitCfgArray.Instance.GetCfg(AllDressIDInfoList[i].ItemId);
+                        SuitCfg actionId = SuitCfgArray.Instance.GetCfg(GetIDByString(AllDressIDInfoList[i].ItemId));
                         if(actionId !=null)
                         {
-                            MathingDressDate.actionId = AllDressIDInfoList[i].ItemId;
+                            MathingDressDate.actionId = GetIDByString(AllDressIDInfoList[i].ItemId);
                         }   
                     }
                 }
             }
             MathingDressDate.itemList = dressitemIDList;
-            DressPropIdList = propIDList;
-            TransformDataList = transDataList;
+            //DressPropIdList = propIDList;
+            //TransformDataList = transDataList;
         }
         public TransformData AnalysisStringToTransform(string strTrans)
         {
@@ -222,80 +257,160 @@ namespace GFGGame
         {
             DressPropNameList.Clear();
             TransformDataList.Clear();
+            DressPropTransInfoDic.Clear();
             for (int i =0;i<itemGameObjs.Count;i++)
-            { 
-                if(itemGameObjs[i].name == "Role")
+            {
+                TransformData itemData = new TransformData();
+                if (itemGameObjs[i].name == "Role")
                 {
-                    TransformData itemData = new TransformData();
                     roleTransFormData.position = itemGameObjs[i].transform.position;
                     roleTransFormData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
                     roleTransFormData.scale = itemGameObjs[i].transform.localScale;
                     TransformDataList.Add(roleTransFormData);
                     DressPropNameList.Add(itemGameObjs[i].name);
+                    if (!DressPropTransInfoDic.ContainsKey(itemGameObjs[i].name))
+                    {
+                        DressPropTransInfoDic.Add(itemGameObjs[i].name, roleTransFormData);
+                    }
+                }
+                else if (itemGameObjs[i].name == "Border")
+                {
+                    itemData.position = itemGameObjs[i].transform.position;
+                    itemData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
+                    itemData.scale = itemGameObjs[i].transform.localScale;
+                    TransformDataList.Add(roleTransFormData);
+                    DressPropNameList.Add(itemGameObjs[i].name);
+                    if (!DressPropTransInfoDic.ContainsKey(itemGameObjs[i].name))
+                    {
+                        DressPropTransInfoDic.Add(BorderID.ToString(), itemData);
+                    }
+                }
+                else if (itemGameObjs[i].name == "Npc")
+                {
+                    itemData.position = itemGameObjs[i].transform.position;
+                    itemData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
+                    itemData.scale = itemGameObjs[i].transform.localScale;
+                    TransformDataList.Add(roleTransFormData);
+                    DressPropNameList.Add(itemGameObjs[i].name);
+                    if (!DressPropTransInfoDic.ContainsKey(itemGameObjs[i].name))
+                    {
+                        DressPropTransInfoDic.Add(NpcID.ToString(), itemData);
+                    }
                 }
                 else
                 {
-                    TransformData itemData = new TransformData();
                     itemData.position = itemGameObjs[i].transform.position;
                     itemData.rotationZ = itemGameObjs[i].transform.eulerAngles.z;
                     itemData.scale = itemGameObjs[i].transform.localScale;
                     TransformDataList.Add(itemData);
                     DressPropNameList.Add(itemGameObjs[i].name);
+                    if(!DressPropTransInfoDic.ContainsKey(itemGameObjs[i].name))
+                    {
+                        DressPropTransInfoDic.Add(itemGameObjs[i].name, itemData);
+                    }  
                 }
-
+                
             }
-            SetNameToIdList();
+            //SetNameToIdList();
         }
-        //将名字转换成道具id
-        public void SetNameToIdList()
+
+        public int GetIDByString(string name)
         {
-            DressPropIdList.Clear();
-            int flog_prefix = 0;
-            int flog_suffix = 0;
-            for (int i = 0; i < DressPropNameList.Count; i++)
+            int id = 0;
+            //使用正则表达式分割字符串
+            string[] parts = Regex.Split(name, "_");
+            if (parts.Length > 0)
             {
-                bool containsUnderscore = Regex.IsMatch(DressPropNameList[i], "_");
-                if(!containsUnderscore)
+                string vl = parts[0];
+                bool isNumeric = int.TryParse(vl, out _);
+                if (vl == "Role")
                 {
-                    if (DressPropNameList[i] == "Role")
-                    {
-                        DressPropIdList.Add(roleID);
-                    }
-                    else if (DressPropNameList[i] == "Border")
-                    {
-                        if (BorderID != 0)
-                        {
-                            DressPropIdList.Add(BorderID);
-                        }
-                    }
-                    else if (DressPropNameList[i] == "Npc")
-                    {
-                        if (NpcID != 0)
-                        {
-                            DressPropIdList.Add(NpcID);
-                        }
-                    }
+                    return -1;
                 }
-                else
+                else if (vl == "Border")
                 {
-                    // 使用正则表达式分割字符串
-                    string[] parts = Regex.Split(DressPropNameList[i], "_");
-                    int partID = int.Parse(parts[0]);
-                    if(flog_prefix == int.Parse(parts[0]))
-                    {
-                        if((flog_suffix == 3 && int.Parse(parts[1]) == 1)|| (flog_suffix == 1 && int.Parse(parts[1]) == 3))
-                        {
-                            flog_prefix = 0;
-                            flog_suffix = 0;
-                            continue;
-                        }
-                    }
-                    flog_prefix = int.Parse(parts[0]);
-                    flog_suffix = int.Parse(parts[1]);   
-                    DressPropIdList.Add(partID);
+                    return -2;
+                }
+                else if (vl == "Npc")
+                {
+                    return -3;
+                }
+                else if(!isNumeric)
+                {
+                    return -4;
                 }
+
+                id = int.Parse(parts[0]);
+            }
+
+            return id;
+        }
+        public List<int> GetIDListByString(string name)
+        {
+            List<int> idList = new List<int>();
+            string[] parts = Regex.Split(name, "_");
+            foreach(string id in parts)
+            {
+                idList.Add(int.Parse(id));
             }
+            return idList;
         }
+        //将名字转换成道具id
+        //public void SetNameToIdList()
+        //{
+        //    //DressPropIdList.Clear();
+        //    int flog_prefix = 0;
+        //    int flog_suffix = 0;
+        //    for (int i = 0; i < DressPropNameList.Count; i++)
+        //    {
+        //        bool containsUnderscore = Regex.IsMatch(DressPropNameList[i], "_");
+        //        if(!containsUnderscore)
+        //        {
+        //            if (DressPropNameList[i] == "Role")
+        //            {
+        //                DressPropIdList.Add(roleID);
+        //            }
+        //            else if (DressPropNameList[i] == "Border")
+        //            {
+        //                if (BorderID != 0)
+        //                {
+        //                    DressPropIdList.Add(BorderID);
+        //                }
+        //            }
+        //            else if (DressPropNameList[i] == "Npc")
+        //            {
+        //                if (NpcID != 0)
+        //                {
+        //                    DressPropIdList.Add(NpcID);
+        //                }
+        //            }
+        //        }
+        //        else
+        //        {
+        //            // 使用正则表达式分割字符串
+        //            string[] parts = Regex.Split(DressPropNameList[i], "_");
+        //            int partID = int.Parse(parts[0]);
+        //            if(flog_prefix == int.Parse(parts[0]))
+        //            {
+        //                if((flog_suffix == 3 && int.Parse(parts[1]) == 1)|| (flog_suffix == 1 && int.Parse(parts[1]) == 3))
+        //                {
+        //                    flog_prefix = 0;
+        //                    flog_suffix = 0;
+        //                    continue;
+        //                }
+        //                if ((flog_suffix == 2 && int.Parse(parts[1]) == 1) || (flog_suffix == 1 && int.Parse(parts[1]) == 2))
+        //                {
+        //                    flog_prefix = 0;
+        //                    flog_suffix = 0;
+        //                    continue;
+        //                }
+        //            }
+        //            flog_prefix = int.Parse(parts[0]);
+        //            flog_suffix = int.Parse(parts[1]);   
+        //            DressPropIdList.Add(partID);
+        //        }
+        //    }
+        //}
         //将穿戴数据分类
         //public void ClassifyEquipData()
         //{
@@ -324,12 +439,16 @@ namespace GFGGame
         //}
         public void InsertGameObjectList()
         {
-            for(int i=0;i< DressPropIdList.Count;i++)
+            int i = 0;
+            foreach(var item in DressPropTransInfoDic)
             {
-                if (DressPropIdList[i] == roleID)
+                i++;
+                if (item.Key == roleID)
                 {
                     indexRoleData = i;
+                    break;
                 }
+                indexRoleData = i;
             }
             if(itemGameObjs.Count ==0)
             {
@@ -411,7 +530,8 @@ namespace GFGGame
             Vector3 pos = Vector3.zero;
             if (!string.IsNullOrEmpty(itemCfg.resLayer3))
             {
-                GameObject parentGameObj3 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 3));
+                DressPropIndex++;
+                GameObject parentGameObj3 = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, 3,DressPropIndex));
                 await PhotographSceneManager.Instance.AddSceneItem(parentGameObj3, itemCfg, 3, setLayer,false,isLeft);
                 if (setLayer)
                 {
@@ -424,7 +544,8 @@ namespace GFGGame
             }
             if (!string.IsNullOrEmpty(itemCfg.resLayer2))
             {
-                GameObject parentGameObj2 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 2));
+                DressPropIndex++;
+                GameObject parentGameObj2 = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, 2,DressPropIndex));
                 await PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, 2, setLayer,false, isLeft);
                 if (setLayer)
                 {
@@ -438,8 +559,8 @@ namespace GFGGame
             }
             if (!string.IsNullOrEmpty(itemCfg.resLayer1))
             {
-
-                GameObject parentGameObj1 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 1));
+                DressPropIndex++;
+                GameObject parentGameObj1 = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, 1, DressPropIndex));
                 await PhotographSceneManager.Instance.AddSceneItem(parentGameObj1, itemCfg, 1, setLayer, false, isLeft);
 
                 if (setLayer)
@@ -453,6 +574,25 @@ namespace GFGGame
                 }
             }
         }
+        public async void AddSceneItemOne(ItemCfg itemCfg, int layer,int index, int isLeft = 0, bool setLayer = true)
+        {
+            Vector3 pos = Vector3.zero;
+            if(DressPropIndex <= index)
+            {
+                DressPropIndex = index + 1;
+            }
+            GameObject parentGameObj3 = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, layer, index));
+            await PhotographSceneManager.Instance.AddSceneItem(parentGameObj3, itemCfg, layer, setLayer, false, isLeft);
+            if (setLayer)
+            {
+                if (parentGameObj3.transform.childCount > 0)
+                {
+                    parentGameObj3.transform.localPosition = -parentGameObj3.transform.GetChild(0).localPosition;
+                    pos = parentGameObj3.transform.localPosition;
+                }
+            }
+        }
+
         public void OnClickBtnRule()
         {
             ViewManager.Show<MatchingCompetitionRuleTipsView>();
@@ -466,7 +606,7 @@ namespace GFGGame
         //人物位置信息
         public TransformData roleTransFormData = new TransformData();
         public GameObject roleGameobj;
-        public int roleID = -1;
+        public string roleID = "Role";
         //*********************搭配数据*********************************
         //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
         public DressUpData MathingDressDate = DressUpData.CreateDefault();
@@ -478,9 +618,13 @@ namespace GFGGame
         public int NpcID = 0;
         //道具数据,一一对应
         //道具id
-        public List<int> DressPropIdList = new List<int>();
+        //public List<int> DressPropIdList = new List<int>();
         //道具位置信息
         public List<TransformData> TransformDataList = new List<TransformData>();
+        //道具索引
+        public int DressPropIndex = 0;
+        //道具索引字典
+        public Dictionary<string, TransformData> DressPropTransInfoDic = new Dictionary<string, TransformData>();
         public List<GameObject> itemGameObjs = new List<GameObject>();
         //***************************************************************
         //解析后台获取的信息
@@ -489,27 +633,32 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < OneRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
-                if (OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
+                CollocationInfo colloctItemInfo = OneRoleInfo.JudgingInfo.CollocationInfoList[i];
+                if (colloctItemInfo.ItemId == roleID)
                 {
-                    propIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                    //propIDList.Add(colloctItemInfo.ItemId);
+                    //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                    if(!DressPropTransInfoDic.ContainsKey(colloctItemInfo.ItemId))
+                    {
+                        DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                    }    
                 }
                 else
                 {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.GetIDByString( colloctItemInfo.ItemId));
                     if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
                     {
                         if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
                         {
                             //记录道具和位置信息
-                            propIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                            transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
-                            if(itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
+                            //propIDList.Add(colloctItemInfo.ItemId);
+                            //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                            if (!DressPropTransInfoDic.ContainsKey(colloctItemInfo.ItemId))
                             {
-                                propIDList.Add(-3);
-                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                                DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                             }
                         }
                         else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
@@ -518,29 +667,35 @@ namespace GFGGame
                         }
                         else
                         {
-                            dressitemIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                            dressitemIDList.Add(MatchingCompetitionDataManager.Instance.GetIDByString(colloctItemInfo.ItemId));
                         }
                     }
                     else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
                         //记录道具和位置信息
-                        propIDList.Add(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                        transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(OneRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                        //propIDList.Add(colloctItemInfo.ItemId);
+                        //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                        if (!DressPropTransInfoDic.ContainsKey(colloctItemInfo.ItemId))
+                        {
+                            DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                        }
                     }
                 }
             }
             MathingDressDate.itemList = dressitemIDList;
             MathingDressDate.actionId = OneRoleInfo.JudgingInfo.ActionId;
-            DressPropIdList = propIDList;
-            TransformDataList = transDataList;
+            //DressPropIdList = propIDList;
+            //TransformDataList = transDataList;
             DressUpBgID = OneRoleInfo.JudgingInfo.BagId;
         }
         public void InsertGameObjectList()
         {
             int indexRoleData = 0;
-            for (int i = 0; i < DressPropIdList.Count; i++)
+            int i = 0;
+            foreach (var item in DressPropTransInfoDic)
             {
-                if (DressPropIdList[i] == roleID)
+                i++;
+                if (item.Key == roleID)
                 {
                     indexRoleData = i;
                 }

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

@@ -33,19 +33,33 @@ namespace GFGGame
             {
                 return true;
             }
-
         }
+        
+        public static IEnumerator DownloadExt(List<CurRanMatchingPhotoWorksData> list)
+        {
+            for (int i = 0; i < list.Count; i++)
+            {
+                CurRanMatchingPhotoWorksData data = list[i];
+                if (data == null || data.Ntexture != null || !data.IsUp) continue;
+                int count = 0;
+                yield return DownloadPictureExt(data, count);
+            }
 
-
+            MatchingCompetitionDataManager.Instance.IsWork = false;
+            ET.Log.Debug("Download  finish!!!");
+            EventAgent.DispatchEvent(ConstMessage.DOWNLOAD_FINISH);
+        }
+        
         public static IEnumerator Download(List<MatchingPhotoWorksData> list)
         {
             for (int i = 0; i < list.Count; i++)
             {
                 MatchingPhotoWorksData data = list[i];
-                if (data == null || data.Ntexture != null) continue;
+                if (data == null || data.Ntexture != null || !data.IsUp) continue;
                 int count = 0;
                 yield return DownloadPicture(data, count);
             }
+            
             ET.Log.Debug("Download  finish!!!");
             EventAgent.DispatchEvent(ConstMessage.DOWNLOAD_FINISH);
         }
@@ -68,6 +82,34 @@ namespace GFGGame
             ET.Log.Debug("Download  finish!!!");
             EventAgent.DispatchEvent(ConstMessage.DOWNLOAD_FINISH);
         }
+        
+        private static IEnumerator DownloadPictureExt(CurRanMatchingPhotoWorksData data, int count)
+        {
+            if (count >= 3)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("下载失败");
+                ET.Log.Error("PoemPhotoData Download  failed!!! data:" + JsonUtility.ToJson(data));
+                data.Ntexture = null;
+                ViewManager.Hide<ModalStatusView>();
+                yield break;
+            }
+            using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(data.JudgingInfo.PictureTempUrl))
+            {
+                yield return request.SendWebRequest();
+                if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
+                {
+                    ET.Log.Error("Download  failed, error code:" + request.result, ",data:" + JsonUtility.ToJson(data));
+                    count += 1;
+                    yield return DownloadPictureExt(data, count);
+                }
+                else
+                {
+                    Texture2D texture = (request.downloadHandler as DownloadHandlerTexture).texture;
+                    data.Ntexture = new NTexture(texture);
+                    data.Bytes = texture.EncodeToJPG();
+                }
+            }
+        }
 
         private static IEnumerator DownloadPicture(MatchingPhotoWorksData data, int count)
         {

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

@@ -17,7 +17,7 @@ namespace GFGGame
         //人物位置信息
         public TransformData roleTransFormData = new TransformData();
         public GameObject roleGameobj;
-        public int roleID = -1;
+        public string roleID = "Role";
         //*********************搭配数据*********************************
         //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
         public DressUpData MathingDressDate = DressUpData.CreateDefault();
@@ -29,9 +29,13 @@ namespace GFGGame
         public int NpcID = 0;
         //道具数据,一一对应
         //道具id
-        public List<int> DressPropIdList = new List<int>();
+        //public List<int> DressPropIdList = new List<int>();
         //道具位置信息
-        public List<TransformData> TransformDataList = new List<TransformData>();
+        //public List<TransformData> TransformDataList = new List<TransformData>();
+        //道具索引
+        public int DressPropIndex = 0;
+        //道具索引字典
+        public Dictionary<string, TransformData> DressPropTransInfoDic = new Dictionary<string, TransformData>();
         public List<GameObject> itemGameObjs = new List<GameObject>();
         //***************************************************************
         //解析后台获取的信息
@@ -40,28 +44,27 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < LeftRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
-                if (LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
+                CollocationInfo colloctItemInfo = LeftRoleInfo.JudgingInfo.CollocationInfoList[i];
+                if (colloctItemInfo.ItemId == roleID)
                 {
-                    propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                    //propIDList.Add(colloctItemInfo.ItemId);
+                    //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                    DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                 }
                 else
                 {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.GetIDByString( colloctItemInfo.ItemId));
                     if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
                     {
                         if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
                         {
                             //记录道具和位置信息
-                            propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                            transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
-                            if (itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
-                            {
-                                propIDList.Add(-3);
-                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
-                            }
+                            //propIDList.Add(colloctItemInfo.ItemId);
+                            //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                            DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                         }
                         else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
                         {
@@ -69,29 +72,32 @@ namespace GFGGame
                         }
                         else
                         {
-                            dressitemIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                            dressitemIDList.Add(MatchingCompetitionDataManager.Instance.GetIDByString(colloctItemInfo.ItemId));
                         }
                     }
                     else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
                         //记录道具和位置信息
-                        propIDList.Add(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                        transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(LeftRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                        //propIDList.Add(colloctItemInfo.ItemId);
+                        //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                        DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                     }
                 }
             }
             MathingDressDate.itemList = dressitemIDList;
             MathingDressDate.actionId = LeftRoleInfo.JudgingInfo.ActionId;
-            DressPropIdList = propIDList;
-            TransformDataList = transDataList;
+            //DressPropIdList = propIDList;
+            //TransformDataList = transDataList;
             DressUpBgID = LeftRoleInfo.JudgingInfo.BagId;
         }
         public void InsertGameObjectList()
         {
             int indexRoleData = 0;
-            for (int i = 0; i < DressPropIdList.Count; i++)
+            int i = 0;
+            foreach (var item in DressPropTransInfoDic)
             {
-                if (DressPropIdList[i] == roleID)
+                i++;
+                if (item.Key == roleID)
                 {
                     indexRoleData = i;
                 }
@@ -121,7 +127,7 @@ namespace GFGGame
         //人物位置信息
         public TransformData roleTransFormData = new TransformData();
         public GameObject roleGameobj;
-        public int roleID = -1;
+        public string roleID = "Role";
         //*********************搭配数据*********************************
         //需要传输的数据：MathingDressDate，DressUpBgID，DressPropIdList，TransformDataList，
         public DressUpData MathingDressDate = DressUpData.CreateDefault();
@@ -133,9 +139,13 @@ namespace GFGGame
         public int NpcID = 0;
         //道具数据,一一对应
         //道具id
-        public List<int> DressPropIdList = new List<int>();
+        //public List<int> DressPropIdList = new List<int>();
         //道具位置信息
-        public List<TransformData> TransformDataList = new List<TransformData>();
+       // public List<TransformData> TransformDataList = new List<TransformData>();
+        //道具索引
+        public int DressPropIndex = 0;
+        //道具索引字典
+        public Dictionary<string, TransformData> DressPropTransInfoDic = new Dictionary<string, TransformData>();
         public List<GameObject> itemGameObjs = new List<GameObject>();
         //***************************************************************
         //解析后台获取的信息
@@ -144,28 +154,27 @@ namespace GFGGame
             List<int> dressitemIDList = new List<int>();
             List<int> propIDList = new List<int>();
             List<TransformData> transDataList = new List<TransformData>();
+            DressPropTransInfoDic.Clear();
             for (int i = 0; i < RightRoleInfo.JudgingInfo.CollocationInfoList.Count; i++)
             {
-                if (RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId == roleID)
+                CollocationInfo colloctItemInfo = RightRoleInfo.JudgingInfo.CollocationInfoList[i];
+                if (colloctItemInfo.ItemId == roleID)
                 {
-                    propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                    transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                    //propIDList.Add(colloctItemInfo.ItemId);
+                    //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                    DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                 }
                 else
                 {
-                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.GetIDByString(colloctItemInfo.ItemId));
                     if (itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
                     {
                         if (itemCfg.subType == 19 || itemCfg.subType == 17 || itemCfg.subType == 21 || itemCfg.subType == 22)
                         {
                             //记录道具和位置信息
-                            propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                            transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
-                            if ( itemCfg.resLayer2 == "t" || itemCfg.resLayer3 == "t")
-                            {
-                                propIDList.Add(-3);
-                                transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
-                            }
+                            //propIDList.Add(colloctItemInfo.ItemId);
+                            //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                            DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                         }
                         else if (itemCfg != null && itemCfg.subType == ConstDressUpItemType.BEI_JING)
                         {
@@ -173,29 +182,32 @@ namespace GFGGame
                         }
                         else
                         {
-                            dressitemIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
+                            dressitemIDList.Add(MatchingCompetitionDataManager.Instance.GetIDByString(colloctItemInfo.ItemId));
                         }
                     }
                     else if (itemCfg != null && itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
                         //记录道具和位置信息
-                        propIDList.Add(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ItemId);
-                        transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(RightRoleInfo.JudgingInfo.CollocationInfoList[i].ClientPosition));
+                        //propIDList.Add(colloctItemInfo.ItemId);
+                        //transDataList.Add(MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
+                        DressPropTransInfoDic.Add(colloctItemInfo.ItemId, MatchingCompetitionDataManager.Instance.AnalysisStringToTransform(colloctItemInfo.ClientPosition));
                     }
                 }
             }
             MathingDressDate.itemList = dressitemIDList;
             MathingDressDate.actionId = RightRoleInfo.JudgingInfo.ActionId;
-            DressPropIdList = propIDList;
-            TransformDataList = transDataList;
+            //DressPropIdList = propIDList;
+            //TransformDataList = transDataList;
             DressUpBgID = RightRoleInfo.JudgingInfo.BagId;
         }
         public void InsertGameObjectList()
         {
             int indexRoleData = 0;
-            for (int i = 0; i < DressPropIdList.Count; i++)
+            int i = 0;
+            foreach (var item in DressPropTransInfoDic)
             {
-                if (DressPropIdList[i] == roleID)
+                i++;
+                if (item.Key == roleID)
                 {
                     indexRoleData = i;
                 }

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

@@ -207,7 +207,24 @@ namespace GFGGame
         private void AddItemGameObjectToList(GameObject parentGameObj, bool setLayer)
         {
             List<GameObject> itemGameObjs = PhotographDataManager.Instance.itemGameObjs;
-            itemGameObjs.Add(parentGameObj);
+            bool hasSame = false;
+            for(int i =0; i<itemGameObjs.Count;i++)
+            {
+                if (itemGameObjs[i].name == parentGameObj.name && parentGameObj.name == "Npc")
+                {
+                    hasSame = true;
+                    itemGameObjs[i] = parentGameObj;
+                }
+                else if (itemGameObjs[i].name == parentGameObj.name && parentGameObj.name == "Border")
+                {
+                    hasSame = true;
+                    itemGameObjs[i] = parentGameObj;
+                }
+            }
+            if(!hasSame)
+            {
+                itemGameObjs.Add(parentGameObj);
+            }        
 
             if (setLayer)
             {

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

@@ -61,7 +61,7 @@ namespace GFGGame
                     for (int k = 0; k < cfg.subTypesArr.Length; k++)
                     {
                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(roleData.itemList[i]);
-                        if (itemCfg.subType == cfg.subTypesArr[k])
+                        if (itemCfg !=null && itemCfg.subType == cfg.subTypesArr[k])
                         {
                             roleData.partListDic[cfg.id].Add(roleData.itemList[i]);
                             roleData.partScoreListDic[cfg.id].Add(roleData.itemScoreList[i]);
@@ -217,7 +217,7 @@ namespace GFGGame
                 tagScore += ItemDataManager.GetItemTagScore(partList[i], roleData.tags);
                 // if (ItemDataManager.CheckItemTagsRight(partList[i], roleData.tags)) tagCount++;
             }
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 tagCount = ArenaDataManager.Instance.GetTagsCount(roleData.itemList, roleData.tags);
                 tagCount = Math.Min(ArenaTagCfgArray.Instance.dataArray.Length, tagCount);
@@ -253,7 +253,7 @@ namespace GFGGame
         private double GetRobotRoundBaseScore(FightData robotData, int roundId)
         {
             double partBaseScore = robotData.itemScoreList[roundId - 1];
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 partBaseScore = partBaseScore * (1 + robotData.tagAddition / 10000f);
             }

GameClient/Assets/Game/HotUpdate/Data/VO/MatchingCompetitionData.cs

@@ -37,13 +37,36 @@ namespace GFGGame
     //道具的位置信息
     public class TransformData
     {
-        public Vector3 position = new Vector3();
+        public Vector3 position = new Vector3(0,0,0);
         public float rotationZ = 0f;
-        public Vector3 scale = new Vector3();
+        public Vector3 scale = new Vector3(1,1,1);
     }
+    
+    //搭配赛当期排行榜作品信息
+    public class CurRanMatchingPhotoWorksData
+    {
+        public long RoleId { get; set; }
+
+        public bool IsUp = true;
+
+        public JudgingRoundRoleInfo JudgingInfo;
+        /// <summary>
+        /// 照片数据
+        /// </summary>
+        public byte[] Bytes;
+        /// <summary>
+        /// 照片资源
+        /// </summary>
+        public NTexture Ntexture;//个人相册数据
+    }
+    
     //搭配赛作品信息
     public class MatchingPhotoWorksData
     {
+        public long RoleId { get; set; }
+
+        public bool IsUp = true;
+
         public JudgingRoundRoleInfo JudgingInfo;
         /// <summary>
         /// 照片数据

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -7,7 +7,7 @@ namespace UI.ActivityDay7
     public partial class UI_ActivityDay7UI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GLoader m_loabg;
         public GLoader m_Top_img;
         public GLoader m_Top_img2;
         public GButton m_btnBack;
@@ -67,7 +67,7 @@ namespace UI.ActivityDay7
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loabg = (GLoader)comp.GetChild("loabg");
             m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_Top_img2 = (GLoader)comp.GetChild("Top_img2");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -83,7 +83,7 @@ namespace UI.ActivityDay7
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_loabg = null;
             m_Top_img = null;
             m_Top_img2 = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs

@@ -8,20 +8,19 @@ namespace UI.ActivityGetYuanXiao
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GGraph m_bgEffect;
-        public GGraph m_leafEffect;
-        public GGraph m_yuanXiaoEffect;
         public GGraph m_doubaoEffect;
+        public GGraph m_titleTextEffect;
+        public GButton m_btnStart;
+        public GGraph m_startBtnEffect;
+        public GTextField m_txtTime;
+        public GGraph m_yuanXiaoEffect;
         public GButton m_btnTask;
         public GButton m_btnShop;
         public GGraph m_cloudEffect;
         public GList m_list;
-        public GGraph m_startBtnEffect;
-        public GGraph m_titleTextEffect;
         public GComponent m_valueBar;
+        public GGraph m_bgEffect;
         public GButton m_btnBack;
-        public GGraph m_btnStart;
-        public GTextField m_txtTime;
         public Transition m_t0;
         public Transition m_listShow;
         public const string URL = "ui://tguohf7uqkvg4";
@@ -72,40 +71,38 @@ namespace UI.ActivityGetYuanXiao
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
-            m_leafEffect = (GGraph)comp.GetChild("leafEffect");
-            m_yuanXiaoEffect = (GGraph)comp.GetChild("yuanXiaoEffect");
             m_doubaoEffect = (GGraph)comp.GetChild("doubaoEffect");
+            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
+            m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_startBtnEffect = (GGraph)comp.GetChild("startBtnEffect");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_yuanXiaoEffect = (GGraph)comp.GetChild("yuanXiaoEffect");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_cloudEffect = (GGraph)comp.GetChild("cloudEffect");
             m_list = (GList)comp.GetChild("list");
-            m_startBtnEffect = (GGraph)comp.GetChild("startBtnEffect");
-            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnStart = (GGraph)comp.GetChild("btnStart");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_t0 = comp.GetTransition("t0");
             m_listShow = comp.GetTransition("listShow");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_bgEffect = null;
-            m_leafEffect = null;
-            m_yuanXiaoEffect = null;
             m_doubaoEffect = null;
+            m_titleTextEffect = null;
+            m_btnStart = null;
+            m_startBtnEffect = null;
+            m_txtTime = null;
+            m_yuanXiaoEffect = null;
             m_btnTask = null;
             m_btnShop = null;
             m_cloudEffect = null;
             m_list = null;
-            m_startBtnEffect = null;
-            m_titleTextEffect = null;
             m_valueBar = null;
+            m_bgEffect = null;
             m_btnBack = null;
-            m_btnStart = null;
-            m_txtTime = null;
             m_t0 = null;
             m_listShow = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_RewardTipsUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_RewardTipsUI
+    {
+        public GComponent target;
+        public GList m_rewardList;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uuufi3m";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "RewardTipsUI";
+        private static UI_RewardTipsUI _proxy;
+
+        public static UI_RewardTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardTipsUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_RewardTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardTipsUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardList = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_RewardTipsUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a9c5cbdc6c132c44fb3a724dabbfcd8f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDressInfoUI.cs

@@ -10,10 +10,12 @@ namespace UI.Arena
         public Controller m_c1;
         public Controller m_c2;
         public Controller m_c3;
+        public Controller m_c4;
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GGraph m_grhCloseComFightScore;
         public UI_ComValueInfo m_comValueInfo;
+        public UI_ComFIeldValueInfo m_comFieldValueInfo;
         public GComponent m_comListBg;
         public GList m_list;
         public UI_ComCard m_comCard;
@@ -22,6 +24,7 @@ namespace UI.Arena
         public UI_BtnTab3 m_btn2;
         public GButton m_btnDress;
         public GButton m_btnRecommend;
+        public GButton m_btnConfire;
         public const string URL = "ui://4lc5fhlbpsph1";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaDressInfoUI";
@@ -72,10 +75,12 @@ namespace UI.Arena
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_c3 = comp.GetController("c3");
+            m_c4 = comp.GetController("c4");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
+            m_comFieldValueInfo = (UI_ComFIeldValueInfo)UI_ComFIeldValueInfo.Create(comp.GetChild("comFieldValueInfo"));
             m_comListBg = (GComponent)comp.GetChild("comListBg");
             m_list = (GList)comp.GetChild("list");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
@@ -84,17 +89,21 @@ namespace UI.Arena
             m_btn2 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn2"));
             m_btnDress = (GButton)comp.GetChild("btnDress");
             m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
+            m_btnConfire = (GButton)comp.GetChild("btnConfire");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_c2 = null;
             m_c3 = null;
+            m_c4 = null;
             m_loaBg = null;
             m_btnBack = null;
             m_grhCloseComFightScore = null;
             m_comValueInfo.Dispose();
             m_comValueInfo = null;
+            m_comFieldValueInfo.Dispose();
+            m_comFieldValueInfo = null;
             m_comListBg = null;
             m_list = null;
             m_comCard.Dispose();
@@ -107,6 +116,7 @@ namespace UI.Arena
             m_btn2 = null;
             m_btnDress = null;
             m_btnRecommend = null;
+            m_btnConfire = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFIeldValueInfo.cs

@@ -0,0 +1,105 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComFIeldValueInfo
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public Controller m_c3;
+        public GTextField m_txtFightScore;
+        public GButton m_btnFightScoreRule;
+        public GLoader m_scoreType;
+        public GTextField m_txtScore;
+        public GButton m_btnTagRule;
+        public GComponent m_comTag;
+        public GComponent m_comTag1;
+        public GTextField m_txtTagScore;
+        public UI_ComFieldFightScore m_comFightScore;
+        public const string URL = "ui://4lc5fhlbo8tw6w";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComFIeldValueInfo";
+        private static UI_ComFIeldValueInfo _proxy;
+
+        public static UI_ComFIeldValueInfo Create(GObject gObject = null)
+        {
+            var ui = new UI_ComFIeldValueInfo();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComFIeldValueInfo Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComFIeldValueInfo();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
+            m_scoreType = (GLoader)comp.GetChild("scoreType");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_btnTagRule = (GButton)comp.GetChild("btnTagRule");
+            m_comTag = (GComponent)comp.GetChild("comTag");
+            m_comTag1 = (GComponent)comp.GetChild("comTag1");
+            m_txtTagScore = (GTextField)comp.GetChild("txtTagScore");
+            m_comFightScore = (UI_ComFieldFightScore)UI_ComFieldFightScore.Create(comp.GetChild("comFightScore"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_c3 = null;
+            m_txtFightScore = null;
+            m_btnFightScoreRule = null;
+            m_scoreType = null;
+            m_txtScore = null;
+            m_btnTagRule = null;
+            m_comTag = null;
+            m_comTag1 = null;
+            m_txtTagScore = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFIeldValueInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 08f872863e7ecd342b89f4a9e06f7df6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFieldFightScore.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComFieldFightScore
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtSuitScore;
+        public GTextField m_txtClickScore;
+        public GTextField m_txtCardScore;
+        public const string URL = "ui://4lc5fhlbo8tw6x";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComFieldFightScore";
+        private static UI_ComFieldFightScore _proxy;
+
+        public static UI_ComFieldFightScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComFieldFightScore();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComFieldFightScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComFieldFightScore();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_txtSuitScore = (GTextField)comp.GetChild("txtSuitScore");
+            m_txtClickScore = (GTextField)comp.GetChild("txtClickScore");
+            m_txtCardScore = (GTextField)comp.GetChild("txtCardScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtSuitScore = null;
+            m_txtClickScore = null;
+            m_txtCardScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFieldFightScore.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ad55ec5c3c1a0614fac473967d04a972
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ArenaDressUpFightUI.cs

@@ -7,12 +7,14 @@ namespace UI.DressUp
     public partial class UI_ArenaDressUpFightUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
         public GGraph m_touchPad;
         public GButton m_btnBack;
         public GTextField m_txtDressLimit;
         public GGraph m_grhCloseComFightScore;
         public GComponent m_comValueInfo;
+        public GComponent m_comFieldValueInfo;
         public UI_comListType m_comListType1;
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
@@ -71,12 +73,14 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtDressLimit = (GTextField)comp.GetChild("txtDressLimit");
             m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_comValueInfo = (GComponent)comp.GetChild("comValueInfo");
+            m_comFieldValueInfo = (GComponent)comp.GetChild("comFieldValueInfo");
             m_comListType1 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType1"));
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
@@ -91,12 +95,14 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
             m_touchPad = null;
             m_btnBack = null;
             m_txtDressLimit = null;
             m_grhCloseComFightScore = null;
             m_comValueInfo = null;
+            m_comFieldValueInfo = null;
             m_comListType1.Dispose();
             m_comListType1 = null;
             m_comListType2.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -40,6 +40,7 @@ namespace UI.DressUp
         public GGroup m_graContent;
         public GLoader m_loaGuide;
         public GButton m_btnSubmission;
+        public GButton m_btnNextCompetition;
         public GTextField m_txtMatch;
         public GTextField m_txtTeaPartyName;
         public const string URL = "ui://mbo439wbqsvd2m";
@@ -122,6 +123,7 @@ namespace UI.DressUp
             m_graContent = (GGroup)comp.GetChild("graContent");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
             m_btnSubmission = (GButton)comp.GetChild("btnSubmission");
+            m_btnNextCompetition = (GButton)comp.GetChild("btnNextCompetition");
             m_txtMatch = (GTextField)comp.GetChild("txtMatch");
             m_txtTeaPartyName = (GTextField)comp.GetChild("txtTeaPartyName");
         }
@@ -166,6 +168,7 @@ namespace UI.DressUp
             m_graContent = null;
             m_loaGuide = null;
             m_btnSubmission = null;
+            m_btnNextCompetition = null;
             m_txtMatch = null;
             m_txtTeaPartyName = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -20,6 +20,7 @@ namespace UI.DressUp
         public GTextField m_txtTitle;
         public GButton m_btnAni;
         public GList m_ListTag;
+        public GImage m_lock;
         public const string URL = "ui://mbo439wbk6he26";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PartsListItem";
@@ -80,6 +81,7 @@ namespace UI.DressUp
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnAni = (GButton)comp.GetChild("btnAni");
             m_ListTag = (GList)comp.GetChild("ListTag");
+            m_lock = (GImage)comp.GetChild("lock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,6 +98,7 @@ namespace UI.DressUp
             m_txtTitle = null;
             m_btnAni = null;
             m_ListTag = null;
+            m_lock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Button1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_Button1
+    {
+        public GButton target;
+        public GTextField m_name;
+        public const string URL = "ui://efym480mrjjsh";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_name = (GTextField)comp.GetChild("name");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_name = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Button1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f2eeff12db5587140acd1aceca5382f9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComAllScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComAllScore
+    {
+        public GComponent target;
+        public GTextField m_txtTargetFightScore;
+        public GTextField m_txtMyFightScore;
+        public const string URL = "ui://efym480mo8tw15";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComAllScore";
+        private static UI_ComAllScore _proxy;
+
+        public static UI_ComAllScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComAllScore();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComAllScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComAllScore();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
+            m_txtMyFightScore = (GTextField)comp.GetChild("txtMyFightScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTargetFightScore = null;
+            m_txtMyFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComAllScore.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a0343d86582da8d4eb7208810e8adfc2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComAllScoreResult.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComAllScoreResult
+    {
+        public GComponent target;
+        public UI_ComAllScore m_comResult;
+        public const string URL = "ui://efym480mo8tw14";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComAllScoreResult";
+        private static UI_ComAllScoreResult _proxy;
+
+        public static UI_ComAllScoreResult Create(GObject gObject = null)
+        {
+            var ui = new UI_ComAllScoreResult();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComAllScoreResult Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComAllScoreResult();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comResult = (UI_ComAllScore)UI_ComAllScore.Create(comp.GetChild("comResult"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comResult.Dispose();
+            m_comResult = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComAllScoreResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ac82915c0d4658a4c812bd4422ca954d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCard.cs

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComCard
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_ComCardMask m_comCard;
+        public GLoader m_loaScore;
+        public GLoader m_loaRarity;
+        public GTextField m_wearRateText;
+        public GTextField m_txtCardName;
+        public const string URL = "ui://efym480mo8tw18";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComCard";
+        private static UI_ComCard _proxy;
+
+        public static UI_ComCard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCard();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComCard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCard();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_wearRateText = (GTextField)comp.GetChild("wearRateText");
+            m_txtCardName = (GTextField)comp.GetChild("txtCardName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_comCard.Dispose();
+            m_comCard = null;
+            m_loaScore = null;
+            m_loaRarity = null;
+            m_wearRateText = null;
+            m_txtCardName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCard.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bd2927ac4edf92742864b71079704557
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCardMask.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComCardMask
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://efym480mo8tw1a";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComCardMask";
+        private static UI_ComCardMask _proxy;
+
+        public static UI_ComCardMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardMask();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComCardMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardMask();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCardMask.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d74664789e0c3b846b0d338fd0e287a5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCardRecord.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComCardRecord
+    {
+        public GComponent target;
+        public UI_ComResultCardMask m_comCardmask;
+        public const string URL = "ui://efym480mo8tw10";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComCardRecord";
+        private static UI_ComCardRecord _proxy;
+
+        public static UI_ComCardRecord Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardRecord();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComCardRecord Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardRecord();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comCardmask = (UI_ComResultCardMask)UI_ComResultCardMask.Create(comp.GetChild("comCardmask"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comCardmask.Dispose();
+            m_comCardmask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComCardRecord.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1612cd35d4c1d334580a91621d6be1a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComResultCardMask.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ComResultCardMask
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://efym480mo8tw11";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ComResultCardMask";
+        private static UI_ComResultCardMask _proxy;
+
+        public static UI_ComResultCardMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ComResultCardMask();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComResultCardMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComResultCardMask();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ComResultCardMask.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c882db5f5a1dfca4b9502451e51fe192
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompChapter.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_CompChapter
+    {
+        public GComponent target;
+        public UI_CompChapterScroll m_compChapterScroll;
+        public const string URL = "ui://efym480mrjjs1";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "CompChapter";
+        private static UI_CompChapter _proxy;
+
+        public static UI_CompChapter Create(GObject gObject = null)
+        {
+            var ui = new UI_CompChapter();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_CompChapter Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompChapter();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_compChapterScroll = (UI_CompChapterScroll)UI_CompChapterScroll.Create(comp.GetChild("compChapterScroll"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_compChapterScroll.Dispose();
+            m_compChapterScroll = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompChapter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97df0f7699811484487718785762887a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompChapterScroll.cs

@@ -0,0 +1,116 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_CompChapterScroll
+    {
+        public GComponent target;
+        public UI_CompStoryLevelItem m_g11;
+        public UI_CompStoryLevelItem m_g10;
+        public UI_CompStoryLevelItem m_g9;
+        public UI_CompStoryLevelItem m_g8;
+        public UI_CompStoryLevelItem m_g7;
+        public UI_CompStoryLevelItem m_g6;
+        public UI_CompStoryLevelItem m_g5;
+        public UI_CompStoryLevelItem m_g4;
+        public UI_CompStoryLevelItem m_g3;
+        public UI_CompStoryLevelItem m_g2;
+        public UI_CompStoryLevelItem m_g1;
+        public UI_CompStoryLevelItem m_g0;
+        public const string URL = "ui://efym480mrjjs2";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "CompChapterScroll";
+        private static UI_CompChapterScroll _proxy;
+
+        public static UI_CompChapterScroll Create(GObject gObject = null)
+        {
+            var ui = new UI_CompChapterScroll();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_CompChapterScroll Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompChapterScroll();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
+            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
+            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
+            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
+            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
+            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
+            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
+            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
+            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
+            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
+            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
+            m_g0 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g0"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_g11.Dispose();
+            m_g11 = null;
+            m_g10.Dispose();
+            m_g10 = null;
+            m_g9.Dispose();
+            m_g9 = null;
+            m_g8.Dispose();
+            m_g8 = null;
+            m_g7.Dispose();
+            m_g7 = null;
+            m_g6.Dispose();
+            m_g6 = null;
+            m_g5.Dispose();
+            m_g5 = null;
+            m_g4.Dispose();
+            m_g4 = null;
+            m_g3.Dispose();
+            m_g3 = null;
+            m_g2.Dispose();
+            m_g2 = null;
+            m_g1.Dispose();
+            m_g1 = null;
+            m_g0.Dispose();
+            m_g0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompChapterScroll.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: be9125c0cd911844e9d708dcc8338039
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompStoryLevelItem.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_CompStoryLevelItem
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_fightBg;
+        public GTextField m_levelIcon;
+        public GTextField m_txtFightOrder;
+        public GGraph m_holder;
+        public GImage m_lock;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://efym480mrjjs5";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "CompStoryLevelItem";
+        private static UI_CompStoryLevelItem _proxy;
+
+        public static UI_CompStoryLevelItem Create(GObject gObject = null)
+        {
+            var ui = new UI_CompStoryLevelItem();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_CompStoryLevelItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompStoryLevelItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_fightBg = (GLoader)comp.GetChild("fightBg");
+            m_levelIcon = (GTextField)comp.GetChild("levelIcon");
+            m_txtFightOrder = (GTextField)comp.GetChild("txtFightOrder");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_lock = (GImage)comp.GetChild("lock");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_fightBg = null;
+            m_levelIcon = null;
+            m_txtFightOrder = null;
+            m_holder = null;
+            m_lock = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_CompStoryLevelItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 31e7bc83aeb4c2542b84dfb52db7a351
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Component1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public GLoader m_guideTarget;
+        public const string URL = "ui://efym480mbc2226";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_guideTarget = (GLoader)comp.GetChild("guideTarget");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_guideTarget = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Component1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 16c7add426c3a4c4da0e6244b4556f3e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Component2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GLoader m_guide;
+        public const string URL = "ui://efym480mbc2227";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_guide = (GLoader)comp.GetChild("guide");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_guide = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_Component2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d335c03b09d6c994e8519abf23c671af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkLevelInfoUI.cs

@@ -0,0 +1,105 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_FieldWorkLevelInfoUI
+    {
+        public GComponent target;
+        public GLoader m_btnBg;
+        public GLoader m_loaderHead;
+        public GTextField m_txtTargetName;
+        public GTextField m_txtTitle;
+        public GTextField m_targetScore;
+        public GLoader m_scoreType;
+        public GTextField m_txtHighestScore;
+        public UI_Component1 m_guideTarget;
+        public GList m_listBonus;
+        public GButton m_btnStart;
+        public GLoader m_btnSkip;
+        public GList m_cardList;
+        public const string URL = "ui://efym480mo8twl";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "FieldWorkLevelInfoUI";
+        private static UI_FieldWorkLevelInfoUI _proxy;
+
+        public static UI_FieldWorkLevelInfoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldWorkLevelInfoUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_FieldWorkLevelInfoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldWorkLevelInfoUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnBg = (GLoader)comp.GetChild("btnBg");
+            m_loaderHead = (GLoader)comp.GetChild("loaderHead");
+            m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_targetScore = (GTextField)comp.GetChild("targetScore");
+            m_scoreType = (GLoader)comp.GetChild("scoreType");
+            m_txtHighestScore = (GTextField)comp.GetChild("txtHighestScore");
+            m_guideTarget = (UI_Component1)UI_Component1.Create(comp.GetChild("guideTarget"));
+            m_listBonus = (GList)comp.GetChild("listBonus");
+            m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_btnSkip = (GLoader)comp.GetChild("btnSkip");
+            m_cardList = (GList)comp.GetChild("cardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBg = null;
+            m_loaderHead = null;
+            m_txtTargetName = null;
+            m_txtTitle = null;
+            m_targetScore = null;
+            m_scoreType = null;
+            m_txtHighestScore = null;
+            m_guideTarget.Dispose();
+            m_guideTarget = null;
+            m_listBonus = null;
+            m_btnStart = null;
+            m_btnSkip = null;
+            m_cardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkLevelInfoUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dc082e4d993d8b646ae3eb711574f735
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkLevelUI.cs

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_FieldWorkLevelUI
+    {
+        public GComponent target;
+        public GLoader m_Bg;
+        public UI_CompChapter m_chapter;
+        public GLoader m_ruleBtn;
+        public UI_Button1 m_shopBtn;
+        public GList m_listTag;
+        public GButton m_BtnBack;
+        public UI_Button1 m_resetBtn;
+        public UI_Button1 m_passBtn;
+        public GGraph m_bgEffect;
+        public const string URL = "ui://efym480mrjjs0";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "FieldWorkLevelUI";
+        private static UI_FieldWorkLevelUI _proxy;
+
+        public static UI_FieldWorkLevelUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldWorkLevelUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_FieldWorkLevelUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldWorkLevelUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_Bg = (GLoader)comp.GetChild("Bg");
+            m_chapter = (UI_CompChapter)UI_CompChapter.Create(comp.GetChild("chapter"));
+            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
+            m_shopBtn = (UI_Button1)UI_Button1.Create(comp.GetChild("shopBtn"));
+            m_listTag = (GList)comp.GetChild("listTag");
+            m_BtnBack = (GButton)comp.GetChild("BtnBack");
+            m_resetBtn = (UI_Button1)UI_Button1.Create(comp.GetChild("resetBtn"));
+            m_passBtn = (UI_Button1)UI_Button1.Create(comp.GetChild("passBtn"));
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_Bg = null;
+            m_chapter.Dispose();
+            m_chapter = null;
+            m_ruleBtn = null;
+            m_shopBtn.Dispose();
+            m_shopBtn = null;
+            m_listTag = null;
+            m_BtnBack = null;
+            m_resetBtn.Dispose();
+            m_resetBtn = null;
+            m_passBtn.Dispose();
+            m_passBtn = null;
+            m_bgEffect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkLevelUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 11ff5dbd589c6754aa06becaa814d34c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkRoundResultUI.cs

@@ -0,0 +1,82 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_FieldWorkRoundResultUI
+    {
+        public GComponent target;
+        public UI_ComAllScoreResult m_ComResult;
+        public GList m_list;
+        public GLoader m_loaResule;
+        public UI_Component2 m_guide;
+        public const string URL = "ui://efym480mo8tww";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "FieldWorkRoundResultUI";
+        private static UI_FieldWorkRoundResultUI _proxy;
+
+        public static UI_FieldWorkRoundResultUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldWorkRoundResultUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_FieldWorkRoundResultUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldWorkRoundResultUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_ComResult = (UI_ComAllScoreResult)UI_ComAllScoreResult.Create(comp.GetChild("ComResult"));
+            m_list = (GList)comp.GetChild("list");
+            m_loaResule = (GLoader)comp.GetChild("loaResule");
+            m_guide = (UI_Component2)UI_Component2.Create(comp.GetChild("guide"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ComResult.Dispose();
+            m_ComResult = null;
+            m_list = null;
+            m_loaResule = null;
+            m_guide.Dispose();
+            m_guide = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkRoundResultUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f8a4b134a4a27d94fae7b5103a9c72a7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkRoundTips.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_FieldWorkRoundTips
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GGraph m_effect;
+        public Transition m_t0;
+        public const string URL = "ui://efym480mjw0925";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "FieldWorkRoundTips";
+        private static UI_FieldWorkRoundTips _proxy;
+
+        public static UI_FieldWorkRoundTips Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldWorkRoundTips();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_FieldWorkRoundTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldWorkRoundTips();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_effect = (GGraph)comp.GetChild("effect");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_effect = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_FieldWorkRoundTips.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e2a636882a8e1064db78393609cb04ca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ListResultItem.cs

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ListResultItem
+    {
+        public GComponent target;
+        public GLoader m_loaScore;
+        public GTextField m_txtMyScore;
+        public GComponent m_comMyHead;
+        public UI_ComCardRecord m_loaMyCard;
+        public GTextField m_txtRound;
+        public const string URL = "ui://efym480mo8twy";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ListResultItem";
+        private static UI_ListResultItem _proxy;
+
+        public static UI_ListResultItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListResultItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListResultItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListResultItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_txtMyScore = (GTextField)comp.GetChild("txtMyScore");
+            m_comMyHead = (GComponent)comp.GetChild("comMyHead");
+            m_loaMyCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaMyCard"));
+            m_txtRound = (GTextField)comp.GetChild("txtRound");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaScore = null;
+            m_txtMyScore = null;
+            m_comMyHead = null;
+            m_loaMyCard.Dispose();
+            m_loaMyCard = null;
+            m_txtRound = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ListResultItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a8a83bc40d7d154b9fd8699431a53c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ListRewardItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldWork
+{
+    public partial class UI_ListRewardItem
+    {
+        public GComponent target;
+        public GComponent m_comItem;
+        public GTextField m_txtName;
+        public GTextField m_txtOwner;
+        public const string URL = "ui://efym480mo8twv";
+        public const string PACKAGE_NAME = "FieldWork";
+        public const string RES_NAME = "ListRewardItem";
+        private static UI_ListRewardItem _proxy;
+
+        public static UI_ListRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRewardItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comItem = (GComponent)comp.GetChild("comItem");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwner = (GTextField)comp.GetChild("txtOwner");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItem = null;
+            m_txtName = null;
+            m_txtOwner = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldWork/UI_ListRewardItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d35b6f8b98e8b9940878349a8cfe47ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceSamllUI.cs

@@ -0,0 +1,102 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.InstanceZones
+{
+    public partial class UI_InstanceSamllUI
+    {
+        public GComponent target;
+        public UI_ButtonModle7 m_btn1;
+        public UI_ButtonModle9 m_btnStudio;
+        public UI_ButtonModle9 m_btnTravel;
+        public UI_ButtonModle9 m_btnPoem;
+        public GButton m_btnPoemGudie;
+        public UI_ButtonModle9 m_btnField;
+        public UI_ButtonModle9 m_btnArena;
+        public UI_ButtonModle9 m_btnFieldWork;
+        public Transition m_t0;
+        public const string URL = "ui://ez8qotvcvnmh9fzm";
+        public const string PACKAGE_NAME = "InstanceZones";
+        public const string RES_NAME = "InstanceSamllUI";
+        private static UI_InstanceSamllUI _proxy;
+
+        public static UI_InstanceSamllUI Create(GObject gObject = null)
+        {
+            var ui = new UI_InstanceSamllUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_InstanceSamllUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_InstanceSamllUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
+            m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
+            m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
+            m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
+            m_btnPoemGudie = (GButton)comp.GetChild("btnPoemGudie");
+            m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
+            m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
+            m_btnFieldWork = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnFieldWork"));
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btnStudio.Dispose();
+            m_btnStudio = null;
+            m_btnTravel.Dispose();
+            m_btnTravel = null;
+            m_btnPoem.Dispose();
+            m_btnPoem = null;
+            m_btnPoemGudie = null;
+            m_btnField.Dispose();
+            m_btnField = null;
+            m_btnArena.Dispose();
+            m_btnArena = null;
+            m_btnFieldWork.Dispose();
+            m_btnFieldWork = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceSamllUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 124446bb46ff4d04aa7744abed24746d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -14,8 +14,10 @@ namespace UI.InstanceZones
         public UI_ButtonModle9 m_btnStudio;
         public UI_ButtonModle9 m_btnTravel;
         public UI_ButtonModle9 m_btnPoem;
+        public GButton m_btnPoemGudie;
         public UI_ButtonModle9 m_btnField;
         public UI_ButtonModle9 m_btnArena;
+        public UI_InstanceSamllUI m_instance;
         public GGraph m_eff;
         public GButton m_btnBack;
         public GComponent m_valueBar;
@@ -74,8 +76,10 @@ namespace UI.InstanceZones
             m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
             m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
             m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
+            m_btnPoemGudie = (GButton)comp.GetChild("btnPoemGudie");
             m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
             m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
+            m_instance = (UI_InstanceSamllUI)UI_InstanceSamllUI.Create(comp.GetChild("instance"));
             m_eff = (GGraph)comp.GetChild("eff");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
@@ -94,10 +98,13 @@ namespace UI.InstanceZones
             m_btnTravel = null;
             m_btnPoem.Dispose();
             m_btnPoem = null;
+            m_btnPoemGudie = null;
             m_btnField.Dispose();
             m_btnField = null;
             m_btnArena.Dispose();
             m_btnArena = null;
+            m_instance.Dispose();
+            m_instance = null;
             m_eff = null;
             m_btnBack = null;
             m_valueBar = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs

@@ -20,6 +20,8 @@ namespace UI.Main
         public UI_ComDodgeFightStar m_dodgeStar3;
         public GImage m_useIcon;
         public GGraph m_effect;
+        public GTextField m_wearRateText;
+        public GGroup m_fieldwork;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
@@ -81,6 +83,8 @@ namespace UI.Main
             m_dodgeStar3 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar3"));
             m_useIcon = (GImage)comp.GetChild("useIcon");
             m_effect = (GGraph)comp.GetChild("effect");
+            m_wearRateText = (GTextField)comp.GetChild("wearRateText");
+            m_fieldwork = (GGroup)comp.GetChild("fieldwork");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -103,6 +107,8 @@ namespace UI.Main
             m_dodgeStar3 = null;
             m_useIcon = null;
             m_effect = null;
+            m_wearRateText = null;
+            m_fieldwork = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -31,6 +31,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityZCJB;
         public UI_BtnModle2 m_btnGetYuanXiao;
         public UI_BtnModle2 m_btnActivityFYJY;
+        public UI_BtnModle2 m_btnActivityZQ;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -128,6 +129,7 @@ namespace UI.Main
             m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
             m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
+            m_btnActivityZQ = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZQ"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -194,6 +196,8 @@ namespace UI.Main
             m_btnGetYuanXiao = null;
             m_btnActivityFYJY.Dispose();
             m_btnActivityFYJY = null;
+            m_btnActivityZQ.Dispose();
+            m_btnActivityZQ = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_Component6.cs

@@ -9,6 +9,7 @@ namespace UI.MatchingCompetition
         public GComponent target;
         public Controller m_c1;
         public GLoader m_playerImage;
+        public GTextField m_descText;
         public GComponent m_head;
         public GTextField m_nameText;
         public GTextField m_countText;
@@ -61,6 +62,7 @@ namespace UI.MatchingCompetition
         {
             m_c1 = comp.GetController("c1");
             m_playerImage = (GLoader)comp.GetChild("playerImage");
+            m_descText = (GTextField)comp.GetChild("descText");
             m_head = (GComponent)comp.GetChild("head");
             m_nameText = (GTextField)comp.GetChild("nameText");
             m_countText = (GTextField)comp.GetChild("countText");
@@ -69,6 +71,7 @@ namespace UI.MatchingCompetition
         {
             m_c1 = null;
             m_playerImage = null;
+            m_descText = null;
             m_head = null;
             m_nameText = null;
             m_countText = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionGatheringUI.cs

@@ -15,6 +15,7 @@ namespace UI.MatchingCompetition
         public GTextField m_titleText;
         public GTextField m_timeText;
         public GTextField m_suitName;
+        public GGroup m_desc;
         public GButton m_btnUploadWorks;
         public GButton m_btnShop;
         public GButton m_BtnBack;
@@ -73,6 +74,7 @@ namespace UI.MatchingCompetition
             m_titleText = (GTextField)comp.GetChild("titleText");
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_suitName = (GTextField)comp.GetChild("suitName");
+            m_desc = (GGroup)comp.GetChild("desc");
             m_btnUploadWorks = (GButton)comp.GetChild("btnUploadWorks");
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
@@ -87,6 +89,7 @@ namespace UI.MatchingCompetition
             m_titleText = null;
             m_timeText = null;
             m_suitName = null;
+            m_desc = null;
             m_btnUploadWorks = null;
             m_btnShop = null;
             m_BtnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionRankUI.cs

@@ -10,12 +10,13 @@ namespace UI.MatchingCompetition
         public Controller m_c1;
         public GLoader m_bg;
         public GLoader m_playerImage;
-        public GLoader m_ruleBtn;
-        public GTextField m_titleText;
-        public GButton m_btnBefore;
+        public GLoader m_outBg;
         public GList m_RankList;
         public UI_Component3 m_playerHead;
         public GButton m_btnLook;
+        public GLoader m_ruleBtn;
+        public GTextField m_titleText;
+        public GButton m_btnBefore;
         public GButton m_BtnBack;
         public const string URL = "ui://ri3cveycp3ft1g";
         public const string PACKAGE_NAME = "MatchingCompetition";
@@ -67,12 +68,13 @@ namespace UI.MatchingCompetition
             m_c1 = comp.GetController("c1");
             m_bg = (GLoader)comp.GetChild("bg");
             m_playerImage = (GLoader)comp.GetChild("playerImage");
-            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
-            m_titleText = (GTextField)comp.GetChild("titleText");
-            m_btnBefore = (GButton)comp.GetChild("btnBefore");
+            m_outBg = (GLoader)comp.GetChild("outBg");
             m_RankList = (GList)comp.GetChild("RankList");
             m_playerHead = (UI_Component3)UI_Component3.Create(comp.GetChild("playerHead"));
             m_btnLook = (GButton)comp.GetChild("btnLook");
+            m_ruleBtn = (GLoader)comp.GetChild("ruleBtn");
+            m_titleText = (GTextField)comp.GetChild("titleText");
+            m_btnBefore = (GButton)comp.GetChild("btnBefore");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
         }
         public void Dispose(bool disposeTarget = false)
@@ -80,13 +82,14 @@ namespace UI.MatchingCompetition
             m_c1 = null;
             m_bg = null;
             m_playerImage = null;
-            m_ruleBtn = null;
-            m_titleText = null;
-            m_btnBefore = null;
+            m_outBg = null;
             m_RankList = null;
             m_playerHead.Dispose();
             m_playerHead = null;
             m_btnLook = null;
+            m_ruleBtn = null;
+            m_titleText = null;
+            m_btnBefore = null;
             m_BtnBack = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionWorksUI.cs

@@ -10,6 +10,7 @@ namespace UI.MatchingCompetition
         public GLoader m_bg;
         public GTextField m_titleText;
         public GList m_worksList;
+        public GTextField m_descText;
         public GButton m_BtnBack;
         public const string URL = "ui://ri3cveycp3ft1n";
         public const string PACKAGE_NAME = "MatchingCompetition";
@@ -61,6 +62,7 @@ namespace UI.MatchingCompetition
             m_bg = (GLoader)comp.GetChild("bg");
             m_titleText = (GTextField)comp.GetChild("titleText");
             m_worksList = (GList)comp.GetChild("worksList");
+            m_descText = (GTextField)comp.GetChild("descText");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
         }
         public void Dispose(bool disposeTarget = false)
@@ -68,6 +70,7 @@ namespace UI.MatchingCompetition
             m_bg = null;
             m_titleText = null;
             m_worksList = null;
+            m_descText = null;
             m_BtnBack = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PhoneBindingUI.cs

@@ -15,6 +15,7 @@ namespace UI.RoleInfo
         public UI_Button19 m_btnSure;
         public GTextField m_inputConfirmCode;
         public GButton m_btnGetCode;
+        public GLoader m_countTime;
         public GButton m_btnClose;
         public GLoader m_icon;
         public const string URL = "ui://374k3dwvr8a09fze";
@@ -72,6 +73,7 @@ namespace UI.RoleInfo
             m_btnSure = (UI_Button19)UI_Button19.Create(comp.GetChild("btnSure"));
             m_inputConfirmCode = (GTextField)comp.GetChild("inputConfirmCode");
             m_btnGetCode = (GButton)comp.GetChild("btnGetCode");
+            m_countTime = (GLoader)comp.GetChild("countTime");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_icon = (GLoader)comp.GetChild("icon");
         }
@@ -86,6 +88,7 @@ namespace UI.RoleInfo
             m_btnSure = null;
             m_inputConfirmCode = null;
             m_btnGetCode = null;
+            m_countTime = null;
             m_btnClose = null;
             m_icon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_ComRewardList.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_ComRewardList
+    {
+        public GComponent target;
+        public GList m_listReward;
+        public const string URL = "ui://zioq0m8xuufi1o";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "ComRewardList";
+        private static UI_ComRewardList _proxy;
+
+        public static UI_ComRewardList Create(GObject gObject = null)
+        {
+            var ui = new UI_ComRewardList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComRewardList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComRewardList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_ComRewardList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 56b7d6e179da4ff44b291718fba08fd1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_Component1.cs

@@ -0,0 +1,103 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public GProgressBar m_bar;
+        public UI_reward m_itemj0;
+        public UI_reward m_itemj1;
+        public UI_reward m_itemj2;
+        public UI_reward m_itemj3;
+        public UI_reward m_itemj4;
+        public UI_reward m_itemj5;
+        public UI_reward m_itemj6;
+        public UI_reward m_itemj7;
+        public const string URL = "ui://zioq0m8xqncf1d";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bar = (GProgressBar)comp.GetChild("bar");
+            m_itemj0 = (UI_reward)UI_reward.Create(comp.GetChild("itemj0"));
+            m_itemj1 = (UI_reward)UI_reward.Create(comp.GetChild("itemj1"));
+            m_itemj2 = (UI_reward)UI_reward.Create(comp.GetChild("itemj2"));
+            m_itemj3 = (UI_reward)UI_reward.Create(comp.GetChild("itemj3"));
+            m_itemj4 = (UI_reward)UI_reward.Create(comp.GetChild("itemj4"));
+            m_itemj5 = (UI_reward)UI_reward.Create(comp.GetChild("itemj5"));
+            m_itemj6 = (UI_reward)UI_reward.Create(comp.GetChild("itemj6"));
+            m_itemj7 = (UI_reward)UI_reward.Create(comp.GetChild("itemj7"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bar = null;
+            m_itemj0.Dispose();
+            m_itemj0 = null;
+            m_itemj1.Dispose();
+            m_itemj1 = null;
+            m_itemj2.Dispose();
+            m_itemj2 = null;
+            m_itemj3.Dispose();
+            m_itemj3 = null;
+            m_itemj4.Dispose();
+            m_itemj4 = null;
+            m_itemj5.Dispose();
+            m_itemj5 = null;
+            m_itemj6.Dispose();
+            m_itemj6 = null;
+            m_itemj7.Dispose();
+            m_itemj7 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_Component1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af1adb360986e094d91b09a53566af05
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnSpecialTipsUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_TurnSpecialTipsUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://zioq0m8xqncf1j";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "TurnSpecialTipsUI";
+        private static UI_TurnSpecialTipsUI _proxy;
+
+        public static UI_TurnSpecialTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TurnSpecialTipsUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TurnSpecialTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TurnSpecialTipsUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnSpecialTipsUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f628605b000f09b429502833ec379def
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableRewardUI.cs

@@ -0,0 +1,96 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_TurnTableRewardUI
+    {
+        public GComponent target;
+        public GGraph m_mask;
+        public GGraph m_bgEffect;
+        public GGraph m_bgEffect1;
+        public GGraph m_holderBgCom;
+        public GGraph m_holderTitle;
+        public GGroup m_downTipsText;
+        public UI_ComRewardList m_comList;
+        public GGroup m_grp;
+        public Transition m_openViewAction;
+        public const string URL = "ui://zioq0m8xuufi1n";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "TurnTableRewardUI";
+        private static UI_TurnTableRewardUI _proxy;
+
+        public static UI_TurnTableRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TurnTableRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TurnTableRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TurnTableRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_bgEffect1 = (GGraph)comp.GetChild("bgEffect1");
+            m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
+            m_downTipsText = (GGroup)comp.GetChild("downTipsText");
+            m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
+            m_grp = (GGroup)comp.GetChild("grp");
+            m_openViewAction = comp.GetTransition("openViewAction");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_mask = null;
+            m_bgEffect = null;
+            m_bgEffect1 = null;
+            m_holderBgCom = null;
+            m_holderTitle = null;
+            m_downTipsText = null;
+            m_comList.Dispose();
+            m_comList = null;
+            m_grp = null;
+            m_openViewAction = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableRewardUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: abad60ae38a10e34c97a8910ccc8df6d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableUI.cs

@@ -0,0 +1,190 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_TurnTableUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_bgEffect;
+        public GGraph m_bgEffec1;
+        public GLoader m_iconBg;
+        public UI_rewardItem m_item0;
+        public UI_rewardItem m_item1;
+        public UI_rewardItem m_item2;
+        public UI_rewardItem m_item3;
+        public UI_rewardItem m_item4;
+        public UI_rewardItem m_item5;
+        public UI_rewardItem m_item6;
+        public UI_rewardItem m_item7;
+        public UI_rewardItem m_item8;
+        public UI_rewardItem m_item9;
+        public GLoader m_pointer2;
+        public GLoader m_pointer1;
+        public GLoader m_pointer0;
+        public GLoader m_rewardIcon;
+        public GGraph m_specialEffect;
+        public UI_Component1 m_reward;
+        public GLoader m_numberBg;
+        public GTextField m_numberText;
+        public GButton m_btnStartOne;
+        public GGraph m_btnEffectOne;
+        public GButton m_btnStartThree;
+        public GGraph m_btnEffectThree;
+        public GTextField m_timeText;
+        public GButton m_ruleBtn;
+        public GGraph m_titleEffect;
+        public GButton m_shopBtn;
+        public GButton m_giftBtn;
+        public GTextField m_giftTimeText;
+        public GGroup m_gift;
+        public GComponent m_valueBar;
+        public GGraph m_bgEffec2;
+        public GGraph m_bgEffec3;
+        public GButton m_btnBack;
+        public const string URL = "ui://zioq0m8xtvgdg";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "TurnTableUI";
+        private static UI_TurnTableUI _proxy;
+
+        public static UI_TurnTableUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TurnTableUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TurnTableUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TurnTableUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_bgEffec1 = (GGraph)comp.GetChild("bgEffec1");
+            m_iconBg = (GLoader)comp.GetChild("iconBg");
+            m_item0 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item9"));
+            m_pointer2 = (GLoader)comp.GetChild("pointer2");
+            m_pointer1 = (GLoader)comp.GetChild("pointer1");
+            m_pointer0 = (GLoader)comp.GetChild("pointer0");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_specialEffect = (GGraph)comp.GetChild("specialEffect");
+            m_reward = (UI_Component1)UI_Component1.Create(comp.GetChild("reward"));
+            m_numberBg = (GLoader)comp.GetChild("numberBg");
+            m_numberText = (GTextField)comp.GetChild("numberText");
+            m_btnStartOne = (GButton)comp.GetChild("btnStartOne");
+            m_btnEffectOne = (GGraph)comp.GetChild("btnEffectOne");
+            m_btnStartThree = (GButton)comp.GetChild("btnStartThree");
+            m_btnEffectThree = (GGraph)comp.GetChild("btnEffectThree");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_shopBtn = (GButton)comp.GetChild("shopBtn");
+            m_giftBtn = (GButton)comp.GetChild("giftBtn");
+            m_giftTimeText = (GTextField)comp.GetChild("giftTimeText");
+            m_gift = (GGroup)comp.GetChild("gift");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_bgEffec2 = (GGraph)comp.GetChild("bgEffec2");
+            m_bgEffec3 = (GGraph)comp.GetChild("bgEffec3");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_bgEffect = null;
+            m_bgEffec1 = null;
+            m_iconBg = null;
+            m_item0.Dispose();
+            m_item0 = null;
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            m_item8.Dispose();
+            m_item8 = null;
+            m_item9.Dispose();
+            m_item9 = null;
+            m_pointer2 = null;
+            m_pointer1 = null;
+            m_pointer0 = null;
+            m_rewardIcon = null;
+            m_specialEffect = null;
+            m_reward.Dispose();
+            m_reward = null;
+            m_numberBg = null;
+            m_numberText = null;
+            m_btnStartOne = null;
+            m_btnEffectOne = null;
+            m_btnStartThree = null;
+            m_btnEffectThree = null;
+            m_timeText = null;
+            m_ruleBtn = null;
+            m_titleEffect = null;
+            m_shopBtn = null;
+            m_giftBtn = null;
+            m_giftTimeText = null;
+            m_gift = null;
+            m_valueBar = null;
+            m_bgEffec2 = null;
+            m_bgEffec3 = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 39712b9cb90e42d49a43ac3994d4c53b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_reward.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_reward
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_icon;
+        public GTextField m_numText;
+        public GGraph m_effect;
+        public const string URL = "ui://zioq0m8xqncf1a";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "reward";
+        private static UI_reward _proxy;
+
+        public static UI_reward Create(GObject gObject = null)
+        {
+            var ui = new UI_reward();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_reward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_reward();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_numText = (GTextField)comp.GetChild("numText");
+            m_effect = (GGraph)comp.GetChild("effect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_icon = null;
+            m_numText = null;
+            m_effect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_reward.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 26c2be5aeed9dc44a8046da99895b968
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_rewardItem.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TurnTable
+{
+    public partial class UI_rewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_iconBg;
+        public GLoader m_icon;
+        public GTextField m_numText;
+        public GGraph m_effect;
+        public const string URL = "ui://zioq0m8xqncf19";
+        public const string PACKAGE_NAME = "TurnTable";
+        public const string RES_NAME = "rewardItem";
+        private static UI_rewardItem _proxy;
+
+        public static UI_rewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_rewardItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_rewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_rewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_iconBg = (GLoader)comp.GetChild("iconBg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_numText = (GTextField)comp.GetChild("numText");
+            m_effect = (GGraph)comp.GetChild("effect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconBg = null;
+            m_icon = null;
+            m_numText = null;
+            m_effect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_rewardItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 03ec5d9986ed47c42836f1d52171411b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoUI.cs

@@ -23,6 +23,7 @@ namespace UI.Poem
         public GTextField m_txtCount;
         public GButton m_btnChooseAll;
         public GButton m_btnRule;
+        public GTextField m_descText;
         public const string URL = "ui://iyz778gkv4825";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoUI";
@@ -86,6 +87,7 @@ namespace UI.Poem
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_btnChooseAll = (GButton)comp.GetChild("btnChooseAll");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_descText = (GTextField)comp.GetChild("descText");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -105,6 +107,7 @@ namespace UI.Poem
             m_txtCount = null;
             m_btnChooseAll = null;
             m_btnRule = null;
+            m_descText = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -428,6 +428,108 @@ namespace GFGGame
                 //
             }
         }
+        //获取转盘活动信息
+        public static async ETTask<bool> ReqGetTurnTableInfo()
+        {
+            S2C_GetWishingActivityInfo response = null;
+            int id = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
+            if (id == 0)
+            {
+                return false;
+            }
+            response = (S2C_GetWishingActivityInfo)await MessageHelper.SendToServer(new C2S_GetWishingActivityInfo() {AcitvityId = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.TurnRewardStateDic.Clear();
+                    ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
+                    ActivityDataManager.Instance.StartDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.GiftBagIdList = response.WishingBags;
+                    for (int i = 0;i<response.RewardIds.Count;i++)
+                    {
+                        ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i],response.RewardStatus[i]);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqTurnTableWish(int wishType)
+        {
+            S2C_WishingLuckyBox response = null;
+            int id = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
+            response = (S2C_WishingLuckyBox)await MessageHelper.SendToServer(new C2S_WishingLuckyBox() { AcitvityId = id,WishingType = wishType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.TurnRewardStateDic.Clear();
+                    ActivityDataManager.Instance.threeTurnResult.Clear();
+                    ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
+                    ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.GiftBagIdList = response.WishingBags;
+                    for (int i = 0; i < response.RewardIds.Count; i++)
+                    {
+                        ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i], response.RewardStatus[i]);
+                    }
+                    if(response.RewardList.Count == 3)
+                    {                  
+                        ActivityDataManager.Instance.threeTurnResult.Add(0, response.RewardList);                     
+                    }
+                    else if(response.RewardList.Count == 9 )
+                    {
+                            List<ItemInfoProto> infoOneList = new List<ItemInfoProto>();
+                        List<ItemInfoProto> infoTwoList = new List<ItemInfoProto>();
+                        List<ItemInfoProto> infoThreeList = new List<ItemInfoProto>();
+                        for (int i = 0; i < response.RewardList.Count; i++)
+                        {
+                            if(i<3)
+                            {
+                                infoOneList.Add(response.RewardList[i]);
+                            }
+                            else if(i>=3 && i<6)
+                            {
+                                infoTwoList.Add(response.RewardList[i]);
+                            }
+                            else if(i >=6)
+                            {
+                                infoThreeList.Add(response.RewardList[i]);
+                            }
+                        }
+                        ActivityDataManager.Instance.threeTurnResult.Add(0, infoOneList);
+                        ActivityDataManager.Instance.threeTurnResult.Add(1, infoTwoList);
+                        ActivityDataManager.Instance.threeTurnResult.Add(2, infoThreeList);
+                    }
+                    ActivityDataManager.Instance.TurnRewardList = response.RewardList;
+                    ActivityDataManager.Instance.TurnSpecialRewardList = response.SpecialRewardList;
+                    return true;
+                }
+            }
+            return false;
+        }
+        //获取领取转盘奖励
+        public static async ETTask<bool> ReqGetTurnTableReward(int rewardId)
+        {
+            S2C_GetWishingRewards response = null;
+            response = (S2C_GetWishingRewards)await MessageHelper.SendToServer(new C2S_GetWishingRewards() { RewardId = rewardId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.TurnRewardStateDic.Clear();
+                    for (int i = 0; i < response.RewardIds.Count; i++)
+                    {
+                        ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i], response.RewardStatus[i]);
+                    }
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+                    EventAgent.DispatchEvent(ConstMessage.TurnTable_DateCHANGE);
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
 

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -59,6 +59,7 @@ namespace GFGGame
                     SuitFosterProxy.SendGetSuitInfos().Coroutine();
                     FieldSProxy.ReqFieldInstanceInfos().Coroutine();
                     ArenaSproxy.ReqArenaInfos().Coroutine();
+                    FieldWorkSproxy.ReqFieldWorkInfos().Coroutine();
                     EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
                     LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
                     RoleLimitSProxy.ReqUnitLimitInfos().Coroutine();
@@ -72,6 +73,7 @@ namespace GFGGame
                     await NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo();
                     await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos();
                     await ActivityFYJYProxy.ReqGetActivityGameInfos();
+                    await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/ServerProxy/FieldWorkSproxy.cs

@@ -0,0 +1,306 @@
+using System;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class NoticeFieldWorkChange : AMHandler<SC_RankChange>
+    {
+        protected override async ETTask Run(Session session, SC_RankChange message)
+        {
+            await ETTask.CompletedTask;
+        }
+    }
+    public static class FieldWorkSproxy
+    {
+        //获取爬塔信息
+        public static async ETTask ReqFieldWorkInfos()
+        {
+            S2C_GetGetCimbingTowerInfo response = null;
+            response = (S2C_GetGetCimbingTowerInfo)await MessageHelper.SendToServer(new C2S_GetCimbingTowerInfo());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    FieldWorkDataManager.Instance.MaxLevelId = response.MaxLevelId;
+                    FieldWorkDataManager.Instance.Tag = response.WeekTags ;
+                    FieldWorkDataManager.Instance.DressupList.Clear();
+                    FieldWorkDataManager.Instance.HistoryDressupList = response.WeekUserItems;
+                    FieldWorkDataManager.Instance.CardAbrasionInfoList = response.CardAbrasionInfoList;
+                    FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Clear();
+                    foreach (var item in response.CimbingTowerLevelInfoList)
+                    {
+                        FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(item.LevelId,item);
+                    }
+                    AddDressup(response.EquipAIds, 0, 0);
+                    AddDressup(response.EquipBIds, 0, 1);
+                    AddDressup(response.EquipCIds, 0, 2);
+                    EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                }
+            }
+        }
+        public static void AddDressup(List<int> itemList,int scoreType,int i)
+        {
+            FightData roleData = GetFightRoleData(itemList, FieldWorkDataManager.Instance.roleInfo, scoreType);
+            roleData.leagueSkillScore = FieldWorkDataManager.Instance.GetAllSkillScore(scoreType);
+            FightDataManager.Instance.SetItemScoreList(roleData);
+            ArenaDataManager.Instance.SetMineFightAttr(roleData, scoreType);
+            ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
+            FieldWorkDataManager.Instance.DressupList.Add(roleData);
+        }
+        //更换搭配
+        public static async ETTask<bool> ReqChangeFieldWorkDressup()
+        {
+            List<List<int>> dress = new List<List<int>>();
+            dress = FieldWorkDataManager.Instance.GetDressAndCard();
+            S2C_CimbingTowerSaveCollocation response = null;
+            response = (S2C_CimbingTowerSaveCollocation)await MessageHelper.SendToServer(new C2S_CimbingTowerSaveCollocation()
+            {
+                EquipAIds = dress[0],
+                EquipBIds = dress[1],
+                EquipCIds = dress[2],
+            }) ;
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //更换单个搭配
+        public static async ETTask<bool> ReqChangeFieldWorkDressupOne(int index,int cardId ,List<int> dressList)
+        {
+            List<int> dress = new List<int>();
+            dress = dressList;
+            dress.Add(cardId);
+            List<List<int>> dressAll = new List<List<int>>();
+            dressAll = FieldWorkDataManager.Instance.GetDressAndCard();
+            dressAll[index] = dress;
+            S2C_CimbingTowerSaveCollocation response = null;
+            response = (S2C_CimbingTowerSaveCollocation)await MessageHelper.SendToServer(new C2S_CimbingTowerSaveCollocation()
+            {
+                EquipAIds = dressAll[0],
+                EquipBIds = dressAll[1],
+                EquipCIds = dressAll[2],
+            });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //关卡挑战
+        public static async ETTask<bool> ReqFieldWorkFight(int levelId)
+        {
+            List<List<int>> dress = new List<List<int>>();
+            dress = FieldWorkDataManager.Instance.GetDressAndCard();
+            S2C_CimbingTowerFightLevel response = null;
+            response = (S2C_CimbingTowerFightLevel)await MessageHelper.SendToServer(new C2S_CimbingTowerFightLevel()
+            {
+                LevelId = levelId,
+                FightScoreList = FieldWorkDataManager.Instance.myScore,
+                EquipAIds = dress[0],
+                EquipBIds = dress[1],
+                EquipCIds = dress[2],
+            }) ;
+            if (response != null)
+            {
+                FieldWorkDataManager.Instance.CardAbrasionInfoList = response.CardAbrasionInfoList;
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    FieldWorkDataManager.Instance.MaxLevelId = response.MaxLevelId;
+                    FieldWorkDataManager.Instance.HistoryDressupList = response.WeekUserItems;
+                    if (response.CimbingTowerLevelInfo.IsPass)
+                    {
+                        if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(response.CimbingTowerLevelInfo.LevelId))
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[response.CimbingTowerLevelInfo.LevelId] = response.CimbingTowerLevelInfo;
+                        }
+                        else
+                        {
+                            //PromptController.Instance.ShowFloatTextPrompt("已通过，自动清除搭配！");
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(response.CimbingTowerLevelInfo.LevelId, response.CimbingTowerLevelInfo);
+                        }
+
+                       int limit = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+                       bool isDelete = false;
+                       for(int i=0;i<FieldWorkDataManager.Instance.DressupList.Count;i++)
+                       {
+                            FieldWorkDataManager.Instance.DressupList[i].itemList.Clear();
+                            FieldWorkDataManager.Instance.DressupList[i].cardId = 0;
+                            isDelete = true;                        
+                       }
+                        FieldWorkDataManager.Instance.BonusList = response.BonusList;
+                        EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                        return true;
+                    }
+                    else
+                    {
+                        if (response.CimbingTowerLevelInfo != null)
+                        {
+                            if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(response.CimbingTowerLevelInfo.LevelId))
+                            {
+                                FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[response.CimbingTowerLevelInfo.LevelId] = response.CimbingTowerLevelInfo;
+                            }
+                            else
+                            {
+                                FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(response.CimbingTowerLevelInfo.LevelId, response.CimbingTowerLevelInfo);
+                            }
+                        }
+                        int limit = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+                        bool isDelete = false;
+                        for (int i = 0; i < FieldWorkDataManager.Instance.DressupList.Count; i++)
+                        {
+                            foreach (var item in FieldWorkDataManager.Instance.CardAbrasionInfoList)
+                            {
+                                if (item.Card == FieldWorkDataManager.Instance.DressupList[i].cardId)
+                                {
+                                    if (item.UseNum >= limit)
+                                    {
+                                        FieldWorkDataManager.Instance.DressupList[i].cardId = 0;
+                                        isDelete = true;
+                                    }
+                                }
+                            }
+                        }
+                        if (isDelete)
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("词牌磨损率过高已自动解除佩戴！");
+                            EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                        }
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (response.CimbingTowerLevelInfo != null)
+                    {
+                        if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(response.CimbingTowerLevelInfo.LevelId))
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[response.CimbingTowerLevelInfo.LevelId] = response.CimbingTowerLevelInfo;
+                        }
+                        else
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(response.CimbingTowerLevelInfo.LevelId, response.CimbingTowerLevelInfo);
+                        }
+                    }
+                    int limit = CimbingTowerCfgArray.Instance.dataArray[0].UseLimit;
+                    bool isDelete = false;
+                    for (int i = 0; i < FieldWorkDataManager.Instance.DressupList.Count; i++)
+                    {
+                        foreach (var item in FieldWorkDataManager.Instance.CardAbrasionInfoList)
+                        {
+                            if (item.Card == FieldWorkDataManager.Instance.DressupList[i].cardId)
+                            {
+                                if (item.UseNum >= limit)
+                                {
+                                    FieldWorkDataManager.Instance.DressupList[i].cardId = 0;
+                                    isDelete = true;
+                                }
+                            }
+                        }
+                    }
+                    if (isDelete)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("词牌磨损率过高已自动解除佩戴！");
+                        EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                    }
+                    return false;
+                }
+            }
+            return false;
+        }
+        //一键跳过
+        public static async ETTask<bool> ReqFieldWorkOneClickPass()
+        {
+            S2C_CimbingTowerOneClickPass response = null;
+            response = (S2C_CimbingTowerOneClickPass)await MessageHelper.SendToServer(new C2S_CimbingTowerOneClickPass(){ });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    FieldWorkDataManager.Instance.MaxLevelId = response.MaxLevelId;
+                    FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Clear();
+                    foreach (var item in response.CimbingTowerLevelInfoList)
+                    {
+                        if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(item.LevelId))
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[item.LevelId] = item;
+                        }
+                        else
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(item.LevelId, item);
+                        }
+                    }
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                    return true;
+                }
+            }
+            return false;
+        }
+        //重置
+        public static async ETTask<bool> ReqFieldWorkReset()
+        {
+            S2C_CimbingTowerResetLevel response = null;
+            response = (S2C_CimbingTowerResetLevel)await MessageHelper.SendToServer(new C2S_CimbingTowerResetLevel(){});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    FieldWorkDataManager.Instance.HistoryDressupList.Clear();
+                    FieldWorkDataManager.Instance.CardAbrasionInfoList = response.CardAbrasionInfoList;
+                    foreach (var item in response.CimbingTowerLevelInfoList)
+                    {
+                        if (FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.ContainsKey(item.LevelId))
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList[item.LevelId] = item;
+                        }
+                        else
+                        {
+                            FieldWorkDataManager.Instance.CimbingTowerLevelInfoList.Add(item.LevelId, item);
+                        }
+                    }
+                    for (int i = 0; i < FieldWorkDataManager.Instance.DressupList.Count; i++)
+                    {
+                        FieldWorkDataManager.Instance.DressupList[i].itemList.Clear();
+                        FieldWorkDataManager.Instance.DressupList[i].cardId = 0;
+                    }
+                    EventAgent.DispatchEvent(ConstMessage.FieldWork_StateCHANGE);
+                    return true;
+                }
+            }
+            return false;
+        }
+        private static FightData GetFightRoleData(List<int> dressupProto, OtherRoleInfoData roleInfo, int scoreType)
+        {
+            FightData fightData = new FightData();
+            fightData.name = roleInfo.roleName;
+            fightData.scoreType = scoreType;
+            fightData.baseScore = RoleLevelCfgArray.Instance.GetCfg(roleInfo.roleLv).baseScore;
+            fightData.tags = FieldWorkDataManager.Instance.Tag.ToArray();
+            fightData.type = FightTargetType.PLAYER;
+            fightData.headId = roleInfo.headId;
+            List<int> dressList = new List<int>();
+            foreach(var item in dressupProto)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(item);
+                if(itemCfg != null && itemCfg.itemType == ConstItemType.DRESS_UP)
+                {
+                    dressList.Add(item);
+                }
+                else if(itemCfg != null && itemCfg.itemType == ConstItemType.CARD)
+                {
+                    fightData.cardId = item;
+                }
+            }
+            fightData.itemList = dressList;
+            return fightData;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/FieldWorkSproxy.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 74b9ab43d4f097e4db32164174836637
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/ServerProxy/MatchingCompetitionSproxy.cs

@@ -1,9 +1,12 @@
-using ET;
+using System;
+using System.Collections;
+using ET;
 using GFGGame;
 using FairyGUI;
 using UnityEngine;
 using UnityEngine.Networking;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ET
 {
@@ -35,6 +38,7 @@ namespace GFGGame
             if(response.MyWorks != null)
             {
                 MatchingCompetitionDataManager.Instance.myWorks = response.MyWorks;
+                MatchingCompetitionDataManager.Instance.WorksID = response.MyWorks.WorksId;
                 MatchingCompetitionDataManager.Instance.AllDressIDInfoList = response.MyWorks.CollocationInfoList;
             }
             else
@@ -56,6 +60,7 @@ namespace GFGGame
         //    if (!(response is { Error: ErrorCode.ERR_Success })) return false;
         //    return true;
         //}
+        
         //获取一个热门推荐的玩家
         public static async ETTask<bool> ReqGetOnePlayers()
         {
@@ -151,20 +156,123 @@ namespace GFGGame
             return true;
         }
         //获取当前排行榜
-        public static async ETTask<bool> ReqCurrentRank()
+        public static async ETTask<bool> ReqCurrentRank(bool isPushEvent = false)
         {
-            var response = (S2C_GetCurJudgingRoundRankList)await MessageHelper.SendToServer(new C2S_GetCurJudgingRoundRankList { });
+            MatchingCompetitionDataManager.Instance.IsWork = true;
+            var response =
+                (S2C_GetCurJudgingRoundRankList)await MessageHelper.SendToServer(new C2S_GetCurJudgingRoundRankList
+                    { });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            MatchingCompetitionDataManager.Instance._currentRankList.Clear();
-            foreach (var item in response.JudgingRoundRoleInfoList)
+
+            //需要从缓存里清理的数据
+            List<long> delRoleIds = new List<long>();
+            foreach (var item in MatchingCompetitionDataManager.Instance._currentRankList)
             {
-                MatchingPhotoWorksData data = new MatchingPhotoWorksData();
-                data.JudgingInfo = item;
-                MatchingCompetitionDataManager.Instance._currentRankList.Add(data);
+                if (response.JudgingRoundRoleInfoList.All(a => a.RoleId != item.RoleId))
+                {
+                    delRoleIds.Add(item.RoleId);
+                }
+            }
+
+            //执行清理
+            if (delRoleIds.Count != 0)
+            {
+                foreach (var roleId in delRoleIds)
+                {
+                    var itemToRemove =
+                        MatchingCompetitionDataManager.Instance._currentRankList.FirstOrDefault(item =>
+                            item.RoleId == roleId);
+                    if (itemToRemove != null)
+                    {
+                        MatchingCompetitionDataManager.Instance._currentRankList.Remove(itemToRemove);
+                    }
+                }
             }
-            Timers.inst.StartCoroutine(MatchingPhotoHelper.Download(MatchingCompetitionDataManager.Instance._currentRankList));
+            
+            foreach (var judgingRoundRoleInfo in response.JudgingRoundRoleInfoList)
+            {
+                CurRanMatchingPhotoWorksData matchingPhotoWorksData =
+                    MatchingCompetitionDataManager.Instance._currentRankList.FirstOrDefault(a =>
+                        a.RoleId == judgingRoundRoleInfo.RoleId);
+                if (matchingPhotoWorksData == null)
+                {
+                    matchingPhotoWorksData = new CurRanMatchingPhotoWorksData
+                    {
+                        RoleId = judgingRoundRoleInfo.RoleId,
+                        JudgingInfo = judgingRoundRoleInfo
+                    };
+                    MatchingCompetitionDataManager.Instance._currentRankList.Add(matchingPhotoWorksData);
+                }
+                else
+                {
+                    int index = MatchingCompetitionDataManager.Instance._currentRankList
+                        .IndexOf(matchingPhotoWorksData);
+                    if (matchingPhotoWorksData.JudgingInfo != null)
+                    {
+                        string newTempFileName = StringUtil.GetUrlFileName(matchingPhotoWorksData.JudgingInfo.PictureTempUrl);
+                        string oldTempFileName = StringUtil.GetUrlFileName(judgingRoundRoleInfo.PictureTempUrl);
+                        matchingPhotoWorksData.IsUp = newTempFileName != oldTempFileName;
+                    }
+
+                    matchingPhotoWorksData.JudgingInfo = judgingRoundRoleInfo;
+                    matchingPhotoWorksData.RoleId = judgingRoundRoleInfo.RoleId;
+                    if (matchingPhotoWorksData.IsUp)
+                    {
+                        matchingPhotoWorksData.Ntexture = null;
+                    }
+                    
+                    MatchingCompetitionDataManager.Instance._currentRankList[index] = matchingPhotoWorksData;
+                }
+            }
+
+            //排序
+            MatchingCompetitionDataManager.Instance._currentRankList.Sort((a, b) =>
+            {
+                // 假设列表项具有一个名为 'score' 的属性，你想要按照分数进行排序
+                if (a.JudgingInfo.Score > b.JudgingInfo.Score)
+                {
+                    return -1; // a在b之前
+                }
+                else if (a.JudgingInfo.Score < b.JudgingInfo.Score)
+                {
+                    return 1; // b在a之前
+                }
+                else
+                {
+                    return 0; // a和b相同
+                }
+            });
+            
+            var enumerator = MatchingPhotoHelper.DownloadExt(MatchingCompetitionDataManager.Instance._currentRankList);
+            Timers.inst.StartCoroutine(enumerator);
+            
+            //推送事件
+            if (isPushEvent)
+            {
+                EventAgent.DispatchEvent(ConstMessage.REQ_CURRENT_RANK);
+            }
+
             return true;
         }
+        
+        public static void UseCoroutine()
+        {
+            if (!MatchingCompetitionDataManager.Instance.IsWork)
+            {
+                if (MatchingCompetitionDataManager.Instance._coroutineQueue.Count == 0)
+                {
+                    return;
+                }
+                
+                int vl = MatchingCompetitionDataManager.Instance._coroutineQueue.Dequeue();
+                if (vl == 1)
+                {
+                    //缓存里面存在数据,那也要再次请求服务器进行更新数据,只是用协程的形式,接着处理完数据后抛出事件
+                    ReqCurrentRank(true).Coroutine();
+                }
+            }
+        }
+        
         //获取往期作品集
         public static async ETTask<bool> ReqBeforeWorks()
         {
@@ -183,12 +291,13 @@ namespace GFGGame
         //获取往期作品排行榜
         public static async ETTask<bool> ReqBeforeRank(int id)
         {
-            var response = (S2C_GetOldJudgingRoundRankList)await MessageHelper.SendToServer(new C2S_GetOldJudgingRoundRankList { JudgingRoundOpenId = id});
+             var response = (S2C_GetOldJudgingRoundRankList)await MessageHelper.SendToServer(new C2S_GetOldJudgingRoundRankList { JudgingRoundOpenId = id});
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             MatchingCompetitionDataManager.Instance._BeforeRankList.Clear();
             foreach (var item in response.JudgingRoundRoleInfoList)
             {
                 MatchingPhotoWorksData data = new MatchingPhotoWorksData();
+                data.RoleId = item.RoleId;
                 data.JudgingInfo = item;
                 MatchingCompetitionDataManager.Instance._BeforeRankList.Add(data);
             }