移除表分组的问题

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

@@ -6,114 +6,166 @@
   <component name="ChangeListManager">
     <list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BonusBoxDetailUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BonusBoxDetailUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBuy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBuy.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnReceive.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnReceive.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle000.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button16.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button16.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button18.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button18.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button19.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button19.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button2.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button21.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button21.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button3.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button3.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonInValueBar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonInValueBar.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyConfirmUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyConfirmUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyTipsUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyTipsUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCurSupplyItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCurSupplyItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDiscount.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDiscount.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFilterType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFilterType.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFunctionOpen.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComFunctionOpen.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComGouMaiGetText.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComGouMaiGetText.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadIcon.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadIcon.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLeftGiftBox.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLeftGiftBox.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRedDot.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRedDot.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComScaleList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComScaleList.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComSpecialOfferGiftBoxItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComSpecialOfferGiftBoxItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComStar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComStar.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTag.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTag.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTitle.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTopTitle.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component1.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_DressUpItemTips.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_DressUpItemTips.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_FunctionOpenUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_FunctionOpenUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem2.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListTagItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListTagItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardIconYellow.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardPreviewUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardPreviewUI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/ActivityOpenCfgArray.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/ActivityOpenCfgArray.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/ArenaRewardCfgArrayPartical.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/ArenaRewardCfgArrayPartical.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/CollegeBoostCfgArray.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/CollegeBoostCfgArray.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/SuitCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/SuitCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityDressCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityDressCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityLoginCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityLoginCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityOpenCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityOpenCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityRecharge2Cfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityRecharge2Cfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityRechargeCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityRechargeCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivitySignCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivitySignCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityVisitCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblActivityVisitCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblArenaRewardCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblArenaRewardCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblArenaRobotCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblArenaRobotCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblBattlePassCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblBattlePassCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardGameCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardGameCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardLvlCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardLvlCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardStarCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCardStarCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblChapterRewardCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblChapterRewardCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCollegeBoostCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCollegeBoostCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCompositeLevelbonusCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCompositeLevelbonusCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCompositebonusCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCompositebonusCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCoolDownCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblCoolDownCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailyLoginCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailyLoginCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailySignBonusCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailySignBonusCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailySignCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDailySignCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDropOutCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblDropOutCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblEctypeCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblEctypeCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblEverydaySaleCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblEverydaySaleCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblFieldTaskCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblFieldTaskCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblFilingRewardCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblFilingRewardCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblGrowthFundCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblGrowthFundCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblHuarongRoadCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblHuarongRoadCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblHuarongRoadGame.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblHuarongRoadGame.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblIActivityLuckybonusCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblIActivityLuckybonusCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblItemCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblItemCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblLeagueSkillCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblLeagueSkillCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMerge2048Cfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMerge2048Cfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMerge2048GameCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMerge2048GameCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMergeGameCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMergeGameCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMonthlyCardClothesCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMonthlyCardClothesCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMonthlyCardPrivilegeCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblMonthlyCardPrivilegeCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPassivitySkillCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPassivitySkillCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPickUpCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPickUpCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPickUpGameCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblPickUpGameCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblShopCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblShopCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoreTabCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoreTabCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoryChapterCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoryChapterCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoryDialogCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStoryDialogCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStudioCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblStudioCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblSuitCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblSuitCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblSuitFosterCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblSuitFosterCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTravelLoactionCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTravelLoactionCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTravelSuitCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTravelSuitCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTurntableRewardCfg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/LuBanConfig/Luban/GfgCfg/TblTurntableRewardCfg.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/MainController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/MainController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityAfuGiftDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityAfuGiftDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/Cache/DropOutDataCache.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/Cache/DropOutDataCache.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/CardDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/CardDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DecomposeDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DecomposeDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/FightDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/FightDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ItemDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ItemDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/MainStoryDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/MainStoryDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/RedDotDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/RedDotDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ScoreSystemData.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ShopDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/ShopDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/SkillDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/SkillDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/StudioDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/StudioDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/TaskDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/TaskDataManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/TimeTracingDataManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Data/TimeTracingDataManager.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitItemUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitItemUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitPartsDetailUI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_holderBg.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_holderBg.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/UGUI/UGUIManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/StudioSProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/StudioSProxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/TimeTracingSProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/TimeTracingSProxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Card/CardUpLevelView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Card/CardUpLevelView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/ViewManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_atlas_tu965m.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkChooseCardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkChooseCardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryLookBackView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MainStory/StoryLookBackView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/BadgeChooseView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/BadgeChooseView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreArenaView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreArenaView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreExchangeView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreExchangeView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreGiftBagAddRebateView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreGiftBagAddRebateView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreZGDCView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Store/StoreZGDCView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelRewardView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelRewardView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TurnTable/TurnSpecialTipsView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TurnTable/TurnSpecialTipsView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Game/Launcher/LauncherConfig.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/Launcher/LauncherConfig.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/GameClient.sln.DotSettings.user" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/EditorUserSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2022.dwlt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -124,7 +176,7 @@
     <option name="firstShow" value="false" />
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/Assets/Game/CSShare" />
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/351e49e2a5bf4fd6beabb458ce2255f3ff600/4e/84b60bbd/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
@@ -133,7 +185,7 @@
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/75/d87ba9d0/LogType.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/88/39e0e101/GameObject.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/f7/323a5d44/Application.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/f7/323a5d44/Application.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/695d1cc93cca45069c528c15c9fdd7493e2800/ae/712a485e/MemoryStream.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
@@ -149,27 +201,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;XThreadsFramesViewSplitterKey&quot;: &quot;0.5252396&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;H5sdk&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
-    &quot;附加到 Unity 编辑器.附加到 Unity 编辑器.executor&quot;: &quot;Debug&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "XThreadsFramesViewSplitterKey": "0.5252396",
+    "git-widget-placeholder": "master",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true",
+    "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
     <configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
@@ -180,7 +232,7 @@
       <method v="2" />
     </configuration>
     <configuration name="单元测试(批处理模式)" type="RunUnityExe" factoryName="Unity Executable">
-      <option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
+      <option name="EXE_PATH" value="E:\ruanJian\2022.3.0f1c1\Editor\Unity.exe" />
       <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
       <option name="WORKING_DIRECTORY" value="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient" />
       <option name="PASS_PARENT_ENVS" value="1" />
@@ -237,6 +289,10 @@
       <workItem from="1752673889439" duration="12276000" />
       <workItem from="1752757462885" duration="11792000" />
       <workItem from="1752841832689" duration="5218000" />
+      <workItem from="1753119608154" duration="1684000" />
+      <workItem from="1753281958378" duration="573000" />
+      <workItem from="1754922524276" duration="3830000" />
+      <workItem from="1755011343842" duration="7838000" />
     </task>
     <servers />
   </component>

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

@@ -100,7 +100,7 @@ namespace GFGGame
 
             await FontLoader.Instance.Init2();
             
-            ViewManager.PreloadViews<MainUIView>();
+            // ViewManager.PreloadViews<MainUIView>();
             ViewManager.PreloadViews<StoryDialogView>();
             ViewManager.PreloadViews<RewardView>();
             ViewManager.PreloadViews<StoryChapterView>();

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

@@ -14,7 +14,9 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
             if (isOpen) return isOpen;
             isOpen = true;
-            List<StoryChapterCfg> _chapterCfgs = CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(0);
+            List<StoryChapterCfg> _chapterCfgs = CommonDataManager.Tables.TblStoryChapterCfg.DataList
+                .Where(a => a.SubType == 0).ToList();
+
             for (int i = 0; i < _chapterCfgs.Count; i++)
             {
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];

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

@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UnityEngine;
 
@@ -10,21 +11,34 @@ namespace GFGGame
     public class ActivityAfuGiftDataManager : SingletonBase<ActivityAfuGiftDataManager>
     {
         private ActivityInfo info;
-        public ActivityInfo Info { get => info; set => info = value; }
+
+        public ActivityInfo Info
+        {
+            get => info;
+            set => info = value;
+        }
 
         private int _indexDay;
+
         private bool _isBuy;
+
         //已经领奖levelId
         private List<int> _normalRewards = new List<int>();
 
         //已经高级领奖levelId
         private List<int> _superRewards = new List<int>();
         private List<ActivityLoginCfg> _rewardCfgs;
-        public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
+
+        public List<ActivityLoginCfg> RewardCfgs
+        {
+            get => _rewardCfgs;
+            set => _rewardCfgs = value;
+        }
 
         //消暑礼包
         public int SummerActivityID = 3003;
         public bool IsSummerGiftBuy = false;
+
         public Dictionary<int, List<int>> SummerGiftRewardState = new Dictionary<int, List<int>>()
         {
             [0] = new List<int>(),
@@ -32,10 +46,20 @@ namespace GFGGame
         };
 
         private bool _isOpen;
-        public bool IsOpen { get => _isOpen; set => _isOpen = value; }
+
+        public bool IsOpen
+        {
+            get => _isOpen;
+            set => _isOpen = value;
+        }
 
         private bool _needRefresh;
-        public bool NeedRefresh { get => _needRefresh; set => _needRefresh = value; }
+
+        public bool NeedRefresh
+        {
+            get => _needRefresh;
+            set => _needRefresh = value;
+        }
 
         public bool CheckIconShow()
         {
@@ -47,7 +71,8 @@ namespace GFGGame
         public void InitActivityInfo()
         {
             Info = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
-            RewardCfgs = CommonDataManager.Tables.TblActivityLoginCfg.GetGroup1ById(Info.ActivityId);
+            RewardCfgs = CommonDataManager.Tables.TblActivityLoginCfg.DataList.Where(a => a.Id == Info.ActivityId)
+                .ToList();
         }
 
         public int GetNormalRewardStateByDay(int indexDay)
@@ -103,7 +128,7 @@ namespace GFGGame
 
             for (int i = passDay - 1; i >= 0; i--)
             {
-                if (GetNormalRewardStateByDay(i) == ConstBonusStatus.CAN_GET 
+                if (GetNormalRewardStateByDay(i) == ConstBonusStatus.CAN_GET
                     || GetSuperRewardStateByDay(i) == ConstBonusStatus.CAN_GET)
                 {
                     return true;
@@ -132,16 +157,18 @@ namespace GFGGame
             {
                 return false;
             }
+
             foreach (var item in SummerGiftRewardState)
             {
-                foreach(var state in item.Value)
+                foreach (var state in item.Value)
                 {
-                    if(state == 1)
+                    if (state == 1)
                     {
                         return true;
                     }
                 }
             }
+
             return false;
         }
     }

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

@@ -1,5 +1,6 @@
 using ET;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -34,19 +35,29 @@ namespace GFGGame
             ActivityInfo info = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(type);
             return (info == null) ? 0 : info.ActivityId;
         }
+
         /**********************************************************活动弹窗*************************************************/
         public int todayActivityTips = 0;
+
         public int todayMonthlyCardTips = 0;
+
         /**********************************************************限时累充*************************************************/
         public int lastActLimitChargeId = 0;
+
         private int _actLimitChargeId = 0;
+
         /**********************************************************限时累充*************************************************/
         public bool IsGetNewPlayerReward = false;
+
         /// <summary>
         /// 当前限时累充活动id
         /// </summary>
         /// <value></value>
-        public int actLimitChargeId { get { return _actLimitChargeId; } set { _actLimitChargeId = value; } }
+        public int actLimitChargeId
+        {
+            get { return _actLimitChargeId; }
+            set { _actLimitChargeId = value; }
+        }
 
 
         /**********************************************************限时抽奖活动*********************************************/
@@ -56,21 +67,29 @@ namespace GFGGame
         private int _actLuckyBoxId = 0;
         private int _actLuckyTsyId = 0;
         private int _actLimitStlycId = 0;
+
         /// <summary>
         /// 当前抽奖活动id
         /// </summary>
         /// <value></value>
-        public int actLuckyBoxId { get { return _actLuckyBoxId; } set { _actLuckyBoxId = value; } }
+        public int actLuckyBoxId
+        {
+            get { return _actLuckyBoxId; }
+            set { _actLuckyBoxId = value; }
+        }
+
         /// <summary>
         /// 抽奖总次数
         /// </summary>
         /// <value></value>
         public long allPlayTimes { get; set; }
+
         /// <summary>
         /// 限时抽奖必掉次数
         /// </summary>
         /// <value></value>
         public int lastDrawCount { get; set; }
+
         /// <summary>
         /// </summary>
         /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>
@@ -82,17 +101,24 @@ namespace GFGGame
         /// 当前天市垣抽奖活动id
         /// </summary>
         /// <value></value>
-        public int actLimitTsyId { get { return _actLuckyTsyId; } set { _actLuckyTsyId = value; } }
+        public int actLimitTsyId
+        {
+            get { return _actLuckyTsyId; }
+            set { _actLuckyTsyId = value; }
+        }
+
         /// <summary>
         /// 天市垣抽奖总次数
         /// </summary>
         /// <value></value>
         public long allTsyPlayTimes { get; set; }
+
         /// <summary>
         /// 限时天市垣抽奖必掉次数
         /// </summary>
         /// <value></value>
         public int lastTsyDrawCount { get; set; }
+
         /// <summary>
         /// </summary>
         /// <typeparam name="int">奖励key，这里对应天市垣抽奖次数</typeparam>
@@ -104,17 +130,24 @@ namespace GFGGame
         /// 当前隋唐洛阳城活动id
         /// </summary>
         /// <value></value>
-        public int actLimitStlycId { get { return _actLimitStlycId; } set { _actLimitStlycId = value; } }
+        public int actLimitStlycId
+        {
+            get { return _actLimitStlycId; }
+            set { _actLimitStlycId = value; }
+        }
+
         /// <summary>
         /// 开服活动抽奖总次数
         /// </summary>
         /// <value></value>
         public long allLimitStlycTimes { get; set; }
+
         /// <summary>
         /// 开服抽奖必掉次数
         /// </summary>
         /// <value></value>
         public int lastStlycDrawCount { get; set; }
+
         /// <summary>
         /// </summary>
         /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>
@@ -122,27 +155,34 @@ namespace GFGGame
         /// <returns></returns>
         public Dictionary<int, int> limitStlycActBonusState = new Dictionary<int, int>();
 
-        public List<ActivityLuckybonusCfg> SortActivityLuckybonusCfg(List<ActivityLuckybonusCfg> list,int typeId)
+        public List<ActivityLuckybonusCfg> SortActivityLuckybonusCfg(List<ActivityLuckybonusCfg> list, int typeId)
         {
             list.Sort((ActivityLuckybonusCfg a, ActivityLuckybonusCfg b) =>
             {
                 long allPlayTimes = 0;
                 int stateA = 0;
                 int stateB = 0;
-                if (typeId == ConstLimitTimeActivityType.ActLimitLuckyBox) {
-                    allPlayTimes = ActivityDataManager.Instance.allPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                if (typeId == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                {
+                    allPlayTimes =
+                        ActivityDataManager.Instance
+                            .allPlayTimes; // GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
                     stateA = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(a.Num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(b.Num) ? 1 : -1;
                 }
-                else if(typeId == ConstLimitTimeActivityType.ActLimitTsy) 
+                else if (typeId == ConstLimitTimeActivityType.ActLimitTsy)
                 {
-                    allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                    allPlayTimes =
+                        ActivityDataManager.Instance
+                            .allTsyPlayTimes; // GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
                     stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.Num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.Num) ? 1 : -1;
                 }
                 else if (typeId == ConstLimitTimeActivityType.ActLimitStlyc)
                 {
-                    allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                    allPlayTimes =
+                        ActivityDataManager.Instance
+                            .allTsyPlayTimes; // GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
                     stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.Num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.Num) ? 1 : -1;
                 }
@@ -161,6 +201,7 @@ namespace GFGGame
 
         /**********************************************************每日登录*************************************************/
         private int _sevenDayLoginLoginId = 1;
+
         /// <summary>
         /// 七日登录 当日奖励id
         /// </summary>
@@ -172,6 +213,7 @@ namespace GFGGame
         }
 
         private int _sevenDayLoginBonusStatus = 0;
+
         /// <summary>
         /// 七日登录 当前奖励状态
         /// </summary>
@@ -186,12 +228,13 @@ namespace GFGGame
 
         /**********************************************************每日登录修改*************************************************/
         public List<int> sevenDayLoginLoginIdList = new List<int>();
+
         /// <summary>
         /// 七日登录 当日奖励id
         /// </summary>
         /// <value></value>
-
         public List<int> sevenDayLoginBonusStatusList = new List<int>();
+
         /// <summary>
         /// 七日登录 当前奖励状态
         /// </summary>
@@ -199,10 +242,11 @@ namespace GFGGame
         /// 
         public bool CanGetSevenDayBonus()
         {
-            foreach(int a in sevenDayLoginBonusStatusList)
+            foreach (int a in sevenDayLoginBonusStatusList)
             {
                 if (a == 1) return true;
             }
+
             return false;
         }
 
@@ -212,6 +256,7 @@ namespace GFGGame
             {
                 if (a != 2) return false;
             }
+
             return true;
         }
 
@@ -221,15 +266,18 @@ namespace GFGGame
             {
                 if (a == 0) return true;
             }
+
             return false;
         }
+
         //判断最后可领取的奖励索引
         public int NowSevenDayBonusDay(bool day = false)
         {
-            if(AllSevenDayBonusGot())
+            if (AllSevenDayBonusGot())
             {
                 return 8;
             }
+
             int a = 0;
             int flog = -1;
             if (day)
@@ -252,11 +300,13 @@ namespace GFGGame
                     if (a == 2) flog = j;
                 }
             }
+
             return flog;
         }
         /******************************************************************************************************************/
 
         private int _firstChargeBonusStatus = 0;
+
         /// <summary>
         /// 首冲奖励 当前奖励状态,ConstBonusStatus 0不可领，1可领，2已领
         /// </summary>
@@ -275,6 +325,7 @@ namespace GFGGame
                 {
                     return ConstBonusStatus.CAN_GET;
                 }
+
                 return ConstBonusStatus.CAN_NOT_GET;
             }
         }
@@ -282,18 +333,22 @@ namespace GFGGame
         //招财进宝活动
         public List<int> ActivityZCJBList = new List<int>();
         public int activityZCJBId = 61101;
+
         public bool CheckZCJBRed()
         {
             List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
-            zcjbCfgList = CommonDataManager.Tables.TblActivityDressCfg.GetGroup1ByActivityId(activityId);
+            zcjbCfgList = CommonDataManager.Tables.TblActivityDressCfg.DataList.Where(a => a.ActivityId == activityId)
+                .ToList();
+
             if (zcjbCfgList == null || zcjbCfgList.Count == 0)
             {
                 return false;
             }
+
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].Comsume[0].ItemId, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].Comsume[0].ItemId, out numItem))
             {
                 num = numItem.num;
             }
@@ -304,14 +359,15 @@ namespace GFGGame
 
             for (int i = 0; i < zcjbCfgList.Count; i++)
             {
-                    if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
+                if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
+                {
+                    if (num >= zcjbCfgList[i].Comsume[0].Count)
                     {
-                        if (num >= zcjbCfgList[i].Comsume[0].Count)
-                        {
-                            return true;
-                        }
+                        return true;
                     }
+                }
             }
+
             return false;
         }
 
@@ -320,7 +376,8 @@ namespace GFGGame
         /// 新年签到 登录第几天列表  奖励状态列表
         /// </summary>
         /// <value></value>
-        public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
+        public Dictionary<int, int> NewYearLoginInfoDic = new Dictionary<int, int>();
+
         public bool CanGetNewYearLoginRed()
         {
             //foreach (var a in NewYearLoginInfoDic)
@@ -335,23 +392,25 @@ namespace GFGGame
         {
             return 0;
         }
+
         public Dictionary<long, long> TipsStatusDic = new Dictionary<long, long>();
+
         //珍珠赠礼是否弹窗
         public bool CheckPearRebateTips(int id)
         {
             bool flog = true;
-            ActivityOpenCfg activityCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(id);   
-            for(int i =0;i< activityCfg.Params1.Count;i++)
+            ActivityOpenCfg activityCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(id);
+            for (int i = 0; i < activityCfg.Params1.Count; i++)
             {
                 ShopCfg shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(activityCfg.Params1[i]);
                 int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id);
                 if (shopCfg.MaxBuyNum == 0 || buyNum < shopCfg.MaxBuyNum)
                 {
                     flog = false;
-                    
                 }
             }
-            if(!flog)
+
+            if (!flog)
             {
                 if (ActivityGlobalDataManager.Instance.IsActivityOpen(id))
                 {
@@ -366,13 +425,12 @@ namespace GFGGame
             {
                 return false;
             }
-
         }
 
         //根据创角时间判断活动是否开启
         public bool CheckActivityByRoleTime(int id)
         {
-           return ActivityGlobalDataManager.Instance.IsActivityOpen(id);
+            return ActivityGlobalDataManager.Instance.IsActivityOpen(id);
             //ActivityOpenCfg item = ActivityOpenCfgArray.Instance.GetCfg(id);
             //if (item == null || item.CreatTime == 0)
             //{
@@ -387,16 +445,18 @@ namespace GFGGame
             //}
             //return false;
         }
+
         public long GetActivityTime(int id)
         {
             ActivityOpenCfg _activityCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(id);
             int endTime = (_activityCfg.AfterCreatRoleTime * 24 * 60) + _activityCfg.OpenLastTime;
             endTime = endTime * 60;
             long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
-            long laterTime = (TimeHelper.ServerNow() - time)/1000;
-            long curTime = (endTime - laterTime)* 1000;
+            long laterTime = (TimeHelper.ServerNow() - time) / 1000;
+            long curTime = (endTime - laterTime) * 1000;
             return curTime;
         }
+
         public bool isExtendTime(int day)
         {
             int id = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
@@ -414,37 +474,47 @@ namespace GFGGame
                     }
                 }
             }
+
             return false;
         }
+
         /***************************转盘活动*******************************/
         public bool CHECK_TIPS_OPEN = false;
-        public int TurnTableActivityType = 102; 
+        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 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)
+            foreach (var item in TurnRewardStateDic)
             {
-                if(item.Value == 1)
+                if (item.Value == 1)
                 {
                     return true;
                 }
             }
+
             return false;
         }
+
         /*****************************************************************/
         /***************************盲盒活动*******************************/
         public int BlindBoxType = 0;
         public BlindBoxType typeOne = new BlindBoxType { type = 1, check = false };
+
         public BlindBoxType typeAll = new BlindBoxType { type = 6, check = false };
+
         /*****************************************************************/
         public string PhoneNum = "";
     }

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

@@ -52,16 +52,18 @@ namespace GFGGame
             {
                 activityInfosByType.Add(activityInfo.Type, new List<int>());
             }
+
             activityInfosByType[activityInfo.Type].Add(activityInfo.ActivityId);
             LogUtil.LogEditor($"AddActivityInfo {activityInfo.Type}");
             var remainTime = activityInfo.EndTime - TimeHelper.ServerNow();
             if (remainTime > 0)
             {
                 //ACTIVITY_ADD
-                if(dispatchEvent)
+                if (dispatchEvent)
                 {
                     EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD);
                 }
+
                 Timers.inst.Add(activityInfo.EndTime - TimeHelper.ServerNow(), 1, ClientRemoveActivityInfo,
                     activityInfo.ActivityId);
             }
@@ -109,16 +111,19 @@ namespace GFGGame
 
         public List<ActivityInfo> GetActivityInfoByTypeAndID(int activityType, int outActivityID)
         {
-            List<ActivityOpenCfg> list = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(activityType);
+            List<ActivityOpenCfg> list = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == activityType).ToList();
+
             List<int> infoList = new List<int>();
-            for(int i = 0; i < list.Count; i++)
+            for (int i = 0; i < list.Count; i++)
             {
-                if(list[i].Params2!=null && list[i].Params2.Count > 0 
-                    && list[i].Params2[0] == outActivityID)
+                if (list[i].Params2 != null && list[i].Params2.Count > 0
+                                            && list[i].Params2[0] == outActivityID)
                 {
                     infoList.Add(list[i].Id);
                 }
             }
+
             return infoList.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
         }
 
@@ -127,7 +132,7 @@ namespace GFGGame
         {
             var activityInfoIds = GetActivityInfoIdsByType(activityType);
             return activityInfoIds.Select(GetActivityInfo).FirstOrDefault(activityInfo =>
-                activityInfo != null && activityInfo.EndTime >TimeHelper.ServerNow());
+                activityInfo != null && activityInfo.EndTime > TimeHelper.ServerNow());
         }
 
         //添加活动奖励获取数据
@@ -147,7 +152,7 @@ namespace GFGGame
             activityInfo.CountValue = countValue;
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, activityId);
         }
-     
+
         //根据活动id判断活动是否开启
         public bool IsActivityOpen(int activityId)
         {

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

@@ -113,7 +113,9 @@ namespace GFGGame
             }
 
             var targetLevel = selectionCache.GetValueNoCache(level);
-            return CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(SeasonId, targetLevel)[0];
+
+            return CommonDataManager.Tables.TblBattlePassCfg.DataList.Where(a =>
+                a.Id == SeasonId && a.Level == targetLevel).ToList()[0];
         }
 
         private void SetSpecialCfgCache()
@@ -147,7 +149,9 @@ namespace GFGGame
         private void InitItemTemp()
         {
             tempItems = new List<KeyValuePair<int, int>>();
-            var battlePassCfgs = CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(GetSeasonId());
+            var battlePassCfgs = CommonDataManager.Tables.TblBattlePassCfg.DataList.Where(a => a.Id == GetSeasonId())
+                .ToList();
+
             var items = new Dictionary<int, int>();
             foreach (var itemsInfo in battlePassCfgs.SelectMany(battlePassCfg => battlePassCfg.BonusSpecial))
             {
@@ -170,7 +174,9 @@ namespace GFGGame
             for (var i = upLevel; i > 0; i--)
             {
                 var passLevel = battlePassLevel + i;
-                var cfg = CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(seasonId, passLevel)[0];
+                var cfg = CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == seasonId && a.Level == passLevel).ToList()[0];
+
                 if (cfg == null) continue;
                 var mergeBonus = ItemUtil.MergeBonus(cfg.BonusNormal.ToGfgGameItemParam(),
                     cfg.BonusSpecial.ToGfgGameItemParam());
@@ -214,7 +220,8 @@ namespace GFGGame
         //筛选出大奖数据 
         public List<BattlePassCfg> GetIsGoodToId(int SeasonId)
         {
-            var battlePassCfgs = CommonDataManager.Tables.TblBattlePassCfg.GetGroup2ByIsGood(1);
+            var battlePassCfgs = CommonDataManager.Tables.TblBattlePassCfg.DataList.Where(a => a.IsGood == 1).ToList();
+
             List<BattlePassCfg> battlePassTypeCfg = new List<BattlePassCfg>();
             foreach (var info in battlePassCfgs)
             {
@@ -241,11 +248,7 @@ namespace GFGGame
             }
 
             //var battlePassCfgs = GetIsGoodToId(GetSeasonId());
-            var list = CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(seid);
-            if (list == null)
-            {
-                return false;
-            }
+            var list = CommonDataManager.Tables.TblBattlePassCfg.DataList.Where(a => a.Id == seid).ToList();
 
             var _rewardCfgs =
                 new List<BattlePassCfg>(list);

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

@@ -36,7 +36,8 @@ namespace GFGGame
 
         public static List<ItemData> GetDropItemData(int dropId, List<ItemData> result)
         {
-            List<DropOutCfg> dropOutCfgs = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(dropId);
+            List<DropOutCfg> dropOutCfgs =
+                CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == dropId).ToList();
 
             for (int i = 0; i < dropOutCfgs.Count; i++)
             {

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

@@ -304,7 +304,9 @@ namespace GFGGame
         {
             List<int> result = new List<int>();
 
-            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.CARD);
+            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.DataList
+                .Where(a => a.ItemType == ConstItemType.CARD).ToList();
+
             itemCfgs.Sort((a, b) =>
             {
                 bool haveA = GetCardDataById(a.Id) != null;
@@ -345,11 +347,13 @@ namespace GFGGame
 
         public static void GetTotalProgress(out int haveCount, out int totalCount, int mainScore = 0)
         {
-            totalCount = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.CARD).Count;
+            totalCount = CommonDataManager.Tables.TblItemCfg.DataList.Count(a => a.ItemType == ConstItemType.CARD);
 
             if (mainScore != 0)
             {
-                List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.CARD);
+                List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.DataList
+                    .Where(a => a.ItemType == ConstItemType.CARD).ToList();
+
                 totalCount = 0;
                 for (int i = 0; i < itemCfgs.Count; i++)
                 {

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

@@ -55,19 +55,21 @@ namespace GFGGame
             var index = cfgs.Count - 1;
             return cfgs[index].Count;
         }
-     
+
         public bool GetHadGetRewardNum(int taskFuncType)
         {
-            foreach(var t in _livenessBoxInfos)
+            foreach (var t in _livenessBoxInfos)
             {
-                if(t.Value == ConstBonusStatus.CAN_GET)
+                if (t.Value == ConstBonusStatus.CAN_GET)
                 {
-                    var cfg = CommonDataManager.Tables.TblTaskActiveRewardCfg.GetGroup1ByFuncType(t.Key)[0];
+                    var cfg = CommonDataManager.Tables.TblTaskActiveRewardCfg.DataList.Where(a => a.FuncType == t.Key)
+                        .ToList()[0];
                     if (cfg == null) continue;
                     if (taskFuncType != 0 && cfg.FuncType != taskFuncType) continue;
                     return true;
                 }
             }
+
             return false;
         }
     }

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg;
 using cfg.GfgCfg;
 using ET;
@@ -262,9 +263,13 @@ namespace GFGGame
         public void InitSuitSyntheticMaterias()
         {
             List<SuitCfg> suitCfgs = new List<SuitCfg>();
-            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.GetGroup1BySyntheticType(1)));
-            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.GetGroup1BySyntheticType(2)));
-            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.GetGroup1BySyntheticType(3)));
+            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.DataList
+                .Where(a => a.SyntheticType == 1).ToList()));
+            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.DataList
+                .Where(a => a.SyntheticType == 2).ToList()));
+            suitCfgs.AddRange(new List<SuitCfg>(CommonDataManager.Tables.TblSuitCfg.DataList
+                .Where(a => a.SyntheticType == 3).ToList()));
+
 
             for (int i = 0; i < suitCfgs.Count; i++)
             {

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

@@ -815,16 +815,17 @@ namespace GFGGame
                 for (int i = 0; i < dressUpGuideSubType.Length; i++)
                 {
                     itemCfgs.AddRange(
-                        CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.DRESS_UP,
-                            dressUpGuideSubType[i]));
+                        CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                            a.ItemType == ConstItemType.DRESS_UP && a.SubType == dressUpGuideSubType[i]).ToList());
                 }
 
                 // 饰品
                 for (int i = 0; i < dressUpGuideAccessoriesType.Length; i++)
                 {
                     itemCfgs.AddRange(
-                        CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.DRESS_UP,
-                            dressUpGuideAccessoriesType[i]));
+                        CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                                a.ItemType == ConstItemType.DRESS_UP && a.SubType == dressUpGuideAccessoriesType[i])
+                            .ToList());
                 }
 
                 // 特殊
@@ -834,8 +835,9 @@ namespace GFGGame
                     if (itemTypeCfg[i].Type > ConstDressUpItemType.TE_SHU)
                     {
                         itemCfgs.AddRange(
-                            CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.DRESS_UP,
-                                itemTypeCfg[i].Type));
+                            CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                                    a.ItemType == ConstItemType.DRESS_UP && a.SubType == itemTypeCfg[i].Type)
+                                .ToList());
                     }
                 }
             }
@@ -850,15 +852,17 @@ namespace GFGGame
                         if (itemTypeCfg[i].Type > ConstDressUpItemType.TE_SHU)
                         {
                             itemCfgs.AddRange(
-                                CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(
-                                    ConstItemType.DRESS_UP, itemTypeCfg[i].Type));
+                                CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                                        a.ItemType == ConstItemType.DRESS_UP && a.SubType == itemTypeCfg[i].Type)
+                                    .ToList());
                         }
                     }
                 }
                 else
                 {
-                    itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.DRESS_UP,
-                        subType);
+                    itemCfgs = CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                            a.ItemType == ConstItemType.DRESS_UP && a.SubType == subType)
+                        .ToList();
                 }
             }
 
@@ -928,20 +932,21 @@ namespace GFGGame
                         if (itemTypeCfg[i].Type > ConstDressUpItemType.TE_SHU)
                         {
                             itemCfgs.AddRange(
-                                CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(
-                                    ConstItemType.DRESS_UP, itemTypeCfg[i].Type));
+                                CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                                        a.ItemType == ConstItemType.DRESS_UP && a.SubType == itemTypeCfg[i].Type)
+                                    .ToList());
                         }
                     }
                 }
                 else
                 {
                     itemCfgs.AddRange(
-                        CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.DRESS_UP,
-                            subType));
+                        CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                                a.ItemType == ConstItemType.DRESS_UP && a.SubType == subType)
+                            .ToList());
                 }
             }
 
-
             itemCfgs.Sort((a, b) =>
             {
                 bool haveA = CheckHasItem(a.Id);
@@ -1035,7 +1040,10 @@ namespace GFGGame
 
         public static void GetTotalProgress(out int haveCount, out int totalCount)
         {
-            totalCount = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.DRESS_UP).Count(a => a.SuitId == 0);
+            totalCount =
+                CommonDataManager.Tables.TblItemCfg.DataList.Count(a =>
+                    a.ItemType == ConstItemType.DRESS_UP && a.SuitId == 0);
+            
             haveCount = 0;
 
             // 除饰品外的散件

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

@@ -96,7 +96,9 @@ namespace GFGGame
             if (_suitIDList.Contains(value))
             {
                 _suitIDList.Remove(value);
-                TravelSuitCfg travelSuitCfg = CommonDataManager.Tables.TblTravelSuitCfg.GetGroup1BySuitId(value)[0];
+                TravelSuitCfg travelSuitCfg =
+                    CommonDataManager.Tables.TblTravelSuitCfg.DataList.Where(a => a.SuitId == value).ToList()[0];
+
                 if (travelSuitCfg != null
                     && _travelSuitIDList != null
                     && _travelSuitIDList.Contains(travelSuitCfg.Id))
@@ -115,9 +117,9 @@ namespace GFGGame
 
         public static void GetTotalProgress(out int count, out int totalCount)
         {
-            totalCount = CommonDataManager.Tables.TblItemCfg
-                .GetGroup1ByItemType(ConstItemType.DRESS_UP)
-                .Count(a => a.SuitId != 0);
+            totalCount =
+                CommonDataManager.Tables.TblItemCfg.DataList.Count(a =>
+                    a.ItemType == ConstItemType.DRESS_UP && a.SuitId != 0);
 
             count = 0;
             foreach (KeyValuePair<int, int> item in _progressBySuitIdDic)
@@ -339,10 +341,15 @@ namespace GFGGame
                 return;
             }
 
-            TravelSuitCfg travelSuitCfg = CommonDataManager.Tables.TblTravelSuitCfg.GetGroup1BySuitId(value)[0];
-            if (travelSuitCfg != null)
+            List<TravelSuitCfg> travelSuitCfgList =
+                CommonDataManager.Tables.TblTravelSuitCfg.DataList.Where(a => a.SuitId == value).ToList();
+            if (travelSuitCfgList.Count > 0)
             {
-                _travelSuitIDList.Add(travelSuitCfg.Id);
+                TravelSuitCfg travelSuitCfg = travelSuitCfgList[0];
+                if (travelSuitCfg != null)
+                {
+                    _travelSuitIDList.Add(travelSuitCfg.Id);
+                }
             }
         }
     }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using UnityEngine;
@@ -8,7 +9,6 @@ namespace GFGGame
 {
     public class FightDataManager : SingletonBase<FightDataManager>
     {
-
         //public byte[] FightRoleRes { get; set; }
         //public Texture2D RoleTextuex { get; set; }
 
@@ -45,91 +45,81 @@ namespace GFGGame
             {
                 score += ItemDataManager.GetArenaScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
             }
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena ||
+                InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
-                int tagCount = ArenaDataManager.Instance.GetTagsCount(roleData.itemList, roleData.tags); ;
-                tagCount = Math.Min( CommonDataManager.Tables.TblArenaTagCfg.DataList.Count , tagCount);
+                int tagCount = ArenaDataManager.Instance.GetTagsCount(roleData.itemList, roleData.tags);
+                ;
+                tagCount = Math.Min(CommonDataManager.Tables.TblArenaTagCfg.DataList.Count, tagCount);
                 float addition = 0;
                 if (tagCount > 0)
                 {
                     int additionCfg = CommonDataManager.Tables.TblArenaTagCfg.GetOrDefault(tagCount).Addition;
                     addition = additionCfg / 10000f;
                 }
+
                 score = score * (1 + addition);
             }
+
             return (int)Math.Ceiling(score);
         }
 
         //最终得分
         private int _totalScore;
+
         public int totalScore
         {
-            get
-            {
-                return _totalScore;
-            }
-            set
-            {
-                _totalScore = value;
-            }
+            get { return _totalScore; }
+            set { _totalScore = value; }
         }
 
         //战斗对象最终得分
         private int _targetTotalScore;
+
         public int npcTotalScore
         {
-            get
-            {
-                return _targetTotalScore;
-            }
-            set
-            {
-                _targetTotalScore = value;
-            }
+            get { return _targetTotalScore; }
+            set { _targetTotalScore = value; }
         }
+
         private bool _autoPlay = false;
+
         public bool autoPlay
         {
-            get
-            {
-                return _autoPlay;
-            }
+            get { return _autoPlay; }
             set
             {
                 _autoPlay = value;
                 if (!_autoPlay) fightSpeed = 1;
-                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
+                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0)
+                    .Coroutine();
             }
         }
+
         public int maxFightSpeed = 3;
         private int _fightSpeed = 1;
+
         public int fightSpeed
         {
-            get
-            {
-                return _fightSpeed;
-            }
+            get { return _fightSpeed; }
             set
             {
-
                 _fightSpeed = value;
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_FIGHT_AUTO_PLAY_SPEED, _fightSpeed).Coroutine();
-
             }
         }
+
         private int _storyDialogSpeed = 1;
+
         public int dialogSpeed
         {
-            get
-            {
-                return _storyDialogSpeed;
-            }
+            get { return _storyDialogSpeed; }
             set
             {
-
                 _storyDialogSpeed = value;
-                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_DIALOG_AUTO_PLAY_SPEED, _storyDialogSpeed).Coroutine();
-
+                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_DIALOG_AUTO_PLAY_SPEED, _storyDialogSpeed)
+                    .Coroutine();
             }
         }
 
@@ -179,6 +169,7 @@ namespace GFGGame
             {
                 score += ItemDataManager.GetItemTagScore(itemList[i], tags);
             }
+
             return score;
         }
 
@@ -202,6 +193,7 @@ namespace GFGGame
             {
                 itemSum += ItemDataManager.GetArenaScore(itemList[i], scoreType);
             }
+
             return itemSum;
         }
 
@@ -218,6 +210,7 @@ namespace GFGGame
             {
                 return ClickType.PERFECT_CLICK;
             }
+
             if (scale <= 0.55f && scale > 0.45f)
             {
                 clickType = ClickType.PERFECT_CLICK;
@@ -230,6 +223,7 @@ namespace GFGGame
             {
                 clickType = ClickType.GOOD_CLICK;
             }
+
             return clickType;
         }
 
@@ -253,8 +247,10 @@ namespace GFGGame
                 //end=================================
                 double addA = a.scores[scoreType];
                 double addB = b.scores[scoreType];
-                double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType], skillLvsA) + addA;
-                double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType], skillLvsB) + addB;
+                double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType],
+                    skillLvsA) + addA;
+                double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType],
+                    skillLvsB) + addB;
                 if (scoreA < scoreB)
                 {
                     return 1;
@@ -278,23 +274,29 @@ namespace GFGGame
         /// <param name="cardScore"></param>
         /// <param name="skillLvs"></param>
         /// <returns></returns>
-        public long GetSkillFightScore(double itemScoreSum, int baseScore, long leagueSkillScore, int cardId, int cardScore, List<int> skillLvs)
+        public long GetSkillFightScore(double itemScoreSum, int baseScore, long leagueSkillScore, int cardId,
+            int cardScore, List<int> skillLvs)
         {
             float skillScore = 0;
             if (skillLvs.Count == 0) return (long)skillScore;
             float skillBaseScore = (long)itemScoreSum + cardScore + baseScore + leagueSkillScore;
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             //容错处理，防止两个长度不一致
             var count = Mathf.Min(skillLvs.Count, skillCfgs.Count);
             for (int j = 0; j < count; j++)
             {
-                PassivitySkillLvlCfg skillLvlCfg = CommonDataManager.Tables.TblPassivitySkillLvlCfg.Get(skillLvs[j], skillCfgs[j].SkillId);
+                PassivitySkillLvlCfg skillLvlCfg =
+                    CommonDataManager.Tables.TblPassivitySkillLvlCfg.Get(skillLvs[j], skillCfgs[j].SkillId);
                 if (skillLvlCfg == null) continue;
                 skillScore += skillBaseScore * ((float)skillLvlCfg.FightPowerParam / 10000f);
             }
+
             // ET.Log.Debug("cardId:" + cardId);
             // ET.Log.Debug("skillScore:" + skillScore);
-            return (long)Math.Ceiling(skillScore); ;
+            return (long)Math.Ceiling(skillScore);
+            ;
         }
 
         /// <summary>
@@ -306,7 +308,8 @@ namespace GFGGame
         /// <param name="targetRobotData"></param>
         /// <param name="_score"></param>
         /// <param name="_targetScore"></param>
-        public void GetQuickFightResult(int roundIndex, FightData myRoleData, FightData targetRoleData, out long _score, out long _targetScore)
+        public void GetQuickFightResult(int roundIndex, FightData myRoleData, FightData targetRoleData, out long _score,
+            out long _targetScore)
         {
             double score = 0;
             double targetScore = 0;
@@ -333,77 +336,109 @@ namespace GFGGame
             {
                 targetMainScore = ScoreSystemData.Instance.GetRobotMainScore(targetRoleData);
             }
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena ||
+                InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 ArenaDataManager.Instance.roundTime = roundTime;
                 ArenaDataManager.Instance.targetRoundTime = targetRoundTime;
-                if (!ArenaDataManager.Instance.vaildSkills.ContainsKey(roundIndex)) ArenaDataManager.Instance.vaildSkills[roundIndex] = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
-                if (!ArenaDataManager.Instance.targetVaildSkills.ContainsKey(roundIndex)) ArenaDataManager.Instance.targetVaildSkills[roundIndex] = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
+                if (!ArenaDataManager.Instance.vaildSkills.ContainsKey(roundIndex))
+                    ArenaDataManager.Instance.vaildSkills[roundIndex] =
+                        new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
+                if (!ArenaDataManager.Instance.targetVaildSkills.ContainsKey(roundIndex))
+                    ArenaDataManager.Instance.targetVaildSkills[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, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-            GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+            GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime,
+                ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
+            GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId,
+                targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
             for (int i = 0; i < CommonDataManager.Tables.TblFightScoreCfg.DataList.Count; i++)
             {
                 roundId++;
                 currentTime = SkillBeginTime.ERVERY_ROUND_BEGIN;
-                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs,
+                    roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime,
+                    ref targetScore);
+                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId,
+                    targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime,
+                    ref score);
                 score += ScoreSystemData.Instance.GetRoundScore(myRoleData, roundId, ClickType.PERFECT_CLICK, 0);
                 if (targetRoleData.type == FightTargetType.PLAYER)
                 {
-                    targetScore += ScoreSystemData.Instance.GetRoundScore(targetRoleData, roundId, ClickType.PERFECT_CLICK, 0);
+                    targetScore +=
+                        ScoreSystemData.Instance.GetRoundScore(targetRoleData, roundId, ClickType.PERFECT_CLICK, 0);
                 }
                 else
                 {
-                    targetScore += ScoreSystemData.Instance.GetRobotRoundScore(targetRoleData, roundId, ClickType.PERFECT_CLICK, 0);
+                    targetScore +=
+                        ScoreSystemData.Instance.GetRobotRoundScore(targetRoleData, roundId, ClickType.PERFECT_CLICK,
+                            0);
                 }
+
                 currentTime = SkillBeginTime.PERFECT_CLICK;
-                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs,
+                    roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime,
+                    ref targetScore);
+                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId,
+                    targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime,
+                    ref score);
                 currentTime = SkillBeginTime.ERVERY_ROUND_END;
-                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs,
+                    roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime,
+                    ref targetScore);
+                GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId,
+                    targetSkillLvs, targetRoundTime, ref targetScore, 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, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-            GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+            GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, roundId, mainScore, cardId, skillLvs, roundTime,
+                ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
+            GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, roundId, targetMainScore, targetCardId,
+                targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
             score += ScoreSystemData.Instance.GetAllCircleAddScore(myRoleData);
             targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(targetRoleData);
             Debug.Log(" targetScore666:" + targetScore);
             _score = Mathf.CeilToInt((float)score);
             _targetScore = Mathf.CeilToInt((float)targetScore);
-
         }
 
-        private void GetSkillScore(int roleType, int roundIndex, int currentTime, int partId, double mainScore, int cardId, List<int> skillLvs, List<int> roundTime, ref double score, double targetMainScore, int targetCardId, List<int> targetSkillLvs, List<int> targetRoundTime, ref double targetScore)
+        private void GetSkillScore(int roleType, int roundIndex, int currentTime, int partId, double mainScore,
+            int cardId, List<int> skillLvs, List<int> roundTime, ref double score, double targetMainScore,
+            int targetCardId, List<int> targetSkillLvs, List<int> targetRoundTime, ref double targetScore)
         {
-            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(currentTime, partId, cardId, skillLvs, targetCardId, targetSkillLvs, roundTime, targetRoundTime);
-            ScoreSystemData.Instance.GetRoundItemSkillScore(vaildSkills, mainScore, targetMainScore, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic);
+            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(currentTime, partId,
+                cardId, skillLvs, targetCardId, targetSkillLvs, roundTime, targetRoundTime);
+            ScoreSystemData.Instance.GetRoundItemSkillScore(vaildSkills, mainScore, targetMainScore, out int skillScore,
+                out int targetSkillScore, out Dictionary<int, int> skillScoreDic);
 
             score += skillScore;
             targetScore += targetSkillScore;
 
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena ||
+                InstanceZonesDataManager.FightScene == ConstInstanceZonesType.FieldWork)
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
                 if (roleType == FightRoleType.MINE)
                 {
-                    if (!dataManager.vaildSkills[roundIndex].ContainsKey(partId)) dataManager.vaildSkills[roundIndex][partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
+                    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>>();
+                    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/InstanceZonesDataManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using UnityEngine;
@@ -11,20 +12,28 @@ namespace GFGGame
     {
         //所有副本关卡通用换装战斗是否使用推荐
         public static bool usedRecommend;
+
         //所有副本关卡通用
         public static int currentScoreType;
+
         //所有副本关卡通用
         public static int currentCardId = 0;
+
         //快速挑战挑战次数
         public static int FightTimes = 10;
+
         //是否速刷中
         public static bool isQuicklyFighting = false;
+
         //是否结算中
         public static bool isResultFighting = false;
+
         //战斗场景
         public static int FightScene;
+
         //战斗结算数据
         public static StoryFightResultData resultData;
+
         //是否战斗结算界面关闭
         public static bool isFightResultHide = false;
 
@@ -36,10 +45,7 @@ namespace GFGGame
         //所有副本关卡通用配置表的id
         public static int currentLevelCfgId
         {
-            get
-            {
-                return _currentLevelCfgId;
-            }
+            get { return _currentLevelCfgId; }
             set
             {
                 _currentLevelCfgId = value;
@@ -48,13 +54,15 @@ namespace GFGGame
                 {
                     MainStoryDataManager.currentLevelCfgId = _currentLevelCfgId;
                 }
+
                 if (string.IsNullOrEmpty(levelCfg.FightID))
                 {
                     currentFightTags = null;
                 }
                 else
                 {
-                    StoryFightCfg storyFightCfg = CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
+                    StoryFightCfg storyFightCfg =
+                        CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
                     currentFightTags = storyFightCfg.NeedTags;
                 }
             }
@@ -69,21 +77,19 @@ namespace GFGGame
                 return levelCfg.Order;
             }
         }
+
         private static FightData _roleData = new FightData();
+
         public static FightData roleData
         {
-            get
-            {
-                return GetMyFightRoleData();
-            }
+            get { return GetMyFightRoleData(); }
         }
+
         private static FightData _targetData = new FightData();
+
         public static FightData targetData
         {
-            get
-            {
-                return GetFightTargetData();
-            }
+            get { return GetFightTargetData(); }
         }
 
         //获取玩家战斗数据
@@ -92,24 +98,29 @@ namespace GFGGame
             _roleData.name = RoleDataManager.roleName;
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = CommonDataManager.Tables.TblRoleLevelCfg.GetOrDefault(RoleDataManager.lvl).BaseScore;
-            if(_roleData.scoreType != 0)
+            if (_roleData.scoreType != 0)
                 _roleData.leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(_roleData.scoreType);
-            _roleData.cardId = InstanceZonesDataManager.currentCardId; ;//词牌id
+            _roleData.cardId = InstanceZonesDataManager.currentCardId;
+            ; //词牌id
 
             CardData cardData = CardDataManager.GetCardDataById(_roleData.cardId);
-            _roleData.cardScore = _roleData.cardId <= 0 || cardData == null ? 0 : cardData.scores[_roleData.scoreType];//词牌对应主题的属性分数
+            _roleData.cardScore =
+                _roleData.cardId <= 0 || cardData == null ? 0 : cardData.scores[_roleData.scoreType]; //词牌对应主题的属性分数
 
-            StoryLevelCfg levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(InstanceZonesDataManager.currentLevelCfgId);
+            StoryLevelCfg levelCfg =
+                CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(InstanceZonesDataManager.currentLevelCfgId);
             if (levelCfg != null && !string.IsNullOrEmpty(levelCfg.FightID))
             {
-                StoryFightCfg fightCfg = CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
-                _roleData.tags = fightCfg.NeedTags;////本次战斗要求的标签
+                StoryFightCfg fightCfg =
+                    CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
+                _roleData.tags = fightCfg.NeedTags; ////本次战斗要求的标签
             }
 
             if (_roleData.cardId > 0)
             {
                 _roleData.skillLvs = SkillDataManager.Instance.GetCardSkillLvs(_roleData.cardId);
             }
+
             _roleData.type = FightTargetType.PLAYER;
 
             _roleData.headId = RoleDataManager.headId;
@@ -123,9 +134,10 @@ namespace GFGGame
         //获取副本机器人战斗数据
         public static FightData GetFightTargetData()
         {
-
-            StoryLevelCfg levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(InstanceZonesDataManager.currentLevelCfgId);
-            StoryFightCfg fightCfg = CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
+            StoryLevelCfg levelCfg =
+                CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg =
+                CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
             _targetData.name = fightCfg.TargetName;
             _targetData.scoreType = InstanceZonesDataManager.currentScoreType; //本次战斗的主题
             _targetData.baseScore = fightCfg.TargetBaseScore;
@@ -134,17 +146,21 @@ namespace GFGGame
             _targetData.cardScore = fightCfg.TargetCardScore;
             _targetData.tags = fightCfg.NeedTags;
 
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(_targetData.cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == _targetData.cardId).ToList();
+
             _targetData.skillLvs.Clear();
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 _targetData.skillLvs.Add(fightCfg.TargetSkillLvs);
             }
+
             _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.TargetPartsScore.Count; i++)
             {
                 _targetData.itemScoreList.Add(fightCfg.TargetPartsScore[i]);
             }
+
             _targetData.type = FightTargetType.ROBOT;
             _targetData.res = fightCfg.TargetRes;
             return _targetData;
@@ -155,8 +171,10 @@ namespace GFGGame
 
         //关卡最高分数记录
         private static Dictionary<int, int> _highestScoreDic = new Dictionary<int, int>();
+
         //关卡星数记录
         private static Dictionary<int, int> _starDic = new Dictionary<int, int>();
+
         public static void InitScoreList(List<int> ks, List<int> vs)
         {
             usedRecommend = false;
@@ -192,6 +210,7 @@ namespace GFGGame
             {
                 return _highestScoreDic[levelID];
             }
+
             return 0;
         }
 
@@ -223,6 +242,7 @@ namespace GFGGame
                     star += item.Value;
                 }
             }
+
             return star;
         }
 
@@ -245,7 +265,8 @@ namespace GFGGame
             if (!CheckLevelPass(levelCfgId))
             {
                 var levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(levelCfgId);
-                var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(levelCfg.Type, levelCfg.SubType, levelCfg.ChapterId);
+                var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(levelCfg.Type, levelCfg.SubType,
+                    levelCfg.ChapterId);
                 _passLevelDic[key] = levelCfgId;
             }
         }
@@ -264,8 +285,10 @@ namespace GFGGame
             {
                 return value;
             }
+
             return 0;
         }
+
         /// <summary>
         /// 获取通关关卡的编号
         /// </summary>
@@ -280,11 +303,13 @@ namespace GFGGame
             {
                 return 0;
             }
+
             var levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(levelCfgId);
             if (levelCfg != null)
             {
                 return levelCfg.Order;
             }
+
             return 0;
         }
 
@@ -301,6 +326,7 @@ namespace GFGGame
                 var passLevelOrder = GetPassLevelOrder(levelCfg.Type, levelCfg.SubType, levelCfg.ChapterId);
                 return levelCfg.Order <= passLevelOrder;
             }
+
             return false;
         }
 
@@ -323,6 +349,7 @@ namespace GFGGame
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -338,20 +365,20 @@ namespace GFGGame
             if (!equipedNeeded)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未穿必需物品");
-                return false;//没穿必需品
+                return false; //没穿必需品
             }
 
 
-
             StoryLevelCfg levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(currentLevelCfgId);
-            StoryFightCfg fightCfg = CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
+            StoryFightCfg fightCfg =
+                CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
             bool hasFightTarget = fightCfg.TargetName != null && fightCfg.TargetName.Length > 0;
             if (hasFightTarget)
             {
                 npcScore = FightDataManager.Instance.npcTotalScore;
                 if (score > npcScore)
                 {
-                    return true;//分数低于对战对象
+                    return true; //分数低于对战对象
                 }
             }
             else
@@ -359,7 +386,7 @@ namespace GFGGame
                 int starCount = GetResultStarCount(score);
                 if (starCount > 0)
                 {
-                    return true;//低于一星
+                    return true; //低于一星
                 }
             }
 
@@ -368,23 +395,25 @@ namespace GFGGame
 
         public static void GetCanFightTime(int type, int subType, int levelCfgId, out int times, out string title)
         {
-
             var levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(levelCfgId);
             //不需要消耗体力
             if (levelCfg.Power == 0)
             {
                 times = GameConst.MAX_COUNT_FIGHT_QUICKLY;
                 //神都宸游
-                if (levelCfg.Type == ConstInstanceZonesType.PureFight) {
-                    var activityFightCfg = CommonDataManager.Tables.TblActivityFightCfg.GetOrDefault(levelCfg.ChapterId);
+                if (levelCfg.Type == ConstInstanceZonesType.PureFight)
+                {
+                    var activityFightCfg =
+                        CommonDataManager.Tables.TblActivityFightCfg.GetOrDefault(levelCfg.ChapterId);
                     RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.Limit);
                     times = limitData.TotalPlayMax - limitData.PlayTimes;
                 }
             }
             else
             {
-                times = (int)Math.Floor((float)RoleDataManager.power / levelCfg.Power);//体力次数
+                times = (int)Math.Floor((float)RoleDataManager.power / levelCfg.Power); //体力次数
             }
+
             times = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times);
             title = "";
             if (type == ConstInstanceZonesType.Studio)
@@ -393,7 +422,7 @@ namespace GFGGame
                 var limitData = RoleLimitDataManager.GetLimitData(studioCfg.Limit);
                 times = Math.Min(times, limitData.TotalPlayMax - limitData.PlayTimes);
             }
-            else if(type == ConstInstanceZonesType.PureFight && subType == 1)
+            else if (type == ConstInstanceZonesType.PureFight && subType == 1)
             {
                 var zcjbFightCfg = CommonDataManager.Tables.TblActivityFightCfg.GetOrDefault(levelCfg.ChapterId);
                 var limitData = RoleLimitDataManager.GetLimitData(zcjbFightCfg.Limit);
@@ -406,23 +435,29 @@ namespace GFGGame
                 int time = limitData.TotalPlayMax - limitData.PlayTimes;
                 times = Math.Min(times, time);
             }
-            else if(type == 1 && subType == 1)
+            else if (type == 1 && subType == 1)
             {
                 //精英关卡特殊处理
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(50);
                 int time = limitData.TotalPlayMax - limitData.PlayTimes;
                 times = Math.Min(times, time);
             }
+
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }
+
         public static void GetTotalProgress(out int count, out int totalCount)
         {
-            List<StoryChapterCfg> storyChapters = CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(ConstInstanceZonesSubType.Normal);
+            List<StoryChapterCfg> storyChapters =
+                CommonDataManager.Tables.TblStoryChapterCfg.DataList
+                    .Where(a => a.SubType == ConstInstanceZonesSubType.Normal).ToList();
+
             totalCount = storyChapters.Count;
             count = 0;
             for (int i = 0; i < storyChapters.Count; i++)
             {
-                bool isPass = InstanceZonesDataManager.CheckChapterPass(storyChapters[i].Type, storyChapters[i].SubType, storyChapters[i].Id, storyChapters[i].LevelCount);
+                bool isPass = InstanceZonesDataManager.CheckChapterPass(storyChapters[i].Type, storyChapters[i].SubType,
+                    storyChapters[i].Id, storyChapters[i].LevelCount);
                 if (isPass)
                 {
                     count++;
@@ -434,4 +469,4 @@ namespace GFGGame
             }
         }
     }
-}
+}

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

@@ -37,6 +37,7 @@ namespace GFGGame
                 itemData.rarity = itemInfoProto.Rarity;
                 _dataDic.Add(itemID, itemData);
             }
+
             itemData.num = itemInfoProto.Count;
             if (itemInfoProto.Type == ConstItemType.DRESS_UP && itemID % GameConst.MAX_COUNT_EVERY_TYPE_ITEM > 0)
             {
@@ -46,15 +47,17 @@ namespace GFGGame
                 if (GameGlobal.PreDataInited)
                 {
                     ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemID);
-                    FunctionOpenCfg functionOpenCfg = CommonDataManager.Tables.TblFunctionOpenCfg.GetOrDefault(typeof(ClothingListView).Name);
+                    FunctionOpenCfg functionOpenCfg =
+                        CommonDataManager.Tables.TblFunctionOpenCfg.GetOrDefault(typeof(ClothingListView).Name);
                     if (itemCfg.Rarity == ConstDressRarity.Rarity_TIANYI
-                    && StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN +
-                                                                   functionOpenCfg.Index) == 0)
+                        && StorageDataManager.Instance.GetStorageValue(ConstStorageId.FUNCTION_OPEN +
+                                                                       functionOpenCfg.Index) == 0)
                     {
                         FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                     }
                 }
             }
+
             if ((itemInfoProto.Type == ConstItemType.ITEM || itemInfoProto.Type == ConstItemType.USEABLE) &&
                 itemData.num > 0)
             {
@@ -70,8 +73,9 @@ namespace GFGGame
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 }
             }
+
             PhotographDataManager.Instance.Add(itemInfoProto);
-            if(GameGlobal.PreDataInited)
+            if (GameGlobal.PreDataInited)
             {
                 EventAgent.DispatchEvent(ConstMessage.ITEM_CHANGED, itemID);
             }
@@ -94,24 +98,28 @@ namespace GFGGame
                     {
                         DressUpMenuItemDataManager.Remove(itemID);
                     }
+
                     if (itemCfg.ItemType == ConstItemType.ITEM)
                     {
                         BagDataManager.Instance.Remove(itemID);
 
-                        if(itemCfg.SubType == ConstItemSubType.MATERIAL_SKILL_BOOK)
+                        if (itemCfg.SubType == ConstItemSubType.MATERIAL_SKILL_BOOK)
                             DecomposeDataManager.Instance.RemoveMaterial(itemID);
                     }
+
                     if (itemCfg.ItemType == ConstItemType.USEABLE)
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }
+
                     if (itemCfg.ItemType == ConstItemType.HEAD)
                     {
                         RoleInfoManager.Instance.Remove(itemID);
                     }
                 }
 
-                if (itemCfg.ItemType == ConstItemType.DRESS_UP)//&& !DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemID)
+                if (itemCfg.ItemType ==
+                    ConstItemType.DRESS_UP) //&& !DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemID)
                 {
                     DecomposeDataManager.Instance.Remove(itemID);
                 }
@@ -127,25 +135,29 @@ namespace GFGGame
             {
                 return GameGlobal.myNumericComponent.GetAsInt(numericType);
             }
+
             int leagueType = NumericUtil.GetLeagueNumericTypeByItemId(itemId);
             if (leagueType != 0)
             {
                 return LeagueDataManager.Instance.GetNumeriValue(leagueType);
             }
+
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {
                 return itemData.num;
             }
+
             return 0;
         }
 
         public static int GetItemType(int itemId)
         {
             _dataDic.TryGetValue(itemId, out var value);
-            if(value != null)
+            if (value != null)
             {
                 return value.itemType;
             }
+
             //Debug.Log($"ItemDataManager GetItemType itemId {itemId}");
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
             return itemCfg.ItemType;
@@ -158,6 +170,7 @@ namespace GFGGame
             {
                 return value.syntheticMateriarsArr;
             }
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
             return itemCfg.SyntheticMateriars.ToGfgGameItemParam();
         }
@@ -169,6 +182,7 @@ namespace GFGGame
             {
                 return value.subType;
             }
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
             return itemCfg.SubType;
         }
@@ -180,6 +194,7 @@ namespace GFGGame
             {
                 return value.rarity;
             }
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
             return itemCfg.Rarity;
         }
@@ -191,11 +206,13 @@ namespace GFGGame
             {
                 return value.param2Arr[0];
             }
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
             if (itemCfg.Param2.Count == 0)
             {
                 return 0;
             }
+
             return itemCfg.Param2[0];
         }
 
@@ -207,8 +224,8 @@ namespace GFGGame
                 //LogUtil.LogEditor($"ItemDataManager InitServerData {roleItem.ConfigId}");
                 Add(roleItem);
             }
-            DressUpMenuItemDataManager.StartPreLoadItemCfg();
 
+            DressUpMenuItemDataManager.StartPreLoadItemCfg();
         }
 
         public static void InitServerDataItemAttribute(List<ItemAttributeProto> infos)
@@ -218,7 +235,7 @@ namespace GFGGame
                 if (_dataDic.TryGetValue(info.ConfigId, out var itemData))
                 {
                     itemData.SetAttributes(info.Ks, info.Vs);
-                    relativeSuitPerPromote(info.ConfigId,0,0,info.Ks, info.Vs);
+                    relativeSuitPerPromote(info.ConfigId, 0, 0, info.Ks, info.Vs);
                 }
             }
         }
@@ -242,6 +259,7 @@ namespace GFGGame
             {
                 InitItemExchange(itemId, 0);
             }
+
             return _itemExchangeDic[itemId];
         }
 
@@ -279,6 +297,7 @@ namespace GFGGame
             {
                 return itemCfg.Score4;
             }
+
             return 0;
         }
 
@@ -297,14 +316,16 @@ namespace GFGGame
                 {
                     scroe += GetItemTagScore(itemId, tags);
                 }
+
                 scroe += itemData.GetScore(scoreType);
                 return scroe;
             }
+
             return 0;
         }
 
         /// 飞花令临时接口
-        public static int GetArenaScore(int itemId, int scoreType, List<string > tags = null)
+        public static int GetArenaScore(int itemId, int scoreType, List<string> tags = null)
         {
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {
@@ -313,6 +334,7 @@ namespace GFGGame
                 {
                     scroe += GetItemTagScore(itemId, tags);
                 }
+
                 scroe += itemData.GetScore(scoreType);
                 return scroe;
             }
@@ -328,10 +350,12 @@ namespace GFGGame
                     {
                         scroe += ItemDataManager.GetItemTagScore(itemId, tags);
                     }
+
                     scroe += itemDate.GetScore(scoreType);
                     return scroe;
                 }
             }
+
             return 0;
         }
 
@@ -341,7 +365,7 @@ namespace GFGGame
         /// <param name="itemId"></param>
         /// <param name="scoreType"></param>
         /// <returns></returns>
-        public static int GetItemAddTeaPartyTagsScore(int itemId)//, int scoreType, string[] tags = null)
+        public static int GetItemAddTeaPartyTagsScore(int itemId) //, int scoreType, string[] tags = null)
         {
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {
@@ -354,8 +378,10 @@ namespace GFGGame
                         scroe += Convert.ToInt32(info.Val);
                     }
                 }
+
                 return scroe;
             }
+
             return 0;
         }
 
@@ -374,6 +400,7 @@ namespace GFGGame
                 ET.Log.Error("物品：" + itemId + "不存在");
                 return score;
             }
+
             for (int i = 0; i < itemCfg.Tags.Count; i++)
             {
                 for (int j = 0; j < tags.Count; j++)
@@ -384,6 +411,7 @@ namespace GFGGame
                     }
                 }
             }
+
             return score;
         }
 
@@ -394,10 +422,11 @@ namespace GFGGame
         public static bool CheckItemTagsRight(int itemId, List<string> tags)
         {
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
-            if(itemCfg == null)
+            if (itemCfg == null)
             {
                 return false;
             }
+
             for (int i = 0; i < itemCfg.Tags.Count; i++)
             {
                 for (int j = 0; j < tags.Count; j++)
@@ -405,6 +434,7 @@ namespace GFGGame
                     if (itemCfg.Tags[i].Name == tags[j]) return true;
                 }
             }
+
             return false;
         }
 
@@ -416,7 +446,7 @@ namespace GFGGame
         {
             var isExistGiftBag = _dataDic.Values.Any(a =>
                 ((a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
-                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM)) 
+                 (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
                 && a.id != 6003001 && a.id != 6003002);
 
             return isExistGiftBag;
@@ -426,15 +456,19 @@ namespace GFGGame
         /// 相对应的染色套装也需要乘以(服装升级)相应提升百分比
         /// </summary>
         /// <returns></returns>
-        public static void relativeSuitPerPromote(int itemId, int keyInt = 0, int valueInt = 0, List<int> keyList = null, List<int> valueList = null)
+        public static void relativeSuitPerPromote(int itemId, int keyInt = 0, int valueInt = 0,
+            List<int> keyList = null, List<int> valueList = null)
         {
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
-            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(itemCfg.SuitId);
+            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList
+                .Where(a => a.SuitId == itemCfg.SuitId).ToList();
+
             SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(fosterCfgs[0].SuitId2);
             if (suitCfg == null)
             {
-             Log.Error($"");   
+                Log.Error($"");
             }
+
             for (int i = 0; i < suitCfg.Parts.Count; i++)
             {
                 ItemCfg itemPartCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(suitCfg.Parts[i]);
@@ -442,11 +476,12 @@ namespace GFGGame
                 {
                     if (_dataDic.TryGetValue(itemPartCfg.Id, out var itemPartData))
                     {
-                        if(keyInt > 0)
+                        if (keyInt > 0)
                             itemPartData.SetAttribute(keyInt, valueInt);
                         else if (keyList.Count > 0)
                             itemPartData.SetAttributes(keyList, valueList);
                     }
+
                     break;
                 }
             }
@@ -458,6 +493,7 @@ namespace GFGGame
             {
                 return true;
             }
+
             return false;
         }
     }

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

@@ -7,6 +7,7 @@ using UnityEngine.Video;
 using YooAsset;
 using GFGGame.Launcher;
 using System.Collections;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -162,7 +163,8 @@ namespace GFGGame
 
         private void AddToBonusDataDic(int dropId, Dictionary<int, LuckyBoxBonusData> dic)
         {
-            List<DropOutCfg> cfgs = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(dropId);
+            List<DropOutCfg> cfgs = CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == dropId).ToList();
+
             if (cfgs == null)
             {
                 return;

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

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using UnityEngine;
 using ET;
@@ -121,7 +122,9 @@ namespace GFGGame
         public static int CheckChapterPassIndex(int subtype)
         {
             int count = 2;
-            List<StoryChapterCfg> chapList = CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(subtype);
+            List<StoryChapterCfg> chapList = CommonDataManager.Tables.TblStoryChapterCfg.DataList
+                .Where(a => a.SubType == subtype).ToList();
+
             foreach (StoryChapterCfg item in chapList)
             {
                 var preChapterCfg = CommonDataManager.Tables.TblStoryChapterCfg.GetOrDefault(item.Id);

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

@@ -266,7 +266,8 @@ namespace GFGGame
         public bool GetStudioFilingRed(bool checkCurChapter = true)
         {
             List<StudioCfg> studioCfgs =
-                CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioFilingView).Name);
+                CommonDataManager.Tables.TblStudioCfg.DataList.Where(a => a.FunId == typeof(StudioFilingView).Name)
+                    .ToList();
 
             for (int i = 0; i < studioCfgs.Count; i++)
             {
@@ -407,7 +408,8 @@ namespace GFGGame
         public bool GetCardUpStarRed(int cardId)
         {
             CardData cardData = CardDataManager.GetCardDataById(cardId);
-            List<CardStarCfg> starCfgs = CommonDataManager.Tables.TblCardStarCfg.GetGroup1ByCardId(cardId);
+            List<CardStarCfg> starCfgs = CommonDataManager.Tables.TblCardStarCfg.DataList.Where(a => a.CardId == cardId)
+                .ToList();
 
             if (cardData.star >= starCfgs.Count) return false;
             CardStarCfg starCfg = CommonDataManager.Tables.TblCardStarCfg.Get(cardId, cardData.star);
@@ -425,7 +427,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetCardSkillsRed(int cardId)
         {
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
 
             for (int i = 0; i < skillCfgs.Count; i++)
             {
@@ -464,7 +467,9 @@ namespace GFGGame
         public bool GetCardStarReward(int cardId)
         {
             CardData cardData = CardDataManager.GetCardDataById(cardId);
-            List<CardStarCfg> cardStarCfgs = CommonDataManager.Tables.TblCardStarCfg.GetGroup1ByCardId(cardId);
+            List<CardStarCfg> cardStarCfgs = CommonDataManager.Tables.TblCardStarCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             for (int i = 0; i < cardStarCfgs.Count; i++)
             {
                 if (cardStarCfgs[i].Rewards.Count > 0 &&
@@ -498,7 +503,9 @@ namespace GFGGame
         public bool GetClothingFosterRed(int suitId)
         {
             int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
-            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId);
+            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList
+                .Where(a => a.SuitId == suitId).ToList();
+
             if (index >= fosterCfgs.Count)
             {
                 return false;
@@ -511,7 +518,9 @@ namespace GFGGame
             if (fosterCfg.Materials.Count == 0) return false;
 
             CardData cardData = new CardData();
-            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1BySuitId(suitId);
+            List<ItemCfg> itemCfgs =
+                CommonDataManager.Tables.TblItemCfg.DataList.Where(a => a.SuitId == suitId).ToList();
+
             for (int i = 0; i < itemCfgs.Count; i++)
             {
                 if (itemCfgs[i].ItemType == ConstItemType.CARD)
@@ -543,7 +552,9 @@ namespace GFGGame
         {
             SuitFosterData suitFosterData = SuitFosterDataManager.Instance.GetSuitFosterData(suitId);
             if (suitFosterData.makeNewState > 0) return false;
-            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId);
+            List<SuitFosterCfg> fosterCfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList
+                .Where(a => a.SuitId == suitId).ToList();
+
             SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(suitId);
             SuitRenewCfg renewCfg = CommonDataManager.Tables.TblSuitRenewCfg.GetOrDefault(suitCfg.Rarity);
             if (suitFosterData.maintainStep >= fosterCfgs.Count
@@ -572,7 +583,9 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetClothingSyntheticTabRed(int tab)
         {
-            List<SuitCfg> suitCfgs = CommonDataManager.Tables.TblSuitCfg.GetGroup1BySyntheticType(tab);
+            List<SuitCfg> suitCfgs = CommonDataManager.Tables.TblSuitCfg.DataList.Where(a => a.SyntheticType == tab)
+                .ToList();
+
             for (int i = 0; i < suitCfgs.Count; i++)
             {
                 if (GetClothingSyntheticBonusRed(suitCfgs[i].Id) || GetClothingSyntheticRewardRed(suitCfgs[i].Id))
@@ -778,9 +791,10 @@ namespace GFGGame
         //商店-礼包-活动礼包
         public bool GetGiftBagRewardRed()
         {
-            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(
-                ConstStoreTabId.STORE_GIFT_BAG,
-                ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList.Where(a =>
+                    a.Menu1 == ConstStoreTabId.STORE_GIFT_BAG && a.Menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
+                .ToList();
+
             shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs);
             for (int i = 0; i < shopCfgs.Count; i++)
             {
@@ -794,9 +808,9 @@ namespace GFGGame
         //商店-礼包-返利商城
         public bool GetGiftBagRebateRed()
         {
-            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(
-                ConstStoreTabId.STORE_GIFT_BAG,
-                ConstStoreSubId.STORE_GIFT_BAG_REBATE);
+            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList.Where(a =>
+                a.Menu1 == ConstStoreTabId.STORE_GIFT_BAG && a.Menu2 == ConstStoreSubId.STORE_GIFT_BAG_REBATE).ToList();
+
             foreach (var info in shopCfgs)
             {
                 var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(info.ItemId);
@@ -991,7 +1005,8 @@ namespace GFGGame
 
             if (_activityId <= 0) return false;
             List<ActivityLuckybonusCfg> _bonueCfgs =
-                CommonDataManager.Tables.TblIActivityLuckybonusCfg.GetGroup1ById(_activityId);
+                CommonDataManager.Tables.TblIActivityLuckybonusCfg.DataList.Where(a => a.Id == _activityId).ToList();
+
             for (int i = 0; i < _bonueCfgs.Count; i++)
             {
                 int key = _bonueCfgs[i].Num;
@@ -1190,7 +1205,9 @@ namespace GFGGame
             ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityId);
             if (_activityInfo == null) return false;
             List<ActivityRechargeCfg> _rechargeCfgs =
-                CommonDataManager.Tables.TblActivityRechargeCfg.GetGroup1ByActivityId(activityId);
+                CommonDataManager.Tables.TblActivityRechargeCfg.DataList.Where(a => a.ActivityId == activityId)
+                    .ToList();
+
             for (int i = 0; i < _rechargeCfgs.Count; i++)
             {
                 if (_activityInfo.CountValue >= _rechargeCfgs[i].Value &&
@@ -1220,7 +1237,9 @@ namespace GFGGame
         {
             int _signCount = MathUtil.CountOnes2(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay));
             List<DailySignCfg> signCfgs =
-                CommonDataManager.Tables.TblDailySignCfg.GetGroup1ByMonth(TimeUtil.GetCurMonth());
+                CommonDataManager.Tables.TblDailySignCfg.DataList.Where(a => a.Month == TimeUtil.GetCurMonth())
+                    .ToList();
+
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignReward),
@@ -1284,9 +1303,11 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetGoldRed()
         {
-            var shopCfgList = CommonDataManager.Tables.TblShopCfg
-                .GetGroup1ByMenu1AndMenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_GOLD)
+            var shopCfgList = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.ENDURING_GIFT_BOX &&
+                            a.Menu2 == ConstStoreSubId.ENDURING_GIFT_BOX_GOLD)
                 .OrderBy(a => a.RefreshType).ToList();
+
             foreach (var shopCfg in shopCfgList)
             {
                 var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(shopCfg.ItemId);
@@ -1305,9 +1326,11 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetPowerRed()
         {
-            var shopCfgList = CommonDataManager.Tables.TblShopCfg
-                .GetGroup1ByMenu1AndMenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_POWER)
+            var shopCfgList = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.ENDURING_GIFT_BOX &&
+                            a.Menu2 == ConstStoreSubId.ENDURING_GIFT_BOX_POWER)
                 .OrderBy(a => a.RefreshType).ToList();
+
             foreach (var shopCfg in shopCfgList)
             {
                 var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(shopCfg.ItemId);
@@ -1369,7 +1392,7 @@ namespace GFGGame
 
             var list = CommonDataManager.Tables.TblStoryLevelCfg.DataList.Where(a =>
                 a.Type == chapterCfg.Type && a.SubType == chapterCfg.SubType &&
-                a.ChapterId ==  chapterCfg.Id).ToList();
+                a.ChapterId == chapterCfg.Id).ToList();
 
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(limit);
             int times = limitData.TotalPlayMax - limitData.PlayTimes;

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

@@ -340,7 +340,8 @@ namespace GFGGame
             List<PassivitySkillLvlCfg> skillCfgs = new List<PassivitySkillLvlCfg>();
 
             List<PassivitySkillCfg> targetSkillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(targetCardId);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == targetCardId).ToList();
+
             //找到敌方对我的减益技能
             List<int> nullifySkillIndex = new List<int>();
             if (targetSkillCfgs != null)
@@ -363,7 +364,7 @@ namespace GFGGame
             }
 
             List<PassivitySkillCfg> mySkillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == cardId).ToList();
 
             for (int i = 0; i < mySkillCfgs.Count; i++)
             {
@@ -451,7 +452,9 @@ namespace GFGGame
         {
             if (cardId <= 0) return false; //未选卡
             if (validSkills.Count == 0) return false; //本轮没有技能被触发不显示词牌
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 if (skillCfgs[i].MainSkill == 1)
@@ -484,7 +487,9 @@ namespace GFGGame
         /// <returns></returns>
         public PassivitySkillCfg GetShowSkillCfg(int cardId)
         {
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             if (skillCfgs.Count <= 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");
@@ -512,8 +517,9 @@ namespace GFGGame
         public PassivitySkillCfg GetMainSkillCfg(int cardId)
         {
             // Dictionary<int, List<PassivitySkillCfg>> cfgs = SkillDataManager.Instance.dicPassivitySkill[cardId];
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
-
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+            
             if (skillCfgs.Count <= 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");

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

@@ -396,7 +396,9 @@ namespace GFGGame
         /// /// </summary>
         public bool GetShopActivityIsShow(int shopType, int menuType)
         {
-            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(shopType, menuType);
+            List<ShopCfg> shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == shopType && a.Menu2 == menuType).ToList();
+
             if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
                 return false;
             else
@@ -406,7 +408,9 @@ namespace GFGGame
         public bool GetShopIdCanBuyInShop(int menuType, List<int> shopListId)
         {
             List<ShopCfg> shopCfgs =
-                CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_GIFT_BAG, menuType);
+                CommonDataManager.Tables.TblShopCfg.DataList
+                    .Where(a => a.Menu1 == ConstStoreTabId.STORE_GIFT_BAG && a.Menu2 == menuType).ToList();
+
             if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
                 return false;
 

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using UnityEngine;
@@ -61,7 +62,8 @@ namespace GFGGame
         public List<int> GetCardSkillLvs(int cardId)
         {
             List<int> skillLvs = new List<int>();
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
 
             if (skillCfgs == null)
             {

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

@@ -24,7 +24,11 @@ namespace GFGGame
 
         public List<StudioCfg> FilingDatas
         {
-            get { return CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioFilingView).Name); }
+            get
+            {
+                return CommonDataManager.Tables.TblStudioCfg.DataList
+                    .Where(a => a.FunId == typeof(StudioFilingView).Name).ToList();
+            }
         }
 
         public void Clear()

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using UnityEngine;
@@ -23,20 +24,21 @@ namespace GFGGame
             {
                 _suitInfoBySuitIdDic.Add(suitFosterData.suitId, suitFosterData);
             }
+
             _suitInfoBySuitIdDic[suitFosterData.suitId] = suitFosterData;
         }
+
         public void SetMaintainSuit(int suitId, int maintainStep)
         {
             _suitInfoBySuitIdDic[suitId].maintainStep = maintainStep;
             // _suitInfoBySuitIdDic[suitId].maintainBonusSteps = maintainBonusSteps;
             EventAgent.DispatchEvent(ConstMessage.MAINTAIN_SUIT);
-
         }
+
         public void SetMaintainBonusSteps(int suitId, int maintainBonusSteps)
         {
             _suitInfoBySuitIdDic[suitId].maintainBonusSteps.Add(maintainBonusSteps);
             EventAgent.DispatchEvent(ConstMessage.GET_MAINTAIN_SUIT_BONUS, maintainBonusSteps);
-
         }
 
         public void SetMakeNewSuit(int suitId, int makeNewSuit)
@@ -54,11 +56,11 @@ namespace GFGGame
             }
             else
             {
-                SuitFosterData suitFosterData = new SuitFosterData() { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
+                SuitFosterData suitFosterData = new SuitFosterData()
+                    { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
                 InitServerData(suitFosterData);
                 return suitFosterData;
             }
-
         }
 
         //加成属性服装占比
@@ -132,15 +134,16 @@ namespace GFGGame
                         _propertyData.Add(score, count);
                     }
                 }
-
             }
+
             return _propertyData;
         }
 
         public Dictionary<int, int> GetAdditionPropertyData(int suitId, int index)
         {
             Dictionary<int, int> _addPropertyData = new Dictionary<int, int>();
-            SuitFosterCfg cfg = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId)[index];
+            SuitFosterCfg cfg =
+                CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == suitId).ToList()[index];
 
             List<int> parts = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(suitId).Parts;
             for (int j = 0; j < parts.Count; j++)
@@ -163,8 +166,10 @@ namespace GFGGame
                     }
                 }
             }
+
             return _addPropertyData;
         }
+
         //0：已完成，1：养护中，2未养护
         public int GetFosterState(int suitId, int index)
         {
@@ -183,7 +188,9 @@ namespace GFGGame
 
         public List<SuitFosterCfg> GetSuitFosterRewards(int suitId)
         {
-            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId);
+            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == suitId)
+                .ToList();
+
             List<SuitFosterCfg> list = new List<SuitFosterCfg>(cfgs);
             for (int i = list.Count - 1; i >= 0; i--)
             {
@@ -192,24 +199,29 @@ namespace GFGGame
                     list.RemoveAt(i);
                 }
             }
+
             list = SortRewardList(list, suitId);
 
             return list;
         }
+
         private List<SuitFosterCfg> SortRewardList(List<SuitFosterCfg> list, int suitId)
         {
             SuitFosterData fosterData = GetSuitFosterData(suitId);
-            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId);
+            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == suitId)
+                .ToList();
 
             list.Sort((SuitFosterCfg a, SuitFosterCfg b) =>
             {
                 int indexA = cfgs.IndexOf(a) + 1;
                 int indexB = cfgs.IndexOf(b) + 1;
-                if (fosterData.maintainBonusSteps.IndexOf(indexA) >= 0 && fosterData.maintainBonusSteps.IndexOf(indexB) < 0)
+                if (fosterData.maintainBonusSteps.IndexOf(indexA) >= 0 &&
+                    fosterData.maintainBonusSteps.IndexOf(indexB) < 0)
                 {
                     return 1;
                 }
-                else if (fosterData.maintainBonusSteps.IndexOf(indexA) < 0 && fosterData.maintainBonusSteps.IndexOf(indexB) >= 0)
+                else if (fosterData.maintainBonusSteps.IndexOf(indexA) < 0 &&
+                         fosterData.maintainBonusSteps.IndexOf(indexB) >= 0)
                 {
                     return -1;
                 }
@@ -226,6 +238,7 @@ namespace GFGGame
 
             return fosterData.maintainBonusSteps.IndexOf(step) >= 0;
         }
+
         //当前奖励状态:state 0：未领1：不可领2：已完成
         //当前奖励Index
         public void GetFosterRewardState(int suitId, out int state, out int index)
@@ -234,7 +247,9 @@ namespace GFGGame
             SuitFosterData fosterData = GetSuitFosterData(suitId);
             int finishStep = fosterData.maintainStep;
 
-            List<SuitFosterCfg> cfg = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(suitId);
+            List<SuitFosterCfg> cfg = CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == suitId)
+                .ToList();
+
             for (int i = 0; i < cfg.Count; i++)
             {
                 if (cfg[i].Rewards.Count == 0) continue;
@@ -245,12 +260,14 @@ namespace GFGGame
                     state = 0;
                     return;
                 }
+
                 if (_step > finishStep)
                 {
                     state = 1;
                     return;
                 }
             }
+
             state = 2;
         }
     }

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

@@ -194,11 +194,13 @@ namespace GFGGame
             switch ((ConstTaskType)activeRewardCfg.Id)
             {
                 case ConstTaskType.CompleteInstanceZones:
-                    var name = CommonDataManager.Tables.TblEctypeCfg.GetGroup1ByType(taskCfg.Params1[0])[0].TypeName;
+                    var name = CommonDataManager.Tables.TblEctypeCfg.DataList.Where(a => a.Type == taskCfg.Params1[0])
+                        .ToList()[0].TypeName;
+
                     if (taskCfg.Params1.Count > 1)
                     {
-                        name = CommonDataManager.Tables.TblEctypeCfg
-                            .GetGroup1ByTypeAndSubType(taskCfg.Params1[0], taskCfg.Params1[1])[0].SubName;
+                        name = CommonDataManager.Tables.TblEctypeCfg.DataList.Where(a =>
+                            a.Type == taskCfg.Params1[0] && a.SubType == taskCfg.Params1[1]).ToList()[0].SubName;
                     }
 
                     return string.Format(activeRewardCfg.Desc, taskCfg.GetTargetCount(), name);

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

@@ -186,7 +186,8 @@ namespace GFGGame
         public bool GetChapterIDRewardStatus(int chapID)
         {
             List<CompositebonusCfg> comBonusList =
-                CommonDataManager.Tables.TblCompositebonusCfg.GetGroup1ByChapterId(chapID);
+                CommonDataManager.Tables.TblCompositebonusCfg.DataList.Where(a => a.ChapterId == chapID).ToList();
+
             foreach (CompositebonusCfg item in comBonusList)
             {
                 if (GetChapterRewardIDStatus(item.Id, item.Params1[0]) == 1)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -13,6 +13,7 @@ namespace UI.CommonGame
         public GGroup m_downTipsText;
         public UI_ComRewardList m_comList;
         public GGroup m_grp;
+        public Transition m_openViewAction;
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "RewardUI";
@@ -66,6 +67,7 @@ namespace UI.CommonGame
             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)
         {
@@ -76,6 +78,7 @@ namespace UI.CommonGame
             m_comList.Dispose();
             m_comList = null;
             m_grp = null;
+            m_openViewAction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using GFGGame;
 using Hutool;
@@ -351,7 +352,9 @@ namespace GFGGame
         public static async ETTask<bool> ReqGetActivitySignInfos()
         {
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ShenDuChenYou);
-            var dd = CommonDataManager.Tables.TblActivitySignCfg.GetGroup1ByActivityId(activityId);
+            var dd = CommonDataManager.Tables.TblActivitySignCfg.DataList.Where(a => a.ActivityId == activityId)
+                .ToList();
+
             int ddCount = dd?.Count ?? 0;
             if (activityId < 0 || ddCount <= 0)
                 return false;

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -366,7 +367,8 @@ namespace GFGGame
                         }
 
                         List<PassivitySkillCfg> skillCfgs =
-                            CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(attrProto.CardId);
+                            CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                                .Where(a => a.CardId == attrProto.CardId).ToList();
 
                         if (skillCfgs != null)
                         {
@@ -512,7 +514,8 @@ namespace GFGGame
             fightData.cardScore = (int)Math.Ceiling(cardScore);
 
             List<PassivitySkillCfg> skillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(fightData.cardId);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == fightData.cardId)
+                    .ToList();
 
             fightData.skillLvs.Clear();
             if (skillCfgs != null)
@@ -522,8 +525,7 @@ namespace GFGGame
                     fightData.skillLvs.Add(robotCfg.SkillLvs);
                 }
             }
-
-
+            
             fightData.showSuitId = robotProto.SuitList.Count <= index ? 0 : robotProto.SuitList[index]; //上赛季没有穿戴数据
 
             return fightData;

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using GFGGame;
@@ -62,7 +63,8 @@ namespace GFGGame
                     {
                         StudioDataManager.Instance.RspFilingScoreReward(response.ChapterId, response.BonusIndexList[i]);
                         List<FilingRewardCfg> filingRewards =
-                            CommonDataManager.Tables.TblFilingRewardCfg.GetGroup1ById(response.ChapterId);
+                            CommonDataManager.Tables.TblFilingRewardCfg.DataList.Where(a => a.Id == response.ChapterId)
+                                .ToList();
 
                         var rewards = filingRewards[response.BonusIndexList[i]].Items;
                         for (int j = 0; j < rewards.Count; j++)

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

@@ -239,7 +239,7 @@ namespace GFGGame
                 {
                     TimeTracingDataManager.SuitID = (int)response.AllVs[i];
                     List<ActivityOpenCfg> activityCfgList =
-                        CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(21);
+                        CommonDataManager.Tables.TblActivityOpenCfg.DataList.Where(a => a.Type == 21).ToList();
 
                     foreach (var item in activityCfgList)
                     {

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using cfg.GfgCfg;
@@ -40,6 +41,7 @@ namespace GFGGame
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -47,7 +49,8 @@ namespace GFGGame
         public static async ETTask<bool> ReqGoTravel(List<int> qSuitIds)
         {
             S2C_TravelGuideGo response = null;
-            response = (S2C_TravelGuideGo)await MessageHelper.SendToServer(new C2S_TravelGuideGo() { TravelSuitIds = qSuitIds });
+            response = (S2C_TravelGuideGo)await MessageHelper.SendToServer(new C2S_TravelGuideGo()
+                { TravelSuitIds = qSuitIds });
 
             if (response != null)
             {
@@ -69,19 +72,21 @@ namespace GFGGame
                     return true;
                 }
             }
+
             return false;
         }
+
         //领取游历奖励
         public static async ETTask<bool> ReqGetTravelReward()
         {
             S2C_ReceiveTravelGuideReward response = null;
-            response = (S2C_ReceiveTravelGuideReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelGuideReward() { });
+            response = (S2C_ReceiveTravelGuideReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelGuideReward()
+                { });
 
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-
                     PoemPhotoData photoData = new PoemPhotoData();
                     photoData.PictureId = response.PictureInfo.PictureId;
                     photoData.CreationTime = response.PictureInfo.CreationTime;
@@ -103,19 +108,23 @@ namespace GFGGame
 
                     EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
 
-                    if (inst.TravelData.TravelCount > 1) return true;//非首次到达该地无需处理图鉴红点
+                    if (inst.TravelData.TravelCount > 1) return true; //非首次到达该地无需处理图鉴红点
 
-                    string location = CommonDataManager.Tables.TblTravelLoactionCfg.GetOrDefault(inst.TravelData.TravelLocationId).Location;
+                    string location = CommonDataManager.Tables.TblTravelLoactionCfg
+                        .GetOrDefault(inst.TravelData.TravelLocationId).Location;
                     for (int i = 0; i < inst.ListTravelAreaRewardState.Count; i++)
                     {
                         TravelGuideCfg travelGuide = CommonDataManager.Tables.TblTravelGuideCfg.GetOrDefault(i + 1);
                         if (travelGuide.Locations.IndexOf(location) >= 0)
                         {
-                            if (inst.ListTravelAreaRewardState[i] > (int)ConstBonusStatus.CAN_NOT_GET) break;//可领和已领状态不用处理
+                            if (inst.ListTravelAreaRewardState[i] > (int)ConstBonusStatus.CAN_NOT_GET)
+                                break; //可领和已领状态不用处理
                             bool isRed = true;
                             for (int j = 0; j < travelGuide.Locations.Count; j++)
                             {
-                                int loactionId = CommonDataManager.Tables.TblTravelLoactionCfg.GetGroup1ByLocation(travelGuide.Locations[j])[0].Id;
+                                int loactionId = CommonDataManager.Tables.TblTravelLoactionCfg.DataList
+                                    .Where(a => a.Location == travelGuide.Locations[j]).ToList()[0].Id;
+
                                 int _index = TravelDataManager.Instance.GetTravelIndexByLocationId(loactionId);
                                 if (inst.ListTravelLocationCount[_index] == 0)
                                 {
@@ -124,17 +133,21 @@ namespace GFGGame
                                     break;
                                 }
                             }
+
                             if (isRed)
                             {
                                 inst.ListTravelAreaRewardState[i] = (int)ConstBonusStatus.CAN_GET;
                                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                             }
+
                             break;
                         }
                     }
+
                     return true;
                 }
             }
+
             return false;
         }
 
@@ -142,24 +155,30 @@ namespace GFGGame
         public static async ETTask<bool> ReqTravelGuideInfo()
         {
             S2C_GetTravelGuideRecordAll response = null;
-            response = (S2C_GetTravelGuideRecordAll)await MessageHelper.SendToServer(new C2S_GetTravelGuideRecordAll() { });
+            response = (S2C_GetTravelGuideRecordAll)await MessageHelper.SendToServer(new C2S_GetTravelGuideRecordAll()
+                { });
 
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    TravelDataManager.Instance.ListTravelLocationCount = new List<int>(response.TglLocationRecordList.ToArray());
-                    TravelDataManager.Instance.ListTravelAreaRewardState = new List<int>(response.TglAreaRecordList.ToArray());
+                    TravelDataManager.Instance.ListTravelLocationCount =
+                        new List<int>(response.TglLocationRecordList.ToArray());
+                    TravelDataManager.Instance.ListTravelAreaRewardState =
+                        new List<int>(response.TglAreaRecordList.ToArray());
                     return true;
                 }
             }
+
             return false;
         }
+
         //领取游历图鉴区域奖励
         public static async ETTask<bool> ReqGetTravelGuideReward(int areaId)
         {
             S2C_ReceiveTravelAreaReward response = null;
-            response = (S2C_ReceiveTravelAreaReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelAreaReward() { AreaId = areaId });
+            response = (S2C_ReceiveTravelAreaReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelAreaReward()
+                { AreaId = areaId });
 
             if (response != null)
             {
@@ -173,13 +192,15 @@ namespace GFGGame
                     return true;
                 }
             }
+
             return false;
         }
 
         public static async ETTask<bool> ReqTravelSpeedUp(int speedUpType, List<ItemInfoProto> useItem)
         {
             S2C_SpeedUpTravelGuide response;
-            response = (S2C_SpeedUpTravelGuide)await MessageHelper.SendToServer(new C2S_SpeedUpTravelGuide() { SpeedUpType =  speedUpType, UseItem = useItem});
+            response = (S2C_SpeedUpTravelGuide)await MessageHelper.SendToServer(new C2S_SpeedUpTravelGuide()
+                { SpeedUpType = speedUpType, UseItem = useItem });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -190,7 +211,8 @@ namespace GFGGame
                     return true;
                 }
             }
+
             return false;
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.ActivityGetYuanXiao;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using cfg.GfgCfg;
 
@@ -154,7 +155,8 @@ namespace GFGGame
             for (int i = 0; i < num; i++)
             {
                 PickUpCfg pickUpCfg =
-                    CommonDataManager.Tables.TblPickUpCfg.GetGroup1ById(_cfg.Res[0])[_cfg.ResId[i] - 1];
+                    CommonDataManager.Tables.TblPickUpCfg.DataList.Where(a => a.Id == _cfg.Res[0]).ToList()[
+                        _cfg.ResId[i] - 1];
 
                 float time = pickUpCfg.Speed * 1f / 1000;
                 YuanXiaoItem item = GetYuanXiaoItem(_cfg.ResId[i]);
@@ -342,7 +344,8 @@ namespace GFGGame
             _ui.m_startEffect.visible = false;
             _ui.m_catcher.m_getEffect.visible = false;
             _ui.m_catcher.m_flyscore.target.visible = false;
-            _ui.m_catcher.m_c2.selectedIndex = _cfg.Id > CommonDataManager.Tables.TblPickUpGameCfg.DataList[0].Id ? 1 : 0;
+            _ui.m_catcher.m_c2.selectedIndex =
+                _cfg.Id > CommonDataManager.Tables.TblPickUpGameCfg.DataList[0].Id ? 1 : 0;
 
             _ui.m_time.text = TimeUtil.FormattingTimeTo_mmss(_countTime * 1000);
             _ui.m_score.text = _score.ToString();

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -6,6 +6,7 @@ using FairyGUI;
 using System.Threading.Tasks;
 using System.Threading;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -225,8 +226,9 @@ namespace GFGGame
                     item.m_index.text = _gridArr[i, j].num.ToString();
                     int groupID = _cfg.Res[0];
                     item.m_icon.url =
-                        GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.GetGroup1ById(groupID)[_gridArr[i, j].num]
-                            .ResName);
+                        GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.DataList.Where(a => a.Id == groupID)
+                            .ToList()[_gridArr[i, j].num].ResName);
+
                     _items[itemIndex].data = _gridArr[i, j].num;
                     UI_item.ProxyEnd();
                     ++itemIndex;
@@ -418,7 +420,9 @@ namespace GFGGame
             UI_item item = UI_item.Proxy(_blankItem);
             int groupID = _cfg.Res[0];
 
-            item.m_icon.url = GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.GetGroup1ById(groupID)[0].ResName);
+            item.m_icon.url =
+                GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.DataList.Where(a => a.Id == groupID).ToList()[0]
+                    .ResName);
             UI_item.ProxyEnd();
         }
 
@@ -534,9 +538,11 @@ namespace GFGGame
                     //item.m_icon.url = string.Format("ui://ActivityHuaRongDao/hrd_1-{0}", _gridArr[i, j].num + 1);
                     int groupID = _cfg.Res[0];
                     item.m_icon.url =
-                        GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.GetGroup1ById(groupID)[_gridArr[i, j].num]
+                        GetPicRes(CommonDataManager.Tables.TblHuarongRoadCfg.DataList.Where(a => a.Id == groupID)
+                            .ToList()[_gridArr[i, j].num]
                             .ResName);
 
+
                     UI_item.ProxyEnd();
                     ++itemIndex;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -160,9 +160,11 @@ namespace GFGGame
 
             _valueBarController.UpdateList(new List<int>()
             {
-                CommonDataManager.Tables.TblActivityDressCfg.GetGroup1ByActivityId(activityID)[0].Comsume[0].ItemId,
+                CommonDataManager.Tables.TblActivityDressCfg.DataList.Where(a => a.ActivityId == activityID).ToList()[0]
+                    .Comsume[0].ItemId,
                 ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED
             });
+            
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using ET;
 using UnityEngine;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -45,7 +46,9 @@ namespace GFGGame
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
 
-            zcjbCfgList = CommonDataManager.Tables.TblActivityDressCfg.GetGroup1ByActivityId(activityId);
+            zcjbCfgList = CommonDataManager.Tables.TblActivityDressCfg.DataList.Where(a => a.ActivityId == activityId)
+                .ToList();
+
             _ui.m_List.numItems = zcjbCfgList.Count;
             UpdateList();
             _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxRewardView.cs

@@ -2,6 +2,7 @@
 using UI.BlindBox;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -46,9 +47,10 @@ namespace GFGGame
             int id1 = blindBoxCfg.OrdinaryDropDisplay; //(int)(this.viewData as object[])[0];
             int id2 = blindBoxCfg.HideDropDisplay; //(int)(this.viewData as object[])[1];
 
-            _rewardNormal = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(id1);
+            _rewardNormal = CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == id1).ToList();
+
             _ui.m_normalList.numItems = _rewardNormal.Count;
-            _rewardSpecial = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(id2);
+            _rewardSpecial = CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == id2).ToList();
             _ui.m_specialList.numItems = _rewardSpecial.Count;
         }
 

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -63,10 +63,12 @@ namespace GFGGame
             _ui.m_rewardList.itemRenderer = RenderRewardList;
 
             List<DropOutCfg> dropOutCfgList =
-                CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(blindBoxCfg.OrdinaryDropDisplay);
-            List<DropOutCfg> hidDropOutCfgList =
-                CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(blindBoxCfg.HideDropDisplay);
+                CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == blindBoxCfg.OrdinaryDropDisplay)
+                    .ToList();
 
+            List<DropOutCfg> hidDropOutCfgList =
+                CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == blindBoxCfg.HideDropDisplay)
+                    .ToList();
 
             ItemCfg hidItemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(hidDropOutCfgList[0].Item);
             _ui.m_rewardList.numItems = dropOutCfgList.Count;
@@ -134,7 +136,8 @@ namespace GFGGame
         {
             UI_rewardItem uiItemChild = UI_rewardItem.Proxy(obj);
             List<DropOutCfg> dropOutCfgList =
-                CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(blindBoxCfg.OrdinaryDropDisplay);
+                CommonDataManager.Tables.TblDropOutCfg.DataList.Where(a => a.Id == blindBoxCfg.OrdinaryDropDisplay)
+                    .ToList();
 
             ItemCfg itemCfgChild = CommonDataManager.Tables.TblItemCfg.GetOrDefault(dropOutCfgList[index].Item);
 
@@ -224,7 +227,7 @@ namespace GFGGame
             ActivityDataManager.Instance.BlindBoxType = 1;
             int costNum = blindBoxCfg.CostIDNum[0];
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemcfg.Id);
-            
+
             if (ActivityDataManager.Instance.typeOne.check == false)
             {
                 string desc = string.Format("确认是否消耗{0}{1}打开一个盲盒？", costNum, itemCfg.Name);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs

@@ -4,6 +4,7 @@ using UI.ActivityMain;
 using UI.CommonGame;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using static GFGGame.ShopSProxy;
 
@@ -70,7 +71,9 @@ namespace GFGGame
         {
             base.OnShown();
 
-            zgthdcListCfg = CommonDataManager.Tables.TblEverydaySaleCfg.GetGroup1ByActivityId(6001);
+            zgthdcListCfg = CommonDataManager.Tables.TblEverydaySaleCfg.DataList.Where(a => a.ActivityId == 6001)
+                .ToList();
+
             indexSuit = ReturnDiscountTimeSuitIndex();
             UpdateView();
             var activityInfo = zgthdcListCfg[indexSuit];
@@ -183,7 +186,7 @@ namespace GFGGame
             ItemData itemDate = ItemUtil.createItemData(id, count);
             ItemView itemView = new ItemView(item.m_item);
             itemView.SetData(itemDate);
-            
+
             item.m_name.text = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemCfg.Items[index].Count).Name;
             UI_ZGTHRewardItem.ProxyEnd();
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -68,9 +69,10 @@ namespace GFGGame
                 _allPlayTimes = ActivityDataManager.Instance.allLimitStlycTimes;
                 _bonusState = ActivityDataManager.Instance.limitStlycActBonusState;
             }
+            
+            _bonueCfgs = CommonDataManager.Tables.TblIActivityLuckybonusCfg.DataList.Where(a => a.Id == _activityId)
+                .ToList();
 
-
-            _bonueCfgs = CommonDataManager.Tables.TblIActivityLuckybonusCfg.GetGroup1ById(_activityId);
             _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs, _typeId);
             _ui.m_list.numItems = _bonueCfgs.Count;
             _ui.m_list.scrollPane.ScrollTop();

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs

@@ -2,6 +2,7 @@
 using FairyGUI;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UI.ActivityWanShiLi;
 using UnityEngine;
@@ -43,7 +44,9 @@ namespace GFGGame
 
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             _rechargeCfgs =
-                CommonDataManager.Tables.TblActivityRecharge2Cfg.GetGroup1ByActivityId(_activityInfo.ActivityId);
+                CommonDataManager.Tables.TblActivityRecharge2Cfg.DataList
+                    .Where(a => a.ActivityId == _activityInfo.ActivityId).ToList();
+
             InitProgressValueList();
             InitReward();
 
@@ -295,7 +298,8 @@ namespace GFGGame
             else
             {
                 // 显示奖励详细列表
-                ActivityRecharge2Cfg _rechargeCfgs = CommonDataManager.Tables.TblActivityRecharge2Cfg.GetOrDefault(getState.rewardID);
+                ActivityRecharge2Cfg _rechargeCfgs =
+                    CommonDataManager.Tables.TblActivityRecharge2Cfg.GetOrDefault(getState.rewardID);
                 ViewManager.Show<GiftDetailView>(_rechargeCfgs.Bonus);
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -69,7 +70,8 @@ namespace GFGGame
 
             System.Collections.Generic.List<ItemParamProto> rewards = new List<ItemParamProto>();
             List<ArenaRewardCfg> rewardCfgs =
-                CommonDataManager.Tables.TblArenaRewardCfg.GetGroup1ByGrade(ArenaDataManager.Instance.Grade);
+                CommonDataManager.Tables.TblArenaRewardCfg.DataList
+                    .Where(a => a.Grade == ArenaDataManager.Instance.Grade).ToList();
 
             for (int i = 0; i < rewardCfgs.Count; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -241,7 +241,9 @@ namespace GFGGame
             _comFosterBottom.m_listSkill.selectedIndex = 0;
             _comFosterBottom.m_btnClearAll.visible = false;
 
-            List<CardStarCfg> cardStarCfgs = CommonDataManager.Tables.TblCardStarCfg.GetGroup1ByCardId(_cardData.id);
+            List<CardStarCfg> cardStarCfgs = CommonDataManager.Tables.TblCardStarCfg.DataList
+                .Where(a => a.CardId == _cardData.id).ToList();
+
             _cardStarRewards.Clear();
             for (int i = 0; i < cardStarCfgs.Count; i++)
             {
@@ -1142,7 +1144,9 @@ namespace GFGGame
         {
             // RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
             _comFosterBottom.m_listSkill.numItems =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(_cardData.id).Count;
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == _cardData.id).ToList()
+                    .Count;
+
             _comFosterBottom.m_ctrlSkillCount.selectedIndex = _comFosterBottom.m_listSkill.numItems;
         }
 
@@ -1161,7 +1165,9 @@ namespace GFGGame
 
 
             PassivitySkillCfg skillCfg =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(_cardData.id)[index];
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == _cardData.id)
+                    .ToList()[index];
+
             int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardData.id, skillCfg.SkillId);
             CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);
             item.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.Res);
@@ -1182,7 +1188,7 @@ namespace GFGGame
         private void OnBtnUpSkill()
         {
             List<PassivitySkillCfg> skillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(_cardData.id);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == _cardData.id).ToList();
 
             ViewManager.Show<CardSkillView>(new object[]
             {
@@ -1195,7 +1201,8 @@ namespace GFGGame
         {
             int index = _comFosterBottom.m_listSkill.GetChildIndex(eventContext.data as GObject);
             List<PassivitySkillCfg> skillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(_cardData.id);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList.Where(a => a.CardId == _cardData.id).ToList();
+
             ViewManager.Show<CardSkillView>(new object[]
                 { _cardData.id, skillCfgs[index].SkillId, _comFosterBottom.m_c_from.selectedIndex });
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpLevelView.cs

@@ -4,6 +4,7 @@ using System.Collections;
 using UnityEngine;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UI.CommonGame;
 using ET;
@@ -18,7 +19,7 @@ namespace GFGGame
         private List<int> upgradeCardItemsArr = CommonDataManager.Tables.TblGlobalCfg.UpgradeCardItems;
         private CardData _cardData;
         private List<int> itemsCount;
-        private Dictionary<int,int> _listItemChose = new Dictionary<int, int>();
+        private Dictionary<int, int> _listItemChose = new Dictionary<int, int>();
         private List<GObject> _listItemObj = new List<GObject>();
         private int _countCanUpMaxLevel = 0;
         private int _nowCountCanUpLevel = 0;
@@ -26,7 +27,7 @@ namespace GFGGame
         private long _goldsHasNum = 0;
         private int _cumulativeGold = 0;
         private int _cfgMaxLevel = 0;
-        
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -39,6 +40,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -68,16 +70,18 @@ namespace GFGGame
             AddEffect();
             ClearItemsCountList();
             _oldCanUpLevel = _cardData.lv;
-            
-            _cfgMaxLevel = CommonDataManager.Tables.TblCardLvlCfg.GetGroup1ByRarity(_cardData.itemCfg.Rarity).Count;
+
+            _cfgMaxLevel = CommonDataManager.Tables.TblCardLvlCfg.DataList
+                .Where(a => a.Rarity == _cardData.itemCfg.Rarity).ToList().Count;
+
             tidyData(_cfgMaxLevel, "Max");
             _ui.m_slideUpLevel.value = 100;
-            tidyData(_countCanUpMaxLevel);  //  _cardData.lv  
+            tidyData(_countCanUpMaxLevel); //  _cardData.lv  
             ReferViewInfo();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
-        private void tidyData(int setLevel,string tidyType = "")
+        private void tidyData(int setLevel, string tidyType = "")
         {
             _goldsHasNum = 0;
             _cumulativeGold = 0;
@@ -85,17 +89,21 @@ namespace GFGGame
             long needExp = 0;
             long allNeedLevelExp = 0;
 
-            if (setLevel > 0){
+            if (setLevel > 0)
+            {
                 for (int i = _cardData.lv; i < setLevel; i++)
                 {
                     allNeedLevelExp += CommonDataManager.Tables.TblCardLvlCfg.Get(_cardData.itemCfg.Rarity, i).NeedExp;
                 }
-                needExp = allNeedLevelExp - _cardData.exp;  //缺的经验值
+
+                needExp = allNeedLevelExp - _cardData.exp; //缺的经验值
             }
+
             //先计算出可以升满的最高级别
             for (int i = 0; i < upgradeCardItemsArr.Count; i++)
             {
-                ItemParamProto cardUpLvGolds = CommonDataManager.Tables.TblItemCfg.GetOrDefault(upgradeCardItemsArr[i]).CardUpLvGolds[_cardData.itemCfg.Rarity - 1].ToGfgGameItemParam();
+                ItemParamProto cardUpLvGolds = CommonDataManager.Tables.TblItemCfg.GetOrDefault(upgradeCardItemsArr[i])
+                    .CardUpLvGolds[_cardData.itemCfg.Rarity - 1].ToGfgGameItemParam();
                 _goldsHasNum = ItemDataManager.GetItemNum(cardUpLvGolds.ItemId);
 
                 if (!_listItemChose.ContainsKey(i) || _listItemChose[i] == 1)
@@ -106,14 +114,16 @@ namespace GFGGame
                     if (setLevel > _cardData.lv)
                         num = (int)Math.Ceiling((needExp - CumulativeExp) / (decimal)itemCfg.CardUpLvExp); //需要购买的数量
                     long itemNum = Math.Min(num, ItemDataManager.GetItemNum(itemId)); //物品可购买数量
-                    int goldNum = (int)Math.Floor((_goldsHasNum - _cumulativeGold) / (decimal)cardUpLvGolds.Count);//货币可购买数量
+                    int goldNum =
+                        (int)Math.Floor((_goldsHasNum - _cumulativeGold) / (decimal)cardUpLvGolds.Count); //货币可购买数量
                     int sumNum = (int)Math.Min(goldNum, itemNum);
                     itemsCount[i] = sumNum;
                     CumulativeExp = CumulativeExp + (sumNum * itemCfg.CardUpLvExp);
                     _cumulativeGold = _cumulativeGold + (sumNum * cardUpLvGolds.Count);
                 }
             }
-            if(tidyType == "Max")
+
+            if (tidyType == "Max")
                 _countCanUpMaxLevel = _cardData.lv;
             else
                 _nowCountCanUpLevel = _cardData.lv;
@@ -126,12 +136,14 @@ namespace GFGGame
                 allNeedLevelExp -= needLevelExp;
                 if (allNeedLevelExp >= 0)
                 {
-                    if (tidyType == "Max") { 
+                    if (tidyType == "Max")
+                    {
                         if (_countCanUpMaxLevel < lvLimit)
                             _countCanUpMaxLevel += 1;
                     }
-                    else {
-                        if (_nowCountCanUpLevel < lvLimit) 
+                    else
+                    {
+                        if (_nowCountCanUpLevel < lvLimit)
                             _nowCountCanUpLevel += 1;
                     }
                 }
@@ -150,7 +162,8 @@ namespace GFGGame
 
         private void ReferSlide()
         {
-            _ui.m_slideUpLevel.value = (float)(_nowCountCanUpLevel - _cardData.lv) / (_countCanUpMaxLevel - _cardData.lv) * 100;
+            _ui.m_slideUpLevel.value =
+                (float)(_nowCountCanUpLevel - _cardData.lv) / (_countCanUpMaxLevel - _cardData.lv) * 100;
         }
 
         //清理itemsCount
@@ -160,6 +173,7 @@ namespace GFGGame
             {
                 itemsCount = new List<int>();
             }
+
             itemsCount.Clear();
             for (int i = 0; i < upgradeCardItemsArr.Count; i++)
             {
@@ -191,7 +205,7 @@ namespace GFGGame
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(upgradeCardItemsArr[index]);
             listItem.m_ButtonType.selectedIndex = 4;
             if (!_listItemChose.ContainsKey(index))
-                _listItemChose.Add(index,1);
+                _listItemChose.Add(index, 1);
             listItem.m_ImgpinkGot.visible = (_listItemChose[index] != 0);
             listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
 
@@ -222,7 +236,7 @@ namespace GFGGame
             ReferViewInfo();
             ReferSlide();
         }
-            
+
         private void ReferViewInfo()
         {
             _ui.m_txtChooseLevel.SetVar("value1", _nowCountCanUpLevel.ToString()).FlushVars();
@@ -241,8 +255,10 @@ namespace GFGGame
                 this.Hide();
                 if (_cardData.lv - _oldCanUpLevel >= 1)
                 {
-                    ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", _oldCanUpLevel, _cardData.lv, _cardData.id });
+                    ViewManager.Show<CardUpView>(new object[]
+                        { _cardData.scores, "lv", _oldCanUpLevel, _cardData.lv, _cardData.id });
                 }
+
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -1,10 +1,12 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
 using UI.ClothingFoster;
 using UI.CommonGame;
+
 namespace GFGGame
 {
     public class ClothingFosterView : BaseWindow
@@ -14,17 +16,20 @@ namespace GFGGame
         private ItemCfg cardItemCfg;
         private int _suitId;
         private int _index;
+
         private SortedList _propertyList;
+
         // private Dictionary<int, int> _addPropertyList;
         private bool _canFoster;
+
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -43,13 +48,14 @@ namespace GFGGame
             _ui.m_listMaterials.onClickItem.Add(OnListMaterialsItem);
             _ui.m_listPropertyAdd.itemRenderer = ListPropertyItemRender;
             _ui.m_btnFoster.onClick.Add(OnClickBtnFoster);
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -59,8 +65,11 @@ namespace GFGGame
             // _addPropertyList = SuitFosterDataManager.Instance.GetAdditionPropertyData(_suitId, _index);
             _canFoster = true;
 
-            cfg = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId)[_index];
-            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1BySuitId(_suitId);
+            cfg = CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == _suitId).ToList()[_index];
+
+            List<ItemCfg> itemCfgs =
+                CommonDataManager.Tables.TblItemCfg.DataList.Where(a => a.SuitId == _suitId).ToList();
+
             for (int i = 0; i < itemCfgs.Count; i++)
             {
                 if (itemCfgs[i].ItemType == ConstItemType.CARD)
@@ -69,7 +78,10 @@ namespace GFGGame
                     break;
                 }
             }
-            _ui.m_txtLock.text = cardItemCfg == null || cfg.CardStar == 0 ? "" : string.Format("词牌【{0}】达到{1}星可养护", cardItemCfg.Name, cfg.CardStar / 5);
+
+            _ui.m_txtLock.text = cardItemCfg == null || cfg.CardStar == 0
+                ? ""
+                : string.Format("词牌【{0}】达到{1}星可养护", cardItemCfg.Name, cfg.CardStar / 5);
             _ui.m_txtLock.visible = cardItemCfg != null && cfg.CardStar > 0;
             _ui.m_listMaterials.numItems = cfg.Materials.Count;
             long has = ItemDataManager.GetItemNum(cfg.CostId);
@@ -83,17 +95,21 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
+
         private void ListMaterialItemRender(int index, GObject obj)
         {
             UI_ListMaterialsItem item = UI_ListMaterialsItem.Proxy(obj);
-            List<ItemParamProto> materialsArr = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId)[_index].Materials.ToGfgGameItemParam();
+            List<ItemParamProto> materialsArr =
+                CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == _suitId).ToList()[_index]
+                    .Materials.ToGfgGameItemParam();
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(materialsArr[index].ItemId);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             long has = ItemDataManager.GetItemNum(itemCfg.Id);
@@ -105,11 +121,15 @@ namespace GFGGame
             item.target.data = materialsArr[index];
             UI_ListMaterialsItem.ProxyEnd();
         }
+
         private void OnListMaterialsItem(EventContext context)
         {
             int[] itemData = (int[])(context.data as GComponent).data;
             //ViewManager.Show<ApproachOfItemView>(new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] });
-            object[] sourceDatas = new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, itemData[1] };
+            object[] sourceDatas = new object[]
+            {
+                itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, itemData[1]
+            };
             GoodsItemTipsController.ShowItemTips(itemData[0], sourceDatas);
         }
 
@@ -128,6 +148,7 @@ namespace GFGGame
             UI_ListPropertyAddItem.ProxyEnd();
             UI_ListScoreItem.ProxyEnd();
         }
+
         private async void OnClickBtnFoster()
         {
             if (cfg.CardStar > 0)
@@ -138,6 +159,7 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt(string.Format("暂未获得词牌【{0}】", cardItemCfg.Name));
                     return;
                 }
+
                 if (cardData.star < cfg.CardStar)
                 {
                     PromptController.Instance.ShowFloatTextPrompt(string.Format("词牌【{0}】星级不足", cardItemCfg.Name));
@@ -156,10 +178,15 @@ namespace GFGGame
             {
                 if (!ItemUtil.CheckItemEnough(cfg.Materials[i].ItemId, cfg.Materials[i].Count, true))
                 {
-                    object[] sourceDatas = new object[] { cfg.Materials[i].ItemId, new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, cfg.Materials[i].Count };
+                    object[] sourceDatas = new object[]
+                    {
+                        cfg.Materials[i].ItemId,
+                        new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] },
+                        cfg.Materials[i].Count
+                    };
                     GoodsItemTipsController.ShowItemTips(cfg.Materials[i].ItemId, sourceDatas);
                     return;
-                }      
+                }
             }
 
             int result = await SuitFosterProxy.SendMaintainSuit(_suitId, _index + 1);

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using FairyGUI;
 using UI.ClothingFoster;
@@ -21,6 +22,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -54,7 +56,9 @@ namespace GFGGame
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             SuitFosterCfg cfg = _rewardsList[index];
-            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId);
+            List<SuitFosterCfg> cfgs = CommonDataManager.Tables.TblSuitFosterCfg.DataList
+                .Where(a => a.SuitId == _suitId).ToList();
+
             int _index = cfgs.IndexOf(cfg);
             item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[_index]);
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(cfg.Rewards[0].ItemId);

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using FairyGUI;
 using UI.ClothingFoster;
@@ -222,7 +223,9 @@ namespace GFGGame
         private void UpdateFosterReward()
         {
             SuitFosterDataManager.Instance.GetFosterRewardState(_suitId, out int state, out int index);
-            SuitFosterCfg cfg = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId)[index];
+            SuitFosterCfg cfg = CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == _suitId)
+                .ToList()[index];
+
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(cfg.Rewards[0].ItemId);
             _ui.m_comFosterReward.m_loaReward.url = ResPathUtil.GetIconPath(itemCfg);
             _ui.m_comFosterReward.m_c1.selectedIndex = state;
@@ -230,7 +233,8 @@ namespace GFGGame
 
         private void UpdateFosterList()
         {
-            _ui.m_listFoster.numItems = CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId).Count;
+            _ui.m_listFoster.numItems =
+                CommonDataManager.Tables.TblSuitFosterCfg.DataList.Count(a => a.SuitId == _suitId);
         }
 
         private void ListFosterItemRender(int index, GObject obj)
@@ -324,7 +328,9 @@ namespace GFGGame
         private void OnListenerGetFosterReward(EventContext context)
         {
             SuitFosterCfg cfg =
-                CommonDataManager.Tables.TblSuitFosterCfg.GetGroup1BySuitId(_suitId)[(int)(context.data) - 1];
+                CommonDataManager.Tables.TblSuitFosterCfg.DataList.Where(a => a.SuitId == _suitId).ToList()[
+                    (int)(context.data) - 1];
+
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(cfg.Rewards.ToGfgGameItemParam()));
             UpdateFosterReward();
             LogUtil.LogEditor("养护奖励：" + ItemDataManager.GetItemNum(100169));

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -4,6 +4,7 @@ using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -146,8 +147,10 @@ namespace GFGGame
                     long selectedItemCount = (long)objs[3];
                     _selectedItemCount = (int)selectedItemCount;
                     List<ShopCfg> dataArray =
-                        CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.FU_ZHUANG_DIAN,
-                            ConstStoreSubId.FU_ZHUANG_DIAN);
+                        CommonDataManager.Tables.TblShopCfg.DataList.Where(a =>
+                                a.Menu1 == ConstStoreTabId.FU_ZHUANG_DIAN && a.Menu2 == ConstStoreSubId.FU_ZHUANG_DIAN)
+                            .ToList();
+
                     for (int i = 0; i < dataArray.Count; i++)
                     {
                         if (dataArray[i].ItemId == _selectedItemId)

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -4,6 +4,7 @@ using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -17,9 +18,9 @@ namespace GFGGame
         public const int BORDER = 3;
         public const int EFFECT = 4;
     }
+
     public class GalleryShopView : BaseView
     {
-
         private UI_GalleryShopUI _ui;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _dataList;
@@ -30,8 +31,8 @@ namespace GFGGame
         private int _storeId = 1;
         private GButton _selectedListItem;
 
-        private int _selectedItemId;//打开界面时选中的物品id
-        private int _selectedType = 0;//打开界面时选中的物品类型
+        private int _selectedItemId; //打开界面时选中的物品id
+        private int _selectedType = 0; //打开界面时选中的物品类型
         private int _selectedItemCount;
         private int _selectedId;
 
@@ -51,8 +52,8 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            base.Dispose();
 
+            base.Dispose();
         }
 
         protected override void OnInit()
@@ -75,8 +76,6 @@ namespace GFGGame
             _ui.m_btnBuy.onClick.Add(OnclickBtnBuy);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hz_bjbj");
-
-
         }
 
         protected override void AddEventListener()
@@ -85,8 +84,8 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateItemChange);
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -104,17 +103,23 @@ namespace GFGGame
                 object[] objs = this.viewData as object[];
                 if (objs.Length > 0 && objs[0] != null)
                 {
-                    _storeId = (int)objs[0];//从抽奖跳转到商店会区分商店Id
+                    _storeId = (int)objs[0]; //从抽奖跳转到商店会区分商店Id
                 }
+
                 if (objs.Length > 1 && objs[1] != null)
                 {
-                    _scoreType = (int)objs[1];//从战斗跳转到商店需要服装突出属性用来服装排序
+                    _scoreType = (int)objs[1]; //从战斗跳转到商店需要服装突出属性用来服装排序
                 }
+
                 if (objs.Length > 2 && objs[2] != null)
                 {
-                    _selectedItemId = (int)objs[2];//从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
+                    _selectedItemId = (int)objs[2]; //从物品来源面板跳转到商店，需要物品id方便打开界面时做选中处理
                     _selectedItemCount = (int)objs[3];
-                    List<ShopCfg> dataArray = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY);
+                    List<ShopCfg> dataArray = CommonDataManager.Tables.TblShopCfg.DataList.Where(a =>
+                            a.Menu1 == ConstStoreTabId.STORE_EXCHANGE &&
+                            a.Menu2 == ConstStoreSubId.STORE_EXCHANGE_GALLERY)
+                        .ToList();
+
                     for (int i = 0; i < dataArray.Count; i++)
                     {
                         if (dataArray[i].ItemId == _selectedItemId)
@@ -129,7 +134,6 @@ namespace GFGGame
             }
 
 
-
             _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex = _selectedType;
             // _ui.m_listType.ScrollToView(_selectedType);
             UpdateList(false);
@@ -140,8 +144,6 @@ namespace GFGGame
             {
                 ShopViewManager.Instance.BuyItem(_cfgSelected.Id, _selectedItemCount, _storeId, _cfgSelected);
             }
-
-
         }
 
         protected override void OnHide()
@@ -150,20 +152,19 @@ namespace GFGGame
             _valueBarController.OnHide();
 
             _selectedItemId = 0;
-
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateItemChange);
-
         }
+
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(GalleryShopView).FullName);
-
         }
 
         private void OnclickBtnBuy()
@@ -173,17 +174,15 @@ namespace GFGGame
             count = Math.Max(1, count);
             ShopViewManager.Instance.BuyItem(_cfgSelected.Id, count, _storeId, _cfgSelected);
         }
+
         private void UpdateItemChange()
         {
             UpdateList(false);
-
         }
 
 
-
         private void UpdateList(bool tween)
         {
-
             int typeIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
             _dataList = ShopDataManager.Instance.GetList(_storeId, typeIndex, _scoreType);
             _ui.m_comItemList.m_list.numItems = _dataList.Count;
@@ -203,15 +202,16 @@ namespace GFGGame
                             break;
                         }
                     }
+
                     _ui.m_comItemList.m_list.ScrollToView(itemIndex < 0 ? 0 : itemIndex);
                     _ui.m_comItemList.m_list.selectedIndex = itemIndex;
                 }
+
                 UpdateSelectedItemInfo(_ui.m_comItemList.m_list.GetChildAt(itemIndex) as GComponent, tween);
             }
         }
 
 
-
         private void OnClickListTypeItem(EventContext context)
         {
             UpdateList(true);
@@ -236,6 +236,7 @@ namespace GFGGame
             listItem.m_txtPrice.text = cfg.Price.ToString();
             UI_ListGalleryShopItem.ProxyEnd();
         }
+
         private void OnClickListShopItem(EventContext context)
         {
             _selectedItemId = 0;
@@ -253,11 +254,13 @@ namespace GFGGame
             UpdateRole(tween);
             UpdateSelectedItemInfo();
         }
+
         private void UpdateRole(bool tween)
         {
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_cfgSelected.ItemId);
             string ext = ItemUtil.GetItemResExt(itemCfg.ItemType, itemCfg.SubType);
-            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg); ;
+            _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            ;
             // _ui.m_comRes.m_loaBg.visible = false;
             // _ui.m_comRes.m_c1.selectedIndex = _ui.m_comItemList.m_comBtnTab.m_c1.selectedIndex;
             // switch (_ui.m_comRes.m_c1.selectedIndex)
@@ -331,15 +334,13 @@ namespace GFGGame
             //     case GalleryShopTabType.EFFECT:
             //         break;
             // }
-
         }
+
         private void UpdateSelectedItemInfo()
         {
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_cfgSelected.ItemId);
             _ui.m_txtName.text = itemCfg.Name;
             _ui.m_txtDesc.text = itemCfg.Desc;
         }
-
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System;
 using ET;
 using System.Collections;
+using System.Linq;
 using System.Threading.Tasks;
 using cfg.GfgCfg;
 using YooAsset;
@@ -624,8 +625,10 @@ namespace GFGGame
 
         private void UpdateCardSyntheticBtn()
         {
-            int count = CommonDataManager.Tables.TblItemCfg.GetGroup1BySuitId(_suitId).Count - 1;
-            ItemCfg item = CommonDataManager.Tables.TblItemCfg.GetGroup1BySuitId(_suitId)[count];
+            int count = CommonDataManager.Tables.TblItemCfg.DataList.Count(a => a.SuitId == _suitId) - 1;
+
+            ItemCfg item = CommonDataManager.Tables.TblItemCfg.DataList.Where(a => a.SuitId == _suitId).ToList()[count];
+
             _cardID = item.Id;
             int rewardStatus = DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(_suitId);
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.ClothingSynthetic;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -10,7 +11,6 @@ namespace GFGGame
 {
     public class SuitSyntheticView : BaseView
     {
-
         private UI_ClothingSyntheticListUI _ui;
         private List<int> _suitListIds;
 
@@ -21,6 +21,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -40,8 +41,8 @@ namespace GFGGame
             _ui.m_listMenu.onClickItem.Add(OnClickListMenuItem);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hz_bjbj");
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -49,6 +50,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateSuitList);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -60,6 +62,7 @@ namespace GFGGame
                 SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(suitId);
                 _ui.m_listMenu.selectedIndex = suitCfg.SyntheticType - 1;
             }
+
             // _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
             UpdateRedDot();
@@ -70,8 +73,8 @@ namespace GFGGame
         {
             base.OnHide();
             //Timers.inst.Remove(CheckGuide);
-
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -79,6 +82,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateSuitList);
         }
+
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(SuitSyntheticView).FullName);
@@ -99,12 +103,16 @@ namespace GFGGame
             {
                 _suitListIds.Clear();
             }
+
             int index = _ui.m_listMenu.selectedIndex;
-            var suitCfgs = CommonDataManager.Tables.TblSuitCfg.GetGroup1BySyntheticType(index + 1);
+            var suitCfgs = CommonDataManager.Tables.TblSuitCfg.DataList.Where(a => a.SyntheticType == index + 1)
+                .ToList();
+
             foreach (var suitCfg in suitCfgs)
             {
                 _suitListIds.Add(suitCfg.Id);
             }
+
             _ui.m_listSuit.numItems = _suitListIds.Count;
         }
 
@@ -133,11 +141,14 @@ namespace GFGGame
                 if (!isLevelPass)
                 {
                     isLock = true;
-                    var levelCfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(suitCfg.SyntheticStoryLevelId);
+                    var levelCfg =
+                        CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(suitCfg.SyntheticStoryLevelId);
                     string str = "";
-                    if (levelCfg.Type == ConstInstanceZonesType.Studio && levelCfg.SubType == ConstInstanceZonesSubType.Hard3)
+                    if (levelCfg.Type == ConstInstanceZonesType.Studio &&
+                        levelCfg.SubType == ConstInstanceZonesSubType.Hard3)
                     {
-                        StoryLevelCfg cfg = CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(suitCfg.SyntheticStoryLevelId);
+                        StoryLevelCfg cfg =
+                            CommonDataManager.Tables.TblStoryLevelCfg.GetOrDefault(suitCfg.SyntheticStoryLevelId);
                         str = string.Format("通关查阅建档 {0}", cfg.Name);
                     }
                     else
@@ -145,9 +156,11 @@ namespace GFGGame
                         var chapterCfg = CommonDataManager.Tables.TblStoryChapterCfg.GetOrDefault(levelCfg.ChapterId);
                         str = string.Format("通关第{0}章第{1}关", chapterCfg.Order, levelCfg.Order);
                     }
+
                     listItem.m_txtLockDesc.text = str;
                 }
             }
+
             if (suitCfg.SyntheticPreSuitId > 0)
             {
                 bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitCfg.SyntheticPreSuitId);
@@ -158,16 +171,14 @@ namespace GFGGame
                     listItem.m_txtLockDesc.text = string.Format("集齐{0}套装", preSuitName);
                 }
             }
+
             listItem.m_groupLock.visible = isLock;
             listItem.target.data = suitId;
             UpdateSuitBoxStatusView(listItem);
             int status = DressUpMenuSuitDataManager.GetSuitSyntheticBonusStatus(suitId);
 
             listItem.m_bonusGift.m_loaderBonusBox.onClick.Clear();
-            listItem.m_bonusGift.m_loaderBonusBox.onClick.Add(() =>
-            {
-                SuitUtil.ShowSuitSyntheticBonus(suitId);
-            });
+            listItem.m_bonusGift.m_loaderBonusBox.onClick.Add(() => { SuitUtil.ShowSuitSyntheticBonus(suitId); });
             listItem.m_bg.onClick.Clear();
             listItem.m_bg.onClick.Add(() =>
             {
@@ -177,11 +188,14 @@ namespace GFGGame
                 }
             });
             // 提示合成物品的红点
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(listItem.target,
+                RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);
             // 奖励红点
-            RedDotController.Instance.SetComRedDot(listItem.m_bonusGift.target, status == ConstBonusStatus.CAN_GET && !isLock, "", -13, -7);
+            RedDotController.Instance.SetComRedDot(listItem.m_bonusGift.target,
+                status == ConstBonusStatus.CAN_GET && !isLock, "", -13, -7);
             //卡牌领取红点
-            RedDotController.Instance.SetComRedDot(listItem.target, DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(suitId) == 1, "");
+            RedDotController.Instance.SetComRedDot(listItem.target,
+                DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(suitId) == 1, "");
             UI_SuitListItem.ProxyEnd();
         }
 
@@ -197,6 +211,7 @@ namespace GFGGame
                 {
                     UpdateSuitBoxStatusView(listItem);
                 }
+
                 UI_SuitListItem.ProxyEnd();
             }
         }
@@ -218,16 +233,21 @@ namespace GFGGame
                 {
                     bonusGift.m_iconGot.visible = true;
                 }
+
                 RedDotController.Instance.SetComRedDot(listItem.m_bonusGift.target, false, "");
             }
+
             UI_BonusGift.ProxyEnd();
         }
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(0).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(1), "", 0, -6);
-            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(1).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(2), "", 0, -6);
-            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(2).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(3), "", 0, -6);
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(0).asCom,
+                RedDotDataManager.Instance.GetClothingSyntheticTabRed(1), "", 0, -6);
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(1).asCom,
+                RedDotDataManager.Instance.GetClothingSyntheticTabRed(2), "", 0, -6);
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(2).asCom,
+                RedDotDataManager.Instance.GetClothingSyntheticTabRed(3), "", 0, -6);
         }
 
         private void CheckGuide(object param)
@@ -241,6 +261,7 @@ namespace GFGGame
                 Timers.inst.Remove(CheckGuide);
             }
         }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -14,7 +15,7 @@ namespace GFGGame
 
         private int _itemId;
         private object[] _fromViewDatas;
-        private int _needCount;//需求总量
+        private int _needCount; //需求总量
         private List<string[]> _approachDatas = new List<string[]>();
 
         public void Dispose()
@@ -24,8 +25,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             UI_ComTipsApproach.ProxyEnd();
         }
+
         public void OnHide()
         {
             // _ui.m_list.onClickItem.Remove(OnClickListApproachItem);
@@ -34,15 +37,17 @@ namespace GFGGame
                 _ui.m_list.ScrollToView(0);
                 _ui.m_list.numItems = 0;
             }
+
             _approachDatas.Clear();
             _fromViewDatas = null;
         }
+
         public void OnInit(GComponent component)
         {
             _ui = UI_ComTipsApproach.Proxy(component);
             _ui.m_list.itemRenderer = ListApproachItemRenderer;
-
         }
+
         public void OnShow(object[] viewData)
         {
             _viewData = viewData;
@@ -68,7 +73,7 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(approachStr)) continue;
                 string[] infos = approachStr.Split('=');
 
-                if(infos[0] == ConstFunctionId.STORE)
+                if (infos[0] == ConstFunctionId.STORE)
                 {
                     if (CheckStoreItem(infos))
                     {
@@ -91,7 +96,9 @@ namespace GFGGame
         {
             int storeTabId = int.Parse(infos[1]);
             int storeSubId = int.Parse(infos[2]);
-            List<ShopCfg> storyActivityCfg = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(storeTabId, storeSubId);
+            List<ShopCfg> storyActivityCfg = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == storeTabId && a.Menu2 == storeSubId).ToList();
+
             storyActivityCfg = ShopDataManager.Instance.RemoveNotOpenCfg(storyActivityCfg);
             foreach (var v in storyActivityCfg)
             {
@@ -126,7 +133,8 @@ namespace GFGGame
                 if (levelCfg.Type == ConstInstanceZonesType.Story)
                 {
                     var chapterCfg = CommonDataManager.Tables.TblStoryChapterCfg.GetOrDefault(levelCfg.ChapterId);
-                    if (chapterCfg != null) { 
+                    if (chapterCfg != null)
+                    {
                         string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.Order);
                         string level = NumberUtil.GetChiniseNumberText(levelCfg.Order);
                         if (levelCfg.SubType == ConstInstanceZonesSubType.Normal)
@@ -169,7 +177,8 @@ namespace GFGGame
             {
                 int storeTabId = int.Parse(infos[1]);
                 int storeSubId = int.Parse(infos[2]);
-                listItem.m_txtSourceName.text = CommonDataManager.Tables.TblStoreTabCfg.GetOrDefault(storeTabId).SubTab[storeSubId].Name;
+                listItem.m_txtSourceName.text = CommonDataManager.Tables.TblStoreTabCfg.GetOrDefault(storeTabId)
+                    .SubTab[storeSubId].Name;
             }
             else
             {
@@ -180,9 +189,11 @@ namespace GFGGame
             {
                 listItem.m_btnGo.target.onClick.Add(OnClickListApproachItem);
             }
+
             listItem.m_btnGo.target.data = infos;
             UI_ListSourceItem.ProxyEnd();
         }
+
         private void OnClickListApproachItem(EventContext context)
         {
             GObject btnGo = context.sender as GObject;
@@ -192,11 +203,13 @@ namespace GFGGame
 
             if (gameFunctionCfg.ActivityId.Count > 0)
             {
-                ActivityOpenCfg _activityCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(gameFunctionCfg.ActivityId[0]);
+                ActivityOpenCfg _activityCfg =
+                    CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(gameFunctionCfg.ActivityId[0]);
                 long openTime = TimeUtil.DateTimeToTimestamp(_activityCfg.OpenTime);
                 long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.EndTime);
                 long curTime = TimeHelper.ServerNow();
-                if (openTime > curTime || curTime > endTime) { 
+                if (openTime > curTime || curTime > endTime)
+                {
                     PromptController.Instance.ShowFloatTextPrompt("活动已过期");
                     return;
                 }
@@ -218,7 +231,8 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, false);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount },
+                        false);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
@@ -230,15 +244,20 @@ namespace GFGGame
                         PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
                         return;
                     }
+
                     isJump = ViewManager.Show<ArenaView>();
                     break;
                 case ConstFunctionId.STORE:
 
                     int storeTabId = int.Parse(infos[1]);
                     int storeSubId = int.Parse(infos[2]);
-                    if (storeTabId == ConstStoreTabId.STORE_GIFT_BAG) { 
-                        List<ShopCfg> shopCfgs   = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
-                    }
+                    // if (storeTabId == ConstStoreTabId.STORE_GIFT_BAG)
+                    // {
+                    //     List<ShopCfg> shopCfgs =
+                    //         CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_GIFT_BAG,
+                    //             ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+                    // }
+
                     isJump = ViewManager.Show<StoreView>(new object[] { storeTabId, storeSubId });
                     break;
                 // case ConstFunctionId.SHOP_GIFT_BAG:
@@ -266,17 +285,20 @@ namespace GFGGame
                         {
                             break;
                         }
+
                         StudioDataManager.Instance.IsCanFight(levelCfg.Id, out bool canFight, out string content);
                         if (!canFight)
                         {
                             PromptController.Instance.ShowFloatTextPrompt("关卡未开启");
                             break;
                         }
+
                         if (!TimeUtil.CheckDayOfWeek(studioCfg.Time))
                         {
                             PromptController.Instance.ShowFloatTextPrompt("不在活动周期内");
                             break;
                         }
+
                         if (studioCfg.FunId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.Id;
@@ -289,8 +311,10 @@ namespace GFGGame
                             {
                                 ViewManager.Show<StudioFilingView>();
                             }
+
                             MainStoryDataManager.currentLevelCfgId = levelCfg.Id;
-                            InstanceZonesController.ShowLevelView(levelCfg.Id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
+                            InstanceZonesController.ShowLevelView(levelCfg.Id,
+                                StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
                             isJump = true;
                         }
                         else
@@ -298,7 +322,11 @@ namespace GFGGame
                             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
                             if (studioCfg.FunId == typeof(StudioPropertyView).Name)
                             {
-                                List<StudioCfg> studioCfgs = CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioPropertyView).Name);
+                                List<StudioCfg> studioCfgs =
+                                    CommonDataManager.Tables.TblStudioCfg.DataList.Where(a => a.FunId ==
+                                        typeof(StudioPropertyView).Name).ToList();
+
+
                                 for (int i = 0; i < studioCfgs.Count; i++)
                                 {
                                     if (studioCfgs[i].Id == studioCfg.Id)
@@ -308,9 +336,13 @@ namespace GFGGame
                                     }
                                 }
                             }
+
                             string viewName = "GFGGame." + studioCfg.FunId;
-                            if (studioCfg.FunId == "StudioActivityView") {
-                                var activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+                            if (studioCfg.FunId == "StudioActivityView")
+                            {
+                                var activityId =
+                                    ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType
+                                        .ActLimitLuckyBox);
                                 if (activityId <= 0)
                                 {
                                     PromptController.Instance.ShowFloatTextPrompt("不在活动周期内");
@@ -320,9 +352,11 @@ namespace GFGGame
 
                             ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX);
                             StudioDataManager.Instance.VIEW_NAME = viewName;
-                            InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
+                            InstanceZonesController.ShowLevelView(levelCfgId,
+                                StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
                             isJump = true;
                         }
+
                         break;
                     }
                     else
@@ -333,6 +367,7 @@ namespace GFGGame
                         {
                             break;
                         }
+
                         if (!MainStoryDataManager.CheckLevelUnlock(levelCfgId))
                         {
                             PromptController.Instance.ShowFloatTextPrompt("关卡未开启");
@@ -344,6 +379,7 @@ namespace GFGGame
                             //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
                             _fromViewDatas = null;
                         }
+
                         isJump = ViewManager.Show<StoryChapterView>(levelCfg.ChapterId, false);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
@@ -365,6 +401,7 @@ namespace GFGGame
                             isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId });
                         }
                     }
+
                     break;
                 case ConstFunctionId.ZHAI_XING:
                     // this.Hide();
@@ -376,6 +413,7 @@ namespace GFGGame
                     {
                         return;
                     }
+
                     isJump = ViewManager.Show<SuitGuideView>();
 
                     break;
@@ -402,6 +440,7 @@ namespace GFGGame
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                         PromptController.Instance.ShowFloatTextPrompt("暂未加入雅集");
                     }
+
                     break;
                 case ConstFunctionId.LEAGUE_ANSWER:
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
@@ -414,6 +453,7 @@ namespace GFGGame
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                         PromptController.Instance.ShowFloatTextPrompt("暂未加入雅集");
                     }
+
                     break;
                 case ConstFunctionId.SKILLBOOK:
                     ViewManager.Show<ExchangeGoodsView>(_itemId);
@@ -428,15 +468,15 @@ namespace GFGGame
                     ViewManager.Show<ActivityGetYuanXiaoEntryView>();
                     ViewManager.Show($"GFGGame.{gameFunctionCfg.FunctionId}");
                     break;
-                case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO:                   
+                case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO:
                     ViewManager.Show($"GFGGame.{gameFunctionCfg.FunctionId}");
                     break;
             }
+
             if (isJump)
             {
                 EventAgent.DispatchEvent(ConstMessage.JUMP_TO_SOURCE);
             }
         }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -14,10 +14,14 @@ namespace GFGGame
         private List<ItemData> _listItemDatas;
 
         private Action onSuccess = null;
-        
+
+        private List<EffectUI> _effects = new List<EffectUI>();
+
         private const int maxHeight = 1030;
-        
-        private int counTime = 0;  //定时器计数
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private int counTime = 0; //定时器计数
 
         public override void Dispose()
         {
@@ -26,8 +30,8 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            base.Dispose();
 
+            base.Dispose();
         }
 
         protected override void OnInit()
@@ -43,6 +47,7 @@ namespace GFGGame
             _ui.m_comList.m_listReward.itemRenderer = RenderListRewardItem;
             _ui.m_mask.onClick.Add(this.Hide);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -57,7 +62,8 @@ namespace GFGGame
                 _listItemDatas = this.viewData as List<ItemData>;
             }
 
-            List<ItemData> suitPart = new List<ItemData>(); ;
+            List<ItemData> suitPart = new List<ItemData>();
+            ;
             for (int i = _listItemDatas.Count - 1; i >= 0; i--)
             {
                 SuitCfg suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault(_listItemDatas[i].id);
@@ -67,9 +73,11 @@ namespace GFGGame
                     {
                         suitPart.Add(ItemUtil.createItemData(suitCfg.Parts[j], _listItemDatas[i].num));
                     }
+
                     _listItemDatas.RemoveAt(i);
                 }
             }
+
             _listItemDatas.AddRange(suitPart);
             //_ui.m_listReward.SetVirtual();  //有虚拟列表的时候，没有办法居中显示列表
 
@@ -81,52 +89,67 @@ namespace GFGGame
         }
 
         private void OnTimerClick(object param)
-        { 
+        {
             _ui.m_mask.touchable = true;
         }
 
         private void OnTimerUpdate(object param)
         {
             counTime += 1;
-            _ui.m_downTipsText.visible = true;
-            _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
+            if (counTime == 1)
+            {
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD_Text");
+                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderBgCom, "ui_hd", "TC_Quad_ALL");
+            }
+            else if (counTime == 2)
+            {
+                _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
 
-            _ui.m_comList.m_listReward.ResizeToFit();
-            if (_ui.m_comList.m_listReward.height > maxHeight)
+                _ui.m_comList.m_listReward.ResizeToFit();
+                if (_ui.m_comList.m_listReward.height > maxHeight)
+                {
+                    _ui.m_comList.m_listReward.height = maxHeight;
+                }
+            }
+            else if (counTime == 3)
             {
-                _ui.m_comList.m_listReward.height = maxHeight;
+                _ui.m_downTipsText.visible = true;
+                Timers.inst.Remove(OnTimerUpdate);
             }
         }
 
         protected override void OnHide()
         {
-            // EffectUIPool.Recycle(_effectUI1);
-            // _effectUI1 = null;
-            // EffectUIPool.Recycle(_effectUI2);
-            // _effectUI2 = null;
-            
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
             Timers.inst.Remove(OnTimerUpdate);
             Timers.inst.Remove(OnTimerClick);
             _ui.m_mask.touchable = true;
-            // for (int i = 0; i < _effects.Count; i++)
-            // {
-            //     if (_effects[i] != null)
-            //     {
-            //         EffectUIPool.Recycle(_effects[i]);
-            //         _effects[i] = null;
-            //     }
-            // }
-            // _effects.Clear();
+            for (int i = 0; i < _effects.Count; i++)
+            {
+                if (_effects[i] != null)
+                {
+                    EffectUIPool.Recycle(_effects[i]);
+                    _effects[i] = null;
+                }
+            }
+
+            _effects.Clear();
 
             if (onSuccess != null)
             {
                 onSuccess();
             }
+
             base.OnHide();
             //_effects.Clear();
             EventAgent.DispatchEvent(ConstMessage.REWARDVIEW_CLOTHER);
             GetSuitItemController.TryShow(0);
         }
+
         private void RenderListRewardItem(int index, GObject obj)
         {
             // obj.data = _listItemDatas[index];
@@ -157,7 +180,7 @@ namespace GFGGame
                 id = itemCfg.Id;
                 isSuit = false;
                 //if (itemCfg.itemType == ConstItemType.DRESS_UP)
-                    rarity = itemCfg.Rarity;
+                rarity = itemCfg.Rarity;
             }
 
             item.m_txtName.text = name;
@@ -177,17 +200,18 @@ namespace GFGGame
 
             item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             //特效("ui_ck", "ui_ck_zl");
-            //int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
-            // if (_effects.Count <= childIndex)
-            // {
-            //     EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin",120);
-            //     _effects.Add(_effectUI);
-            // }
+            int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
+            if (_effects.Count <= childIndex)
+            {
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin", 120);
+                _effects.Add(_effectUI);
+            }
 
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnClickListReward);
             }
+
             item.target.data = _listItemDatas[index];
             UI_ComItem.ProxyEnd();
         }
@@ -202,6 +226,7 @@ namespace GFGGame
         }
 
         private bool _showTips = true;
+
         /// <summary>
         /// 是否展示物品详情，默认展示
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -46,6 +47,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -95,7 +97,7 @@ namespace GFGGame
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
 
             //这个是0时区的0时间戳，所以转换为中国时间（东八区）需要加八个小时的毫秒
-            DateTime unixStartTime = new DateTime(1970, 1, 1, 0 , 0 , 0);
+            DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0);
             double chinaTime = GameGlobal.OpenServerTime + 28800000;
             dateTime = unixStartTime.AddMilliseconds(chinaTime);
             UpdateSignView();
@@ -116,6 +118,7 @@ namespace GFGGame
                     }
                 );
             }
+
             GameGlobal.AutoDailySignView = false;
         }
 
@@ -136,9 +139,12 @@ namespace GFGGame
         {
             _signCount = MathUtil.CountOnes2(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay));
             _ui.m_proSign.m_txtSignCount.text = _signCount.ToString();
-            List<DailySignBonusCfg> signBonusCfgs = CommonDataManager.Tables.TblDailySignBonusCfg.GetGroup1ByMonth(_month);
+            List<DailySignBonusCfg> signBonusCfgs = CommonDataManager.Tables.TblDailySignBonusCfg.DataList
+                .Where(a => a.Month == _month).ToList();
+
+            List<DailySignCfg> signCfgs = CommonDataManager.Tables.TblDailySignCfg.DataList
+                .Where(a => a.Month == _month).ToList();
 
-            List<DailySignCfg> signCfgs = CommonDataManager.Tables.TblDailySignCfg.GetGroup1ByMonth(_month);
             _ui.m_proSign.target.max = signCfgs[signCfgs.Count - 1].Day;
             _ui.m_proSign.target.value = _signCount;
             if (_signCount >= signCfgs[signCfgs.Count - 1].Day)
@@ -149,25 +155,30 @@ namespace GFGGame
             {
                 _ui.m_proSign.m_holder.visible = true;
             }
+
             _ui.m_proSign.m_holder.x = _signCount / signCfgs[signCfgs.Count - 1].Day * _ui.m_proSign.target.width - 88;
-            
+
             _ui.m_proSign.m_holderReward.visible = false;
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
                 if (i == signCfgs.Count - 1)
-                {                   
-                    comProBonus.x = ((float)signCfgs[i].Day / (float)signCfgs[signCfgs.Count - 1].Day) * _ui.m_proSign.target.width - 48;
+                {
+                    comProBonus.x = ((float)signCfgs[i].Day / (float)signCfgs[signCfgs.Count - 1].Day) *
+                        _ui.m_proSign.target.width - 48;
                 }
                 else
                 {
-                    comProBonus.x = ((float)signCfgs[i].Day / (float)signCfgs[signCfgs.Count-1].Day) * _ui.m_proSign.target.width - 20;
+                    comProBonus.x = ((float)signCfgs[i].Day / (float)signCfgs[signCfgs.Count - 1].Day) *
+                        _ui.m_proSign.target.width - 20;
                 }
 
 
                 UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
                 item.target.visible = true;
-                item.m_loaIcon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(signCfgs[i].Bonus[0].ItemId));
+                item.m_loaIcon.url =
+                    ResPathUtil.GetIconPath(
+                        CommonDataManager.Tables.TblItemCfg.GetOrDefault(signCfgs[i].Bonus[0].ItemId));
                 item.m_txtCount.text = signCfgs[i].Bonus[0].Count.ToString();
                 item.m_txtDay.text = signCfgs[i].Day.ToString();
                 if (item.target.data == null)
@@ -195,13 +206,16 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
+
             if ((_month > dateTime.Month && _year == dateTime.Year) || _year > dateTime.Year)
             {
                 _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
             }
             else if (_month == dateTime.Month)
             {
-                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 - dateTime.Day : signBonusCfgs.Count - dateTime.Day + 1;
+                _ui.m_list.numItems = signBonusCfgs.Count > 29
+                    ? signBonusCfgs.Count + 1 - dateTime.Day
+                    : signBonusCfgs.Count - dateTime.Day + 1;
             }
         }
 
@@ -218,7 +232,7 @@ namespace GFGGame
             {
                 bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.Day);
                 if (result)
-                { 
+                {
                     UpdateSignView();
                 }
             }
@@ -241,7 +255,9 @@ namespace GFGGame
             }
 
             int _index = index >= 29 && _ui.m_list.numItems > 29 ? index - 1 : index;
-            DailySignBonusCfg bonusCfg = CommonDataManager.Tables.TblDailySignBonusCfg.GetGroup1ByMonth(_month)[_index];
+            DailySignBonusCfg bonusCfg = CommonDataManager.Tables.TblDailySignBonusCfg.DataList
+                .Where(a => a.Month == _month).ToList()[_index];
+
             int itemType = ItemDataManager.GetItemType(bonusCfg.Bonus[0].ItemId);
             bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), bonusCfg.Day);
             if (bonusCfg.Day == _day && !isGot && _effectUI3 == null)

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -1,5 +1,5 @@
-
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -18,12 +18,12 @@ namespace GFGGame
 
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -40,6 +40,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -51,28 +52,32 @@ namespace GFGGame
         {
             base.OnShown();
             _activityId = (int)(this.viewData as object[])[0];
-            _rechargeCfgs = CommonDataManager.Tables.TblActivityRechargeCfg.GetGroup1ByActivityId(_activityId);
+            _rechargeCfgs = CommonDataManager.Tables.TblActivityRechargeCfg.DataList
+                .Where(a => a.ActivityId == _activityId).ToList();
             UpdateView();
 
             Timers.inst.Add(1, 0, UpdateTime);
-
         }
+
         protected override void OnHide()
         {
             base.OnHide();
             if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
             Timers.inst.Remove(UpdateTime);
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
         }
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LimitChargeView).FullName);
         }
+
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
@@ -93,16 +98,18 @@ namespace GFGGame
             ActivityOpenCfg openCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.Res);
         }
+
         private void RenderListItem(int index, GObject obj)
         {
-
             UI_ListChargeItem item = UI_ListChargeItem.Proxy(obj);
 
-            long limitChargeExp = _activityInfo.CountValue;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
-            item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].Value, limitChargeExp, _rechargeCfgs[index].Value);
+            long limitChargeExp =
+                _activityInfo.CountValue; // GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+            item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].Value, limitChargeExp,
+                _rechargeCfgs[index].Value);
             if (limitChargeExp >= _rechargeCfgs[index].Value)
             {
-                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].Id) >= 0 ? 2 : 1; 
+                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].Id) >= 0 ? 2 : 1;
             }
             else
             {
@@ -113,17 +120,20 @@ namespace GFGGame
             {
                 item.m_btnGet.onClick.Add(OnBtnGetClick);
             }
+
             item.m_btnGet.data = _rechargeCfgs[index].Id;
 
             if (item.m_listRewards.data == null)
             {
                 item.m_listRewards.itemRenderer = RenderListRewardItem;
             }
+
             item.m_listRewards.data = _rechargeCfgs[index].Bonus;
             item.m_listRewards.numItems = _rechargeCfgs[index].Bonus.Count;
             item.m_listRewards.scrollPane.posX = 0;
             UI_ListChargeItem.ProxyEnd();
         }
+
         private void RenderListRewardItem(int index, GObject obj)
         {
             ItemParamProto reward = ((List<ItemParamProto>)obj.parent.data)[index];
@@ -132,6 +142,7 @@ namespace GFGGame
             {
                 obj.data = new ItemView(obj as GComponent);
             }
+
             (obj.data as ItemView).SetData(itemData);
         }
 
@@ -141,11 +152,13 @@ namespace GFGGame
             int id = (int)obj.data;
             ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
         }
+
         private List<ActivityRechargeCfg> SortCfg(List<ActivityRechargeCfg> rechargeCfgs)
         {
             rechargeCfgs.Sort((ActivityRechargeCfg a, ActivityRechargeCfg b) =>
             {
-                long limitChargeExp = _activityInfo.CountValue;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                long limitChargeExp =
+                    _activityInfo.CountValue; // GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
                 int stateA = _activityInfo.GetRewards.IndexOf(a.Id);
                 int stateB = _activityInfo.GetRewards.IndexOf(b.Id);
 

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -3,6 +3,7 @@ using FairyGUI;
 using System.Collections.Generic;
 using ET;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using Hutool;
 using UI.DailyWelfare;
@@ -64,7 +65,9 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_bg1", "jpg");
             _activityId = (int)(this.viewData as object[])[0];
-            _rechargeCfgs = CommonDataManager.Tables.TblActivityRechargeCfg.GetGroup1ByActivityId(_activityId);
+            _rechargeCfgs = CommonDataManager.Tables.TblActivityRechargeCfg.DataList
+                .Where(a => a.ActivityId == _activityId).ToList();
+
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
             //RefreshList();
             //由于这个需要外部参数所以在onshown里面预加载

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs

@@ -1,5 +1,5 @@
-
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -16,12 +16,12 @@ namespace GFGGame
 
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -38,7 +38,6 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = ListItemRender;
             _ui.m_comIcon.m_loaIcon.onClick.Add(OnListItemClick);
-
         }
 
         protected override void OnShown()
@@ -46,12 +45,17 @@ namespace GFGGame
             base.OnShown();
             ViewManager.SetMaskAlpha(0.8f);
 
-            _cfgs = CommonDataManager.Tables.TblDailyLoginCfg.GetGroup1ByType((int)ConstBonusType.Item);
-            _cfg = CommonDataManager.Tables.TblDailyLoginCfg.GetGroup1ByType((int)ConstBonusType.Suit)[0];
+            _cfgs = CommonDataManager.Tables.TblDailyLoginCfg.DataList.Where(a => a.Type == (int)ConstBonusType.Item)
+                .ToList();
+
+            _cfg = CommonDataManager.Tables.TblDailyLoginCfg.DataList.Where(a => a.Type == (int)ConstBonusType.Suit)
+                .ToList()[0];
+
             UpdateView();
             _ui.m_comIcon.m_loaIcon.data = _cfg;
             GameGlobal.AutoSevenDayLoginView = false;
         }
+
         private void UpdateView()
         {
             _ui.m_list.numItems = _cfgs.Count;
@@ -63,14 +67,18 @@ namespace GFGGame
             {
                 _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5_zz";
             }
-            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.Id - 1] == ConstBonusStatus.CAN_GET);
+
+            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target,
+                ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.Id - 1] == ConstBonusStatus.CAN_GET);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
             _ui.m_list.numItems = 0;
             ViewManager.SetMaskAlpha(0.6f);
         }
+
         private void ListItemRender(int index, GObject obj)
         {
             DailyLoginCfg cfg = _cfgs[index];
@@ -80,18 +88,22 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.Name;
             item.m_txtNum.text = "x" + NumberUtil.ChangeNumberUnit(cfg.Rewards[0].Count, 10000);
-            item.m_imgGot.visible = ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.Id - 1] == ConstBonusStatus.GOT;
+            item.m_imgGot.visible = ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.Id - 1] ==
+                                    ConstBonusStatus.GOT;
             // if (cfg.id == dailyLoginId)
             // {
-           RedDotController.Instance.SetComRedDot(item.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.Id - 1] == ConstBonusStatus.CAN_GET);
+            RedDotController.Instance.SetComRedDot(item.target,
+                ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.Id - 1] == ConstBonusStatus.CAN_GET);
             // }
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnListItemClick);
             }
+
             item.target.data = cfg;
             UI_ListItem.ClearProxy();
         }
+
         private async void OnListItemClick(EventContext context)
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -132,9 +132,11 @@ namespace GFGGame
             if (_itemId == ConstItemID.POWER)
             {
                 //体力礼包
-                _shopCfgList = CommonDataManager.Tables.TblShopCfg.
-                    GetGroup1ByMenu1AndMenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_POWER)
-                    .OrderBy(a => a.RefreshType).ToList();
+                _shopCfgList = CommonDataManager.Tables.TblShopCfg.DataList
+                    .Where(a => a.Menu1 == ConstStoreTabId.ENDURING_GIFT_BOX &&
+                                a.Menu2 == ConstStoreSubId.ENDURING_GIFT_BOX_POWER).OrderBy(a => a.RefreshType)
+                    .ToList();
+
                 _ui.m_txtNeed.align = AlignType.Center;
 
                 int maxLimit = CommonDataManager.Tables.TblItemExchangeCfg.GetOrDefault(ConstItemID.POWER).MaxLimit;
@@ -144,8 +146,10 @@ namespace GFGGame
             else
             {
                 //金币礼包
-                _shopCfgList = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_GOLD)
-                    .OrderBy(a => a.RefreshType).ToList();
+                _shopCfgList = CommonDataManager.Tables.TblShopCfg.DataList
+                    .Where(a => a.Menu1 == ConstStoreTabId.ENDURING_GIFT_BOX &&
+                                a.Menu2 == ConstStoreSubId.ENDURING_GIFT_BOX_GOLD).OrderBy(a => a.RefreshType).ToList();
+
                 _ui.m_txtNeed.align = AlignType.Right;
 
                 if (_maxTimes != 0)
@@ -257,7 +261,8 @@ namespace GFGGame
                 var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(shopCfg.ItemId);
                 item.m_comLeftGiftBox.m_comGouMaiGetText.target.visible = true;
                 var itemArr = itemCfg.Items[0];
-                ItemCfg getItemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemArr.ItemId); //及时获得的物品,读取第一个显示ICON
+                ItemCfg getItemCfg =
+                    CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemArr.ItemId); //及时获得的物品,读取第一个显示ICON
                 item.m_comLeftGiftBox.m_comGouMaiGetText.m_loaIcon.url = ResPathUtil.GetIconPath(getItemCfg);
                 item.m_comLeftGiftBox.m_comGouMaiGetText.m_txtGetGold.text = itemArr.Count.ToString();
                 item.m_txtUrc.text = string.Format("每周限购{0}/{1}", remainBuyNum, shopCfg.MaxBuyNum);
@@ -405,7 +410,7 @@ namespace GFGGame
             List<ItemParamProto> result;
             if (shopCfg.RefreshType == RefreshType.DAY)
             {
-                    result = itemCfg.Items.ToGfgGameItemParam();
+                result = itemCfg.Items.ToGfgGameItemParam();
                 //    uiItemChild.m_bagYellow.visible = false;
                 //    uiItemChild.m_bagBlue.visible = true;
                 //    uiItemChild.m_bagYellowEx.visible = false;
@@ -415,20 +420,20 @@ namespace GFGGame
             {
                 //周刷
                 result = itemCfg.Param1.ToGfgGameItemParam();
-            //    uiItemChild.m_bagYellow.visible = true;
-            //    uiItemChild.m_bagBlue.visible = false;
-            //    uiItemChild.m_bagYellowEx.visible = true;
-            //    uiItemChild.m_bagBlueEx.visible = false;
-        }
+                //    uiItemChild.m_bagYellow.visible = true;
+                //    uiItemChild.m_bagBlue.visible = false;
+                //    uiItemChild.m_bagYellowEx.visible = true;
+                //    uiItemChild.m_bagBlueEx.visible = false;
+            }
 
-        // if (curGiftBoxState == EnduringGiftBoxBuyStatus.YesGet)
-        // {
-        //     uiItemChild.m_showRreceives.visible = true;
-        // }
-        // else if (curGiftBoxState == EnduringGiftBoxBuyStatus.NoGet)
-        // {
-        //     uiItemChild.m_showRreceives.visible = false;
-        // }
+            // if (curGiftBoxState == EnduringGiftBoxBuyStatus.YesGet)
+            // {
+            //     uiItemChild.m_showRreceives.visible = true;
+            // }
+            // else if (curGiftBoxState == EnduringGiftBoxBuyStatus.NoGet)
+            // {
+            //     uiItemChild.m_showRreceives.visible = false;
+            // }
 
             var itemArr = result[index];
             var itemCfgChild = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemArr.ItemId);

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -152,9 +152,8 @@ namespace GFGGame
         {
             while (DressUpMenuItemDataManager.isLoading)
             {
-                int sum = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.DRESS_UP)
-                    .Count(a => a.SuitId == 0);
-                ;
+                // int sum = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.DRESS_UP)
+                //     .Count(a => a.SuitId == 0);
                 //TODO 看看要怎么重新做换装数据加载
                 // LoadingView.Instance.SetProgress(FieldGuideView.ProgressCalculate(DressUpConfigUtil.LoadCount, sum));
                 yield return new WaitForEndOfFrame();

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs

@@ -3,6 +3,7 @@ using FairyGUI;
 using UnityEngine;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -21,8 +22,8 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            base.Dispose();
 
+            base.Dispose();
         }
 
         protected override void OnInit()
@@ -32,14 +33,13 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-            
+
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnReward.target.onClick.Add(OnBtnRewardClick);
 
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
-
         }
 
         protected override void OnShown()
@@ -49,23 +49,25 @@ namespace GFGGame
 
             UpdateView();
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRewardState);
-
         }
+
         protected override void OnHide()
         {
             base.OnHide();
             if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRewardState);
-
         }
+
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(TravelShowView).FullName);
@@ -76,17 +78,21 @@ namespace GFGGame
             _ui.m_list.numItems = _cfg.Locations.Count;
             UpdateRewardState();
         }
+
         private void UpdateRewardState()
         {
             // int state = TravelDataManager.Instance.ListTravelAreaRewardState[_index];
-            _ui.m_btnReward.m_c1.selectedIndex = TravelDataManager.Instance.GetGuideRewardStateByAreaId(_cfg.Id) == ConstBonusStatus.GOT ? 0 : 1;
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target, RedDotDataManager.Instance.GetTravelGuideAreaRed(_cfg.Id));
-
+            _ui.m_btnReward.m_c1.selectedIndex =
+                TravelDataManager.Instance.GetGuideRewardStateByAreaId(_cfg.Id) == ConstBonusStatus.GOT ? 0 : 1;
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target,
+                RedDotDataManager.Instance.GetTravelGuideAreaRed(_cfg.Id));
         }
 
         private void RenderListItem(int index, GObject obj)
         {
-            TravelLoactionCfg locationCfg = CommonDataManager.Tables.TblTravelLoactionCfg.GetGroup1ByLocation(_cfg.Locations[index])[0];
+            TravelLoactionCfg locationCfg = CommonDataManager.Tables.TblTravelLoactionCfg.DataList
+                .Where(a => a.Location == _cfg.Locations[index]).ToList()[0];
+
             UI_ListTravelLocationItem item = UI_ListTravelLocationItem.Proxy(obj);
             item.m_txtName.text = locationCfg.Name;
             item.m_comLocation.m_loaLocation.url = ResPathUtil.GetTravelBgPath(locationCfg.Res);
@@ -101,7 +107,6 @@ namespace GFGGame
             int state = TravelDataManager.Instance.GetGuideRewardStateByAreaId(_cfg.Id);
             if (state == ConstBonusStatus.CAN_NOT_GET)
             {
-
                 List<ItemData> rewards = ItemUtil.CreateItemDataList(_cfg.Rewards.ToGfgGameItemParam());
                 ViewManager.Show<RewardPreView>(new object[] { rewards, "到达奖励", "到达该区域所有地点时可领取" });
             }

GameClient/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkChooseCardView.cs

@@ -164,7 +164,9 @@ namespace GFGGame
             if (cfg == null) return;
             _ui.m_txtName.text = cardList[index].itemCfg.Name;
 
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             _ui.m_listSkill.data = skillCfgs;
             _ui.m_listSkill.numItems = skillCfgs.Count;
             _ui.m_comSkillTips.target.visible = false;
@@ -192,7 +194,8 @@ namespace GFGGame
             GObject gObject = context.sender as GObject;
             int index = (int)gObject.data;
             List<PassivitySkillCfg> skillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardList[_selectedIndex].id);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                    .Where(a => a.CardId == cardList[_selectedIndex].id).ToList();
 
             PassivitySkillCfg skillCfg = skillCfgs[index];
             _ui.m_comSkillTips.target.visible = _skillId != skillCfg.SkillId;

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -71,7 +72,7 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_ch_jnbg");
 
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_league", "TEA",110);
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_league", "TEA", 110);
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSkill, "ui_league", "tea_unlock");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderScore, "ui_league", "tea_unlock");
         }
@@ -90,11 +91,13 @@ namespace GFGGame
             _valueBarController.Controller(11);
             _showEff = false;
 
-            _ui.m_comSkill.m_list.numItems = CommonDataManager.Tables.TblLeagueSkillCountCfg.GetOrDefault(_type).LayerCount;
+            _ui.m_comSkill.m_list.numItems =
+                CommonDataManager.Tables.TblLeagueSkillCountCfg.GetOrDefault(_type).LayerCount;
             _ui.m_t0.Play(() =>
             {
                 _showEff = true;
-                _ui.m_comSkill.m_list.numItems = CommonDataManager.Tables.TblLeagueSkillCountCfg.GetOrDefault(_type).LayerCount;
+                _ui.m_comSkill.m_list.numItems =
+                    CommonDataManager.Tables.TblLeagueSkillCountCfg.GetOrDefault(_type).LayerCount;
                 UpdateView(false);
             });
         }
@@ -118,6 +121,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUIs[i]);
                 _effectUIs[i] = null;
             }
+
             _effectUIs.Clear();
         }
 
@@ -175,7 +179,9 @@ namespace GFGGame
                 {
                     bool isActive = true;
                     List<LeagueSkillCfg> skillCfgs =
-                        CommonDataManager.Tables.TblLeagueSkillCfg.GetGroup1ByTypeAndLayer(_type, LeagueDataManager.Instance.CurLayer);
+                        CommonDataManager.Tables.TblLeagueSkillCfg.DataList.Where(a =>
+                            a.Type == _type && a.Layer == LeagueDataManager.Instance.CurLayer).ToList();
+
                     for (int i = 0; i < skillCfgs.Count; i++)
                     {
                         if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
@@ -215,7 +221,10 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            List<LeagueSkillCfg> skillCfgs = CommonDataManager.Tables.TblLeagueSkillCfg.GetGroup1ByTypeAndLayer(_type, index + 1);
+            List<LeagueSkillCfg> skillCfgs =
+                CommonDataManager.Tables.TblLeagueSkillCfg.DataList.Where(a => a.Type == _type && a.Layer == index + 1)
+                    .ToList();
+
             UI_ListSkillLayerItem item = UI_ListSkillLayerItem.Proxy(obj);
             if (item.m_listSkill.data == null)
             {
@@ -246,7 +255,8 @@ namespace GFGGame
 
             bool canActive = true;
             List<LeagueSkillCfg> lastSkillCfgs =
-                CommonDataManager.Tables.TblLeagueSkillCfg.GetGroup1ByTypeAndLayer(_type, skillCfgs[index].Layer - 1);
+                CommonDataManager.Tables.TblLeagueSkillCfg.DataList
+                    .Where(a => a.Type == _type && a.Layer == skillCfgs[index].Layer - 1).ToList();
 
             for (int i = 0; i < lastSkillCfgs.Count; i++)
             {
@@ -266,12 +276,13 @@ namespace GFGGame
                 _effectUIs.Add(_effectUI);
             }
 
-            if (isLock && canActive) 
+            if (isLock && canActive)
                 item.m_c1.selectedIndex = 1;
             else
                 item.m_c1.selectedIndex = 0;
 
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].Consume[0].ToGfgGameItemParam(), false, "#FFFBF4");
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].Consume[0].ToGfgGameItemParam(), false,
+                "#FFFBF4");
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnActiveSkill);
@@ -293,7 +304,9 @@ namespace GFGGame
 
             LeagueSkillCfg skillCfg = CommonDataManager.Tables.TblLeagueSkillCfg.GetOrDefault(skillId);
             List<LeagueSkillCfg> lastSkillCfgs =
-                CommonDataManager.Tables.TblLeagueSkillCfg.GetGroup1ByTypeAndLayer(_type, skillCfg.Layer - 1);
+                CommonDataManager.Tables.TblLeagueSkillCfg.DataList
+                    .Where(a => a.Type == _type && a.Layer == skillCfg.Layer - 1).ToList();
+
             for (int i = 0; i < lastSkillCfgs.Count; i++)
             {
                 if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
@@ -332,7 +345,7 @@ namespace GFGGame
             DestroySkillAni();
             _ui.m_comSkill.m_list.RefreshVirtualList();
         }
-        
+
         // private void OnDropDisSkillList(EventContext context)
         // {
         //    

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_luckyBoxCtrl != null)
             {
                 _luckyBoxCtrl.Dispose();
@@ -49,6 +50,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -69,9 +71,12 @@ namespace GFGGame
             _ui.m_btnShop.target.onClick.Add(OnClickBtnShop);
             _ui.m_btnGiftBag.target.onClick.Add(OnClickBtnGiftBag);
             _ui.m_btnLuckyDiscount.target.onClick.Add(OnClickBtnLuckyDiscount);
-            _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
-            _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
+            _effectUIDic.Add("Button_public",
+                EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
+            _effectUIDic.Add("Button_Text_DianCang",
+                EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -80,6 +85,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpLuckyDiscount);
             EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_BONUS_VIEW_CLOSE, UpLuckyDiscount);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -89,7 +95,8 @@ namespace GFGGame
             _activityCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(_activityId);
             _luckyBoxCfg = CommonDataManager.Tables.TblLuckyBoxCfg.GetOrDefault(_activityCfg.Params1[0]);
             _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() {  _luckyBoxCfg.CostID, ConstItemID.DIAMOND_RED, ConstItemID.DIAMOND_PURPLE });
+            _valueBarController.UpdateList(new List<int>()
+                { _luckyBoxCfg.CostID, ConstItemID.DIAMOND_RED, ConstItemID.DIAMOND_PURPLE });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.Id);
             LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.Id;
             LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
@@ -101,7 +108,7 @@ namespace GFGGame
             ChangeUIByActivity();
             UpdateRedDot();
             ActivityOpenCfg activityOpenCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(_activityId);
-            if(activityOpenCfg.Params2.Count > 0)
+            if (activityOpenCfg.Params2.Count > 0)
                 GetWishingPoolInfo(_activityId);
         }
 
@@ -118,6 +125,7 @@ namespace GFGGame
                 OnClickBtnBack();
                 return;
             }
+
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
             _ui.m_txtTime.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
 
@@ -136,27 +144,34 @@ namespace GFGGame
 
             comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
-            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.CostNum.ToString(); 
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(_luckyBoxCfg.CostID).Res, "png");
+            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.CostNum.ToString();
+            comBox.m_comCostOne.m_loaCost.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(_luckyBoxCfg.CostID).Res,
+                    "png");
             comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.CostNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(_luckyBoxCfg.CostID).Res, "png");
+            comBox.m_comCostTen.m_loaCost.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(_luckyBoxCfg.CostID).Res,
+                    "png");
 
             if (comBox.m_btnBuyOne.data == null)
             {
                 comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
             }
+
             comBox.m_btnBuyOne.data = _luckyBoxCfg.Id;
 
             if (comBox.m_btnBuyTen.data == null)
             {
                 comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             }
+
             comBox.m_btnBuyTen.data = _luckyBoxCfg.Id;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
                 comBox.m_btnOpenServer.onClick.Add(OnClickBtnPreview);
             }
+
             comBox.m_btnPreview.target.data = _luckyBoxCfg.Id;
             comBox.m_btnOpenServer.data = _luckyBoxCfg.Id;
 
@@ -166,6 +181,7 @@ namespace GFGGame
 
             UpdateView();
         }
+
         private void UpdateView()
         {
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
@@ -177,22 +193,28 @@ namespace GFGGame
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.NumericType);
             comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", _luckyBoxCfg.MaxCount - boughtCount);
 
-            if (_activityType == ConstLimitTimeActivityType.ActLimitLuckyBox) {
+            if (_activityType == ConstLimitTimeActivityType.ActLimitLuckyBox)
+            {
                 string strDrawCount = ActivityDataManager.Instance.lastDrawCount.ToString();
                 comBox.m_txtCount.SetVar("value", strDrawCount).FlushVars();
                 comBox.m_txtCount.SetVar("name", _luckyBoxCfg.Name).FlushVars();
             }
-            else if (_activityType == ConstLimitTimeActivityType.ActLimitStlyc){
-                string strLimitStlycDrawCount = (ActivityDataManager.Instance.lastStlycDrawCount + _activityCfg.Params1[3]).ToString();
+            else if (_activityType == ConstLimitTimeActivityType.ActLimitStlyc)
+            {
+                string strLimitStlycDrawCount =
+                    (ActivityDataManager.Instance.lastStlycDrawCount + _activityCfg.Params1[3]).ToString();
                 comBox.m_txtOpenServerCount.SetVar("value", strLimitStlycDrawCount).FlushVars();
                 comBox.m_txtOpenServerCount.SetVar("name", _luckyBoxCfg.Name).FlushVars();
             }
+
             UI_ComBox.ProxyEnd();
         }
 
         private void UpLuckyDiscount()
         {
-            var activityOpenCfgs = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.LuckyDiscount);
+            var activityOpenCfgs = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.LuckyDiscount).ToList();
+
             var shopCfgId = activityOpenCfgs[0].Params1[0];
             var shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(shopCfgId);
             var remainBuyNum = shopCfg.MaxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id);
@@ -200,22 +222,27 @@ namespace GFGGame
                 ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.LuckyDiscount);
             var list = activityInfoByTypeList
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            _ui.m_comLuckyDiscount.visible = ActivityDataManager.Instance.allLimitStlycTimes >= 20 && remainBuyNum != 0 && list.Count > 0;
-            if(_effectUI1 == null)
-                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnLuckyDiscount.m_holderEff, "ui_Activity", "Luckyicon");
+            _ui.m_comLuckyDiscount.visible = ActivityDataManager.Instance.allLimitStlycTimes >= 20 &&
+                                             remainBuyNum != 0 && list.Count > 0;
+            if (_effectUI1 == null)
+                _effectUI1 =
+                    EffectUIPool.CreateEffectUI(_ui.m_btnLuckyDiscount.m_holderEff, "ui_Activity", "Luckyicon");
 
-            if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.target.visible) {
+            if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.target.visible)
+            {
                 LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData16();
                 LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = false;
                 //ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
             }
+
             _ui.m_comBox.target.visible = true;
         }
 
         private void UpGiftBox()
         {
-            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, _activityId);
-            
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, _activityId);
+
             var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
@@ -226,7 +253,8 @@ namespace GFGGame
                 bool isSoldOut = true;
                 foreach (var activityInfo in list)
                 {
-                    ActivityOpenCfg activityOpenCfg = CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(activityInfo.ActivityId);
+                    ActivityOpenCfg activityOpenCfg =
+                        CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(activityInfo.ActivityId);
                     var paramsArr = activityOpenCfg.Params1;
                     foreach (var shopCfgId in paramsArr)
                     {
@@ -247,15 +275,18 @@ namespace GFGGame
                 }
                 else
                 {
-                    _ui.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                    _ui.m_comBagTime.m_txtGiftBagTime.text =
+                        TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
                     _ui.m_showGiftBag.selectedIndex = 0;
                 }
             }
+
             var listSaleGift = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData16;
             if (listSaleGift.Count > 0)
             {
                 _ui.m_comDiscountTime.target.visible = true;
-                _ui.m_comDiscountTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), listSaleGift[0].EndTime);
+                _ui.m_comDiscountTime.m_txtGiftBagTime.text =
+                    TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), listSaleGift[0].EndTime);
             }
         }
 
@@ -275,17 +306,19 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
                 return;
             }
+
             LuckyBoxDataManager.Instance.CheckItemEnough(_luckyBoxCfg.Id, LuckyBoxDataManager.ONCE_TIME, async () =>
-             {
-                 bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.Id, LuckyBoxDataManager.ONCE_TIME,false, _activityId);
-                 if (result)
-                 {
-                     ViewManager.Show<LuckyBoxStarView>();
-                     _ui.m_comBox.target.visible = false;
-                     //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
-                     GetSuitItemController.showSingle = false;
-                 }
-             });
+            {
+                bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.Id, LuckyBoxDataManager.ONCE_TIME, false,
+                    _activityId);
+                if (result)
+                {
+                    ViewManager.Show<LuckyBoxStarView>();
+                    _ui.m_comBox.target.visible = false;
+                    //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                    GetSuitItemController.showSingle = false;
+                }
+            });
         }
 
         private void OnClickBtnBuyTen(EventContext context)
@@ -298,9 +331,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
                 return;
             }
+
             LuckyBoxDataManager.Instance.CheckItemEnough(this._luckyBoxCfg.Id, LuckyBoxDataManager.TEN_TIME, async () =>
             {
-                bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.Id, LuckyBoxDataManager.TEN_TIME,false, _activityId);
+                bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.Id, LuckyBoxDataManager.TEN_TIME,
+                    false, _activityId);
                 if (result)
                 {
                     ViewManager.Show<LuckyBoxStarView>();
@@ -315,9 +350,11 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityThemeLuckyBoxBonusView>(_activityType);
         }
+
         private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[]
+                { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         //限时礼包按钮点击执行方法
@@ -339,7 +376,7 @@ namespace GFGGame
         {
             ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
         }
-        
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -368,20 +405,25 @@ namespace GFGGame
                 ViewManager.DeleteViewStackCountDown("MainUIView");
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
             }
+
             Hide();
         }
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnShop.target, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target,
+                RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnShop.target,
+                RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag.target,
+                RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
 
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
         }
+
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();

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

@@ -16,7 +16,8 @@ namespace GFGGame
 
         private static OnFinishStoryLevelCall _onFinishStoryLevelCall;
 
-        public static void ShowLevelView(int levelCfgId, OnFinishStoryLevelCall onFinishStoryLevelCall, int needitemId = 0, int needItemCount = 0)
+        public static void ShowLevelView(int levelCfgId, OnFinishStoryLevelCall onFinishStoryLevelCall,
+            int needitemId = 0, int needItemCount = 0)
         {
             _onFinishStoryLevelCall = onFinishStoryLevelCall;
             InstanceZonesDataManager.currentLevelCfgId = levelCfgId;
@@ -24,13 +25,15 @@ namespace GFGGame
 
             if (levelCfg.FightID.Length > 0)
             {
-                StoryFightCfg storyFightCfg = CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
+                StoryFightCfg storyFightCfg =
+                    CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(levelCfg.FightID));
                 if (storyFightCfg == null)
                 {
                     Debug.LogError(string.Format("战斗id：{0}  无配置", levelCfg.FightID));
                     return;
                 }
-                if(levelCfg.Type == 6 && levelCfg.SubType == 2)
+
+                if (levelCfg.Type == 6 && levelCfg.SubType == 2)
                 {
                     ViewManager.Show<TimeTracingLevelInfoView>(new object[] { levelCfgId, needitemId, needItemCount });
                 }
@@ -38,19 +41,26 @@ namespace GFGGame
                 {
                     ViewManager.Show<StoryLevelInfoView>(new object[] { levelCfgId, needitemId, needItemCount });
                 }
-                
             }
             else if (!string.IsNullOrEmpty(levelCfg.StoryStartID))
             {
-                List<StoryDialogCfg> storyDialogCfg = CommonDataManager.Tables.TblStoryDialogCfg.GetGroup1ById(int.Parse(levelCfg.StoryStartID));
+                List<StoryDialogCfg> storyDialogCfg = CommonDataManager.Tables.TblStoryDialogCfg.DataList
+                    .Where(a => a.Id == int.Parse(levelCfg.StoryStartID)).ToList();
+
                 if (storyDialogCfg.Count <= 0)
                 {
                     Debug.LogError(string.Format("剧情id：{0}  无配置", levelCfg.StoryStartID));
                     return;
                 }
+
                 //, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.StoryStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, true,false);
+                ViewManager.Show<StoryDialogView>(
+                    new object[]
+                    {
+                        levelCfg.StoryStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),
+                        null, false
+                    }, true, false);
             }
         }
 
@@ -68,7 +78,8 @@ namespace GFGGame
             var success = InstanceZonesDataManager.GetFightResult(score, out var npcScore);
             if (success)
             {
-                await InstanceZonesSProxy.FinishStoryFightLevel(InstanceZonesDataManager.currentLevelCfgId, score, npcScore, InstanceZonesDataManager.usedRecommend);
+                await InstanceZonesSProxy.FinishStoryFightLevel(InstanceZonesDataManager.currentLevelCfgId, score,
+                    npcScore, InstanceZonesDataManager.usedRecommend);
             }
             else
             {
@@ -82,7 +93,8 @@ namespace GFGGame
                 //失败仅判断并更新最高分
                 if (score > InstanceZonesDataManager.GetScoreHighest(InstanceZonesDataManager.currentCardId))
                 {
-                    InstanceZonesSProxy.StoryFightLevelFail(InstanceZonesDataManager.currentLevelCfgId, score).Coroutine();
+                    InstanceZonesSProxy.StoryFightLevelFail(InstanceZonesDataManager.currentLevelCfgId, score)
+                        .Coroutine();
                 }
             }
         }
@@ -104,4 +116,4 @@ namespace GFGGame
             _onFinishStoryLevelCall?.Invoke(levelCfgId, firstPass, success);
         }
     }
-}
+}

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

@@ -28,7 +28,7 @@ namespace GFGGame
 
         public override void Dispose()
         {
-             EffectUIPool.Recycle(_effectUI1);
+            EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
@@ -54,6 +54,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -128,7 +129,7 @@ namespace GFGGame
             {
                 OnCardSelected(cardList[0].id);
             }
-           
+
 
             UpdateView(0);
 
@@ -152,13 +153,16 @@ namespace GFGGame
                 _ui.m_noCardTips.visible = false;
                 cardId = cardList[index].id;
             }
+
             _ui.m_txtName.text = "无";
 
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
             _ui.m_txtName.text = cardList[index].itemCfg.Name;
 
-            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+            List<PassivitySkillCfg> skillCfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                .Where(a => a.CardId == cardId).ToList();
+
             _ui.m_listSkill.data = skillCfgs;
             _ui.m_listSkill.numItems = skillCfgs.Count;
             _ui.m_comSkillTips.target.visible = false;
@@ -186,7 +190,8 @@ namespace GFGGame
             GObject gObject = context.sender as GObject;
             int index = (int)gObject.data;
             List<PassivitySkillCfg> skillCfgs =
-                CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardList[_selectedIndex].id);
+                CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                    .Where(a => a.CardId == cardList[_selectedIndex].id).ToList();
 
             PassivitySkillCfg skillCfg = skillCfgs[index];
             _ui.m_comSkillTips.target.visible = _skillId != skillCfg.SkillId;
@@ -200,7 +205,7 @@ namespace GFGGame
             PassivitySkillLvlCfg skillLvlCfg =
                 CommonDataManager.Tables.TblPassivitySkillLvlCfg.Get(skillLv, skillCfg.SkillId);
             _ui.m_comSkillTips.m_txtSkillTips.text = skillLvlCfg.Describe;
-            
+
             _skillId = skillCfg.SkillId;
         }
 
@@ -234,7 +239,8 @@ namespace GFGGame
                 //EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_comEff.m_holder, "ui_fight_new", "kp_Select");
                 // _effects.Add(_effectUI);
             }
-            if(index == 0)
+
+            if (index == 0)
             {
                 item.m_useIcon.visible = true;
             }
@@ -242,9 +248,11 @@ namespace GFGGame
             {
                 item.m_useIcon.visible = false;
             }
+
             item.m_fieldwork.visible = false;
             item.target.asCom.RemoveChild(_comSelected);
-            if (_selectedIndex == index) { 
+            if (_selectedIndex == index)
+            {
                 item.target.asCom.AddChild(_comSelected);
             }
 
@@ -264,15 +272,15 @@ namespace GFGGame
             UpdateView(_ui.m_listCard.selectedIndex);
 
             OnCardSelected(cardList[_ui.m_listCard.selectedIndex].id);
-
         }
 
         private void OnCardSelected(int cardId)
         {
-            if ( cardId == 0)
+            if (cardId == 0)
             {
                 return;
             }
+
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
@@ -298,8 +306,10 @@ namespace GFGGame
             {
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
-                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, true);
+                    ViewManager.Show<ArenaDressInfoView>(
+                        new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, true);
                 }
+
                 this.Hide();
                 return;
             }
@@ -310,16 +320,20 @@ namespace GFGGame
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
                 List<long> fightScoreDatas = dataManager.GetFightScoreList(dataManager.DressupList);
-                ArenaSproxy.ReqChangeArenaDressup(dataManager.SelectThemeIndex, cardId,MyDressUpHelper.dressUpObj.itemList, fightScoreDatas).Coroutine();
+                ArenaSproxy.ReqChangeArenaDressup(dataManager.SelectThemeIndex, cardId,
+                    MyDressUpHelper.dressUpObj.itemList, fightScoreDatas).Coroutine();
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
                     //ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
-                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" },true);
+                    ViewManager.Show<ArenaDressInfoView>(
+                        new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, true);
                 }
             }
             else
             {
-                List<PassivitySkillCfg> cfgs = CommonDataManager.Tables.TblPassivitySkillCfg.GetGroup1ByCardId(cardId);
+                List<PassivitySkillCfg> cfgs = CommonDataManager.Tables.TblPassivitySkillCfg.DataList
+                    .Where(a => a.CardId == cardId).ToList();
+
                 InstanceZonesDataManager.currentCardId = cfgs.Count > 0 ? cardId : -1;
                 EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);
             }
@@ -363,6 +377,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_listCard, ConstGuideId.SKILL_CARD_FIGHT, 2, "选择一张合适的词牌，增加过关战斗力。", 0);
             GuideController.TryCompleteGuide(ConstGuideId.SKILL_CARD_FIGHT, 2);
         }
+
         private void AddEffect()
         {
             //邊框左上角特效

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

@@ -315,7 +315,9 @@ namespace GFGGame
 
         private void UpdateList(bool isView = false)
         {
-            _chapterCfgs = CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(subType);
+            _chapterCfgs = CommonDataManager.Tables.TblStoryChapterCfg.DataList.Where(a => a.SubType == subType)
+                .ToList();
+
             //这里+2，只是为了list左右两边为空白的表现，对于数据没啥意义
             _ui.m_listChapter.numItems = _chapterCfgs.Count + 2;
             //_ui.m_listChapter.numItems = MainStoryDataManager.CheckChapterPassIndex(subType) + 2;
@@ -342,7 +344,9 @@ namespace GFGGame
                 if (subType != 1)
                 {
                     ChapterRewardCfg chapterReward =
-                        CommonDataManager.Tables.TblChapterRewardCfg.GetGroup1ByChapterId(chapterID)[0];
+                        CommonDataManager.Tables.TblChapterRewardCfg.DataList.Where(a => a.ChapterId == chapterID)
+                            .ToList()[0];
+
                     listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(
                         CommonDataManager.Tables.TblItemCfg.GetOrDefault(chapterReward.BonusOnce[0].ItemId).Res, "png");
                     listItem.m_content.m_reward.m_rewardNum.text =
@@ -528,7 +532,9 @@ namespace GFGGame
         {
             chapterIndex = 0;
             List<StoryChapterCfg> storyChapterList =
-                CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(MainStoryDataManager.currentChapterType);
+                CommonDataManager.Tables.TblStoryChapterCfg.DataList
+                    .Where(a => a.SubType == MainStoryDataManager.currentChapterType).ToList();
+
             foreach (StoryChapterCfg item in storyChapterList)
             {
                 if (!MainStoryDataManager.CheckChapterUnlock(item.Id))

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

@@ -5,6 +5,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System;
+using System.Linq;
 using YooAsset;
 using GFGGame.Launcher;
 using UnityEngine.UI;
@@ -365,7 +366,9 @@ namespace GFGGame
 
         private void InitStepListById(string dialogID)
         {
-            var temp = CommonDataManager.Tables.TblStoryDialogCfg.GetGroup1ById(int.Parse(dialogID));
+            var temp = CommonDataManager.Tables.TblStoryDialogCfg.DataList.Where(a => a.Id == int.Parse(dialogID))
+                .ToList();
+
             _stepListToRead = new List<StoryDialogCfg>(temp);
         }
 

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

@@ -1,6 +1,7 @@
 using UI.Main;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -17,6 +18,7 @@ namespace GFGGame
         private bool _isShowLetters;
         private string _currentWords;
         private string _currentData;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -24,6 +26,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -42,7 +45,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            
+
             _ui.m_content.m_txtContent.text = "";
 
             bool needScrollBottom = false;
@@ -65,6 +68,7 @@ namespace GFGGame
                 {
                     content += words + "\n";
                 }
+
                 _ui.m_content.m_txtContent.text = content;
                 _ui.m_content.m_txtContent.height = _ui.m_content.m_txtContent.textHeight;
             }
@@ -86,7 +90,9 @@ namespace GFGGame
 
         private void InitStepListById(string dialogID)
         {
-            var temp = CommonDataManager.Tables.TblStoryDialogCfg.GetGroup1ById(int.Parse(dialogID));
+            var temp = CommonDataManager.Tables.TblStoryDialogCfg.DataList.Where(a => a.Id == int.Parse(dialogID))
+                .ToList();
+
             _stepListToRead = new List<StoryDialogCfg>(temp);
         }
 
@@ -96,6 +102,7 @@ namespace GFGGame
             {
                 InitStepListById(nextStepId);
             }
+
             if (_stepListToRead != null && _stepListToRead.Count > 0)
             {
                 StoryDialogCfg storyDialogCfg = (StoryDialogCfg)_stepListToRead[0];
@@ -104,7 +111,6 @@ namespace GFGGame
             }
             else
             {
-
             }
         }
 
@@ -134,6 +140,7 @@ namespace GFGGame
             {
                 stepID = "0";
             }
+
             OnStepComplete(stepID);
         }
 
@@ -164,11 +171,13 @@ namespace GFGGame
             {
                 roleName = RoleDataManager.roleName;
             }
+
             //回顾
             if (!string.IsNullOrEmpty(roleName))
             {
                 _dialogListLookBack.Add("[color=#FDA2B1]" + roleName + "[/color]");
             }
+
             _wordList = Regex.Split(words, "&&");
             _wordIndex = 0;
             ShowNextDialog();
@@ -190,6 +199,7 @@ namespace GFGGame
                 {
                     _currentData = null;
                 }
+
                 ShowCurrentWords();
             }
             else
@@ -222,7 +232,6 @@ namespace GFGGame
         {
             if (value.Length > 0)
             {
-
             }
         }
 
@@ -230,7 +239,6 @@ namespace GFGGame
         {
             if (value.Length > 0)
             {
-
             }
         }
 
@@ -251,22 +259,17 @@ namespace GFGGame
 
         private void PlayEffect(string[] infos)
         {
-
         }
 
         private void PlayShake(int[] shakeInfoArr)
         {
             if (shakeInfoArr != null && shakeInfoArr.Length > 0)
             {
-
             }
         }
 
         private void Over(bool isSkip = false)
         {
-
         }
-
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.MiniGame;
@@ -14,6 +15,7 @@ namespace GFGGame
         private UI_ChallengeRewardsUI _ui;
 
         private List<int> gameList = new List<int>();
+
         //private MiniGame[] gameNameDate; 
         //由于每个游戏都有一个表
         private List<CardGameCfg> CardGameDate;
@@ -23,16 +25,18 @@ namespace GFGGame
 
         private int oneNumItems;
         private int twoNumItems;
+
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -45,17 +49,18 @@ namespace GFGGame
             _ui.m_reward.m_rewardOneList.itemRenderer = RenderListOne;
             _ui.m_reward.m_rewardTwoList.itemRenderer = RenderListTwo;
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             gameList = (this.viewData as object[])[0] as List<int>;
 
-            for(int i= 0;i< gameList.Count; i+=2)
+            for (int i = 0; i < gameList.Count; i += 2)
             {
-                GetGameArray(gameList[i], gameList[i + 1],i);
+                GetGameArray(gameList[i], gameList[i + 1], i);
             }
 
-            switch(gameList.Count)
+            switch (gameList.Count)
             {
                 case 0:
                     oneNumItems = 0;
@@ -70,23 +75,34 @@ namespace GFGGame
                     oneNumItems = 0;
                     break;
             }
-            foreach(GameInfoProto t in MiniGameDateManager.Instance.gameinfoList)
+
+            foreach (GameInfoProto t in MiniGameDateManager.Instance.gameinfoList)
             {
-                if(t.GameType == 1)
+                if (t.GameType == 1)
                 {
                     CardGameInfo.Add(t);
                 }
-                if(t.GameType == 2)
+
+                if (t.GameType == 2)
                 {
                     Merge2048GameInfo.Add(t);
                 }
             }
 
-            _ui.m_reward.m_rewardOneList.numItems = CardGameInfo[0].StarRewardStatus.Count == 0? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
-            oneNumItems = CardGameInfo[0].StarRewardStatus.Count == 0 ? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
-            _ui.m_reward.m_rewardTwoList.numItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
-            twoNumItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
+            _ui.m_reward.m_rewardOneList.numItems = CardGameInfo[0].StarRewardStatus.Count == 0
+                ? CardGameInfo.Count
+                : CardGameInfo[0].StarRewardStatus.Count;
+            oneNumItems = CardGameInfo[0].StarRewardStatus.Count == 0
+                ? CardGameInfo.Count
+                : CardGameInfo[0].StarRewardStatus.Count;
+            _ui.m_reward.m_rewardTwoList.numItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0
+                ? Merge2048GameInfo.Count
+                : Merge2048GameInfo[0].StarRewardStatus.Count;
+            twoNumItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0
+                ? Merge2048GameInfo.Count
+                : Merge2048GameInfo[0].StarRewardStatus.Count;
         }
+
         protected override void OnHide()
         {
             CardGameInfo.Clear();
@@ -94,11 +110,12 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void RenderListOne(int index ,GObject obj)
+        private void RenderListOne(int index, GObject obj)
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}首次{1}星通关",CommonDataManager.Tables.TblMiniGameCfg.GetOrDefault(gameList[0]).TypeName, starNum);
+            item.m_rewardDesc.text = string.Format("{0}首次{1}星通关",
+                CommonDataManager.Tables.TblMiniGameCfg.GetOrDefault(gameList[0]).TypeName, starNum);
             item.m_rewardList.itemRenderer = RenditemReward;
             //var reward;
             item.m_getBtn.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[0].StarRewardStatus[2 - index];
@@ -109,25 +126,30 @@ namespace GFGGame
             {
                 item.m_getBtn.target.onClick.Add(OnBtnGoClick);
             }
+
             List<int> rewardList = new List<int>();
-            List<int> starList = new List<int>() { CardGameDate[0].TimeStar3, CardGameDate[0].TimeStar2, CardGameDate[0].TimeStar1 };
+            List<int> starList = new List<int>()
+                { CardGameDate[0].TimeStar3, CardGameDate[0].TimeStar2, CardGameDate[0].TimeStar1 };
             rewardList.Add(CardGameDate[0].Id);
             rewardList.Add(CardGameDate[0].Type);
             rewardList.Add(1);
-            rewardList.Add(3-index);
+            rewardList.Add(3 - index);
             rewardList.Add(MiniGameDateManager.Instance.gameinfoList[0].StarRewardStatus[2 - index]);
             item.m_getBtn.target.data = rewardList;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
-        private void RenderListTwo(int index , GObject obj)
+
+        private void RenderListTwo(int index, GObject obj)
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}关卡{1}首次通关", CommonDataManager.Tables.TblMiniGameCfg.GetOrDefault(gameList[2]).TypeName,index+1);
+            item.m_rewardDesc.text = string.Format("{0}关卡{1}首次通关",
+                CommonDataManager.Tables.TblMiniGameCfg.GetOrDefault(gameList[2]).TypeName, index + 1);
             item.m_rewardList.itemRenderer = RenditemReward;
             //读表
             //var reward;
-            item.m_getBtn.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index + CardGameInfo.Count].FirstPassRewardStatus;
+            item.m_getBtn.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index + CardGameInfo.Count]
+                .FirstPassRewardStatus;
             item.m_rewardList.data = gameList[2];
             item.m_rewardList.numItems = Merge2048GameDate[index].BonusWinFirst.Count;
 
@@ -135,8 +157,10 @@ namespace GFGGame
             {
                 item.m_getBtn.target.onClick.Add(OnBtnGoClick);
             }
+
             List<int> rewardList = new List<int>();
-            List<int> starList = new List<int>() { Merge2048GameDate[0].TimeStar3, Merge2048GameDate[0].TimeStar2, Merge2048GameDate[0].TimeStar1 };
+            List<int> starList = new List<int>()
+                { Merge2048GameDate[0].TimeStar3, Merge2048GameDate[0].TimeStar2, Merge2048GameDate[0].TimeStar1 };
             rewardList.Add(Merge2048GameDate[index].Id);
             rewardList.Add(Merge2048GameDate[index].Type);
             rewardList.Add(1);
@@ -145,24 +169,31 @@ namespace GFGGame
             item.m_getBtn.target.data = rewardList;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
+
         private void RenditemReward(int index, GObject obj)
         {
             UI_ChallengeRewardItem item = UI_ChallengeRewardItem.Proxy(obj);
             int num = 3 - index;
-            if((int)item.target.parent.data == 1)
+            if ((int)item.target.parent.data == 1)
             {
                 switch (num)
                 {
                     case 1:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar1[0].ItemId).Res, "png");      
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar1[0].ItemId).Res,
+                            "png");
                         item.m_Num.text = CardGameDate[0].BonusStar1[0].Count.ToString();
                         break;
                     case 2:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar2[0].ItemId).Res, "png");
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar2[0].ItemId).Res,
+                            "png");
                         item.m_Num.text = CardGameDate[0].BonusStar2[0].Count.ToString();
                         break;
                     case 3:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar3[0].ItemId).Res, "png");
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg.GetOrDefault(CardGameDate[0].BonusStar3[0].ItemId).Res,
+                            "png");
                         item.m_Num.text = CardGameDate[0].BonusStar3[0].Count.ToString();
                         break;
                     default:
@@ -174,62 +205,73 @@ namespace GFGGame
                 switch (num)
                 {
                     case 1:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(Merge2048GameDate[0].BonusWinFirst[0].ItemId).Res, "png");
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg
+                                .GetOrDefault(Merge2048GameDate[0].BonusWinFirst[0].ItemId).Res, "png");
                         item.m_Num.text = Merge2048GameDate[0].BonusWinFirst[0].Count.ToString();
                         break;
                     case 2:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(Merge2048GameDate[1].BonusWinFirst[0].ItemId).Res, "png");
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg
+                                .GetOrDefault(Merge2048GameDate[1].BonusWinFirst[0].ItemId).Res, "png");
                         item.m_Num.text = Merge2048GameDate[1].BonusWinFirst[0].Count.ToString();
                         break;
                     case 3:
-                        item.m_icon.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(Merge2048GameDate[2].BonusWinFirst[0].ItemId).Res, "png");
+                        item.m_icon.url = ResPathUtil.GetIconPath(
+                            CommonDataManager.Tables.TblItemCfg
+                                .GetOrDefault(Merge2048GameDate[2].BonusWinFirst[0].ItemId).Res, "png");
                         item.m_Num.text = Merge2048GameDate[2].BonusWinFirst[0].Count.ToString();
                         break;
                     default:
                         break;
                 }
             }
-            UI_ChallengeRewardItem.ProxyEnd();
 
+            UI_ChallengeRewardItem.ProxyEnd();
         }
+
         private async void OnBtnGoClick(EventContext context)
         {
-
             if (!(context.sender is GObject btnGet)) return;
             List<int> itemList = btnGet.data as List<int>;
             if (itemList[4] != 1)
             {
                 return;
             }
+
             if (itemList[1] == 1)
-            { 
+            {
                 var result = await MiniGameProxy.ReqGetReward(itemList[0], itemList[1], itemList[2], itemList[3]);
                 if (!result) return;
             }
-            else if(itemList[1] == 2)
+            else if (itemList[1] == 2)
             {
                 var result = await MiniGameProxy.ReqGetFirstPassReward(itemList[0], itemList[1], itemList[2]);
                 if (!result) return;
             }
+
             _ui.m_reward.m_rewardOneList.numItems = oneNumItems;
             _ui.m_reward.m_rewardTwoList.numItems = twoNumItems;
             EventAgent.DispatchEvent(ConstMessage.MINI_GAME_UPDATE);
         }
-        private void GetGameArray(int i,int j,int index)
+
+        private void GetGameArray(int i, int j, int index)
         {
-            switch(i)
+            switch (i)
             {
                 case 1:
-                    CardGameDate = CommonDataManager.Tables.TblCardGameCfg.GetGroup1ByTypeAndSubType(i,j);
+                    CardGameDate = CommonDataManager.Tables.TblCardGameCfg.DataList
+                        .Where(a => a.Type == i && a.SubType == j).ToList();
+
                     break;
                 case 2:
-                    Merge2048GameDate = CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(i,j);
+                    Merge2048GameDate = CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                        .Where(a => a.Type == i && a.SubType == j).ToList();
+
                     break;
                 default:
                     break;
             }
-
         }
-
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -11,30 +12,42 @@ namespace GFGGame
     public class FlipGameView : BaseWindow
     {
         private UI_FlipGameUI _ui;
+
         //卡牌数量（配置）
         private int cardNum = 16;
+
         //当前卡牌数量
         private int currentCardNum = 16;
+
         //当前翻开卡牌
         //"state" 0:未翻开，1：已翻开，2：已消除
         private List<Dictionary<string, int>> cardList = new List<Dictionary<string, int>>();
+
         //消除所需数量(配置)
         private int needNum;
+
         //游戏结束时长(配置)
         private int gameTime = 120;
+
         //游戏当前时长倒计时
         private int currentGameTime = 120;
+
         //当前游戏时长
         private int timeIndex = 0;
+
         //进度条
         private float barTime = 120.0f;
+
         //行数
         private int rows = 4;
+
         //列数
         private int columns = 4;
         private int gameID;
         private CardGameCfg gameDate;
+
         System.Random rand;
+
         //通关评价
         private List<int> CustemsNum = new List<int>()
         {
@@ -42,6 +55,7 @@ namespace GFGGame
             30,
             60,
         };
+
         private List<string> CustemsName = new List<string>()
         {
             "良好",
@@ -50,6 +64,7 @@ namespace GFGGame
         };
 
         private List<ActivityOpenCfg> activityGameDate;
+
         //假数据
         private List<int> cardArray = new List<int> { 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 8, 8 };
 
@@ -65,6 +80,7 @@ namespace GFGGame
         private EffectUI _effectUI2;
         private List<EffectUI> _effectFlipList = new List<EffectUI>();
         private List<EffectUI> _effectRemoveList = new List<EffectUI>();
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -77,6 +93,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -108,11 +125,13 @@ namespace GFGGame
             {
                 gameID = 10001;
             }
+
             gameDate = CommonDataManager.Tables.TblCardGameCfg.GetOrDefault(gameID);
 
             UpdateView();
             UpdateList();
         }
+
         protected override void OnHide()
         {
             DestroyObjectFromView();
@@ -125,7 +144,6 @@ namespace GFGGame
             Timers.inst.Remove(FlipAllCard);
             Timers.inst.Remove(ResetTouch);
             base.OnHide();
-
         }
 
         private void DestroyObjectFromView()
@@ -135,6 +153,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectFlipList[i]);
                 _effectFlipList[i] = null;
             }
+
             _effectFlipList.Clear();
 
             for (int i = 0; i < _effectRemoveList.Count; i++)
@@ -142,8 +161,10 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectRemoveList[i]);
                 _effectRemoveList[i] = null;
             }
+
             _effectRemoveList.Clear();
         }
+
         private void OnClickBtnBack()
         {
             Timers.inst.Remove(UpdateTime);
@@ -158,18 +179,20 @@ namespace GFGGame
             {
                 exitTip = "退出游戏会按失败结算，获得80%的奖励，是否退出？";
             }
+
             AlertUI.Show(exitTip)
-            .SetLeftButton(true, "取消", (object data) =>
-            {
-                Timers.inst.Add(1.0f, 0, UpdateTime);
-                Timers.inst.Add(0.1f, 0, UpdateBar);
-            })
-            .SetRightButton(true, "确定", async (object data) =>
-            {
-                var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.Type, timeIndex, false, activityGameDate[0].Id, true);
-                this.Hide();
-            }).SetShowCheck(false);
-        }         
+                .SetLeftButton(true, "取消", (object data) =>
+                {
+                    Timers.inst.Add(1.0f, 0, UpdateTime);
+                    Timers.inst.Add(0.1f, 0, UpdateBar);
+                })
+                .SetRightButton(true, "确定", async (object data) =>
+                {
+                    var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.Type, timeIndex, false,
+                        activityGameDate[0].Id, true);
+                    this.Hide();
+                }).SetShowCheck(false);
+        }
 
         private void ListCardItem(int index, GObject item)
         {
@@ -178,18 +201,23 @@ namespace GFGGame
 
             cardItem.target.visible = true;
             cardItem.target.alpha = 1;
-            EffectUI _effectUI1 = EffectUIPool.CreateEffectUI(cardItem.m_flipEffect, "ui_Activity", "YXJY_Game_OpenCard");
+            EffectUI _effectUI1 =
+                EffectUIPool.CreateEffectUI(cardItem.m_flipEffect, "ui_Activity", "YXJY_Game_OpenCard");
             _effectFlipList.Add(_effectUI1);
             cardItem.m_flipEffect.visible = false;
-            EffectUI _effectUI2 = EffectUIPool.CreateEffectUI(cardItem.m_removeEffect, "ui_Activity", "YXJY_Game_CardDie");
+            EffectUI _effectUI2 =
+                EffectUIPool.CreateEffectUI(cardItem.m_removeEffect, "ui_Activity", "YXJY_Game_CardDie");
             _effectRemoveList.Add(_effectUI2);
             cardItem.m_removeEffect.visible = false;
 
-            cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath( CommonDataManager.Tables.TblCardCfg.DataList[cardArray[index]].ResName,"FlipGame");
+            cardItem.m_card.GetChild("icon").icon =
+                ResPathUtil.GetMiniGamePicPath(CommonDataManager.Tables.TblCardCfg.DataList[cardArray[index]].ResName,
+                    "FlipGame");
             if (cardItem.target.data == null)
             {
                 cardItem.target.onClick.Add(OnClickCardItem);
             }
+
             Card _c1 = (Card)cardItem.m_card;
             _c1.opened = true;
             _c1.SetPerspective();
@@ -197,10 +225,11 @@ namespace GFGGame
             itemInfo.Add("index", index);
             itemInfo.Add("id", cardArray[index]);
             itemInfo.Add("state", 0);
-            cardItem.m_id.visible = false;//text = itemInfo["id"].ToString();
+            cardItem.m_id.visible = false; //text = itemInfo["id"].ToString();
             cardItem.target.data = itemInfo;
             UI_cardItem.ProxyEnd();
         }
+
         private void UpdateView()
         {
             gameTime = CommonDataManager.Tables.TblCardGameCfg.GetOrDefault(gameID).Time;
@@ -219,6 +248,7 @@ namespace GFGGame
                         break;
                 }
             }
+
             StartHit = true;
             firstHit = true;
             canHit = true;
@@ -228,7 +258,9 @@ namespace GFGGame
             currentCardNum = cardNum;
             barTime = (float)gameTime;
             needNum = 2;
-            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.ActLimitStlyc).ToList();
+
             rand = new System.Random();
             //洗牌
             RandomGetNum();
@@ -238,9 +270,12 @@ namespace GFGGame
             _ui.m_ScareBar.max = gameTime;
             _ui.m_ScareBar.min = 0;
             _ui.m_ScareBar.value = gameTime;
-            _ui.m_star1.SetPosition(((float)(gameTime - CustemsNum[0]) / (float)gameTime) * _ui.m_ScareBar.width + 70, _ui.m_star1.position.y, _ui.m_star1.position.z);
-            _ui.m_star2.SetPosition(((float)(gameTime - CustemsNum[1]) / (float)gameTime) * _ui.m_ScareBar.width + 10, _ui.m_star1.position.y, _ui.m_star1.position.z);
-            _ui.m_star3.SetPosition(((float)(gameTime - CustemsNum[2]) / (float)gameTime) * _ui.m_ScareBar.width, _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star1.SetPosition(((float)(gameTime - CustemsNum[0]) / (float)gameTime) * _ui.m_ScareBar.width + 70,
+                _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star2.SetPosition(((float)(gameTime - CustemsNum[1]) / (float)gameTime) * _ui.m_ScareBar.width + 10,
+                _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star3.SetPosition(((float)(gameTime - CustemsNum[2]) / (float)gameTime) * _ui.m_ScareBar.width,
+                _ui.m_star1.position.y, _ui.m_star1.position.z);
             _ui.m_title.visible = false;
             _ui.m_titleEffec.visible = true;
             _ui.m_barEffect.x = _ui.m_ScareBar.width;
@@ -255,12 +290,14 @@ namespace GFGGame
             //翻转所有牌
             Timers.inst.Add(1.0f, 1, FlipAllCard);
         }
+
         private void OnClickCardItem(EventContext context)
         {
             if (!canHit)
             {
                 return;
             }
+
             GObject cardItem = context.sender as GObject;
             Dictionary<string, int> cardInfo = (Dictionary<string, int>)cardItem.data;
             UI_cardItem item = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardInfo["index"]));
@@ -271,6 +308,7 @@ namespace GFGGame
                 _ui.m_back.touchable = false;
                 Timers.inst.Add(1.0f, 1, StartTime);
             }
+
             Card card = (Card)item.m_card;
             bool isSame = false;
             for (int i = 0; i < cardList.Count; i++)
@@ -284,7 +322,7 @@ namespace GFGGame
                     canHit = false;
                     cardList.RemoveAt(0);
 
-                    Timers.inst.Add(0.5f, 1,UpdateOneHit);
+                    Timers.inst.Add(0.5f, 1, UpdateOneHit);
                     isSame = true;
                     break;
                 }
@@ -297,6 +335,7 @@ namespace GFGGame
                     }
                 }
             }
+
             firstHit = false;
             //翻牌
             if (!isSame)
@@ -306,15 +345,17 @@ namespace GFGGame
                 item.m_flipEffect.visible = true;
                 cardList.Add(cardInfo);
             }
+
             UI_cardItem.ProxyEnd();
         }
+
         private void StartTime(object param = null)
         {
-
             _ui.m_cardList.touchable = false;
             canHit = false;
             UpdateCard();
         }
+
         //这里是处理已翻开的数量
         private void UpdateCard()
         {
@@ -331,7 +372,7 @@ namespace GFGGame
                     UI_cardItem.ProxyEnd();
 
                     UI_cardItem item2 = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i - 1]["index"]));
-                    item2.m_t0.Play(()=> { _ui.m_back.touchable = true; });
+                    item2.m_t0.Play(() => { _ui.m_back.touchable = true; });
                     UI_cardItem.ProxyEnd();
 
                     currentCardNum -= 2;
@@ -339,21 +380,23 @@ namespace GFGGame
                     removeList.Add(cardList[i]);
                 }
             }
+
             if (currentCardNum <= 0)
             {
                 Gameover(true);
                 return;
             }
+
             //先处理消除的列表
             for (int i = 0; i < removeList.Count; i++)
             {
                 cardList.Remove(removeList[i]);
             }
+
             removeList.Clear();
             //后处理翻牌的列表
             for (int i = 1; i < cardList.Count; i++)
             {
-
                 UI_cardItem item = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i - 1]["index"]));
                 //翻回去
                 Card card = (Card)item.m_card;
@@ -388,6 +431,7 @@ namespace GFGGame
 
             Timers.inst.Add(0.6f, 1, UpdateHit);
         }
+
         private void UpdateHit(object param = null)
         {
             StartHit = true;
@@ -397,6 +441,7 @@ namespace GFGGame
             _ui.m_back.touchable = true;
             Timers.inst.Remove(UpdateHit);
         }
+
         private void UpdateOneHit(object param = null)
         {
             canHit = true;
@@ -418,6 +463,7 @@ namespace GFGGame
                 card.Turn();
                 UI_cardItem.ProxyEnd();
             }
+
             Timers.inst.Add(0.6f, 1, ResetTouch);
         }
 
@@ -425,6 +471,7 @@ namespace GFGGame
         {
             _ui.m_cardList.touchable = true;
         }
+
         private void UpdateTime(object param = null)
         {
             timeIndex++;
@@ -436,6 +483,7 @@ namespace GFGGame
                 Gameover(false);
             }
         }
+
         private void UpdateBar(object param = null)
         {
             barTime -= 0.1f;
@@ -449,6 +497,7 @@ namespace GFGGame
             Timers.inst.Remove(UpdateBar);
             ViewManager.Show<ResultTipsView>(new object[] { isPass, gameDate.Type, timeIndex, gameDate.Id });
         }
+
         //洗牌
         private void RandomCardList(List<int> array, int length)
         {
@@ -471,6 +520,7 @@ namespace GFGGame
             {
                 tArray.Add(i);
             }
+
             RandomCardList(tArray, numCount);
             int j = 0;
             for (int i = 0; i < cardNum; i += 4)
@@ -482,6 +532,5 @@ namespace GFGGame
                 j++;
             }
         }
-
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.MiniGame;
@@ -12,8 +13,11 @@ namespace GFGGame
     public class GameStartView : BaseWindow
     {
         private UI_GameStartUI _ui;
+
         //后续这里改成读表内容,1:CardGame,2:Merge2048Game,3:HuarongRoadGame
-        private List<string> viewJumpName = new List<string>() {"","FlipGameView", "TZFEGameCheckView" ,"ActivityHuaRongDaoView"};
+        private List<string> viewJumpName = new List<string>()
+            { "", "FlipGameView", "TZFEGameCheckView", "ActivityHuaRongDaoView" };
+
         private List<ActivityOpenCfg> activityGameDate;
         private List<int> GameType = new List<int>();
         private List<int> ChallengeList = new List<int>();
@@ -44,6 +48,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -74,22 +79,27 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.ActLimitStlyc).ToList();
+
             GetGameIdByActivityDate();
             UpdateChallengeBtn();
             ReqChallageReward();
             UpdateView();
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
         }
+
         protected override void OnHide()
         {
             GameType.Clear();
@@ -101,9 +111,10 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBtn.target, MiniGameDateManager.Instance.GetRewardRot());
         }
+
         private void UpdateView()
         {
-            if(ChallengeList.Count == 0)
+            if (ChallengeList.Count == 0)
             {
                 _ui.m_rewardBtn.target.visible = false;
             }
@@ -112,7 +123,10 @@ namespace GFGGame
                 _ui.m_rewardBtn.target.visible = true;
             }
 
-            CardGameCfg cardGameDate = CommonDataManager.Tables.TblCardGameCfg.GetGroup1ByTypeAndSubType(GameType[0],GameType[1])[0];
+            CardGameCfg cardGameDate =
+                CommonDataManager.Tables.TblCardGameCfg.DataList
+                    .Where(a => a.Type == GameType[0] && a.SubType == GameType[1]).ToList()[0];
+
             int consumeID;
             if (cardGameDate.ComsumePass.Count > 0)
             {
@@ -125,10 +139,13 @@ namespace GFGGame
                 consumeID = 3000017;
             }
 
-            _ui.m_ticket.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res,"png");
+            _ui.m_ticket.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res, "png");
             _ui.m_needNum1.text = NumTicketOne.ToString();
-            _ui.m_needIcon1.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res,"png");
-            _ui.m_needIcon2.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res, "png");
+            _ui.m_needIcon1.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res, "png");
+            _ui.m_needIcon2.url =
+                ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(consumeID).Res, "png");
             _ui.m_needNum2.text = NumTicketTwo.ToString();
             _ui.m_needNum2.visible = false;
             _ui.m_needIcon2.visible = false;
@@ -147,14 +164,18 @@ namespace GFGGame
                 _ui.m_ticketNum.text = "0";
             }
         }
+
         private void OnClickBtnBack()
         {
             this.Hide();
         }
+
         private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            ViewManager.Show<StoreView>(new object[]
+                { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
+
         private void OnClickBtnReward()
         {
             ViewManager.Show<ChallengeRewardView>(new object[] { ChallengeList });
@@ -166,26 +187,38 @@ namespace GFGGame
             if (!result) return;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBtn.target, MiniGameDateManager.Instance.GetRewardRot());
         }
+
         private void OnClickBtnAdd()
         {
             object[] sourceDatas = new object[] { 3000017, null };
             GoodsItemTipsController.ShowItemTips(3000017, sourceDatas);
         }
+
         private async void OnClickBtnGameOne()
         {
-            var result = await MiniGameProxy.ReqMiniGameStart( CommonDataManager.Tables.TblCardGameCfg.GetGroup1ByTypeAndSubType(GameType[0], GameType[1])[0].Id, GameType[0], activityGameDate[0].Id);
+            var result = await MiniGameProxy.ReqMiniGameStart(
+                CommonDataManager.Tables.TblCardGameCfg.DataList
+                    .Where(a => a.Type == GameType[0] && a.SubType == GameType[1]).ToList()[0].Id,
+                GameType[0], activityGameDate[0].Id);
+
             if (!result) return;
-            ViewManager.Show($"GFGGame.{viewJumpName[GameType[0]]}", new object[] { CommonDataManager.Tables.TblCardGameCfg.GetGroup1ByTypeAndSubType(GameType[0], GameType[1])[0].Id });
+            ViewManager.Show($"GFGGame.{viewJumpName[GameType[0]]}",
+                new object[]
+                {
+                    CommonDataManager.Tables.TblCardGameCfg.DataList
+                        .Where(a => a.Type == GameType[0] && a.SubType == GameType[1]).ToList()[0].Id
+                });
         }
+
         private void OnClickBtnGameTwo()
         {
-            ViewManager.Show($"GFGGame.{viewJumpName[GameType[2]]}",new object[] { GameType[2],GameType[3]});
+            ViewManager.Show($"GFGGame.{viewJumpName[GameType[2]]}", new object[] { GameType[2], GameType[3] });
         }
 
         private void GetGameIdByActivityDate()
         {
             string pattern = @"\d+";
-            for(int i = 0; i < activityGameDate[0].Params5.Count; i++)
+            for (int i = 0; i < activityGameDate[0].Params5.Count; i++)
             {
                 MatchCollection matches = Regex.Matches(activityGameDate[0].Params5[i], pattern);
                 foreach (Match match in matches)
@@ -193,7 +226,6 @@ namespace GFGGame
                     GameType.Add(int.Parse(match.Value));
                 }
             }
-
         }
 
         private void OnNumericChange()
@@ -213,19 +245,22 @@ namespace GFGGame
         {
             int index = 0;
             //当两个游戏都只有一关时，奖励按钮隐藏
-            for(int i = 0;i<GameType.Count;i+=2)
+            for (int i = 0; i < GameType.Count; i += 2)
             {
                 switch (GameType[i])
                 {
                     case 1:
-                       List<CardGameCfg> CardGameDate = CommonDataManager.Tables.TblCardGameCfg.GetGroup1ByTypeAndSubType(GameType[i], GameType[i +1]);
-                        if( CardGameDate.Count <= 1)
+                        List<CardGameCfg> CardGameDate =
+                            CommonDataManager.Tables.TblCardGameCfg.DataList
+                                .Where(a => a.Type == GameType[i] && a.SubType == GameType[i + 1]).ToList();
+
+                        if (CardGameDate.Count <= 1)
                         {
                             ChallengeList.Add(GameType[i]);
-                            ChallengeList.Add(GameType[i+1]);
+                            ChallengeList.Add(GameType[i + 1]);
                         }
 
-                        if(i < 1)
+                        if (i < 1)
                         {
                             //NumTicketOne = CardGameDate[0].comsumeStartArr[0][1];
                         }
@@ -233,9 +268,13 @@ namespace GFGGame
                         {
                             //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
                         }
+
                         break;
                     case 2:
-                       List<Merge2048GameCfg> Merge2048GameDate = CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(GameType[i], GameType[i + 1]);
+                        List<Merge2048GameCfg> Merge2048GameDate =
+                            CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                                .Where(a => a.Type == GameType[i] && a.SubType == GameType[i + 1]).ToList();
+
                         if (Merge2048GameDate.Count <= 1 || Merge2048GameDate[0].BonusWinFirst.Count > 0)
                         {
                             ChallengeList.Add(GameType[i]);
@@ -250,9 +289,13 @@ namespace GFGGame
                         {
                             //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
                         }
+
                         break;
                     case 3:
-                       List <HuarongRoadGame> HuarongRoadGameDate = CommonDataManager.Tables.TblHuarongRoadGame.GetGroup1ByTypeAndSubType(GameType[i], GameType[i + 1]);
+                        List<HuarongRoadGame> HuarongRoadGameDate =
+                            CommonDataManager.Tables.TblHuarongRoadGame.DataList
+                                .Where(a => a.Type == GameType[i] && a.SubType == GameType[i + 1]).ToList();
+
                         if (HuarongRoadGameDate.Count <= 1)
                         {
                             ChallengeList.Add(GameType[i]);
@@ -267,9 +310,10 @@ namespace GFGGame
                         {
                             //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
                         }
+
                         break;
                 }
             }
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -16,7 +17,10 @@ namespace GFGGame
         private int gameType;
         private int gameID;
         private List<ActivityOpenCfg> activityGameDate;
-        private Dictionary<int, string> viewJumpView = new Dictionary<int, string>(){{1,"FlipGameView"},{ 2,"TZFEGameView"} };
+
+        private Dictionary<int, string> viewJumpView = new Dictionary<int, string>()
+            { { 1, "FlipGameView" }, { 2, "TZFEGameView" } };
+
         //通关评价,不同关卡不同
         private List<int> CustemsNum = new List<int>()
         {
@@ -28,6 +32,7 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -41,8 +46,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -60,6 +67,7 @@ namespace GFGGame
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_effectSucces, "ui_Activity", "Game_Quad_Win");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_effectFail, "ui_Activity", "Game_Quad_Lose");
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -67,13 +75,14 @@ namespace GFGGame
             {
                 gameResult = (bool)(this.viewData as object[])[0];
                 gameType = (int)(this.viewData as object[])[1];
-                timeResult = (int) (this.viewData as object[])[2];
+                timeResult = (int)(this.viewData as object[])[2];
                 gameID = (int)(this.viewData as object[])[3];
-
             }
+
             UpdateView();
             ReqResultReward();
         }
+
         private void UpdateView()
         {
             ItemCfg itemCfg;
@@ -95,7 +104,8 @@ namespace GFGGame
                         itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(3000017);
                         consumeText = "";
                     }
-                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.Res,"png");
+
+                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.Res, "png");
                     _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 2:
@@ -113,7 +123,8 @@ namespace GFGGame
                         itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(3000017);
                         consumeText = "";
                     }
-                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.Res,"png");
+
+                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.Res, "png");
                     _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 3:
@@ -127,7 +138,7 @@ namespace GFGGame
             if (gameResult)
             {
                 _ui.m_failTxt.visible = false;
-                _ui.m_success.visible = true ;
+                _ui.m_success.visible = true;
                 _ui.m_effectFail.visible = false;
                 _ui.m_effectSucces.visible = true;
                 _ui.m_resultTxt.text = "通关奖励";
@@ -143,9 +154,11 @@ namespace GFGGame
                 _ui.m_resultTxt.text = "失败奖励";
                 _ui.m_resultTitle.url = "ui://MiniGame/shibai_bt";
             }
+
             _ui.m_resultTitle.visible = false;
             _ui.m_bg.visible = false;
-            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.ActLimitStlyc).ToList();
         }
 
         private void UpdateStar()
@@ -158,8 +171,9 @@ namespace GFGGame
                     starNum += 1;
                 }
             }
-            switch(starNum)
-             {
+
+            switch (starNum)
+            {
                 case 1:
                     _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
                     _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star_grey";
@@ -182,6 +196,7 @@ namespace GFGGame
                     break;
             }
         }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -194,6 +209,7 @@ namespace GFGGame
             ViewManager.Show<GameStartView>();
             EventAgent.DispatchEvent(ConstMessage.TZFE_GAME_UPDATE);
         }
+
         private async void OnClickAgain()
         {
             this.Hide();
@@ -203,15 +219,18 @@ namespace GFGGame
                 ViewManager.Hide(viewJumpView[gameType]);
                 return;
             }
-            ViewManager.Show(viewJumpView[gameType],new object[] { gameID });
+
+            ViewManager.Show(viewJumpView[gameType], new object[] { gameID });
         }
-        private void RenderRewardList(int index,GObject obj)
+
+        private void RenderRewardList(int index, GObject obj)
         {
             UI_rewardItem item = UI_rewardItem.Proxy(obj);
-            ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(MiniGameDateManager.Instance.itemList[index].ConfigId);
+            ItemCfg itemCfg =
+                CommonDataManager.Tables.TblItemCfg.GetOrDefault(MiniGameDateManager.Instance.itemList[index].ConfigId);
             if (itemCfg != null)
             {
-                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.Res,"png");
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.Res, "png");
                 item.m_Count.text = MiniGameDateManager.Instance.itemList[index].Count.ToString();
             }
 
@@ -220,14 +239,16 @@ namespace GFGGame
 
         private async void ReqResultReward()
         {
-            var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameType, timeResult, gameResult, activityGameDate[0].Id,false);
+            var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameType, timeResult, gameResult,
+                activityGameDate[0].Id, false);
             if (!result)
             {
                 this.Hide();
                 ViewManager.Hide(viewJumpView[gameType]);
                 return;
             }
+
             _ui.m_rewardList.numItems = MiniGameDateManager.Instance.itemList.Count;
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.MiniGame;
@@ -13,16 +14,18 @@ namespace GFGGame
         private int target;
         private int srcID;
         private Dictionary<int, GLoader> iconDic = new Dictionary<int, GLoader>();
+
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -43,6 +46,7 @@ namespace GFGGame
             iconDic.Add(256, _ui.m_icon256);
             iconDic.Add(512, _ui.m_icon512);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -98,14 +102,18 @@ namespace GFGGame
                 default:
                     break;
             }
-            for(int i = target; i>=2 ; i= i/2 )
+
+            for (int i = target; i >= 2; i = i / 2)
             {
-                iconDic[i].url = ResPathUtil.GetMiniGamePicPath( CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(srcID,i)[0].ResName, "TZFEGame");
+                iconDic[i].url = ResPathUtil.GetMiniGamePicPath(
+                    CommonDataManager.Tables.TblMerge2048Cfg.DataList.Where(a => a.Id == srcID && a.Num == i)
+                        .ToList()[0].ResName, "TZFEGame");
             }
         }
+
         protected override void OnHide()
         {
             base.OnHide();
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.MiniGame;
@@ -12,8 +13,9 @@ namespace GFGGame
     public class TZFEGameCheckView : BaseWindow
     {
         private UI_TZFEGameCheckUI _ui;
+
         //后续这里改成读表内容,1:CardGame,2:Merge2048Game,3:HuarongRoadGame
-        private List<string> viewJumpName = new List<string>() {"","FlipGameView", "TZFEGameView" };
+        private List<string> viewJumpName = new List<string>() { "", "FlipGameView", "TZFEGameView" };
         private List<ActivityOpenCfg> activityGameDate;
         private List<Merge2048GameCfg> gameDate;
         private int type;
@@ -26,6 +28,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -46,10 +49,12 @@ namespace GFGGame
             _ui.m_backBtn.onClick.Add(OnClickBtnBack);
             _ui.m_tipsOne.onClick.Add(RuleController.ShowRuleView);
         }
+
         protected override void AddEventListener()
         {
             EventAgent.AddEventListener(ConstMessage.TZFE_GAME_UPDATE, OnCheckChange);
         }
+
         protected override void RemoveEventListener()
         {
             EventAgent.RemoveEventListener(ConstMessage.TZFE_GAME_UPDATE, OnCheckChange);
@@ -60,24 +65,33 @@ namespace GFGGame
             base.OnShown();
             type = (int)(this.viewData as object[])[0];
             subType = (int)(this.viewData as object[])[1];
-            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.ActLimitStlyc);
-            gameDate = CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType);
+            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.ActLimitStlyc).ToList();
+
+            gameDate = CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                .Where(a => a.Type == type && a.SubType == subType).ToList();
+
             UpdateView();
         }
+
         protected override void OnHide()
         {
             base.OnHide();
         }
+
         private void UpdateView()
         {
-            if(gameDate[0].ComsumePass.Count > 0)
+            if (gameDate[0].ComsumePass.Count > 0)
             {
                 _ui.m_needNum1.text = gameDate[0].ComsumePass[0].Count.ToString();
                 _ui.m_needNum2.text = gameDate[1].ComsumePass[0].Count.ToString();
                 _ui.m_needNum3.text = gameDate[2].ComsumePass[0].Count.ToString();
-                _ui.m_needIcon1.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[0].ComsumePass[0].ItemId).Res,"png");
-                _ui.m_needIcon2.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[1].ComsumePass[0].ItemId).Res,"png");
-                _ui.m_needIcon3.url = ResPathUtil.GetIconPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[2].ComsumePass[0].ItemId).Res,"png");
+                _ui.m_needIcon1.url = ResPathUtil.GetIconPath(
+                    CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[0].ComsumePass[0].ItemId).Res, "png");
+                _ui.m_needIcon2.url = ResPathUtil.GetIconPath(
+                    CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[1].ComsumePass[0].ItemId).Res, "png");
+                _ui.m_needIcon3.url = ResPathUtil.GetIconPath(
+                    CommonDataManager.Tables.TblItemCfg.GetOrDefault(gameDate[2].ComsumePass[0].ItemId).Res, "png");
             }
             else
             {
@@ -89,18 +103,31 @@ namespace GFGGame
                 _ui.m_needIcon3.url = "";
             }
 
-            _ui.m_game1.url = ResPathUtil.GetMiniGamePicPath(CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(gameDate[0].SubType, gameDate[0].TargetNum)[0].ResName, "TZFEGame");
-            _ui.m_game2.url = ResPathUtil.GetMiniGamePicPath(CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(gameDate[1].SubType, gameDate[1].TargetNum)[0].ResName, "TZFEGame");
-            _ui.m_game3.url = ResPathUtil.GetMiniGamePicPath(CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(gameDate[2].SubType, gameDate[2].TargetNum)[0].ResName, "TZFEGame");
+            _ui.m_game1.url = ResPathUtil.GetMiniGamePicPath(
+                CommonDataManager.Tables.TblMerge2048Cfg.DataList
+                    .Where(a => a.Id == gameDate[0].SubType && a.Num == gameDate[0].TargetNum).ToList()[0].ResName,
+                "TZFEGame");
+
+            _ui.m_game2.url = ResPathUtil.GetMiniGamePicPath(
+                CommonDataManager.Tables.TblMerge2048Cfg.DataList
+                    .Where(a => a.Id == gameDate[1].SubType && a.Num == gameDate[1].TargetNum).ToList()[0].ResName,
+                "TZFEGame");
+
+            _ui.m_game3.url = ResPathUtil.GetMiniGamePicPath(
+                CommonDataManager.Tables.TblMerge2048Cfg.DataList
+                    .Where(a => a.Id == gameDate[2].SubType && a.Num == gameDate[2].TargetNum).ToList()[0].ResName,
+                "TZFEGame");
+
             OnCheckChange();
             _ui.m_tipsOne.data = 300027;
         }
+
         private void OnClickBtnBack()
         {
             this.Hide();
         }
 
-       private async void  OnCheckChange()
+        private async void OnCheckChange()
         {
             var result = await MiniGameProxy.ReqGetChallengeReward(1);
             if (!result) return;
@@ -118,11 +145,11 @@ namespace GFGGame
                             _ui.m_newGame1.visible = t.PlayCount == 0 ? true : false;
                             break;
                         case 2:
-                            _ui.m_gameLock2.visible = !MiniGameDateManager.Instance.gameinfoList[i-1].IsCleared;
+                            _ui.m_gameLock2.visible = !MiniGameDateManager.Instance.gameinfoList[i - 1].IsCleared;
                             _ui.m_newGame2.visible = t.PlayCount == 0 ? true : false;
                             break;
                         case 3:
-                            _ui.m_gameLock3.visible = !MiniGameDateManager.Instance.gameinfoList[i-1].IsCleared;
+                            _ui.m_gameLock3.visible = !MiniGameDateManager.Instance.gameinfoList[i - 1].IsCleared;
                             _ui.m_newGame3.visible = t.PlayCount == 0 ? true : false;
                             break;
                         default:
@@ -134,17 +161,28 @@ namespace GFGGame
 
         private async void OnClickBtnGameOne()
         {
-            if(_ui.m_gameLock1.visible == true)
+            if (_ui.m_gameLock1.visible == true)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
                 return;
             }
-            var result = await MiniGameProxy.ReqMiniGameStart(CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[0].Id, type, activityGameDate[0].Id);
+
+            var result = await MiniGameProxy.ReqMiniGameStart(
+                CommonDataManager.Tables.TblMerge2048GameCfg.DataList.Where(a => a.Type == type && a.SubType == subType)
+                    .ToList()[0].Id, type, activityGameDate[0].Id);
+
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
-            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[0].Id });
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}",
+                new object[]
+                {
+                    CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                        .Where(a => a.Type == type && a.SubType == subType).ToList()[0].Id
+                });
+
             this.Hide();
         }
+
         private async void OnClickBtnGameTwo()
         {
             if (_ui.m_gameLock2.visible == true)
@@ -152,10 +190,20 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
                 return;
             }
-            var result = await MiniGameProxy.ReqMiniGameStart(CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[1].Id, type, activityGameDate[0].Id);
+
+            var result = await MiniGameProxy.ReqMiniGameStart(
+                CommonDataManager.Tables.TblMerge2048GameCfg.DataList.Where(a => a.Type == type && a.SubType == subType)
+                    .ToList()[1].Id, type, activityGameDate[0].Id);
+
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
-            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[1].Id });
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}",
+                new object[]
+                {
+                    CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                        .Where(a => a.Type == type && a.SubType == subType).ToList()[1].Id
+                });
+
             this.Hide();
         }
 
@@ -166,12 +214,21 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("未解锁，请通关前置关卡");
                 return;
             }
-            var result = await MiniGameProxy.ReqMiniGameStart(CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[2].Id, type, activityGameDate[0].Id);
+
+            int id = CommonDataManager.Tables.TblMerge2048GameCfg.DataList
+                .Where(a => a.Type == type && a.SubType == subType)
+                .ToList()[2].Id;
+            var result = await MiniGameProxy.ReqMiniGameStart(
+                id, type, activityGameDate[0].Id);
+
             if (!result) return;
             //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
-            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { CommonDataManager.Tables.TblMerge2048GameCfg.GetGroup1ByTypeAndSubType(type, subType)[2].Id });
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}",
+                new object[]
+                {
+                    id
+                });
             this.Hide();
         }
-
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -13,23 +14,37 @@ namespace GFGGame
         private UI_TZFEGameView _ui;
 
         private int[,] Map;
-        enum Direction { up, down, left, right};
-        private Vector2 touchFirst = Vector2.zero;//手指开始按下的位置
-        private Vector2 touchSecond = Vector2.zero;//手指拖动的位置
+
+        enum Direction
+        {
+            up,
+            down,
+            left,
+            right
+        };
+
+        private Vector2 touchFirst = Vector2.zero; //手指开始按下的位置
+        private Vector2 touchSecond = Vector2.zero; //手指拖动的位置
         private System.Random rand;
 
         //这个是数组的行数和列数，mapLength一般采用行列一样
         private int rows = 4;
         private int columns = 4;
+
         private int mapLength = 5;
+
         //得分
         private int score = 0;
+
         private int scoreMax = 0;
+
         //目标分数
         private int targetNum = 128;
         private int gameID;
         private Merge2048GameCfg gameDate;
+
         private List<ActivityOpenCfg> activityGameDate;
+
         //评价
         private List<int> CustemsNum = new List<int>()
         {
@@ -37,14 +52,17 @@ namespace GFGGame
             0,
             0,
         };
+
         private bool isMove;
         private bool isMerge;
+
         private struct NumPos
         {
             public int x;
             public int y;
             public bool isCreat;
         }
+
         //需要播放动效的列表
         private List<NumPos> numPosArray = new List<NumPos>();
         private int time = 0;
@@ -60,6 +78,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -93,12 +112,16 @@ namespace GFGGame
             {
                 gameID = 128;
             }
+
             gameDate = CommonDataManager.Tables.TblMerge2048GameCfg.GetOrDefault(gameID);
-            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            activityGameDate = CommonDataManager.Tables.TblActivityOpenCfg.DataList
+                .Where(a => a.Type == ConstLimitTimeActivityType.ActLimitStlyc).ToList();
+
             InitMap();
             UpdateView();
             UpdateList();
         }
+
         protected override void OnHide()
         {
             Timers.inst.Remove(UpdateTime);
@@ -116,25 +139,26 @@ namespace GFGGame
             {
                 exitTip = "退出游戏会按失败结算，获得80%的奖励，是否退出？";
             }
+
             AlertUI.Show(exitTip)
-            .SetLeftButton(true, "取消", (object data) =>
-            {
-            })
-            .SetRightButton(true, "确定",async (object data) =>
-            {
-                var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.Type, time, false, activityGameDate[0].Id,true);
-                this.Hide();
-            });
+                .SetLeftButton(true, "取消", (object data) => { })
+                .SetRightButton(true, "确定", async (object data) =>
+                {
+                    var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.Type, time, false,
+                        activityGameDate[0].Id, true);
+                    this.Hide();
+                });
         }
 
         private void InitMap()
         {
-            for(int i = 0; i < rows; i++)
-                for(int j = 0; j < columns; j++)
-                {
-                    Map[i, j] = 0;
-                }
+            for (int i = 0; i < rows; i++)
+            for (int j = 0; j < columns; j++)
+            {
+                Map[i, j] = 0;
+            }
         }
+
         private void UpdateView()
         {
             time = 1;
@@ -144,7 +168,11 @@ namespace GFGGame
             CustemsNum[1] = CommonDataManager.Tables.TblMerge2048GameCfg.GetOrDefault(gameID).TimeStar2;
             CustemsNum[2] = CommonDataManager.Tables.TblMerge2048GameCfg.GetOrDefault(gameID).TimeStar1;
             _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star";
-            _ui.m_target.url = ResPathUtil.GetMiniGamePicPath( CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(gameDate.SubType, targetNum)[0].ResName, "TZFEGame");
+            _ui.m_target.url = ResPathUtil.GetMiniGamePicPath(
+                CommonDataManager.Tables.TblMerge2048Cfg.DataList
+                    .Where(a => a.Id == gameDate.SubType && a.Num == targetNum).ToList()[0].ResName,
+                "TZFEGame");
+
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
             _ui.m_score.visible = false;
             _ui.m_time.visible = false;
@@ -154,10 +182,12 @@ namespace GFGGame
             UpdateStar();
             Timers.inst.Add(1.0f, 0, UpdateTime);
         }
+
         private void UpdateScore()
         {
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
         }
+
         private void UpdateList()
         {
             RandomCreateNum();
@@ -169,22 +199,26 @@ namespace GFGGame
             UI_numItem numItem = UI_numItem.Proxy(item);
             int x = index / rows;
             int y = index % columns;
-            if(Map[x,y] == 0)
+            if (Map[x, y] == 0)
             {
                 numItem.m_icon.visible = false;
             }
             else
             {
                 //numItem.m_icon.url = string.Format("ui://MiniGame/sgll2_{0}", Map[x, y]);
-                numItem.m_icon.url = ResPathUtil.GetMiniGamePicPath( CommonDataManager.Tables.TblMerge2048Cfg.GetGroup1ByIdAndNum(gameDate.SubType, Map[x, y])[0].ResName, "TZFEGame");
+                numItem.m_icon.url = ResPathUtil.GetMiniGamePicPath(
+                    CommonDataManager.Tables.TblMerge2048Cfg.DataList
+                        .Where(a => a.Id == gameDate.SubType && a.Num == Map[x, y]).ToList()[0].ResName, "TZFEGame");
+
                 numItem.m_icon.visible = true;
             }
+
             //播放生成和合并动效
-            for(int i=0; i<numPosArray.Count; i++)
+            for (int i = 0; i < numPosArray.Count; i++)
             {
-                if(x == numPosArray[i].x && y == numPosArray[i].y)
+                if (x == numPosArray[i].x && y == numPosArray[i].y)
                 {
-                    if(numPosArray[i].isCreat)
+                    if (numPosArray[i].isCreat)
                     {
                         numItem.m_t0.Play();
                         numPosArray.RemoveAt(i);
@@ -198,6 +232,7 @@ namespace GFGGame
                     }
                 }
             }
+
             UI_numItem.ProxyEnd();
         }
 
@@ -205,9 +240,9 @@ namespace GFGGame
         private void RandomCreateNum()
         {
             bool gameOver = false;
-            for(int i = 0;i< rows; i++)
+            for (int i = 0; i < rows; i++)
             {
-                for(int j = 0; j< columns; j++)
+                for (int j = 0; j < columns; j++)
                 {
                     if (Map[i, j] == 0)
                     {
@@ -216,11 +251,13 @@ namespace GFGGame
                     }
                 }
             }
-            if(!gameOver)
+
+            if (!gameOver)
             {
                 //GameOver(false);
                 return;
             }
+
             while (true)
             {
                 int x = rand.Next(0, rows);
@@ -228,15 +265,16 @@ namespace GFGGame
                 NumPos item;
                 int num;
                 int randNum = rand.Next(1, 11);
-                if(randNum <= 9)
+                if (randNum <= 9)
                 {
                     num = 2;
                 }
                 else
                 {
-                    num = 4 ;
+                    num = 4;
                 }
-                if (Map[x,y] == 0)
+
+                if (Map[x, y] == 0)
                 {
                     Map[x, y] = num;
                     item.x = x;
@@ -252,7 +290,7 @@ namespace GFGGame
         /// 去零
         /// </summary>
         /// <param name="row">对于一行或一列元素</param>
-        private void Remove0(int[] row,Direction dir,int xy = 0)
+        private void Remove0(int[] row, Direction dir, int xy = 0)
         {
             int pos = 0;
             int[] rowB = new int[row.Length];
@@ -260,12 +298,13 @@ namespace GFGGame
             {
                 rowB[i] = row[i];
             }
+
             for (int i = 0; i < row.Length; ++i)
             {
                 if (row[i] != 0)
                 {
                     row[pos] = row[i];
-                    
+
                     //-----这里修改需要播放动效的数字位置列表-----
                     int x = 0;
                     int y = 0;
@@ -300,7 +339,8 @@ namespace GFGGame
                                 nextY = row.Length - 1 - pos;
                                 break;
                         }
-                        if(numPosArray.Count != 0 && numPosArray[t].x == x && numPosArray[t].y == y && pos != i)
+
+                        if (numPosArray.Count != 0 && numPosArray[t].x == x && numPosArray[t].y == y && pos != i)
                         {
                             numPosArray.RemoveAt(t);
                             NumPos item;
@@ -310,28 +350,30 @@ namespace GFGGame
                             numPosArray.Add(item);
                         }
                     }
+
                     //---------------------------------------
                     pos++;
-                    
-                } 
+                }
             }
+
             for (; pos < row.Length; ++pos) row[pos] = 0;
 
-            for(int i= 0; i< row.Length; i++)
+            for (int i = 0; i < row.Length; i++)
             {
-                if(row[i] != rowB[i])
+                if (row[i] != rowB[i])
                 {
                     isMove = true;
                 }
             }
         }
+
         /// <summary>
         /// 合并
         /// </summary>
         /// <param name="row">对于一行或一列元素，完成一次向左合并的操作</param>
-        private void Merge(int[] row , Direction dir, int xy)
+        private void Merge(int[] row, Direction dir, int xy)
         {
-            Remove0(row,dir,xy);
+            Remove0(row, dir, xy);
             // 相邻相同则合并
             for (int i = 0; i < row.Length - 1; ++i)
             {
@@ -341,7 +383,7 @@ namespace GFGGame
                     row[i + 1] = 0;
                     //将合并的数字放入列表
                     NumPos item;
-                    item = MoveAddNum(i, xy, dir, row.Length-1);
+                    item = MoveAddNum(i, xy, dir, row.Length - 1);
                     numPosArray.Add(item);
                     //-------
                     score += row[i];
@@ -351,13 +393,16 @@ namespace GFGGame
                         //游戏成功
                         GameOver(true);
                     }
+
                     isMerge = true;
                 }
             }
-            Remove0(row,dir,xy);
+
+            Remove0(row, dir, xy);
         }
+
         //将合并的数字位置放入列表的准备
-        private NumPos MoveAddNum(int i, int xy, Direction dir,int length)
+        private NumPos MoveAddNum(int i, int xy, Direction dir, int length)
         {
             NumPos item = new NumPos();
             switch (dir)
@@ -383,8 +428,10 @@ namespace GFGGame
                     item.isCreat = false;
                     break;
             }
+
             return item;
         }
+
         /// <summary>
         /// 上移
         /// </summary>
@@ -397,12 +444,14 @@ namespace GFGGame
             {
                 for (int i = 0; i < rows; ++i)
                 {
-                    arr[i] = map[i, j]; 
+                    arr[i] = map[i, j];
                 }
-                Merge(arr,Direction.up,j);
+
+                Merge(arr, Direction.up, j);
                 for (int i = 0; i < rows; ++i) map[i, j] = arr[i];
             }
         }
+
         /// <summary>
         /// 下移
         /// </summary>
@@ -415,9 +464,11 @@ namespace GFGGame
                 {
                     arr[rows - 1 - i] = map[i, j];
                 }
-                Merge(arr,Direction.down ,j);
+
+                Merge(arr, Direction.down, j);
                 for (int i = 0; i < rows; ++i) map[i, j] = arr[rows - 1 - i];
             }
+
             return map;
         }
 
@@ -433,11 +484,14 @@ namespace GFGGame
                 {
                     arr[j] = map[i, j];
                 }
-                Merge(arr,Direction.left,i);
+
+                Merge(arr, Direction.left, i);
                 for (int j = 0; j < columns; ++j) map[i, j] = arr[j];
             }
+
             return map;
         }
+
         /// <summary>
         /// 右移
         /// </summary>
@@ -450,11 +504,14 @@ namespace GFGGame
                 {
                     arr[columns - 1 - j] = map[i, j];
                 }
-                Merge(arr,Direction.right,i);
+
+                Merge(arr, Direction.right, i);
                 for (int j = 0; j < columns; ++j) map[i, j] = arr[columns - 1 - j];
             }
+
             return map;
         }
+
         /// <summary>
         /// 进行一次移动操作
         /// </summary>
@@ -473,7 +530,8 @@ namespace GFGGame
                 case Direction.right:
                     Right(map); break;
             }
-            if(isMerge || isMove)
+
+            if (isMerge || isMove)
             {
                 isMove = false;
                 isMerge = false;
@@ -488,38 +546,48 @@ namespace GFGGame
 
         private void OnClickBegin()
         {
-            touchFirst = Input.mousePosition;//记录开始按下的位置
+            touchFirst = Input.mousePosition; //记录开始按下的位置
         }
+
         private void OnClickEnd()
         {
-            touchSecond = Input.mousePosition;//记录拖动的位置
-            if (touchSecond.x < touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+            touchSecond = Input.mousePosition; //记录拖动的位置
+            if (touchSecond.x < touchFirst.x &&
+                Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
             {
                 //向左滑动
                 Move(Map, Direction.left);
             }
-            if (touchSecond.x > touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+
+            if (touchSecond.x > touchFirst.x &&
+                Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
             {
                 //向右滑动
                 Move(Map, Direction.right);
             }
-            if (touchSecond.y < touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+
+            if (touchSecond.y < touchFirst.y &&
+                Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
             {
                 //向下滑动
                 Move(Map, Direction.down);
             }
-            if (touchSecond.y > touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+
+            if (touchSecond.y > touchFirst.y &&
+                Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
             {
                 //向上滑动
                 Move(Map, Direction.up);
             }
+
             touchFirst = touchSecond;
         }
 
         private void OnClickMergeTips()
         {
-            ViewManager.Show<SyntheticRoutetipView>(new object[] { targetNum , gameDate.SubType}) ;
+            ViewManager.Show<SyntheticRoutetipView>(new object[] { targetNum, gameDate.SubType });
         }
+
         private void UpdateTime(object param = null)
         {
             _ui.m_timeNum.text = sec_to_hms(time);
@@ -537,6 +605,7 @@ namespace GFGGame
                     starNum += 1;
                 }
             }
+
             switch (starNum)
             {
                 case 1:
@@ -571,12 +640,14 @@ namespace GFGGame
             {
                 _hours = ts.Days * 24;
             }
+
             string str = "";
             if (ts.Hours > 0)
             {
-
-                str = String.Format("{0:00}", ts.Hours + _hours) + ":" + String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
+                str = String.Format("{0:00}", ts.Hours + _hours) + ":" + String.Format("{0:00}", ts.Minutes) + ":" +
+                      String.Format("{0:00}", ts.Seconds);
             }
+
             if (ts.Hours == 0 && ts.Minutes > 0)
             {
                 str = "00:";
@@ -584,8 +655,10 @@ namespace GFGGame
                 {
                     str = String.Format("{0:00}", ts.Hours + _hours) + ":";
                 }
+
                 str += String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
             }
+
             if (ts.Hours == 0 && ts.Minutes == 0)
             {
                 str = "00";
@@ -593,10 +666,13 @@ namespace GFGGame
                 {
                     str = String.Format("{0:00}", ts.Hours + _hours);
                 }
+
                 str += ":00:" + String.Format("{0:00}", ts.Seconds);
             }
+
             return str;
         }
+
         private void CheckArray()
         {
             bool gameOver = false;
@@ -611,6 +687,7 @@ namespace GFGGame
                     }
                 }
             }
+
             if (!gameOver)
             {
                 // 游戏结束
@@ -622,7 +699,7 @@ namespace GFGGame
         private void GameOver(bool target)
         {
             Timers.inst.Remove(UpdateTime);
-            ViewManager.Show<ResultTipsView>(new object[]{target, gameDate.Type, time, gameDate.Id });
+            ViewManager.Show<ResultTipsView>(new object[] { target, gameDate.Type, time, gameDate.Id });
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs

@@ -2,6 +2,7 @@ using FairyGUI;
 using ET;
 using UnityEngine;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using UI.NewYearLogin;
 
@@ -19,6 +20,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -33,6 +35,7 @@ namespace GFGGame
             //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_listLogin.itemRenderer = RenderListLogin;
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -52,13 +55,14 @@ namespace GFGGame
 
         private void RefreshViewInfo()
         {
-            _ui.m_listLogin.numItems = CommonDataManager.Tables.TblActivitySignCfg.GetGroup1ByActivityId(_activityId).Count;
+            _ui.m_listLogin.numItems =
+                CommonDataManager.Tables.TblActivitySignCfg.DataList.Count(a => a.ActivityId == _activityId);
         }
 
         private void RenderListLogin(int index, GObject obj)
         {
             UI_ComLoginItem item = UI_ComLoginItem.Proxy(obj);
-            var data = CommonDataManager.Tables.TblActivitySignCfg.Get(_activityId,index + 1);
+            var data = CommonDataManager.Tables.TblActivitySignCfg.Get(_activityId, index + 1);
             var cfg = data;
             var cfgBonus = data.Bonus;
             item.m_bgType.selectedIndex = index % 2;
@@ -74,6 +78,7 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnListItemClick);
             }
+
             item.target.data = cfg;
             UI_ComLoginItem.ProxyEnd();
         }
@@ -104,4 +109,4 @@ namespace GFGGame
             base.OnHide();
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/BadgeChooseView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.RoleInfo;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using cfg.GfgCfg;
 using ET;
@@ -21,6 +22,7 @@ namespace GFGGame
             {
                 _ui.Dispose();
             }
+
             _ui = null;
 
             base.Dispose();
@@ -39,7 +41,8 @@ namespace GFGGame
             _ui.m_btnback.onClick.Add(Hide);
             _ui.m_list.itemRenderer = OnRenderItem;
 
-            _badgeList = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.BADGE);
+            _badgeList = CommonDataManager.Tables.TblItemCfg.DataList.Where(a => a.ItemType == ConstItemType.BADGE)
+                .ToList();
         }
 
         protected override void OnShown()
@@ -83,13 +86,10 @@ namespace GFGGame
                     gObject.onClick.Set(RemoveBadge);
                 }
                 // 显示 已选中
-                else if(RoleDataManager.badgeDatas.Contains(_badgeList[index].Id))
+                else if (RoleDataManager.badgeDatas.Contains(_badgeList[index].Id))
                 {
                     badgeItem.m_type.SetSelectedIndex(1);
-                    gObject.onClick.Set(()=>
-                    {
-                        PromptController.Instance.ShowFloatTextPrompt("该徽章已在展示中");
-                    });
+                    gObject.onClick.Set(() => { PromptController.Instance.ShowFloatTextPrompt("该徽章已在展示中"); });
                 }
                 else
                 {
@@ -117,7 +117,7 @@ namespace GFGGame
             int id = (int)(eventContext.sender as GObject).data;
 
             // 点击空位进来的
-            if(selectedID == -1)
+            if (selectedID == -1)
             {
                 RoleDataManager.badgeDatas.Add(id);
             }
@@ -126,6 +126,7 @@ namespace GFGGame
                 int index = RoleDataManager.badgeDatas.FindIndex(x => x.Equals(selectedID));
                 RoleDataManager.badgeDatas[index] = id;
             }
+
             UpdateBadgeList();
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -1,5 +1,6 @@
 using UI.RoleInfo;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -31,6 +32,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -64,9 +66,15 @@ namespace GFGGame
             base.OnShown();
             RoleInfoManager.Instance.SortHeadDatas();
             RoleInfoManager.Instance.SortHeadBorderDatas();
-            _headCfgs.AddRange(CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEAD));
+            _headCfgs.AddRange(CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                a.ItemType == ConstItemType.HEAD && a.SubType == ConstItemSubType.ROLE_HEAD).ToList());
+
             _headCfgs = SortItemCfgDatas(_headCfgs);
-            _headBorderCfgs.AddRange(CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemTypeAndSubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEADBORDER));
+            _headBorderCfgs.AddRange(
+                CommonDataManager.Tables.TblItemCfg.DataList.Where(a =>
+                    a.ItemType == ConstItemType.HEAD && a.SubType == ConstItemSubType.ROLE_HEADBORDER).ToList());
+
+
             _headBorderCfgs = SortItemCfgDatas(_headBorderCfgs);
             OnTabChange();
             // _ui.m_list.selectedIndex = 0;
@@ -84,6 +92,7 @@ namespace GFGGame
             _headCfgs.Clear();
             _headBorderCfgs.Clear();
         }
+
         private async void OnBtnSureClick()
         {
             if (_ui.m_c1.selectedIndex == 0)
@@ -93,6 +102,7 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("暂未获得");
                     return;
                 }
+
                 bool result = await RoleInfoSProxy.ReqModifyRoleHead(_selectHeadId);
                 if (result)
                 {
@@ -107,6 +117,7 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("暂未获得");
                     return;
                 }
+
                 bool result = await RoleInfoSProxy.ReqModifyRoleHeadBorder(_selectHeadBorderId);
                 if (result)
                 {
@@ -114,7 +125,6 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("头像框设置成功");
                 }
             }
-            
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -133,6 +143,7 @@ namespace GFGGame
             {
                 ItemProxy.ReqSetItemRead(headId).Coroutine();
             }
+
             item.target.data = headId;
             UI_ListHeadItem.ProxyEnd();
         }
@@ -156,6 +167,7 @@ namespace GFGGame
             {
                 ItemProxy.ReqSetItemRead(headBorderId).Coroutine();
             }
+
             item.target.data = headBorderId;
             UI_ListHeadBorderItem.ProxyEnd();
         }
@@ -196,13 +208,16 @@ namespace GFGGame
                     showHeadBorderRedDot = false;
                     UpdateRedDot();
                 }
+
                 _ui.m_listBorder.numItems = _headBorderCfgs.Count;
                 int selectedIndex = _headBorderCfgs.FindIndex(x => x.Id == _selectHeadBorderId);
                 _ui.m_listBorder.ScrollToView(selectedIndex);
                 _ui.m_listBorder.selectedIndex = selectedIndex;
             }
+
             UpdateView();
         }
+
         private void UpdateView()
         {
             ItemCfg headCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(_selectHeadId);
@@ -220,6 +235,7 @@ namespace GFGGame
                 _ui.m_txtDesc.text = headBorderCfg.Desc;
             }
         }
+
         private List<ItemCfg> SortItemCfgDatas(List<ItemCfg> list)
         {
             list.Sort((ItemCfg a, ItemCfg b) =>

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -188,7 +188,9 @@ namespace GFGGame
 
         private async void SkipAllChapter()
         {
-            List<StoryChapterCfg> chapterList = CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubType(1);
+            List<StoryChapterCfg> chapterList = CommonDataManager.Tables.TblStoryChapterCfg.DataList
+                .Where(a => a.SubType == 1).ToList();
+
             foreach (var item in chapterList)
             {
                 List<StoryLevelCfg> levelList = CommonDataManager.Tables.TblStoryLevelCfg.DataList
@@ -258,7 +260,9 @@ namespace GFGGame
         private async void OnClickBtnLeagueSkill()
         {
             int _type = int.Parse(_ui.m_ComBtn.m_txtskillType.text);
-            List<LeagueSkillCfg> skillCfgs = CommonDataManager.Tables.TblLeagueSkillCfg.GetGroup1ByType(_type);
+            List<LeagueSkillCfg> skillCfgs = CommonDataManager.Tables.TblLeagueSkillCfg.DataList
+                .Where(a => a.Type == _type).ToList();
+
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 int skillId = skillCfgs[i].Id;
@@ -312,12 +316,15 @@ namespace GFGGame
 
         private void InitChapterText()
         {
-            var chapterCount = CommonDataManager.Tables.TblStoryChapterCfg
-                .GetGroup1BySubType(ConstInstanceZonesSubType.Normal).Count;
+            var chapterCount =
+                CommonDataManager.Tables.TblStoryChapterCfg.DataList.Count(a =>
+                    a.SubType == ConstInstanceZonesSubType.Normal);
+
             _ui.m_ComBtn.m_txtChapter.text = "" + chapterCount;
             StoryChapterCfg storyChapterCfg =
-                CommonDataManager.Tables.TblStoryChapterCfg.GetGroup1BySubTypeAndOrder(ConstInstanceZonesSubType.Normal,
-                    chapterCount)[0];
+                CommonDataManager.Tables.TblStoryChapterCfg.DataList.Where(a =>
+                    a.SubType == ConstInstanceZonesSubType.Normal && a.Order == chapterCount).ToList()[0];
+
             _ui.m_ComBtn.m_txtChapterLv.text = "" + storyChapterCfg.LevelCount;
         }
 
@@ -328,7 +335,8 @@ namespace GFGGame
 
         private void OnClickBtnMaterials()
         {
-            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.GetGroup1ByItemType(ConstItemType.ITEM);
+            List<ItemCfg> itemCfgs = CommonDataManager.Tables.TblItemCfg.DataList
+                .Where(a => a.ItemType == ConstItemType.ITEM).ToList();
 
             for (int i = 0; i < itemCfgs.Count; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreArenaView.cs

@@ -2,6 +2,7 @@ using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -20,10 +21,12 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+
             _ui = null;
             base.Dispose();
         }
@@ -41,16 +44,20 @@ namespace GFGGame
             _ui.m_storeExchangeList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_ARENA, menu2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.STORE_ARENA && a.Menu2 == menu2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
@@ -63,6 +70,7 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -75,6 +83,7 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _ui.m_storeExchangeList.m_list.numItems = _shopCfgs.Count;
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];
@@ -82,10 +91,13 @@ namespace GFGGame
 
             UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
 
-            ItemCfg costItemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(shopCfg.Menu2 == 0 || shopCfg.Menu2 == ArenaDataManager.Instance.SeasonId ? shopCfg.CostIdReal : shopCfg.OldSeasonCostId);
+            ItemCfg costItemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(
+                shopCfg.Menu2 == 0 || shopCfg.Menu2 == ArenaDataManager.Instance.SeasonId
+                    ? shopCfg.CostIdReal
+                    : shopCfg.OldSeasonCostId);
             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.Res);
 
             UI_ListShopItem.ProxyEnd();
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -1,10 +1,12 @@
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
 using Hutool;
 using UI.Store;
 using UI.CommonGame;
+
 namespace GFGGame
 {
     public class StoreBlackCardRewardView : BaseWindow
@@ -12,6 +14,7 @@ namespace GFGGame
         private UI_StoreBlackCardRewardUI _ui;
         private int _month;
         private int _day;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -19,6 +22,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -35,8 +39,8 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnClose.onClick.Add(Hide);
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -46,31 +50,34 @@ namespace GFGGame
         {
             base.OnShown();
             _month = TimeUtil.GetCurMonth();
-            _ui.m_list.numItems = CommonDataManager.Tables.TblMonthlyCardClothesCfg.GetGroup1ByYear(TimeUtil.GetCurYear()).Count;
+            _ui.m_list.numItems =
+                CommonDataManager.Tables.TblMonthlyCardClothesCfg.DataList.Count(a => a.Year == TimeUtil.GetCurYear());
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
 
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListBlackRewardtem item = UI_ListBlackRewardtem.Proxy(obj);
-          
-            MonthlyCardClothesCfg clothesCfg = CommonDataManager.Tables.TblMonthlyCardClothesCfg.GetGroup1ByYear(TimeUtil.GetCurYear())[index];
+
+            MonthlyCardClothesCfg clothesCfg =
+                CommonDataManager.Tables.TblMonthlyCardClothesCfg.DataList.Where(a => a.Year == TimeUtil.GetCurYear())
+                    .ToList()[index];
+
             if (clothesCfg.Clothes.Count == 0)
             {
                 item.m_showItemType.selectedIndex = 1;
             }
-            else {
+            else
+            {
                 item.m_showItemType.selectedIndex = 0;
                 ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(clothesCfg.Clothes[0].ItemId);
                 item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
@@ -81,13 +88,18 @@ namespace GFGGame
                 item.m_imgMask.visible = !isCurMonth;
                 item.m_grpMonth.visible = isCurMonth;
                 item.m_grpName.visible = isCurMonth;
-                item.m_imggot.visible = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), clothesCfg.Month);
+                item.m_imggot.visible =
+                    MathUtil.isBitSet(
+                        GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth),
+                        clothesCfg.Month);
                 if (item.target.data == null)
                 {
                     item.target.onClick.Add(OnBtnGetClick);
                 }
+
                 item.target.data = clothesCfg.Month;
             }
+
             UI_ListBlackRewardtem.ProxyEnd();
         }
 
@@ -98,7 +110,7 @@ namespace GFGGame
             int month = (int)obj.data;
             if (month < _month)
             {
-                PromptController.Instance.ShowFloatTextPrompt("逾期单品不可领取");//奖励不可领
+                PromptController.Instance.ShowFloatTextPrompt("逾期单品不可领取"); //奖励不可领
                 return;
             }
 
@@ -108,7 +120,8 @@ namespace GFGGame
                 return;
             }
 
-            if (MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), month))
+            if (MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth),
+                    month))
             {
                 PromptController.Instance.ShowFloatTextPrompt("奖励已领取");
                 return;
@@ -119,8 +132,8 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("开通福气卡可领");
                 return;
             }
-            ShopSProxy.ReqGetMonthCardItem(month).Coroutine();
 
+            ShopSProxy.ReqGetMonthCardItem(month).Coroutine();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs

@@ -71,8 +71,9 @@ namespace GFGGame
             SetOpenBattlePassBtnStatus();
             FreshSpecialReward(oldLevel);
             var battlePassCfgs =
-                CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(
-                    BattlePassTaskDataManager.Instance.GetSeasonId());
+                CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == BattlePassTaskDataManager.Instance.GetSeasonId()).ToList();
+
             var minLevel =
                 (from battlePassCfg in battlePassCfgs
                     let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.Level)
@@ -137,8 +138,9 @@ namespace GFGGame
             var dataManager = BattlePassTaskDataManager.Instance;
             var seasonId = dataManager.GetSeasonId();
             var battlePassCfg =
-                CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(seasonId,
-                    dataManager.GetBattlePassLevel() + 1);
+                CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == seasonId && a.Level == dataManager.GetBattlePassLevel() + 1).ToList();
+
             if (battlePassCfg == null)
             {
                 PromptController.Instance.ShowFloatTextPrompt("已经满级");
@@ -381,9 +383,10 @@ namespace GFGGame
             var uiExpProcess = _ui.m_LevelProcess;
             //获取当前等级的经验
             var battlePassCfg =
-                CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(seasonId,
-                    dataManager.GetBattlePassLevel());
-            if (battlePassCfg == null)
+                CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == seasonId && a.Level == dataManager.GetBattlePassLevel()).ToList();
+
+            if (battlePassCfg.Count == 0)
             {
                 //已经超过了最大等级
                 uiExpProcess.target.max = 100;
@@ -405,8 +408,10 @@ namespace GFGGame
             //刷新奖励列表
             _rewardCfgs =
                 new List<BattlePassCfg>(
-                    CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(BattlePassTaskDataManager.Instance
-                        .GetSeasonId()));
+                    CommonDataManager.Tables.TblBattlePassCfg.DataList
+                        .Where(a => a.Id == BattlePassTaskDataManager.Instance
+                            .GetSeasonId()).ToList());
+
             //去掉第一个为0的配置
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
             RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll,

GameClient/Assets/Game/HotUpdate/Views/Store/StoreExchangeView.cs

@@ -2,6 +2,7 @@ using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -20,10 +21,12 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+
             _ui = null;
             base.Dispose();
         }
@@ -41,16 +44,20 @@ namespace GFGGame
             _ui.m_storeExchangeList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.STORE_EXCHANGE && a.Menu2 == menu2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
@@ -63,6 +70,7 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -75,10 +83,11 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _ui.m_storeExchangeList.m_list.numItems = _shopCfgs.Count;
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];
             ShopViewManager.Instance.UptadeItem(obj, shopCfg);
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagAddRebateView.cs

@@ -2,6 +2,7 @@ using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -57,8 +58,9 @@ namespace GFGGame
         {
             base.OnShown();
             menu2 = (int)this.viewData;
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_GIFT_BAG,
-                menu2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.STORE_GIFT_BAG && a.Menu2 == menu2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs

@@ -2,6 +2,7 @@ using UI.Store;
 using UI.CommonGame;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 
@@ -21,10 +22,12 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+
             _ui = null;
             base.Dispose();
         }
@@ -42,16 +45,20 @@ namespace GFGGame
             _ui.m_storeGiftBagList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             menu2 = (int)this.viewData;
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.STORE_GIFT_BAG && a.Menu2 == menu2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
@@ -65,6 +72,7 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -77,11 +85,14 @@ namespace GFGGame
             ShopViewManager.Instance.ClearItemEff();
             _ui.m_storeGiftBagList.m_list.numItems = _shopCfgs.Count;
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];
             ShopViewManager.Instance.UptadeItem(obj, shopCfg);
-            RedDotController.Instance.SetComRedDot(obj.asCom, menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY && shopCfg.Price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id) < shopCfg.MaxBuyNum, "", 5, 76);
+            RedDotController.Instance.SetComRedDot(obj.asCom,
+                menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY && shopCfg.Price == 0 &&
+                ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id) < shopCfg.MaxBuyNum, "", 5, 76);
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -4,6 +4,7 @@ using FairyGUI;
 using System.Collections.Generic;
 using ET;
 using System;
+using System.Linq;
 using cfg.GfgCfg;
 
 namespace GFGGame
@@ -26,10 +27,12 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+
             _ui = null;
             base.Dispose();
         }
@@ -53,13 +56,14 @@ namespace GFGGame
             _ui.m_guideBackBtn.onClick.Add(OnClickBtnBack);
             AddEffect();
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -84,25 +88,31 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
+
         private void OnClickBtnBack()
         {
             this.Hide();
             ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
+
         private void OnBtnBlackRewardClick()
         {
             ViewManager.Show<StoreBlackCardRewardView>();
         }
+
         private void UpdateView()
         {
             menu2 = (int)this.viewData;
             ShopViewManager.Instance.ClearItemEff();
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(ConstStoreTabId.STORE_MONTH_CARD, menu2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == ConstStoreTabId.STORE_MONTH_CARD && a.Menu2 == menu2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             _ui.m_storeMonthList.m_list.numItems = _shopCfgs.Count;
 
-            MonthlyCardPrivilegeCfg privilegeCfg = CommonDataManager.Tables.TblMonthlyCardPrivilegeCfg.GetOrDefault(MonthCardPrivilegeType.Privilege1);
+            MonthlyCardPrivilegeCfg privilegeCfg =
+                CommonDataManager.Tables.TblMonthlyCardPrivilegeCfg.GetOrDefault(MonthCardPrivilegeType.Privilege1);
 
             string iconUrl = "";
             bool isGot = false;
@@ -123,6 +133,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
+
                     _ui.m_txtDesc.SetVar("value", "红包卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.Value1[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.Value1[1].ToString();
@@ -141,6 +152,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
+
                     _ui.m_txtDesc.SetVar("value", "福气卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.Value2[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.Value2[1].ToString();
@@ -162,6 +174,7 @@ namespace GFGGame
                     shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(shopCfg.OnceShopId);
                 }
             }
+
             _ui.m_btnBuy.m_txtOriginalPrice.text = shopCfg.OriginalPrice.ToString();
             _ui.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.Price < shopCfg.OriginalPrice;
             int price = shopCfg.Price;
@@ -171,21 +184,27 @@ namespace GFGGame
             _ui.m_txtTips.SetVar("day", monthCfg.LimitDays.ToString()).FlushVars();
 
 
-            _ui.m_loaMoney.url = ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(privilegeCfg.Params1[0]).Res);
-            _ui.m_loaDailyMoney.url = ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(privilegeCfg.Params1[1]).Res);
+            _ui.m_loaMoney.url =
+                ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg
+                    .GetOrDefault(privilegeCfg.Params1[0]).Res);
+            _ui.m_loaDailyMoney.url =
+                ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg
+                    .GetOrDefault(privilegeCfg.Params1[1]).Res);
             _ui.m_txtPrivilegeCount.text = privilegeCount.ToString();
             _ui.m_txtTPrivilege.SetVar("value", privilegeCount.ToString()).FlushVars();
             _ui.m_btnGet.enabled = endTime > TimeHelper.ServerNow() && !isGot;
             _ui.m_btnGet.text = isGot ? "已领取" : "领取";
-            _ui.m_btnGet.data = monthCfg.Type; ;
+            _ui.m_btnGet.data = monthCfg.Type;
+            ;
         }
+
         private void OnBtnBuyCardClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
             int goodsId = (int)obj.data;
             ShopSProxy.ReqShopBuy(goodsId).Coroutine();
-
         }
+
         private async void OnBtnGetClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -196,6 +215,7 @@ namespace GFGGame
                 UpdateView();
             }
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];
@@ -220,10 +240,12 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnGet, menu2 == ConstStoreSubId.STORE_MONTH_GOLD_CARD && RedDotDataManager.Instance.GetGoldCardRewardRed() || menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardRewardRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnBlackReward, menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardClothingRed(), "", -10, 5);
-
-
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGet,
+                menu2 == ConstStoreSubId.STORE_MONTH_GOLD_CARD && RedDotDataManager.Instance.GetGoldCardRewardRed() ||
+                menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBlackReward,
+                menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardClothingRed(),
+                "", -10, 5);
         }
 
         private void AddEffect()
@@ -239,8 +261,10 @@ namespace GFGGame
             {
                 return true;
             }
+
             return false;
         }
+
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.SHEZHI_ZHUJIEMBG) <= 0 && CheckIsBuyMonthCard())
@@ -259,4 +283,4 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_guideBackBtn, ConstGuideId.SHEZHI_ZHUJIEMBG, 1, "去开启背景更换特权");
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreZGDCView.cs

@@ -3,6 +3,7 @@ using UI.CommonGame;
 using UI.ActivityMain;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using static GFGGame.ShopSProxy;
@@ -24,9 +25,12 @@ namespace GFGGame
 
         //创角时间
         private long day_CreateRole = 0;
+
         private long second_CreateRole = 0;
+
         //折扣时间两天(豪秒)
         private long saleSecondNum = 172800000;
+
         public override void Dispose()
         {
             if (_valueBarController != null)
@@ -34,10 +38,12 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+
             if (_ui != null)
             {
                 _ui.Dispose();
             }
+
             _ui = null;
             base.Dispose();
         }
@@ -87,6 +93,7 @@ namespace GFGGame
             Timers.inst.Add(5, 0, UpdateListSuit);
             //Timers.inst.Add(1, 0, UpdateTime);
         }
+
         protected override void OnHide()
         {
             Timers.inst.Remove(UpdateListSuit);
@@ -101,28 +108,32 @@ namespace GFGGame
         private void OnNumericChange(EventContext context)
         {
         }
+
         private void AddgiftBagID()
         {
-            for(int i=0;i< CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(6001).Params1.Count;i++)
+            for (int i = 0; i < CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(6001).Params1.Count; i++)
             {
                 giftBagList.Add(CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(6001).Params1[i]);
             }
+
             for (int i = 0; i < CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(6002).Params1.Count; i++)
             {
                 giftBagList.Add(CommonDataManager.Tables.TblActivityOpenCfg.GetOrDefault(6002).Params1[i]);
             }
         }
+
         private void UpdateView()
         {
             ClearItemEff();
-            _shopCfgs = CommonDataManager.Tables.TblShopCfg.GetGroup1ByMenu1AndMenu2(102, muem2);
+            _shopCfgs = CommonDataManager.Tables.TblShopCfg.DataList
+                .Where(a => a.Menu1 == 102 && a.Menu2 == muem2).ToList();
+
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _shopCfgs = SortSaleCfg();
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             //UpdateShopCfg();
             _ui.m_suitList.numItems = giftBagList.Count;
             _ui.m_listCom.m_list.numItems = _shopCfgs.Count;
-
         }
 
         private void ListItemRender(int index, GObject obj)
@@ -135,18 +146,20 @@ namespace GFGGame
             originalID = shopCfg.Id;
             bool flog = false;
             foreach (var Id in listIndex)
-            {   
-                if(Id == shopCfg.Id)
+            {
+                if (Id == shopCfg.Id)
                 {
                     flog = true;
                     break;
                 }
             }
+
             if (!flog)
             {
                 shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(_shopCfgs[index].OriginalId);
                 currentID = shopCfg.Id;
             }
+
             UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
 
             ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(shopCfg.ItemId);
@@ -160,7 +173,10 @@ namespace GFGGame
                 _effectUIs.Add(_effectUI);
                 item.m_holderfEff.visible = shopCfg.Price < shopCfg.OriginalPrice;
             }
-            item.m_txtDesc.text = shopCfg.Price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.Id).ToString();
+
+            item.m_txtDesc.text = shopCfg.Price <= 0
+                ? ""
+                : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.Id).ToString();
 
             item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.Id)).FlushVars();
             item.m_txtEndTime.visible = shopCfg.EndTime != "";
@@ -170,26 +186,29 @@ namespace GFGGame
 
             int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.Id);
             item.m_txtLimit.visible = shopCfg.MaxBuyNum > 0;
-            item.m_txtLimit.text = string.Format("{0}({1}/{2})", ShopDataManager.Instance.refreshType[shopCfg.RefreshType], StringUtil.GetColorText(buyNum.ToString(), "#5A3E16"), shopCfg.MaxBuyNum);
+            item.m_txtLimit.text = string.Format("{0}({1}/{2})",
+                ShopDataManager.Instance.refreshType[shopCfg.RefreshType],
+                StringUtil.GetColorText(buyNum.ToString(), "#5A3E16"), shopCfg.MaxBuyNum);
 
             item.m_c1.selectedIndex = shopCfg.MaxBuyNum == 0 || buyNum < shopCfg.MaxBuyNum ? 0 : 1;
 
-            if (item.m_c1.selectedIndex == 0)//可购买
+            if (item.m_c1.selectedIndex == 0) //可购买
             {
                 item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.OriginalPrice);
-                if (shopCfg.Price > 0 && shopCfg.CostTypeReal != CostType.FREE)//不免费
+                if (shopCfg.Price > 0 && shopCfg.CostTypeReal != CostType.FREE) //不免费
                 {
-                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.OriginalPrice > 0 && shopCfg.OriginalPrice != shopCfg.Price;
+                    item.m_btnBuy.m_grpOriginalPrice.visible =
+                        shopCfg.OriginalPrice > 0 && shopCfg.OriginalPrice != shopCfg.Price;
                     item.m_btnBuy.m_loaIcon.visible = true;
-                    item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.Price);// cfg.price.ToString();
+                    item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.Price); // cfg.price.ToString();
 
-                    if (shopCfg.CostTypeReal == CostType.RMB)//人民币
+                    if (shopCfg.CostTypeReal == CostType.RMB) //人民币
                     {
                         item.m_btnBuy.m_loaIcon.visible = false;
                         item.m_btnBuy.m_txtIcon.visible = true;
                         item.m_btnBuy.m_txtIcon.text = "￥";
                     }
-                    else//道具
+                    else //道具
                     {
                         ItemCfg costItemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(shopCfg.CostIdReal);
                         item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costItemCfg);
@@ -210,6 +229,7 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnBtnBugItem);
             }
+
             item.target.data = new List<int> { currentID, originalID };
             bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.Price == 0;
 
@@ -220,7 +240,9 @@ namespace GFGGame
         private void ListItemSuitRender(int index, GObject obj)
         {
             UI_StoreZGTHitem item = UI_StoreZGTHitem.Proxy(obj);
-            var suitCfg = CommonDataManager.Tables.TblSuitCfg.GetOrDefault( CommonDataManager.Tables.TblEverydaySaleCfg.DataList[index].SuitShow);
+            var suitCfg =
+                CommonDataManager.Tables.TblSuitCfg.GetOrDefault(CommonDataManager.Tables.TblEverydaySaleCfg
+                    .DataList[index].SuitShow);
             ShopCfg shopCfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(giftBagList[index]);
             int discount = (int)(((double)shopCfg.OriginalPrice / (double)shopCfg.ConfigPrice) * 100);
             item.m_suitIcon.url = string.Format("ui://Store/{0}", suitCfg.Res);
@@ -243,19 +265,21 @@ namespace GFGGame
                 long endTime;
                 if (CommonDataManager.Tables.TblEverydaySaleCfg.DataList[index].ActivityId == 6002)
                 {
-                    var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(CommonDataManager.Tables.TblEverydaySaleCfg.DataList[index].ActivityId);
+                    var activityInfo =
+                        ActivityGlobalDataManager.Instance.GetActivityInfo(CommonDataManager.Tables.TblEverydaySaleCfg
+                            .DataList[index].ActivityId);
                     endTime = activityInfo.EndTime;
                     var leftTime = endTime - TimeHelper.ServerNow();
                     item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
                 }
                 else
                 {
-                    long timeSale = (second_CreateRole+(saleSecondNum*(index+1))) - TimeHelper.ServerNow();
+                    long timeSale = (second_CreateRole + (saleSecondNum * (index + 1))) - TimeHelper.ServerNow();
                     item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(timeSale);
                 }
-
             }
-            if(suitCfg.Rarity == 5)
+
+            if (suitCfg.Rarity == 5)
             {
                 item.m_tyDesc.visible = true;
             }
@@ -263,26 +287,31 @@ namespace GFGGame
             {
                 item.m_tyDesc.visible = false;
             }
+
             UI_StoreZGTHitem.ProxyEnd();
         }
+
         private void OnBtnBugItem(EventContext context)
         {
             //idlist:0:当前显示的id，1：折扣id；
-            List<int> idList = (List<int>) (context.sender as GObject).data;
+            List<int> idList = (List<int>)(context.sender as GObject).data;
             ShopCfg cfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(idList[0]);
             ShopCfg cfg1 = CommonDataManager.Tables.TblShopCfg.GetOrDefault(idList[1]);
             bool isSellOutoriginal = true;
             if (cfg.OriginalId == 0)
             {
                 int maxBuyNum = cfg.MaxBuyNum;
-                int countBuyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.Id) + ShopDataManager.Instance.GetGoodsBuyNumById(cfg1.OriginalId);
+                int countBuyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.Id) +
+                                  ShopDataManager.Instance.GetGoodsBuyNumById(cfg1.OriginalId);
                 isSellOutoriginal = maxBuyNum > 0 && maxBuyNum - countBuyNum <= 0;
             }
             else
             {
                 ShopCfg shopcfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(idList[0]);
-                isSellOutoriginal = shopcfg.MaxBuyNum > 0 && shopcfg.MaxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopcfg.Id) <= 0;
+                isSellOutoriginal = shopcfg.MaxBuyNum > 0 &&
+                                    shopcfg.MaxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopcfg.Id) <= 0;
             }
+
             if (isSellOutoriginal)
             {
                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
@@ -304,6 +333,7 @@ namespace GFGGame
                 ViewManager.Show<ItemExchangeView>(cfg.Id);
             }
         }
+
         private void UpdateListSuit(object param)
         {
             int itemIndex = _ui.m_suitList.ChildIndexToItemIndex(0) + 1;
@@ -311,52 +341,60 @@ namespace GFGGame
             itemIndex = itemIndex == _ui.m_suitList.numItems ? 0 : itemIndex;
             _ui.m_suitList.scrollPane.ScrollRight(0.8f, true);
         }
-        
+
         public List<ShopCfg> SortSaleCfg()
         {
             List<ShopCfg> shopCfgs = new List<ShopCfg>();
             for (int i = 0; i < CommonDataManager.Tables.TblEverydaySaleCfg.DataList.Count; i++)
             {
-                ShopCfg shopcfg =  CommonDataManager.Tables.TblShopCfg.GetOrDefault(giftBagList[i]);
+                ShopCfg shopcfg = CommonDataManager.Tables.TblShopCfg.GetOrDefault(giftBagList[i]);
                 var item = CommonDataManager.Tables.TblEverydaySaleCfg.DataList[i];
                 //if (item.openTime == "" || item.openTime == null)
                 //{
                 //    shopCfgs.Add(shopcfg);
                 //    break;
                 //}
-                if (IsDisountTime(item) || day_CreateRole >= item.Id*2)
+                if (IsDisountTime(item) || day_CreateRole >= item.Id * 2)
                 {
                     shopCfgs.Add(shopcfg);
-                }    
+                }
             }
+
             return shopCfgs;
         }
+
         private bool IsDisountTime(EverydaySaleCfg item)
         {
-            if(item.ActivityId == 6002)
+            if (item.ActivityId == 6002)
             {
                 return ActivityGlobalDataManager.Instance.IsActivityOpen(item.ActivityId);
             }
+
             long second = TimeHelper.ServerNow() - second_CreateRole;
-            if (second < (saleSecondNum * item.Id) && second >= (saleSecondNum*(item.Id-1)))
+            if (second < (saleSecondNum * item.Id) && second >= (saleSecondNum * (item.Id - 1)))
             {
                 return true;
             }
-                return false;
+
+            return false;
         }
+
         private bool IsSaleTime(EverydaySaleCfg item)
         {
             if (item.ActivityId == 6002 && item.OpenTime == "")
             {
                 return !ActivityGlobalDataManager.Instance.IsActivityOpen(item.ActivityId);
             }
+
             long second = TimeHelper.ServerNow() - second_CreateRole;
             if (second < (saleSecondNum * item.Id) && second >= (saleSecondNum * (item.Id - 1)))
             {
                 return false;
             }
+
             return true;
         }
+
         private void ReturnDiscountTimeSuitIndex()
         {
             int count = 0;
@@ -372,9 +410,11 @@ namespace GFGGame
                 {
                     listIndex.Add(giftBagList[count]);
                 }
+
                 count++;
             }
         }
+
         private void UpdateTime(object param)
         {
             var activityInfo = CommonDataManager.Tables.TblEverydaySaleCfg.DataList[indexItem];
@@ -383,8 +423,9 @@ namespace GFGGame
             {
                 endTime = TimeUtil.DateTimeToTimestamp(activityInfo.EndTime);
             }
+
             int index = _ui.m_suitList.GetFirstChildInView();
-            GObject itemobj = _ui.m_suitList.GetChildAt(index%3);
+            GObject itemobj = _ui.m_suitList.GetChildAt(index % 3);
             UI_StoreZGTHitem item = UI_StoreZGTHitem.Proxy(itemobj);
             var leftTime = endTime - TimeHelper.ServerNow();
             if (leftTime <= 0)
@@ -396,8 +437,10 @@ namespace GFGGame
             {
                 item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
             }
+
             UI_StoreZGTHitem.ProxyEnd();
         }
+
         private void ClearItemEff()
         {
             for (int i = 0; i < _effectUIs.Count; i++)
@@ -405,6 +448,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUIs[i]);
                 _effectUIs[i] = null;
             }
+
             _effectUIs.Clear();
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs

@@ -106,8 +106,9 @@ namespace GFGGame
                 item.m_loaItem.visible = true;
                 StoryFightCfg storyFightCfg =
                     CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(_storyLevelCfgs[index].FightID));
-                int itemId = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(storyFightCfg.BonusBase[0].ItemId)[0]
-                    .Item;
+                int itemId = CommonDataManager.Tables.TblDropOutCfg.DataList
+                    .Where(a => a.Id == storyFightCfg.BonusBase[0].ItemId).ToList()[0].Item;
+
                 ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
                 item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
                 if (item.m_loaItem.data == null)
@@ -145,8 +146,9 @@ namespace GFGGame
             int index = (int)obj.data;
             StoryFightCfg storyFightCfg =
                 CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(_storyLevelCfgs[index].FightID));
-            int itemId = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(storyFightCfg.BonusBase[0].ItemId)[0]
-                .Item;
+            int itemId = CommonDataManager.Tables.TblDropOutCfg.DataList
+                .Where(a => a.Id == storyFightCfg.BonusBase[0].ItemId).ToList()[0].Item;
+
             GoodsItemTipsController.ShowItemTips(itemId);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -1,5 +1,5 @@
-
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using FairyGUI;
 using UI.CommonGame;
@@ -7,7 +7,6 @@ using UI.Studio;
 
 namespace GFGGame
 {
-
     public class StudioBuyNumView : BaseWindow
     {
         private UI_StudioBuyNumUI _ui;
@@ -30,6 +29,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
@@ -50,13 +50,14 @@ namespace GFGGame
             _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
             _ui.m_btnBack.onClick.Add(this.Hide);
             AddEffect();
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, OnLimitChanged);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -75,15 +76,22 @@ namespace GFGGame
             _ui.m_txtNum0.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.BuyNum);
             _ui.m_loaBg.url = ResPathUtil.GetCommonGameResPath("ty_tc_s");
 
-            List<MonthlyCardPrivilegeCfg> privilegeCfgs = CommonDataManager.Tables.TblMonthlyCardPrivilegeCfg.GetGroup1ByParamsType(1);
+            List<MonthlyCardPrivilegeCfg> privilegeCfgs = CommonDataManager.Tables.TblMonthlyCardPrivilegeCfg.DataList
+                .Where(a => a.ParamsType == 1).ToList();
+
             for (int i = 0; i < privilegeCfgs.Count; i++)
             {
                 if (privilegeCfgs[i].Params1[0] == _limitId)
                 {
                     _ui.m_txtNum1.visible = true;
-                    string str0 = privilegeCfgs[i].Value1[0] > 0 ? string.Format("红包卡+{0}次", privilegeCfgs[i].Value1[0]) : "";
-                    string str1 = privilegeCfgs[i].Value2[0] > 0 ? string.Format("福气卡+{0}次", privilegeCfgs[i].Value2[0]) : "";
-                    _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0, !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
+                    string str0 = privilegeCfgs[i].Value1[0] > 0
+                        ? string.Format("红包卡+{0}次", privilegeCfgs[i].Value1[0])
+                        : "";
+                    string str1 = privilegeCfgs[i].Value2[0] > 0
+                        ? string.Format("福气卡+{0}次", privilegeCfgs[i].Value2[0])
+                        : "";
+                    _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0,
+                        !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
                     _ui.m_txtNum1.text = string.Format("2.道具兑换(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.BuyNum);
                     break;
                 }
@@ -94,9 +102,9 @@ namespace GFGGame
 
             if (_limitCfg.MoneyId <= 0) return;
             _ui.m_c1.selectedIndex = 1;
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.Id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.Id, _limitData.BuyTimes, 1, out int moneyId,
+                out int moneyNum);
             ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _limitCfg.MoneyId, moneyNum, true);
-
         }
 
         protected override void OnHide()
@@ -112,11 +120,13 @@ namespace GFGGame
             //边框右下角特效
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, OnLimitChanged);
         }
+
         private void OnClickBtnBuy(int type)
         {
             if (_limitData.BuyTimes == _limitCfg.BuyNum)
@@ -124,24 +134,30 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("今日购买次数已达上限", MessageType.ERR);
                 return;
             }
-            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.Id, _limitData.BuyTimes, 1, out int moneyId, out int moneyNum);
 
-            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_limitCfg.ItemID) < _limitCfg.ItemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
+            LimitCfgArray.Instance.GetMoneyIdAndNum(_limitCfg.Id, _limitData.BuyTimes, 1, out int moneyId,
+                out int moneyNum);
+
+            if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_limitCfg.ItemID) < _limitCfg.ItemNum ||
+                type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
             {
-                object[] sourceDatas = new object[]{ _limitCfg.ItemID, new object[] { typeof(BagView).FullName, this.viewData } };
+                object[] sourceDatas = new object[]
+                    { _limitCfg.ItemID, new object[] { typeof(BagView).FullName, this.viewData } };
                 GoodsItemTipsController.ShowItemTips(_limitCfg.ItemID, sourceDatas);
                 PromptController.Instance.ShowFloatTextPrompt("道具不足", MessageType.ERR);
                 return;
             }
-            RoleLimitSProxy.ReqBuyLimitPlayTimes(_limitId, type, 1).Coroutine();
 
+            RoleLimitSProxy.ReqBuyLimitPlayTimes(_limitId, type, 1).Coroutine();
         }
+
         private void OnLimitChanged(EventContext context = null)
         {
             if ((int)context.data != _limitId)
             {
                 return;
             }
+
             PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
             UpdateView();
             if (_limitData.BuyTimes == _limitCfg.BuyNum)

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -26,7 +26,9 @@ namespace GFGGame
             AddChildCom(com);
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).FullName;
-            this._studioCfg = CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioFabricView).Name)[0];
+            this._studioCfg = CommonDataManager.Tables.TblStudioCfg.DataList
+                .Where(a => a.FunId == typeof(StudioFabricView).Name).ToList()[0];
+
             this.storyLevelCfgs = CommonDataManager.Tables.TblStoryLevelCfg.DataList
                 .Where(a => a.Type == this._studioCfg.Type &&
                             a.SubType == _studioCfg.SubType &&

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -4,6 +4,7 @@ using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using UI_ListRewardItem = UI.Studio.UI_ListRewardItem;
 
@@ -23,6 +24,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
@@ -45,26 +47,33 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(this.Hide);
             AddEffect();
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.FILING_SCORE_CHANGE, UpdateView);
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetCommonGameResPath("ty_tc_l");
-            _ui.m_txtScore.text = string.Format("本章评分: {0}", StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
+            _ui.m_txtScore.text = string.Format("本章评分: {0}",
+                StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
             UpdateView();
         }
 
         private void UpdateView()
         {
-            _ui.m_list.numItems = CommonDataManager.Tables.TblFilingRewardCfg
-                .GetGroup1ById(StudioDataManager.Instance.filingChapterId).Count;   
-            _ui.m_btnGet.grayed = !StudioDataManager.Instance.GetFilingRewardState(StudioDataManager.Instance.filingChapterId);
+            _ui.m_list.numItems =
+                CommonDataManager.Tables.TblFilingRewardCfg.DataList.Count(a =>
+                    a.Id == StudioDataManager.Instance.filingChapterId);
+            ;
+
+            _ui.m_btnGet.grayed =
+                !StudioDataManager.Instance.GetFilingRewardState(StudioDataManager.Instance.filingChapterId);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -79,14 +88,19 @@ namespace GFGGame
             //边框右下角特效
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.FILING_SCORE_CHANGE, UpdateView);
         }
+
         private void RenderListItem(int index, GObject obj)
         {
-            FilingRewardCfg cfg = CommonDataManager.Tables.TblFilingRewardCfg.GetGroup1ById(StudioDataManager.Instance.filingChapterId)[index];
+            FilingRewardCfg cfg =
+                CommonDataManager.Tables.TblFilingRewardCfg.DataList
+                    .Where(a => a.Id == StudioDataManager.Instance.filingChapterId).ToList()[index];
+
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             item.m_txtDesc.text = string.Format("总评分达到{0}", cfg.Score);
 
@@ -103,6 +117,7 @@ namespace GFGGame
             {
                 item.m_canGet.visible = false;
             }
+
             item.m_listReward.data = index;
             item.m_listReward.itemRenderer = RenderListRewardItem;
             item.m_listReward.numItems = cfg.Items.Count;
@@ -110,17 +125,27 @@ namespace GFGGame
 
             UI_ListRewardItem.ProxyEnd();
         }
+
         private void RenderListRewardItem(int index, GObject obj)
         {
             int rewardIndex = (int)obj.parent.data;
-            var rewards =  CommonDataManager.Tables.TblFilingRewardCfg.GetGroup1ById(StudioDataManager.Instance.filingChapterId)[rewardIndex].Items;
-            ItemData reward = ItemUtil.createItemData(rewards[index].ToGfgGameItemParam());//_rewardDatas[index];
+            var rewards =
+                CommonDataManager.Tables.TblFilingRewardCfg.DataList
+                    .Where(a => a.Id == StudioDataManager.Instance.filingChapterId).ToList()[
+                        rewardIndex].Items;
+
+            ItemData reward = ItemUtil.createItemData(rewards[index].ToGfgGameItemParam()); //_rewardDatas[index];
             if (obj.data == null)
             {
                 obj.data = new ItemView(obj as GComponent);
             }
+
             (obj.data as ItemView).SetData(reward);
-            (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
+            (obj.data as ItemView).GrpGotVisible =
+                StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId,
+                    rewardIndex) == ConstBonusStatus.GOT
+                    ? true
+                    : false;
             //(obj.data as ItemView).SetComItemScale = 0.6f;
             //(obj.data as ItemView).SetTxtCountPos(175, 135);
         }
@@ -132,6 +157,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("当前无奖励可领取");
                 return;
             }
+
             StudioSProxy.ReqFilingScoreRewards(StudioDataManager.Instance.filingChapterId).Coroutine();
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -163,7 +163,9 @@ namespace GFGGame
                 item.m_loaItem.visible = true;
                 StoryFightCfg storyFightCfg =
                     CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(_storyLevelCfgs[index].FightID));
-                int itemId = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(storyFightCfg.BonusRandom[0])[0].Item;
+                int itemId = CommonDataManager.Tables.TblDropOutCfg.DataList
+                    .Where(a => a.Id == storyFightCfg.BonusRandom[0]).ToList()[0].Item;
+
                 ItemCfg itemCfg = CommonDataManager.Tables.TblItemCfg.GetOrDefault(itemId);
                 item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
                 if (item.m_loaItem.data == null)
@@ -218,7 +220,9 @@ namespace GFGGame
             int index = (int)obj.data;
             StoryFightCfg storyFightCfg =
                 CommonDataManager.Tables.TblStoryFightCfg.GetOrDefault(int.Parse(_storyLevelCfgs[index].FightID));
-            int itemId = CommonDataManager.Tables.TblDropOutCfg.GetGroup1ById(storyFightCfg.BonusRandom[0])[0].Item;
+            int itemId = CommonDataManager.Tables.TblDropOutCfg.DataList
+                .Where(a => a.Id == storyFightCfg.BonusRandom[0]).ToList()[0].Item;
+
             // StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
             // ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(storyFightCfg.bonusBaseArr[0][0]);
             GoodsItemTipsController.ShowItemTips(itemId);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -26,7 +26,9 @@ namespace GFGGame
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).FullName;
 
-            this._studioCfg = CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioMetalView).Name)[0];
+            this._studioCfg = CommonDataManager.Tables.TblStudioCfg.DataList
+                .Where(a => a.FunId == typeof(StudioMetalView).Name).ToList()[0];
+
             this.storyLevelCfgs = CommonDataManager.Tables.TblStoryLevelCfg.DataList
                 .Where(a => a.Type == this._studioCfg.Type &&
                             a.SubType == _studioCfg.SubType &&

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -35,8 +35,10 @@ namespace GFGGame
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg =
-                CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioPorcelainView).Name)[
-                    StudioDataManager.Instance.PorcelainTheme - 1];
+                CommonDataManager.Tables.TblStudioCfg.DataList.Where(a => a.FunId == typeof(StudioPorcelainView).Name)
+                    .ToList()[
+                        StudioDataManager.Instance.PorcelainTheme - 1];
+
             this.storyLevelCfgs = CommonDataManager.Tables.TblStoryLevelCfg.DataList
                 .Where(a => a.Type == this._studioCfg.Type &&
                             a.SubType == _studioCfg.SubType &&

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -54,7 +54,9 @@ namespace GFGGame
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).FullName;
             List<StudioCfg> studioCfgs =
-                CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioPropertyView).Name);
+                CommonDataManager.Tables.TblStudioCfg.DataList.Where(a => a.FunId == typeof(StudioPropertyView).Name)
+                    .ToList();
+
             firstOpenProperty = -1;
             for (int i = 0; i < studioCfgs.Count; i++)
             {
@@ -102,7 +104,9 @@ namespace GFGGame
         {
             // int index = _croProperty.selectedIndex;
             List<StudioCfg> studioCfgs =
-                CommonDataManager.Tables.TblStudioCfg.GetGroup1ByFunId(typeof(StudioPropertyView).Name);
+                CommonDataManager.Tables.TblStudioCfg.DataList.Where(a => a.FunId == typeof(StudioPropertyView).Name)
+                    .ToList();
+
             StudioCfg studioCfg = studioCfgs[_croProperty.selectedIndex];
             if (!TimeUtil.CheckDayOfWeek(studioCfg.Time))
             {

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -21,6 +21,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -42,7 +43,8 @@ namespace GFGGame
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300012;
             _ui.m_LevelProcess.m_loaIcon.url =
-                ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg.GetOrDefault(ConstItemID.BATTLE_PASS_CURRENCY).Res);
+                ResPathUtil.GetCommonGameResPath(CommonDataManager.Tables.TblItemCfg
+                    .GetOrDefault(ConstItemID.BATTLE_PASS_CURRENCY).Res);
         }
 
         protected override void OnHide()
@@ -61,12 +63,14 @@ namespace GFGGame
             SetOpenBattlePassBtnStatus();
             FreshSpecialReward(oldLevel);
             var battlePassCfgs =
-               CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(BattlePassTaskDataManager.Instance.GetSeasonId());
+                CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == BattlePassTaskDataManager.Instance.GetSeasonId()).ToList();
+
             var minLevel =
                 (from battlePassCfg in battlePassCfgs
-                 let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.Level)
-                 where battlePassCfg.Level != 0 && state != 2
-                 select battlePassCfg.Level).FirstOrDefault();
+                    let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.Level)
+                    where battlePassCfg.Level != 0 && state != 2
+                    select battlePassCfg.Level).FirstOrDefault();
             minLevel = Mathf.Max(1, minLevel);
             _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
@@ -114,12 +118,15 @@ namespace GFGGame
             var dataManager = BattlePassTaskDataManager.Instance;
             var seasonId = dataManager.GetSeasonId();
             var battlePassCfg =
-               CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(seasonId, dataManager.GetBattlePassLevel() + 1);
-            if(battlePassCfg == null)
+                CommonDataManager.Tables.TblBattlePassCfg.DataList
+                    .Where(a => a.Id == seasonId && a.Level == dataManager.GetBattlePassLevel() + 1).ToList();
+
+            if (battlePassCfg.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("已经满级");
                 return;
             }
+
             ViewManager.Show<BuyBattlePassLevelView>();
         }
 
@@ -188,7 +195,8 @@ namespace GFGGame
             if (bonusNormalArr != null && bonusNormalArr.Count > 0)
             {
                 item.m_NormalReward.visible = true;
-                var itemData = ItemUtil.createItemData(new ItemParamProto(){ItemId = bonusNormalArr[0].ItemId,Count = bonusNormalArr[0].Count});
+                var itemData = ItemUtil.createItemData(new ItemParamProto()
+                    { ItemId = bonusNormalArr[0].ItemId, Count = bonusNormalArr[0].Count });
                 var itemView = new ItemView(item.m_NormalReward);
                 item.m_NormalReward.data ??= itemView;
                 itemView.SetData(itemData);
@@ -200,10 +208,12 @@ namespace GFGGame
                 item.m_NormalReward.data = null;
                 item.m_NormalReward.visible = false;
             }
+
             if (item.m_RewardList.data == null)
             {
                 item.m_RewardList.itemRenderer = SpecialRewardRender;
             }
+
             var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
             item.m_RewardList.data = (battlePassCfg.BonusSpecial, superLevelRewardGet);
             item.m_RewardList.numItems = battlePassCfg.BonusSpecial.Count;
@@ -221,7 +231,7 @@ namespace GFGGame
         {
             var keyValuePair = ((int[][], bool))obj.parent.data;
             var itemInfo = keyValuePair.Item1[index];
-            var itemData = ItemUtil.createItemData(new ItemParamProto(){ItemId = itemInfo[0],Count = itemInfo[1]});
+            var itemData = ItemUtil.createItemData(new ItemParamProto() { ItemId = itemInfo[0], Count = itemInfo[1] });
             var itemView = new ItemView(obj as GComponent);
             obj.data ??= itemView;
             itemView.SetData(itemData);
@@ -238,18 +248,21 @@ namespace GFGGame
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
             }
+
             item.m_GetRewardBt.data = id;
             //继续领取
             if (item.m_ContinueBt.data == null)
             {
                 item.m_ContinueBt.onClick.Add(OnBtnContinueClick);
             }
+
             item.m_ContinueBt.data = id;
             //前往
             if (item.m_ComeBt.data == null)
             {
                 item.m_ComeBt.enabled = false;
             }
+
             item.m_ComeBt.data = id;
         }
 
@@ -270,6 +283,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
+
             _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
         }
 
@@ -290,7 +304,7 @@ namespace GFGGame
             var uiExpProcess = _ui.m_LevelProcess;
             //获取当前等级的经验
             var battlePassCfg =
-               CommonDataManager.Tables.TblBattlePassCfg.Get(seasonId, dataManager.GetBattlePassLevel());
+                CommonDataManager.Tables.TblBattlePassCfg.Get(seasonId, dataManager.GetBattlePassLevel());
             if (battlePassCfg == null)
             {
                 //已经超过了最大等级
@@ -313,7 +327,10 @@ namespace GFGGame
             //刷新奖励列表
             _rewardCfgs =
                 new List<BattlePassCfg>(
-                   CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ById(BattlePassTaskDataManager.Instance.GetSeasonId()));
+                    CommonDataManager.Tables.TblBattlePassCfg.DataList.Where(a => a.Id == BattlePassTaskDataManager
+                        .Instance
+                        .GetSeasonId()).ToList());
+
             //去掉第一个为0的配置
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
         }
@@ -337,6 +354,7 @@ namespace GFGGame
                 uiBattlePassReward.target.visible = false;
                 return;
             }
+
             var newLeve = battlePassCfg.Level;
             if (newLeve == oldLevel) return;
             oldLevel = newLeve;
@@ -356,6 +374,7 @@ namespace GFGGame
             {
                 uiBattlePassReward.m_NormalReward.visible = false;
             }
+
             var state = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
             uiBattlePassReward.m_RewardList.data = (battlePassCfg.BonusSpecial, state);
             uiBattlePassReward.m_RewardList.numItems = battlePassCfg.BonusSpecial.Count;

GameClient/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.Task;
@@ -86,9 +87,10 @@ namespace GFGGame
         {
             var newLevel = addLevel + 1;
             var dataManager = BattlePassTaskDataManager.Instance;
-            var cfg = CommonDataManager.Tables.TblBattlePassCfg.GetGroup1ByIdAndLevel(dataManager.GetSeasonId(),
-                newLevel);
-            if (cfg == null)
+            var cfg = CommonDataManager.Tables.TblBattlePassCfg.DataList
+                .Where(a => a.Id == dataManager.GetSeasonId() && a.Level == newLevel).ToList();
+
+            if (cfg.Count == 0)
             {
                 return;
             }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelRewardView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -50,7 +51,9 @@ namespace GFGGame
         {
             _ui.m_txtScore.text = string.Format("最高评分：{0}", InstanceZonesDataManager.GetScoreHighest(levelID));
             //_ui.m_btnGet.grayed = !StudioDataManager.Instance.GetFilingRewardState(StudioDataManager.Instance.filingChapterId);
-            bonusList = CommonDataManager.Tables.TblCompositeLevelbonusCfg.GetGroup1ByStoryLevelId(levelID);
+            bonusList = CommonDataManager.Tables.TblCompositeLevelbonusCfg.DataList
+                .Where(a => a.StoryLevelId == levelID).ToList();
+
             _ui.m_list.numItems = bonusList.Count;
         }
 

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -199,7 +199,9 @@ namespace GFGGame
         private void UpdateproBar()
         {
             int consumeID = 0;
-            datas = CommonDataManager.Tables.TblCompositebonusCfg.GetGroup1ByChapterId(_chapterID);
+            datas = CommonDataManager.Tables.TblCompositebonusCfg.DataList.Where(a => a.ChapterId == _chapterID)
+                .ToList();
+
             consumeID = datas[0].Params1[0];
             ItemData item;
             if (BagDataManager.Instance.GetBagData().TryGetValue(consumeID, out item))

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using cfg.GfgCfg;
 using ET;
 using FairyGUI;
@@ -166,7 +167,9 @@ namespace GFGGame
 
         private void CheckChapterID()
         {
-            List<ActivityOpenCfg> activityList = CommonDataManager.Tables.TblActivityOpenCfg.GetGroup1ByType(21);
+            List<ActivityOpenCfg> activityList =
+                CommonDataManager.Tables.TblActivityOpenCfg.DataList.Where(a => a.Type == 21).ToList();
+
             foreach (var item in activityList)
             {
                 if (item.Params1[0] == SuitID)