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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -47,6 +47,10 @@ namespace GFGEditor
         public static string DressUpTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string DressUpMd5FileSaveName = "DressUpMd5";
 
+        private static string[] NpcFaceSrcPaths { get { return new string[] { ResRootPath + "npc/对话表情/" }; } }
+        public static string NpcFaceTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/Face/";
+        public static string NpcFacepMd5FileSaveName = "NpcFaceMd5";
+
         private static string[] NpcHeadSrcPaths { get { return new string[] { ResRootPath + "npc/对战头像/" }; } }
         public static string NpcHeadTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/Head/";
         public static string NPCHeadMd5FileSaveName = "NpcHeadMd5";
@@ -155,6 +159,15 @@ namespace GFGEditor
         public static string MiniGameTZFETargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/TZFEGame/";
         public static string MiniGameTZFEMd5FileSaveName = "MiniGameTZFEMd5";
 
+        public static string[] MiniGameMergePaths { get { return new string[] { ResRootPath + "MiniGame/MergeGame/" }; } }
+        public static string MiniGameMergeTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/MergeGame/";
+        public static string MiniGameMergeMd5FileSaveName = "MiniGameMergeMd5";
+
+        public static void Test()
+        {
+            ImportClip(NpcFaceSrcPaths, NpcFaceTargetPath, NpcFacepMd5FileSaveName);
+        }
+
         public static void Import()
         {
             var md5Path = ImportArtResTool.Md5FilePath;
@@ -183,7 +196,10 @@ namespace GFGEditor
             ImportRes(ItemIconSrcPaths, ItemIconTargetPath, IconMd5FileSaveName);
             // 换装部件
             EditorUtility.DisplayProgressBar("进度", "正在裁减换装部件", 1);
-            ImportClipImage();
+            ImportClip(DressUpSrcPaths, DressUpTargetPath, DressUpMd5FileSaveName);
+            // NPC对话表情
+            EditorUtility.DisplayProgressBar("进度", "正在裁减NPC对话表情", 1);
+            ImportClip(NpcFaceSrcPaths, NpcFaceTargetPath, NpcFacepMd5FileSaveName);
             //NPC头像
             EditorUtility.DisplayProgressBar("进度", "正在导入NPC头像", 1);
             ImportRes(NpcHeadSrcPaths, NpcHeadTargetPath, NPCHeadMd5FileSaveName);
@@ -278,6 +294,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
             ImportRes(MiniGameTZFEPaths, MiniGameTZFETargetPath, MiniGameTZFEMd5FileSaveName);
 
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameMergePaths, MiniGameMergeTargetPath, MiniGameMergeMd5FileSaveName);
+
             EditorUtility.ClearProgressBar();
             AssetDatabase.Refresh();
             Debug.LogWarning("导入美术资源成功!");
@@ -301,12 +320,7 @@ namespace GFGEditor
             return files;
         }
 
-        public static void ImportClipImage()
-        {
-            ImportClip(DressUpSrcPaths, DressUpTargetPath);
-        }
-
-        public static void ImportClip(string[] sourceDirs, string targetDir)
+        public static void ImportClip(string[] sourceDirs, string targetDir, string md5FileName)
         {
             //换装部件
             if (!Directory.Exists(targetDir))
@@ -314,7 +328,7 @@ namespace GFGEditor
                 Directory.CreateDirectory(targetDir);
             }
             Dictionary<string, string> sourceImageMD5 = new Dictionary<string, string>();
-            sourceImageMD5 = ImagesClip.ReadSourceImagesMD5(DressUpMd5FileSaveName);
+            sourceImageMD5 = ImagesClip.ReadSourceImagesMD5(md5FileName);
 
             foreach (string dir in sourceDirs)
             {
@@ -332,7 +346,7 @@ namespace GFGEditor
                     }
                 });
             }
-            ImagesClip.WriteSourceImagesMD5(sourceImageMD5, DressUpMd5FileSaveName);
+            ImagesClip.WriteSourceImagesMD5(sourceImageMD5, md5FileName);
             AssetDatabase.Refresh();
         }
 

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach  };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -578,7 +578,7 @@ namespace GFGEditor
             return false;
         }
         /// <summary>
-        /// 检测商城-豆包卡是否产出该物品
+        /// 检测商城-红包卡是否产出该物品
         /// </summary>
         /// <param name="itemId"></param>
         /// <returns></returns>
@@ -807,5 +807,24 @@ namespace GFGEditor
             }
             return null;
         }
+
+        /// <summary>
+        /// 检测技能书合成途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetSkillBookSyntheticApproach(int itemId)
+        {
+            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (itemCfg == null)
+            {
+                return null;
+            }
+            if (itemCfg.param1Arr.Length <= 0)
+            {
+                return null;
+            }
+            return ConstFunctionId.SKILLBOOK;
+        }
     }
 }

GameClient/Assets/Editor/ToolsMenu.cs

@@ -232,10 +232,10 @@ namespace GFGEditor
             ImportExcel();
         }
 
-        [MenuItem("Tools/ImageClip/ImportClipImage")]
-        public static void ImportClipImage()
+        [MenuItem("Tools/ImageClip/TestImportClipImage")]
+        public static void TestImportClipImage()
         {
-            ImportArtResTool.ImportClipImage();
+            ImportArtResTool.Test();
         }
         [MenuItem("Tools/ImageClip/ReadImagePosition")]
         public static void ReadImagePosition()

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

@@ -101,5 +101,9 @@ namespace GFGGame
         ///飞花令
         /// </summary>
         public const string ARENA = "ARENA";
+        /// <summary>
+        ///技能书
+        /// </summary>
+        public const string SKILLBOOK = "SKILLBOOK";
     }
 }

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

@@ -186,6 +186,9 @@ namespace GFGGame
         //摘星抽奖展示界面关闭
         public const string LUCKY_BOX_SHOW_VIEW_CLOSE = "LUCKY_BOX_SHOW_VIEW_CLOSE";
 
+        //摘星抽奖奖品界面关闭
+        public const string LUCKY_BOX_BONUS_VIEW_CLOSE = "LUCKY_BOX_BONUS_VIEW_CLOSE";
+
         //词牌升级刷新
         public const string CARD_LEVEL_UP = "CARD_LEVEL_UP";
 
@@ -222,7 +225,5 @@ namespace GFGGame
         //更新2048游戏关卡状态
         public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
         
-        //服务端推送最新排队信息
-        public const string UPDATE_QUEUE = "UPDATE_QUEUE";
     }
 }

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

@@ -7,13 +7,13 @@ namespace GFGGame
     {
         private static BuyTipsView _buyTipsView;
 
-        public static void Show(int itemId, long count, Action onSuccess = null)
+        public static void Show(int itemId, long count, Action onSuccess = null,bool showCheck = false)
         {
             if (_buyTipsView == null)
             {
                 _buyTipsView = new BuyTipsView();
             }
-            _buyTipsView.SetParams(itemId, count, onSuccess);
+            _buyTipsView.SetParams(itemId, count, onSuccess, showCheck);
             _buyTipsView.Show();
         }
 

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

@@ -9,6 +9,8 @@ namespace GFGGame
         {
             switch (errorCode)
             {
+                case ET.ErrorCode.ERR_Cancel:
+                    return true;
                 case ET.ErrorCode.ERR_NetWorkError:
                     {
                         AlertSystem.Show("网络异常，也有可能是服务器异常，请稍后再试！")

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

@@ -10,7 +10,6 @@ namespace GFGGame
 
         public static async void Start()
         {
-            QDManager.Init();
             //初始化声音，不可以去掉
             MusicManager.Instance.Stop();
             SoundManager.Instance.Stop();
@@ -28,6 +27,8 @@ namespace GFGGame
             GameGlobal.Init();
             //sqlite
             SqliteController.Instance.Init(false, ResPathUtil.SQLITE_FILE_PATH);
+            //渠道
+            QDManager.Init();
             //全局点击效果
             ViewGlobal.CreatClickEffect();
             //获取游戏配置
@@ -239,6 +240,7 @@ namespace GFGGame
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             ActivityAfuGiftSProxy.GetAfuGiftInfo().Coroutine();
             ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
+            ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();

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

@@ -248,25 +248,27 @@ namespace GFGGame
                 ErrorCodeController.Handler(errorCode);
                 return;
             }
-            ViewManager.Hide<ModalStatusView>();
-            ViewManager.Hide<LoginView>();
-            ViewManager.Show<LoadingView>(0.01f);
-            LoadingView.Instance.SetProgress(99);
-            LoadingView.Instance.SetDesc("正在加载数据...");
-            LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
             errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             {
                 ErrorCodeController.Handler(errorCode);
                 return;
             }
+            ViewManager.Hide<ModalStatusView>();
+            ViewManager.Hide<LoginView>();
+            ViewManager.Show<LoadingView>(0.01f);
+            LoadingView.Instance.SetProgress(99);
+            LoadingView.Instance.SetDesc("正在加载数据...");
+            LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
+            await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
+            AlertSystem.hide();
             await GameController.PreEnterGameAsync();
-
             LogServerHelper.SendNodeLog((int)LogNode.OnEnterGame);
         }
 
         public static async ETTask ReqReConnectGate()
         {
+            LogUtil.LogDev("ReqReConnectGate");
             ViewManager.Show<ModalStatusView>("重新连接中...");
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
@@ -282,8 +284,10 @@ namespace GFGGame
                         });
                 return;
             }
+            await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
             EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE, NumericType.All);
             GameController.OnReconnected();
+            AlertSystem.hide();
             ViewManager.Hide<ModalStatusView>();
         }
     }

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

@@ -9,7 +9,7 @@ namespace GFGGame
     public class PromptController : SingletonBase<PromptController>
     {
         private List<GComponent> _uis = new List<GComponent>();
-        private int showCount = 3;  //ÏÔʾ¶àÉÙÌõ
+        private int showCount = 3;  //显示多少�
 
         public PromptController()
         {

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

@@ -14,6 +14,9 @@ namespace GFGGame
             luckyActTsyBonusState.Clear();
             allTsyPlayTimes = 0;
             lastActLimitTsyId = 0;
+
+            limitStlycActBonusState.Clear();
+            allLimitStlycTimes = 0;
             lastActLimitStlycId = 0;
         }
 
@@ -236,5 +239,33 @@ namespace GFGGame
                 return ConstBonusStatus.CAN_NOT_GET;
             }
         }
+
+        //招财进宝活动
+        public List<int> ActivityZCJBList = new List<int>();
+        public bool CheckZCJBRed()
+        {
+            ItemData numItem;
+            long num;
+            if(BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            {
+                num = numItem.num;
+            }
+            else
+            {
+                num = 0;
+            }
+
+            for (int i = 0; i < ActivityDressCfgArray.Instance.dataArray.Length - 1; i++)
+            {
+                    if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
+                    {
+                        if (num >= ActivityDressCfgArray.Instance.dataArray[i].comsumeArr[0][1])
+                        {
+                            return true;
+                        }
+                    }
+            }
+            return false;
+        }
     }
 }

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

@@ -98,7 +98,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "豆包卡开启";
+                        posItems[i] = "红包卡开启";
                     }
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold)
@@ -109,7 +109,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "阿福卡开启";
+                        posItems[i] = "福气卡开启";
                     }
                 }
             }

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

@@ -9,6 +9,8 @@ namespace GFGGame
         private static List<int> _suitIDList = new List<int>();
         private static List<int> _actionIDList;//拥有的特殊动作列表列表
         private static List<int> _travelSuitIDList;//拥有的游历套装列表
+        public static int chooseClothing = 0;//服裝合成选择合成第几件衣服
+
         public static List<int> TravelSuitIDList
         {
             get

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

@@ -19,10 +19,15 @@ namespace GFGGame
         private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData5 = new List<LimitedTimeGiftBoxItemYxData>();
         public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData5 => _ltgGbItemData5;
 
+        //圆形样式数据16--时间条件的数据
+        private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData16 = new List<LimitedTimeGiftBoxItemYxData>();
+        public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData16 => _ltgGbItemData16;
+
         public void Clear()
         {
             _ltgGbItemData4.Clear();
             _ltgGbItemData5.Clear();
+            _ltgGbItemData16.Clear();
             _isOpenMeiRiTeHui = false;
         }
 
@@ -75,6 +80,26 @@ namespace GFGGame
             _ltgGbItemData5 = _ltgGbItemData5.OrderBy(a => a.ShopCfgId).ToList();
         }
 
+        public void UpLtgGbItemData16()
+        {
+            _ltgGbItemData16.Clear();
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                         ActivityType.LuckyDiscount))
+            {
+                if (activityInfo.EndTime >= TimeInfo.Instance.ServerNow())
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                    //判断是否是类型16的数据
+                    if (activityOpenCfg.type == ActivityType.LuckyDiscount)
+                    {
+                        FillData(_ltgGbItemData16, activityOpenCfg.paramsArr[0], activityInfo.EndTime);
+                    }
+                }
+            }
+
+            _ltgGbItemData16 = _ltgGbItemData16.OrderBy(a => a.ShopCfgId).ToList();
+        }
+
         private void FillData(List<LimitedTimeGiftBoxItemYxData> listData, int shopCfgId, long endTime)
         {
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);

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

@@ -16,6 +16,10 @@ namespace GFGGame
 
         public const float ANIMATION_TIME = 1.2f; //翻牌获得物品展示时间
 
+        public bool CHECK_TIPS_OPEN = false; //提示弹窗是否打开
+
+        public bool OPEN_LUCKY_DISCONT = false; //抽奖满20次幸运折扣弹窗是否打开
+
         private List<ItemData> _rewardsList;//当前奖励，每次抽奖后刷新
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         private Dictionary<int, List<LuckyBoxBonusData>> _dicShowList = new Dictionary<int, List<LuckyBoxBonusData>>();
@@ -242,7 +246,10 @@ namespace GFGGame
             }
             else if (hasNum >= costNum)
             {
-                AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
+                if(LuckyBoxDataManager.Instance.CHECK_TIPS_OPEN == false)
+                    AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); }).SetShowCheck(true);
+                else
+                    onSuccess();
             }
             else
             {
@@ -269,9 +276,13 @@ namespace GFGGame
                     {
                         ItemUtil.ExchangeItemById(costId, needNum, false, onSuccess);
                     }
-                    else
-                    {
-                        BuyTipsController.Show(costId, needNum, onSuccess);
+                    else {
+                        if (LuckyBoxDataManager.Instance.CHECK_TIPS_OPEN == false)
+                            BuyTipsController.Show(costId, needNum, onSuccess, true);
+                        else
+                        {
+                            OnBuyItem(costId, needNum, onSuccess);
+                        }
                     }
                 }
                 else//购买消耗品的道具不足，提示购买 购买消耗品的道具
@@ -281,6 +292,13 @@ namespace GFGGame
             }
         }
 
+        private async void OnBuyItem(int itemId, long count, Action onSuccess = null)
+        {
+            var _result = await ItemExchangeSProxy.ItemExchange(itemId, count);
+            if (_result)
+                BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(itemId, count), onSuccess);
+        }
+
         private int GetCostNum(int boxId, int times)
         {
             LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);

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

@@ -11,6 +11,11 @@ namespace GFGGame
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
 
+        public bool CHECK_TIPS = false; //提示弹窗是否打开
+
+        //合成游戏
+        public int taskID = 40001;
+
         public bool GetRewardRot()
         {
             foreach(GameInfoProto t in gameinfoList)

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

@@ -1,3 +1,4 @@
+using ET;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -72,10 +73,73 @@ namespace GFGGame
             });
         }
 
-
         public NoticeInfo GetNoticeInfoById(int noticeId)
         {
             return _noticeInfoDic[noticeId];
         }
+
+        public List<AdCfg> UpdateShowActivity()
+        {
+            AdCfg[] activitydata = AdCfgArray.Instance.dataArray;
+            List<AdCfg> showActivity = new List<AdCfg>();
+            for (int i = 0; i < activitydata.Length; i++)
+            {
+                AdCfg adCfg = activitydata[i];
+                if (adCfg.activityId > 0)
+                {
+                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                }
+                if (adCfg.NoticeTips != null && adCfg.NoticeTips != "")
+                {
+                    if (adCfg.activityId != 0)
+                    {
+                        ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
+                        {
+
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                            continue;
+                        }
+                    }
+                    if (adCfg.startTime != "" && adCfg.startTime != null)
+                    {
+                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                        }
+                    }
+                }
+            }
+
+            return showActivity;
+        }
+
+        public bool GetRedDotState(string jumpId, int activityID)
+        {
+            switch (jumpId)
+            {
+                case "DailySignView":
+                    return RedDotDataManager.Instance.GetActivityDay7Red();
+                case "LuckyBoxView":
+                    return RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes();
+                case "NewLimitChargeView":
+                    return RedDotDataManager.Instance.GetLimiteChargeRewardRed(activityID);
+                case "OpenServerActivityView":
+                    return RedDotDataManager.Instance.GetOpenServerRed();
+            }
+
+            return false;
+        }
     }
 }

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

@@ -1,21 +0,0 @@
-namespace GFGGame
-{
-    public class QueueDataManager : SingletonBase<QueueDataManager>
-    {
-        public int Index { get; private set; }
-
-        public int Count { get; private set; }
-
-        public void UpQueueData(int index, int count)
-        {
-            Index = index;
-            count = count;
-        }
-
-        public void ClaerQueueData()
-        {
-            Index = 0;
-            Count = 0;
-        }
-    }
-}

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

@@ -20,6 +20,15 @@ namespace GFGGame
             {
                 if (noticeInfos[i].readStatus == false) return true;
             }
+
+            List<AdCfg> showActivity = NoticeDataManager.Instance.UpdateShowActivity();
+            for (int i = 0; i < showActivity.Count; i++)
+            {
+                if (NoticeDataManager.Instance.GetRedDotState(showActivity[i].jumpId, showActivity[i].activityId))
+                {
+                    return true;
+                }
+            }
             return false;
         }
 
@@ -641,7 +650,7 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// 商城-月卡-豆包卡
+        /// 商城-月卡-红包卡
         /// </summary>
         /// <returns></returns>
         public bool GetGoldCardRewardRed()
@@ -649,7 +658,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡
+        /// 商城-月卡-福气卡
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardRewardRed()
@@ -657,7 +666,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡-单品奖励
+        /// 商城-月卡-福气卡-单品奖励
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardClothingRed()
@@ -781,7 +790,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetOpenServerRed()
         {
-           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed())
+           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed())
                 return true;
 
             return false;
@@ -831,6 +840,30 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 开服活动-剧情
+        /// </summary>
+        /// <returns></returns>
+        public bool GetOpenServerStoryRed()
+        {
+            var activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (activityId != 0) { 
+                var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+                Dictionary<int, List<StoryLevelCfg>> storyLevelCfgs = new Dictionary<int, List<StoryLevelCfg>>();
+
+                for (int i = 0; i < 4; i++) {
+                    ActivityStoryCfg activityStoryCfg = ActivityStoryCfgArray.Instance.GetCfg(activityCfg.params4Arr[i]);
+                    var storyLevelCfg = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(activityStoryCfg.type, activityStoryCfg.subType, activityCfg.params4Arr[i]);
+                    storyLevelCfgs.Add(i, storyLevelCfg);
+                    if ((i == 0 && !InstanceZonesDataManager.CheckLevelPass(storyLevelCfgs[i][0].id)) || (i > 0 && InstanceZonesDataManager.CheckLevelPass(storyLevelCfgs[i - 1][0].id) && !InstanceZonesDataManager.CheckLevelPass(storyLevelCfgs[i][0].id) && ItemDataManager.ItemCollect.ContainsKey(activityStoryCfg.needItemsArr[0][0]) && ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]] >= activityStoryCfg.needItemsArr[0][1]))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
         /// 背包中存在礼包就一直给主界面 背包 红点
         /// </summary>
         /// <returns></returns>

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

@@ -280,11 +280,11 @@ namespace GFGGame
                 }
                 else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
                 {
-                    posItems[i] = "豆包卡开启";
+                    posItems[i] = "红包卡开启";
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
                 {
-                    posItems[i] = "阿福卡开启";
+                    posItems[i] = "福气卡开启";
                 }
             }
             return posItems;

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

@@ -15,6 +15,7 @@ namespace GFGGame
                 var data = new RoleLimitData();
                 data.FromMessage(proto);
                 _roleLimitDatas.Add(proto.LimitId, data);
+                EventAgent.DispatchEvent(ConstMessage.NOTICE_LIMIT_CHANGED, proto.LimitId);
             }
         }
 

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

@@ -203,7 +203,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "豆包卡" : "阿福卡");
+                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "红包卡" : "福气卡");
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
@@ -351,9 +351,9 @@ namespace GFGGame
         /// <summary>
         /// 返回活动商城是否显示
         /// /// </summary>
-        public bool GetShopActivityIsShow(int menuType)
+        public bool GetShopActivityIsShow(int shopType,int menuType)
         {
-            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menuType);
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(shopType, menuType);
             if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
                 return false;
             else

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

@@ -140,6 +140,11 @@ namespace GFGGame
             ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX);
         }
 
+        public void OnFinishZCJBStoryLevel(int levelCfgId, bool firstPass, bool success)
+        {
+            ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
+        }
+
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, true);

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -653,17 +653,17 @@ namespace GFGGame
                         Remove(ConstItemID.DEFULT_NEI_DA);
                         Add(ConstItemID.DEFULT_LIAN_YI_QUN);
                     }
-                    else
-                    {
-                        if (!hasXiaZhuang)
-                        {
-                            Add(ConstItemID.DEFULT_XIA_ZHUANG);
-                        }
-                        if (!hasNeiDa)
-                        {
-                            Add(ConstItemID.DEFULT_NEI_DA);
-                        }
-                    }
+                    //else
+                    //{
+                    //    if (!hasXiaZhuang)
+                    //    {
+                    //        Add(ConstItemID.DEFULT_XIA_ZHUANG);
+                    //    }
+                    //    if (!hasNeiDa)
+                    //    {
+                    //        Add(ConstItemID.DEFULT_NEI_DA);
+                    //    }
+                    //}
 
                 }
             }

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -82,11 +82,34 @@ namespace GFGGame
             }
         }
 
+        public static void InitPicFace(string faceValue, GameObject sceneObj)
+        {
+
+            Transform face = sceneObj.transform.Find("Pic/Face");
+            SpriteRenderer sprFace = face.GetComponent<SpriteRenderer>();
+
+            if (faceValue == "0")
+            {
+                SpriteHelper.RemoveSpriteFrom(sprFace);
+            }
+            else
+            {
+                var resPath = ResPathUtil.GetNpcPicFacePath(faceValue);
+                float tx, ty;
+                DressUpUtil.LoadSpritePos(resPath, out tx, out ty);
+                face.localPosition = new Vector3(tx, ty, face.localPosition.z);
+                SpriteHelper.AddSpriteTo(sprFace, resPath);
+            }
+        }
+
         public static async void UpdateDialogPic(string value, GameObject sceneObj)
         {
             StoryDialogDataManager.Instance.waitPicFade = false;
             Transform tf = sceneObj.transform.Find("Pic");
+            Transform face = sceneObj.transform.Find("Pic/Face");
+
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            SpriteRenderer sprFace = face.GetComponent<SpriteRenderer>();
             if (value == "0")
             {
                 SpriteHelper.RemoveSpriteFrom(spr);
@@ -98,6 +121,8 @@ namespace GFGGame
                 var resPath = ResPathUtil.GetNpcPicSPath(value);
                 SpriteHelper.AddSpriteTo(spr, resPath);
                 SetSpriteRendererAlpha(spr, 0f);
+                SetSpriteRendererAlpha(sprFace, 0f);
+
                 FairyGUI.Timers.inst.StartCoroutine(UpdateDialogPicAlpha());
 
                 IEnumerator UpdateDialogPicAlpha()
@@ -109,6 +134,7 @@ namespace GFGGame
                             if (spr.enabled && spr.color.a < 1f)
                             {
                                 SetSpriteRendererAlpha(spr, spr.color.a + 0.055f);
+                                SetSpriteRendererAlpha(sprFace, spr.color.a);
                             }
                             else
                             {

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected/DisConnectedCompnentSystem.cs

@@ -26,10 +26,14 @@ namespace ET
                         });
                         return;
                     }
-                    else
+                    else if(self.SessionState == SessionState.Gate)
                     {
                         LoginController.ReqReConnectGate().Coroutine();
                     }
+                    else
+                    {
+                        LogUtil.LogDev("DisConnectedCompnentDestroy");
+                    }
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -81,7 +81,7 @@ namespace ET
         {
             zoneScene.GetComponent<SessionComponent>().AccountSession = accountSession;
             accountSession.AddComponent<PingComponent>();
-            accountSession.AddComponent<DisConnectedCompnent>();
+            accountSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Login;
             zoneScene.GetComponent<SessionComponent>().SessionState = SessionState.Login;
             AccountInfoComponent accountInfoComponent = zoneScene.GetComponent<AccountInfoComponent>();
             accountInfoComponent.Token = a2CLoginAccount.Token;
@@ -167,7 +167,7 @@ namespace ET
 
             try
             {
-                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRoles()
+                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession.Call(new C2A_GetRoles()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -289,7 +289,7 @@ namespace ET
 
             zoneScene.GetComponent<AccountInfoComponent>().RealmKey = a2C_GetRealmKey.RealmKey;
             zoneScene.GetComponent<AccountInfoComponent>().RealmAddress = a2C_GetRealmKey.RealmAddress;
-            zoneScene.GetComponent<SessionComponent>().Disconnect();
+            zoneScene.GetComponent<SessionComponent>().DisconnectAccount();
 
             await ETTask.CompletedTask;
             return ErrorCode.ERR_Success;
@@ -323,10 +323,10 @@ namespace ET
                 return r2C_LoginRealm.Error;
             }
 
-            Log.Debug($"GateAddress : {r2C_LoginRealm.GateAddress}");
+            LogUtil.LogDev($"GateAddress : {r2C_LoginRealm.GateAddress}");
             Session gateSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress));
             gateSession.AddComponent<PingComponent>();
-            gateSession.AddComponent<DisConnectedCompnent>();
+            gateSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Gate;
             zoneScene.GetComponent<SessionComponent>().GateSession = gateSession;
             zoneScene.GetComponent<SessionComponent>().SessionState = SessionState.Gate;
 
@@ -355,7 +355,7 @@ namespace ET
                 zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
                 return g2C_LoginGate.Error;
             }
-            Log.Debug("登陆gate成功！");
+            LogUtil.LogDev("登陆gate成功！");
 
             //3.角色正式请求进入游戏逻辑服
             G2C_EnterGame g2C_EnterGame = null;
@@ -375,12 +375,13 @@ namespace ET
                 //Log.Error(g2C_EnterGame.Error.ToString());
                 return g2C_EnterGame.Error;
             }
-
-            Log.Debug("角色进入游戏成功！");
             zoneScene.GetComponent<PlayerComponent>().MyId = g2C_EnterGame.MyId;
-            await zoneScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_SceneChangeFinish>();
-
-            await ETTask.CompletedTask;
+            var result = await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeStart>();
+            if(result.Error == WaitTypeError.Cancel)
+            {
+                return ErrorCode.ERR_Cancel;
+            }
+            LogUtil.LogDev("角色进入游戏成功！");
             return ErrorCode.ERR_Success;
         }
 

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Scene/M2C_StartSceneChangeHandler.cs

@@ -1,4 +1,5 @@
-using System;
+using GFGGame;
+using System;
 
 namespace ET
 {
@@ -6,7 +7,24 @@ namespace ET
     {
         protected override async ETTask Run(Session session, M2C_StartSceneChange message)
         {
-            await SceneChangeHelper.SceneChangeTo(GFGGame.GameGlobal.zoneScene, message.SceneName, message.SceneInstanceId);
+            LogUtil.LogDev("Notify Wait_SceneChangeStart");
+            // 通知等待场景切换的协程
+            GameGlobal.zoneScene.GetComponent<ObjectWait>().Notify(new WaitType.Wait_SceneChangeStart());
+
+            CurrentScenesComponent currentScenesComponent = GameGlobal.zoneScene.GetComponent<CurrentScenesComponent>();
+
+            currentScenesComponent.Scene?.Dispose(); // 删除之前的CurrentScene，创建新的
+            Scene currentScene = SceneFactory.CreateCurrentScene(message.SceneInstanceId, GameGlobal.zoneScene.Zone, message.SceneName, currentScenesComponent);
+
+            // 等待CreateMyUnit的消息
+            WaitType.Wait_CreateMyUnit waitCreateMyUnit = await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_CreateMyUnit>();
+            M2C_CreateMyUnit m2CCreateMyUnit = waitCreateMyUnit.Message;
+            Unit unit = UnitFactory.Create(currentScene, m2CCreateMyUnit.Unit);
+            GameGlobal.myNumericComponent = unit.GetComponent<NumericComponent>();
+
+            LogUtil.LogDev("Notify Wait_SceneChangeFinish");
+            // 通知等待场景切换的协程
+            GameGlobal.zoneScene.GetComponent<ObjectWait>().Notify(new WaitType.Wait_SceneChangeFinish());
         }
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Scene/SceneChangeHelper.cs

@@ -1,24 +0,0 @@
-using GFGGame;
-
-namespace ET
-{
-    public static class SceneChangeHelper
-    {
-        // 场景切换协程
-        public static async ETTask SceneChangeTo(Scene zoneScene, string sceneName, long sceneInstanceId)
-        {
-            CurrentScenesComponent currentScenesComponent = zoneScene.GetComponent<CurrentScenesComponent>();
-            currentScenesComponent.Scene?.Dispose(); // 删除之前的CurrentScene，创建新的
-            Scene currentScene = SceneFactory.CreateCurrentScene(sceneInstanceId, zoneScene.Zone, sceneName, currentScenesComponent);
-
-            // 等待CreateMyUnit的消息
-            WaitType.Wait_CreateMyUnit waitCreateMyUnit = await zoneScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_CreateMyUnit>();
-            M2C_CreateMyUnit m2CCreateMyUnit = waitCreateMyUnit.Message;
-            Unit unit = UnitFactory.Create(currentScene, m2CCreateMyUnit.Unit);
-            GameGlobal.myNumericComponent = unit.GetComponent<NumericComponent>();
-
-            // 通知等待场景切换的协程
-            zoneScene.GetComponent<ObjectWait>().Notify(new WaitType.Wait_SceneChangeFinish());
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Session/SessionComponentSystem.cs

@@ -5,18 +5,27 @@
 		public override void Destroy(SessionComponent self)
 		{
 			self.AccountSession?.Dispose();
+			self.AccountSession = null;
 			self.GateSession?.Dispose();
+			self.GateSession = null;
 		}
 	}
 
 	public static class SessionComponentComponent
     {
-		public static void Disconnect(this SessionComponent self)
+		public static void DisconnectAccount(this SessionComponent self)
 		{
 			self.AccountSession?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
 			self.AccountSession?.Dispose();
+			self.AccountSession = null;
+		}
+
+		public static void Disconnect(this SessionComponent self)
+		{
+			self.DisconnectAccount();
 			self.GateSession?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
 			self.GateSession?.Dispose();
+			self.GateSession = null;
 		}
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/DisConnected/DisConnectedCompnent.cs

@@ -3,5 +3,6 @@
     public class DisConnectedCompnent : Entity, IAwake, IDestroy
     {
         public bool ToReconnect = true;
+        public SessionState SessionState;
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/WaitType.cs

@@ -21,7 +21,16 @@
 
             public M2C_CreateMyUnit Message;
         }
-        
+
+        public struct Wait_SceneChangeStart : IWaitType
+        {
+            public int Error
+            {
+                get;
+                set;
+            }
+        }
+
         public struct Wait_SceneChangeFinish: IWaitType
         {
             public int Error

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityRewardItemUI.cs

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityRewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GList m_List;
+        public UI_Button7 m_RewardBtn;
+        public GTextField m_rewardName;
+        public const string URL = "ui://4ht5s77uqbf4u";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityRewardItemUI";
+        private static UI_ActivityRewardItemUI _proxy;
+
+        public static UI_ActivityRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityRewardItemUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityRewardItemUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_List = (GList)comp.GetChild("List");
+            m_RewardBtn = (UI_Button7)UI_Button7.Create(comp.GetChild("RewardBtn"));
+            m_rewardName = (GTextField)comp.GetChild("rewardName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_List = null;
+            m_RewardBtn.Dispose();
+            m_RewardBtn = null;
+            m_rewardName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/QueueDataManager.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityRewardItemUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1a74ff909c5901b40b36ccac70d64578
+guid: 87c9eb1e5a64ff04fbce6644d12fc918
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityZCJB
+    {
+        public GComponent target;
+        public GLoader m_btnChange;
+        public GLoader m_icon;
+        public GButton m_rewardBTn;
+        public GTextField m_activityTime;
+        public GLoader m_backBtn;
+        public GLoader m_viewBtn;
+        public const string URL = "ui://4ht5s77uqbf4l";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityZCJB";
+        private static UI_ActivityZCJB _proxy;
+
+        public static UI_ActivityZCJB Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityZCJB();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityZCJB Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityZCJB();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnChange = (GLoader)comp.GetChild("btnChange");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rewardBTn = (GButton)comp.GetChild("rewardBTn");
+            m_activityTime = (GTextField)comp.GetChild("activityTime");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnChange = null;
+            m_icon = null;
+            m_rewardBTn = null;
+            m_activityTime = null;
+            m_backBtn = null;
+            m_viewBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Scene/SceneChangeHelper.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 979d8a25f84f51a4ab07e3001b61fdff
+guid: 8c0d3b1188db23c46bb92208b1166c5e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJBRewardUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityZCJBRewardUI
+    {
+        public GComponent target;
+        public GLoader m_back;
+        public GLoader m_loaBg;
+        public GList m_List;
+        public GTextField m_num;
+        public GLoader m_backBtn;
+        public const string URL = "ui://4ht5s77uqbf4m";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityZCJBRewardUI";
+        private static UI_ActivityZCJBRewardUI _proxy;
+
+        public static UI_ActivityZCJBRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityZCJBRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityZCJBRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityZCJBRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_back = (GLoader)comp.GetChild("back");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_List = (GList)comp.GetChild("List");
+            m_num = (GTextField)comp.GetChild("num");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_back = null;
+            m_loaBg = null;
+            m_List = null;
+            m_num = null;
+            m_backBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJBRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button7.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button7.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ZCJBBuyTips
+    {
+        public GComponent target;
+        public GGraph m_graphBg;
+        public GTextField m_txtContent;
+        public GTextField m_txtTips;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
+        public const string URL = "ui://4ht5s77uqzw81c";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ZCJBBuyTips";
+        private static UI_ZCJBBuyTips _proxy;
+
+        public static UI_ZCJBBuyTips Create(GObject gObject = null)
+        {
+            var ui = new UI_ZCJBBuyTips();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ZCJBBuyTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ZCJBBuyTips();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_graphBg = (GGraph)comp.GetChild("graphBg");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_graphBg = null;
+            m_txtContent = null;
+            m_txtTips = null;
+            m_btnLeft = null;
+            m_btnRight = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardFosterUI.cs

@@ -18,6 +18,7 @@ namespace UI.Card
         public GLoader m_loaGuide;
         public GButton m_btnLeft;
         public GButton m_btnRight;
+        public GGraph m_touchLayer;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_open;
@@ -79,6 +80,7 @@ namespace UI.Card
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_touchLayer = (GGraph)comp.GetChild("touchLayer");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_open = comp.GetTransition("open");
@@ -100,6 +102,7 @@ namespace UI.Card
             m_loaGuide = null;
             m_btnLeft = null;
             m_btnRight = null;
+            m_touchLayer = null;
             m_t0 = null;
             m_t1 = null;
             m_open = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardUpUI.cs

@@ -8,7 +8,6 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_bgTouch;
         public GGraph m_holderBgCom;
         public GGraph m_holderTitle;
         public GTextField m_txtLast;
@@ -65,7 +64,6 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bgTouch = (GGraph)comp.GetChild("bgTouch");
             m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_txtLast = (GTextField)comp.GetChild("txtLast");
@@ -78,7 +76,6 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bgTouch = null;
             m_holderBgCom = null;
             m_holderTitle = null;
             m_txtLast = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertUI.cs

@@ -7,11 +7,13 @@ namespace UI.Common
     public partial class UI_AlertUI
     {
         public GComponent target;
+        public Controller m_checkType;
         public GGraph m_graphBg;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
         public GButton m_btnLeft;
         public GButton m_btnRight;
+        public GButton m_btnCheck;
         public const string URL = "ui://mk0fwx0xl55o0";
         public const string PACKAGE_NAME = "Common";
         public const string RES_NAME = "AlertUI";
@@ -59,19 +61,23 @@ namespace UI.Common
 
         private void Init(GComponent comp)
         {
+            m_checkType = comp.GetController("checkType");
             m_graphBg = (GGraph)comp.GetChild("graphBg");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_btnCheck = (GButton)comp.GetChild("btnCheck");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_checkType = null;
             m_graphBg = null;
             m_txtContent = null;
             m_txtTips = null;
             m_btnLeft = null;
             m_btnRight = null;
+            m_btnCheck = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,12 +7,14 @@ namespace UI.CommonGame
     public partial class UI_BuyTipsUI
     {
         public GComponent target;
-        public GComponent m_bg;
+        public Controller m_checkType;
+        public GImage m_bg;
         public GTextField m_txtNeed;
         public GTextField m_txtCost;
         public GLoader m_loaNeed;
-        public GButton m_btnCancel;
-        public GButton m_btnSure;
+        public UI_Button18 m_btnCancel;
+        public UI_Button18 m_btnSure;
+        public GButton m_btnCheck;
         public const string URL = "ui://eg2y0ldpds629g";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "BuyTipsUI";
@@ -60,21 +62,27 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_bg = (GComponent)comp.GetChild("bg");
+            m_checkType = comp.GetController("checkType");
+            m_bg = (GImage)comp.GetChild("bg");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
             m_txtCost = (GTextField)comp.GetChild("txtCost");
             m_loaNeed = (GLoader)comp.GetChild("loaNeed");
-            m_btnCancel = (GButton)comp.GetChild("btnCancel");
-            m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnCancel = (UI_Button18)UI_Button18.Create(comp.GetChild("btnCancel"));
+            m_btnSure = (UI_Button18)UI_Button18.Create(comp.GetChild("btnSure"));
+            m_btnCheck = (GButton)comp.GetChild("btnCheck");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_checkType = null;
             m_bg = null;
             m_txtNeed = null;
             m_txtCost = null;
             m_loaNeed = null;
+            m_btnCancel.Dispose();
             m_btnCancel = null;
+            m_btnSure.Dispose();
             m_btnSure = null;
+            m_btnCheck = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,6 +11,8 @@ namespace UI.CommonGame
         public Controller m_style;
         public GLoader m_loaIcon;
         public GTextField m_txtNeed;
+        public GTextField m_limitNum;
+        public GLoader m_addBtn;
         public const string URL = "ui://eg2y0ldpn3xha1";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComCostCurrency";
@@ -62,6 +64,8 @@ namespace UI.CommonGame
             m_style = comp.GetController("style");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_limitNum = (GTextField)comp.GetChild("limitNum");
+            m_addBtn = (GLoader)comp.GetChild("addBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +73,8 @@ namespace UI.CommonGame
             m_style = null;
             m_loaIcon = null;
             m_txtNeed = null;
+            m_limitNum = null;
+            m_addBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,8 +7,13 @@ namespace UI.CommonGame
     public partial class UI_ComGouMaiGetText
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_txtGetGold;
+        public GLoader m_loaIcon1;
+        public GTextField m_txtGetGold1;
+        public GLoader m_loaIcon2;
+        public GTextField m_txtGetGold2;
         public const string URL = "ui://eg2y0ldpqqhz1r";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComGouMaiGetText";
@@ -56,13 +61,23 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtGetGold = (GTextField)comp.GetChild("txtGetGold");
+            m_loaIcon1 = (GLoader)comp.GetChild("loaIcon1");
+            m_txtGetGold1 = (GTextField)comp.GetChild("txtGetGold1");
+            m_loaIcon2 = (GLoader)comp.GetChild("loaIcon2");
+            m_txtGetGold2 = (GTextField)comp.GetChild("txtGetGold2");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_txtGetGold = null;
+            m_loaIcon1 = null;
+            m_txtGetGold1 = null;
+            m_loaIcon2 = null;
+            m_txtGetGold2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,8 +12,8 @@ namespace UI.CommonGame
         public UI_ComCardMask m_comCard;
         public GLoader m_loaBorder;
         public GLoader m_loaRarity;
-        public GGraph m_holderGoldBg;
         public GGraph m_holderPurpleBg;
+        public GGraph m_holderGoldBg;
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public GLoader m_loaMainScore;
@@ -74,8 +74,8 @@ namespace UI.CommonGame
             m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_holderGoldBg = (GGraph)comp.GetChild("holderGoldBg");
             m_holderPurpleBg = (GGraph)comp.GetChild("holderPurpleBg");
+            m_holderGoldBg = (GGraph)comp.GetChild("holderGoldBg");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
@@ -93,8 +93,8 @@ namespace UI.CommonGame
             m_comCard = null;
             m_loaBorder = null;
             m_loaRarity = null;
-            m_holderGoldBg = null;
             m_holderPurpleBg = null;
+            m_holderGoldBg = null;
             m_txtLv = null;
             m_txtName = null;
             m_loaMainScore = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_RushSaleGiftBoxUI.cs

@@ -7,6 +7,7 @@ namespace UI.EnduringGiftBox
     public partial class UI_RushSaleGiftBoxUI
     {
         public GComponent target;
+        public Controller m_showType;
         public GComponent m_btnUp;
         public GComponent m_btnNext;
         public GComponent m_btnBack;
@@ -70,6 +71,7 @@ namespace UI.EnduringGiftBox
 
         private void Init(GComponent comp)
         {
+            m_showType = comp.GetController("showType");
             m_btnUp = (GComponent)comp.GetChild("btnUp");
             m_btnNext = (GComponent)comp.GetChild("btnNext");
             m_btnBack = (GComponent)comp.GetChild("btnBack");
@@ -89,6 +91,7 @@ namespace UI.EnduringGiftBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showType = null;
             m_btnUp = null;
             m_btnNext = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyItem.cs

@@ -7,8 +7,8 @@ namespace UI.League
     public partial class UI_comTeaPartyItem
     {
         public GComponent target;
-        public GLoader m_iconRoleBg;
         public GLoader m_iconRole;
+        public GLoader m_iconRoleBg;
         public GTextField m_txtRoleName;
         public GTextField m_txtMaxValue;
         public GImage m_imgChoose;
@@ -62,8 +62,8 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_iconRoleBg = (GLoader)comp.GetChild("iconRoleBg");
             m_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_iconRoleBg = (GLoader)comp.GetChild("iconRoleBg");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtMaxValue = (GTextField)comp.GetChild("txtMaxValue");
             m_imgChoose = (GImage)comp.GetChild("imgChoose");
@@ -73,8 +73,8 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_iconRoleBg = null;
             m_iconRole = null;
+            m_iconRoleBg = null;
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyOverItem.cs

@@ -7,8 +7,8 @@ namespace UI.League
     public partial class UI_comTeaPartyOverItem
     {
         public GComponent target;
-        public GLoader m_iconRoleBg;
         public GLoader m_iconRole;
+        public GLoader m_iconRoleBg;
         public GTextField m_txtRoleName;
         public GTextField m_txtGuildName;
         public const string URL = "ui://tw70qm9dic4otq5";
@@ -58,15 +58,15 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_iconRoleBg = (GLoader)comp.GetChild("iconRoleBg");
             m_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_iconRoleBg = (GLoader)comp.GetChild("iconRoleBg");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtGuildName = (GTextField)comp.GetChild("txtGuildName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_iconRoleBg = null;
             m_iconRole = null;
+            m_iconRoleBg = null;
             m_txtRoleName = null;
             m_txtGuildName = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button9.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button9.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -21,6 +21,8 @@ namespace UI.LuckyBox
         public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
         public GTextField m_txtCount;
+        public GTextField m_txtHasTime;
+        public GGroup m_grpActivityTips;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -82,6 +84,8 @@ namespace UI.LuckyBox
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtHasTime = (GTextField)comp.GetChild("txtHasTime");
+            m_grpActivityTips = (GGroup)comp.GetChild("grpActivityTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -102,6 +106,8 @@ namespace UI.LuckyBox
             m_comLuckBoxBtn.Dispose();
             m_comLuckBoxBtn = null;
             m_txtCount = null;
+            m_txtHasTime = null;
+            m_grpActivityTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -7,10 +7,12 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxActivityUI
     {
         public GComponent target;
+        public Controller m_showGiftBag;
         public UI_ComBox m_comBox;
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public GTextField m_txtTime;
+        public UI_Button9 m_btnLuckyDiscount;
         public GButton m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
         public GButton m_btnShop;
@@ -62,10 +64,12 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_showGiftBag = comp.GetController("showGiftBag");
             m_comBox = (UI_ComBox)UI_ComBox.Create(comp.GetChild("comBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnLuckyDiscount = (UI_Button9)UI_Button9.Create(comp.GetChild("btnLuckyDiscount"));
             m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
             m_btnShop = (GButton)comp.GetChild("btnShop");
@@ -73,11 +77,14 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showGiftBag = null;
             m_comBox.Dispose();
             m_comBox = null;
             m_btnBack = null;
             m_valueBar = null;
             m_txtTime = null;
+            m_btnLuckyDiscount.Dispose();
+            m_btnLuckyDiscount = null;
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxWishUI.cs

@@ -7,6 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxWishUI
     {
         public GComponent target;
+        public Controller m_showType;
         public GButton m_btnWish1;
         public GButton m_btnWish2;
         public GButton m_btnRule;
@@ -61,6 +62,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_showType = comp.GetController("showType");
             m_btnWish1 = (GButton)comp.GetChild("btnWish1");
             m_btnWish2 = (GButton)comp.GetChild("btnWish2");
             m_btnRule = (GButton)comp.GetChild("btnRule");
@@ -71,6 +73,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showType = null;
             m_btnWish1 = null;
             m_btnWish2 = null;
             m_btnRule = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_comLuckBoxBtn.cs

@@ -14,7 +14,7 @@ namespace UI.LuckyBox
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
         public GButton m_btnBuyFifty;
-        public GTextField m_txtRemainTimes;
+        public GRichTextField m_txtRemainTimes;
         public GImage m_imgSpecial;
         public GGraph m_holder;
         public GGroup m_grpSpecial;
@@ -75,7 +75,7 @@ namespace UI.LuckyBox
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_btnBuyFifty = (GButton)comp.GetChild("btnBuyFifty");
-            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_txtRemainTimes = (GRichTextField)comp.GetChild("txtRemainTimes");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_holder = (GGraph)comp.GetChild("holder");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GButton target;
         public Controller m_c1;
         public Controller m_c2;
-        public GImage m_min;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kvolso9";
@@ -61,7 +60,6 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_min = (GImage)comp.GetChild("min");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
@@ -69,7 +67,6 @@ namespace UI.Main
         {
             m_c1 = null;
             m_c2 = null;
-            m_min = null;
             m_txtTime = null;
             m_grpTime = null;
             if(disposeTarget && target != null)

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

@@ -9,6 +9,8 @@ namespace UI.Main
         public GButton target;
         public Controller m_c1;
         public Controller m_c2;
+        public Controller m_c3;
+        public GLoader m_iconMain;
         public GTextField m_txtTime;
         public const string URL = "ui://mfvz4q8kt6j1ow";
         public const string PACKAGE_NAME = "Main";
@@ -59,12 +61,16 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_iconMain = (GLoader)comp.GetChild("iconMain");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_c2 = null;
+            m_c3 = null;
+            m_iconMain = null;
             m_txtTime = null;
             if(disposeTarget && target != null)
             {

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

@@ -11,11 +11,11 @@ namespace UI.Main
         public Controller m_ProbabilityUpType;
         public GLoader m_icon0;
         public GGraph m_holder;
+        public GLoader m_iconMain;
         public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public GLoader m_loaLockIcon2;
-        public GGroup m_loaLockIcons;
+        public GLoader m_loaLockIcons;
+        public Transition m_HideEffect;
+        public Transition m_ShowEffect;
         public const string URL = "ui://mfvz4q8kq08xu";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ButtonModle1";
@@ -67,11 +67,11 @@ namespace UI.Main
             m_ProbabilityUpType = comp.GetController("ProbabilityUpType");
             m_icon0 = (GLoader)comp.GetChild("icon0");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_iconMain = (GLoader)comp.GetChild("iconMain");
             m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-            m_loaLockIcon2 = (GLoader)comp.GetChild("loaLockIcon2");
-            m_loaLockIcons = (GGroup)comp.GetChild("loaLockIcons");
+            m_loaLockIcons = (GLoader)comp.GetChild("loaLockIcons");
+            m_HideEffect = comp.GetTransition("HideEffect");
+            m_ShowEffect = comp.GetTransition("ShowEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,11 +79,11 @@ namespace UI.Main
             m_ProbabilityUpType = null;
             m_icon0 = null;
             m_holder = null;
+            m_iconMain = null;
             m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            m_loaLockIcon2 = null;
             m_loaLockIcons = null;
+            m_HideEffect = null;
+            m_ShowEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModleEffect
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_icon0;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_titleText;
+        public GLoader m_loaLockIcons;
+        public GLoader m_iconMain;
+        public const string URL = "ui://mfvz4q8kdkxp9fyb";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModleEffect";
+        private static UI_ButtonModleEffect _proxy;
+
+        public static UI_ButtonModleEffect Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModleEffect();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonModleEffect Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModleEffect();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_icon0 = (GLoader)comp.GetChild("icon0");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_titleText = (GLoader)comp.GetChild("titleText");
+            m_loaLockIcons = (GLoader)comp.GetChild("loaLockIcons");
+            m_iconMain = (GLoader)comp.GetChild("iconMain");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_icon0 = null;
+            m_holder = null;
+            m_holder1 = null;
+            m_titleText = null;
+            m_loaLockIcons = null;
+            m_iconMain = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModleEffect.cs.meta

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

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

@@ -12,34 +12,38 @@ namespace UI.Main
         public GComponent m_valueBar;
         public GTextField m_grpLeaguetext;
         public GGroup m_grpLeagueTips;
-        public UI_ButtonModle1 m_btnMain;
-        public UI_ButtonModle1 m_btnXiuFang;
-        public UI_ButtonModle1 m_btnHuanZhuang;
-        public UI_ButtonModle1 m_btnZhaiXing;
-        public UI_ButtonModle1 m_btnCiPai;
-        public UI_ButtonModle1 m_btnHaiZhiShi;
         public GGraph m_BottomEffectHolder;
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
-        public UI_ComAd m_comListAd;
-        public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle2 m_btnActivityDay7;
-        public UI_BtnModle2 m_btnActivityLuckyBox;
-        public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle2 m_btnTea;
+        public UI_BtnModle2 m_btnOpenServerActivity;
+        public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnActivityZCJB;
+        public GTextField m_serverTime;
+        public GLoader m_loaGuidestudio;
+        public UI_ComAd m_comListAd;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
-        public GGroup m_grpLeft;
-        public GTextField m_serverTime;
-        public GGroup m_grpMove;
-        public GLoader m_loaGuidestudio;
+        public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle1 m_btnActivityDay7;
+        public UI_BtnModle1 m_btnShow;
+        public UI_ButtonModle1 m_btnCiPai;
+        public UI_ButtonModle1 m_btnXiuFang;
+        public UI_ButtonModle1 m_btnHuanZhuang;
+        public UI_ButtonModleEffect m_btnHaiZhiShi;
+        public UI_ButtonModleEffect m_btnMain;
+        public GGroup m_AllUI;
+        public GGraph m_touchMask;
         public Transition m_openViewAction;
+        public Transition m_hide;
+        public Transition m_show;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -92,34 +96,38 @@ namespace UI.Main
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
             m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
-            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
-            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
-            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
-            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
-            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
-            m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
-            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
-            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
-            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
+            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
+            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
+            m_serverTime = (GTextField)comp.GetChild("serverTime");
+            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
-            m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_serverTime = (GTextField)comp.GetChild("serverTime");
-            m_grpMove = (GGroup)comp.GetChild("grpMove");
-            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
+            m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
+            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
+            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
+            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
+            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
+            m_btnHaiZhiShi = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnHaiZhiShi"));
+            m_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
+            m_AllUI = (GGroup)comp.GetChild("AllUI");
+            m_touchMask = (GGraph)comp.GetChild("touchMask");
             m_openViewAction = comp.GetTransition("openViewAction");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -128,18 +136,6 @@ namespace UI.Main
             m_valueBar = null;
             m_grpLeaguetext = null;
             m_grpLeagueTips = null;
-            m_btnMain.Dispose();
-            m_btnMain = null;
-            m_btnXiuFang.Dispose();
-            m_btnXiuFang = null;
-            m_btnHuanZhuang.Dispose();
-            m_btnHuanZhuang = null;
-            m_btnZhaiXing.Dispose();
-            m_btnZhaiXing = null;
-            m_btnCiPai.Dispose();
-            m_btnCiPai = null;
-            m_btnHaiZhiShi.Dispose();
-            m_btnHaiZhiShi = null;
             m_BottomEffectHolder = null;
             m_headBar.Dispose();
             m_headBar = null;
@@ -148,33 +144,51 @@ namespace UI.Main
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
-            m_comListAd.Dispose();
-            m_comListAd = null;
-            m_btnDailyWelfare.Dispose();
-            m_btnDailyWelfare = null;
-            m_btnActivityDay7.Dispose();
-            m_btnActivityDay7 = null;
-            m_btnActivityLuckyBox.Dispose();
-            m_btnActivityLuckyBox = null;
-            m_btnOpenServerActivity.Dispose();
-            m_btnOpenServerActivity = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();
             m_btnWanShiLi = null;
             m_btnTea.Dispose();
             m_btnTea = null;
+            m_btnOpenServerActivity.Dispose();
+            m_btnOpenServerActivity = null;
+            m_btnActivityLuckyBox.Dispose();
+            m_btnActivityLuckyBox = null;
+            m_btnActivityZCJB.Dispose();
+            m_btnActivityZCJB = null;
+            m_serverTime = null;
+            m_loaGuidestudio = null;
+            m_comListAd.Dispose();
+            m_comListAd = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
-            m_grpLeft = null;
-            m_serverTime = null;
-            m_grpMove = null;
-            m_loaGuidestudio = null;
+            m_btnZhaiXing.Dispose();
+            m_btnZhaiXing = null;
+            m_btnDailyWelfare.Dispose();
+            m_btnDailyWelfare = null;
+            m_btnActivityDay7.Dispose();
+            m_btnActivityDay7 = null;
+            m_btnShow.Dispose();
+            m_btnShow = null;
+            m_btnCiPai.Dispose();
+            m_btnCiPai = null;
+            m_btnXiuFang.Dispose();
+            m_btnXiuFang = null;
+            m_btnHuanZhuang.Dispose();
+            m_btnHuanZhuang = null;
+            m_btnHaiZhiShi.Dispose();
+            m_btnHaiZhiShi = null;
+            m_btnMain.Dispose();
+            m_btnMain = null;
+            m_AllUI = null;
+            m_touchMask = null;
             m_openViewAction = null;
+            m_hide = null;
+            m_show = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,11 +20,15 @@ namespace UI.Main
         public GTextField m_txtChapterName2;
         public GTextField m_txtChapterName3;
         public GTextField m_txtChapterName4;
+        public GGroup m_selectChapter;
         public UI_CompBonusBox m_bonusBox3;
         public UI_CompBonusBox m_bonusBox2;
         public UI_CompBonusBox m_bonusBox1;
         public GTextField m_txtStarCount;
+        public GGroup m_bonusBox;
         public GLoader m_switchChapter;
+        public GTextField m_ZCJBTimeText;
+        public GGroup m_ActivityZCJB;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8km7n51u";
         public const string PACKAGE_NAME = "Main";
@@ -86,11 +90,15 @@ namespace UI.Main
             m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
             m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
             m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
+            m_selectChapter = (GGroup)comp.GetChild("selectChapter");
             m_bonusBox3 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox3"));
             m_bonusBox2 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox2"));
             m_bonusBox1 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox1"));
             m_txtStarCount = (GTextField)comp.GetChild("txtStarCount");
+            m_bonusBox = (GGroup)comp.GetChild("bonusBox");
             m_switchChapter = (GLoader)comp.GetChild("switchChapter");
+            m_ZCJBTimeText = (GTextField)comp.GetChild("ZCJBTimeText");
+            m_ActivityZCJB = (GGroup)comp.GetChild("ActivityZCJB");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -109,6 +117,7 @@ namespace UI.Main
             m_txtChapterName2 = null;
             m_txtChapterName3 = null;
             m_txtChapterName4 = null;
+            m_selectChapter = null;
             m_bonusBox3.Dispose();
             m_bonusBox3 = null;
             m_bonusBox2.Dispose();
@@ -116,7 +125,10 @@ namespace UI.Main
             m_bonusBox1.Dispose();
             m_bonusBox1 = null;
             m_txtStarCount = null;
+            m_bonusBox = null;
             m_switchChapter = null;
+            m_ZCJBTimeText = null;
+            m_ActivityZCJB = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_Button11
+    {
+        public GButton target;
+        public GTextField m_sellText;
+        public GLoader m_sellReward;
+        public GTextField m_sellGetNum;
+        public const string URL = "ui://wgkh30qjqbf44c";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Button11";
+        private static UI_Button11 _proxy;
+
+        public static UI_Button11 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button11();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button11 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button11();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_sellText = (GTextField)comp.GetChild("sellText");
+            m_sellReward = (GLoader)comp.GetChild("sellReward");
+            m_sellGetNum = (GTextField)comp.GetChild("sellGetNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_sellText = null;
+            m_sellReward = null;
+            m_sellGetNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MaterialItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public GTextField m_Count;
+        public const string URL = "ui://wgkh30qjqbf44a";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MaterialItem";
+        private static UI_MaterialItem _proxy;
+
+        public static UI_MaterialItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MaterialItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MaterialItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MaterialItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_Count = (GTextField)comp.GetChild("Count");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            m_Count = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGameRouteTips
+    {
+        public GComponent target;
+        public GGraph m_btnBack;
+        public GLoader m_bg;
+        public GLoader m_AFuHead;
+        public GList m_AFuList;
+        public GLoader m_DouBaoHead;
+        public GList m_DouBaoList;
+        public GTextField m_name;
+        public GTextField m_desc;
+        public const string URL = "ui://wgkh30qjqbf42z";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGameRouteTips";
+        private static UI_MergeGameRouteTips _proxy;
+
+        public static UI_MergeGameRouteTips Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGameRouteTips();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGameRouteTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGameRouteTips();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnBack = (GGraph)comp.GetChild("btnBack");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_AFuHead = (GLoader)comp.GetChild("AFuHead");
+            m_AFuList = (GList)comp.GetChild("AFuList");
+            m_DouBaoHead = (GLoader)comp.GetChild("DouBaoHead");
+            m_DouBaoList = (GList)comp.GetChild("DouBaoList");
+            m_name = (GTextField)comp.GetChild("name");
+            m_desc = (GTextField)comp.GetChild("desc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_bg = null;
+            m_AFuHead = null;
+            m_AFuList = null;
+            m_DouBaoHead = null;
+            m_DouBaoList = null;
+            m_name = null;
+            m_desc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -0,0 +1,124 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGameUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_backBtn;
+        public GComponent m_rangeTop;
+        public GComponent m_rangeDown;
+        public GTextField m_name;
+        public GTextField m_desc;
+        public GButton m_MergeTipBtn;
+        public UI_Button11 m_sellBtn;
+        public GLoader m_taskBg;
+        public GTextField m_rewardNum;
+        public UI_MaterialItem m_rewardOne;
+        public UI_MaterialItem m_rewardTwo;
+        public GLoader m_rewardIcon;
+        public GButton m_rewardGet;
+        public GButton m_shopBtn;
+        public UI_NewMaterialShowView m_newMaterial;
+        public UI_MergeGameItemUI m_guildDouBaoBtn;
+        public const string URL = "ui://wgkh30qjqbf42v";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGameUI";
+        private static UI_MergeGameUI _proxy;
+
+        public static UI_MergeGameUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGameUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGameUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGameUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_rangeTop = (GComponent)comp.GetChild("rangeTop");
+            m_rangeDown = (GComponent)comp.GetChild("rangeDown");
+            m_name = (GTextField)comp.GetChild("name");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_MergeTipBtn = (GButton)comp.GetChild("MergeTipBtn");
+            m_sellBtn = (UI_Button11)UI_Button11.Create(comp.GetChild("sellBtn"));
+            m_taskBg = (GLoader)comp.GetChild("taskBg");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_rewardOne = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardOne"));
+            m_rewardTwo = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardTwo"));
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardGet = (GButton)comp.GetChild("rewardGet");
+            m_shopBtn = (GButton)comp.GetChild("shopBtn");
+            m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
+            m_guildDouBaoBtn = (UI_MergeGameItemUI)UI_MergeGameItemUI.Create(comp.GetChild("guildDouBaoBtn"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_backBtn = null;
+            m_rangeTop = null;
+            m_rangeDown = null;
+            m_name = null;
+            m_desc = null;
+            m_MergeTipBtn = null;
+            m_sellBtn.Dispose();
+            m_sellBtn = null;
+            m_taskBg = null;
+            m_rewardNum = null;
+            m_rewardOne.Dispose();
+            m_rewardOne = null;
+            m_rewardTwo.Dispose();
+            m_rewardTwo = null;
+            m_rewardIcon = null;
+            m_rewardGet = null;
+            m_shopBtn = null;
+            m_newMaterial.Dispose();
+            m_newMaterial = null;
+            m_guildDouBaoBtn.Dispose();
+            m_guildDouBaoBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGamematerialItem
+    {
+        public GComponent target;
+        public GLoader m_iconBg;
+        public GLoader m_icon;
+        public GLoader m_newIcon;
+        public GLoader m_right;
+        public const string URL = "ui://wgkh30qjqbf430";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGamematerialItem";
+        private static UI_MergeGamematerialItem _proxy;
+
+        public static UI_MergeGamematerialItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGamematerialItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGamematerialItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGamematerialItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_iconBg = (GLoader)comp.GetChild("iconBg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_newIcon = (GLoader)comp.GetChild("newIcon");
+            m_right = (GLoader)comp.GetChild("right");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconBg = null;
+            m_icon = null;
+            m_newIcon = null;
+            m_right = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs

@@ -20,6 +20,7 @@ namespace UI.OpenServerActivity
         public GTextField m_txtDay;
         public GTextField m_txtHour;
         public GTextField m_txtMinute;
+        public GGraph m_holderSmallBgTx;
         public Transition m_openEff;
         public const string URL = "ui://b8ha2mnsdedg0";
         public const string PACKAGE_NAME = "OpenServerActivity";
@@ -81,6 +82,7 @@ namespace UI.OpenServerActivity
             m_txtDay = (GTextField)comp.GetChild("txtDay");
             m_txtHour = (GTextField)comp.GetChild("txtHour");
             m_txtMinute = (GTextField)comp.GetChild("txtMinute");
+            m_holderSmallBgTx = (GGraph)comp.GetChild("holderSmallBgTx");
             m_openEff = comp.GetTransition("openEff");
         }
         public void Dispose(bool disposeTarget = false)
@@ -98,6 +100,7 @@ namespace UI.OpenServerActivity
             m_txtDay = null;
             m_txtHour = null;
             m_txtMinute = null;
+            m_holderSmallBgTx = null;
             m_openEff = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/PopWindow/UI_ExchangeGoodsUI.cs

@@ -9,6 +9,16 @@ namespace UI.PopWindow
         public GComponent target;
         public GGraph m_holderLeftTop;
         public GGraph m_holderRightDowm;
+        public GComponent m_itemSkill;
+        public GList m_listConsume;
+        public GButton m_btnCancel;
+        public GButton m_btnUse;
+        public GTextField m_txtHasNum;
+        public GButton m_btnAdd;
+        public GButton m_btnReduce;
+        public GButton m_btnAllChoose;
+        public GSlider m_slideUpLevel;
+        public GTextField m_txtChooseLevel;
         public const string URL = "ui://i9tn319dnzuq0";
         public const string PACKAGE_NAME = "PopWindow";
         public const string RES_NAME = "ExchangeGoodsUI";
@@ -58,11 +68,31 @@ namespace UI.PopWindow
         {
             m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_itemSkill = (GComponent)comp.GetChild("itemSkill");
+            m_listConsume = (GList)comp.GetChild("listConsume");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnUse = (GButton)comp.GetChild("btnUse");
+            m_txtHasNum = (GTextField)comp.GetChild("txtHasNum");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_btnReduce = (GButton)comp.GetChild("btnReduce");
+            m_btnAllChoose = (GButton)comp.GetChild("btnAllChoose");
+            m_slideUpLevel = (GSlider)comp.GetChild("slideUpLevel");
+            m_txtChooseLevel = (GTextField)comp.GetChild("txtChooseLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holderLeftTop = null;
             m_holderRightDowm = null;
+            m_itemSkill = null;
+            m_listConsume = null;
+            m_btnCancel = null;
+            m_btnUse = null;
+            m_txtHasNum = null;
+            m_btnAdd = null;
+            m_btnReduce = null;
+            m_btnAllChoose = null;
+            m_slideUpLevel = null;
+            m_txtChooseLevel = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,6 +12,7 @@ namespace UI.RoleInfo
         public GLoader m_icon;
         public GList m_settingTypeList;
         public GButton m_btnExit;
+        public GButton m_btnBinding;
         public UI_Slider2 m_musicSlider;
         public GButton m_btnMusic;
         public UI_Slider2 m_soundSlider;
@@ -21,7 +22,6 @@ namespace UI.RoleInfo
         public GRichTextField m_gameProtectAgree;
         public GRichTextField m_privacyAgree;
         public GRichTextField m_childrenAgree;
-        public GButton m_btnBinding;
         public UI_Button19 m_btnLogout;
         public UI_Button20 m_btnGiftCode;
         public GButton m_btnExchange;
@@ -78,6 +78,7 @@ namespace UI.RoleInfo
             m_icon = (GLoader)comp.GetChild("icon");
             m_settingTypeList = (GList)comp.GetChild("settingTypeList");
             m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnBinding = (GButton)comp.GetChild("btnBinding");
             m_musicSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("musicSlider"));
             m_btnMusic = (GButton)comp.GetChild("btnMusic");
             m_soundSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("soundSlider"));
@@ -87,7 +88,6 @@ namespace UI.RoleInfo
             m_gameProtectAgree = (GRichTextField)comp.GetChild("gameProtectAgree");
             m_privacyAgree = (GRichTextField)comp.GetChild("privacyAgree");
             m_childrenAgree = (GRichTextField)comp.GetChild("childrenAgree");
-            m_btnBinding = (GButton)comp.GetChild("btnBinding");
             m_btnLogout = (UI_Button19)UI_Button19.Create(comp.GetChild("btnLogout"));
             m_btnGiftCode = (UI_Button20)UI_Button20.Create(comp.GetChild("btnGiftCode"));
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
@@ -100,6 +100,7 @@ namespace UI.RoleInfo
             m_icon = null;
             m_settingTypeList = null;
             m_btnExit = null;
+            m_btnBinding = null;
             m_musicSlider.Dispose();
             m_musicSlider = null;
             m_btnMusic = null;
@@ -112,7 +113,6 @@ namespace UI.RoleInfo
             m_gameProtectAgree = null;
             m_privacyAgree = null;
             m_childrenAgree = null;
-            m_btnBinding = null;
             m_btnLogout.Dispose();
             m_btnLogout = null;
             m_btnGiftCode.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthList.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthList.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -22,7 +22,7 @@ namespace UI.Store
         public GTextField m_txtTime;
         public GButton m_btnGet;
         public GTextField m_txtGiftBag;
-        public GList m_list;
+        public UI_StoreMonthList m_storeMonthList;
         public GButton m_btnBlackReward;
         public GGraph m_holderfEff;
         public const string URL = "ui://p9mtgheoqik1tc0";
@@ -87,7 +87,7 @@ namespace UI.Store
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
-            m_list = (GList)comp.GetChild("list");
+            m_storeMonthList = (UI_StoreMonthList)UI_StoreMonthList.Create(comp.GetChild("storeMonthList"));
             m_btnBlackReward = (GButton)comp.GetChild("btnBlackReward");
             m_holderfEff = (GGraph)comp.GetChild("holderfEff");
         }
@@ -109,7 +109,8 @@ namespace UI.Store
             m_txtTime = null;
             m_btnGet = null;
             m_txtGiftBag = null;
-            m_list = null;
+            m_storeMonthList.Dispose();
+            m_storeMonthList = null;
             m_btnBlackReward = null;
             m_holderfEff = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -18,11 +18,12 @@ namespace GFGGame
         public static string VOICE_VOLUMN_KEY = "voice_volumn";
 
         public static string LoginAddress;
-        public static string PlatformName;
         public static string logApiReportUrl;
         public static int showGM;
         //开服时间
         public static long openTime = 0;
+        public static int tsStatus;
+        public static int tsServer;
 
         public static void InitData(string json)
         {
@@ -30,22 +31,30 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "127.0.0.1:10005";//测试地址
-            PlatformName = result.platformName;
+            //LoginAddress = "10.108.64.100:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {
                 openTime = TimeUtil.GetTimestamp(result.openTime);
             }
+            if(!string.IsNullOrEmpty(result.tsStatus))
+            {
+                tsStatus = int.Parse(result.tsStatus);
+            }
+            if (!string.IsNullOrEmpty(result.tsServer))
+            {
+                tsServer = int.Parse(result.tsServer);
+            }
             GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "ReportGet";
         }
 
         private struct Result
         {
             public string loginApiUrl;
-            public string platformName;
             public string showGM;
             public string openTime;
+            public string tsStatus;
+            public string tsServer;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -1,5 +1,7 @@
-using UniFramework.Pooling;
+using System.Collections;
+using UniFramework.Pooling;
 using UnityEngine;
+using YooAsset;
 
 namespace GFGGame
 {
@@ -43,5 +45,36 @@ namespace GFGGame
             }
         }
 
+        private void OnApplicationPause(bool pause)
+        {
+            if(!pause)
+            {
+                StartCoroutine(CheckVersion(VersionController.DefaultPackage));
+            }
+        }
+
+        private IEnumerator CheckVersion(string packageName)
+        {
+            var package = YooAssets.GetPackage(packageName);
+            string oldVersion = package.GetPackageVersion();
+            var operation = package.UpdatePackageVersionAsync();
+            yield return operation;
+
+            if (operation.Status == EOperationStatus.Succeed)
+            {
+                VersionController.Instance.PackageVersion = operation.PackageVersion;
+                LogUtil.LogDev($"版本对比: {oldVersion} {operation.PackageVersion}");
+                if(!operation.PackageVersion.Equals(oldVersion))
+                {
+                    AlertSystem.Show("游戏已有更新，您可以立即重启游戏获取最佳游戏体验，也可以稍后重启更新。")
+                        .SetLeftButton(true, "稍后更新")
+                        .SetRightButton(true, "重启游戏", (obj)=> 
+                        {
+                            Application.Quit();
+                        });
+                }
+            }
+        }
+
     }
 }

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

@@ -7,7 +7,12 @@
 
         public static void Init()
         {
-
+            switch(LauncherConfig.ChannelId)
+            {
+                default:
+                    
+                    break;
+            }
         }
 
         public static void InitPlatform()

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

@@ -243,6 +243,38 @@ namespace GFGGame
             }
             return false;
         }
+
+        //招财进宝活动
+        public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
+        {
+            S2C_GetDressRewrdStatusList response = null;
+            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                   ActivityDataManager.Instance.ActivityZCJBList = response.RewrdIds;
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqActivityZCJBReward(int id,int rewardId)
+        {
+            S2C_GetDressRewrd response = null;
+            response = (S2C_GetDressRewrd)await MessageHelper.SendToServer(new C2S_GetDressRewrd() { ActivityId = id ,RewrdId = rewardId});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.ActivityZCJBList = response.RewrdIds;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }
 

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

@@ -17,6 +17,10 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqGetNPCVisitInfo(int id = 5004)
         {
+            if(!ActivityTeaDataManager.Instance.CheckOpen())
+            {
+                return false;
+            }
             var response = (S2C_GetNpcVisits) await MessageHelper.SendToServer(new C2S_GetNpcVisits { ActivityId = id });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             ActivityTeaDataManager.Instance.NpcInfoList = response.NpcVisits;

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

@@ -12,16 +12,8 @@ namespace ET
             chatData.Type = message.Type;
             chatData.RoleInfo = RoleDataManager.GetOtherRoleInfoData(message.RoleInfo);
             chatData.TargetId = chatData.RoleInfo.roleId;
-            string content = "";
-            for (int i = 0; i < message.Content.Length; i++)
-            {
-                string str = i > 0 && (i + 1) % 12 == 0 ? message.Content[i] + "\n" : message.Content[i].ToString();
-                content += str;
-            }
-            chatData.Content = content;
-
+            chatData.Content = message.Content;
             chatData.Time = message.Time;
-
             if (chatData.Type == ChatType.Private)
             {
                 ChatDataManager.Instance.GetChatDatas(chatData.TargetId).Add(chatData);

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

@@ -41,12 +41,22 @@ namespace GFGGame
                     ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
                     if (activityOpenCfg != null && activityOpenCfg.paramsArr[0] == luckyBoxId)
                     {
+                        
                         var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
                         if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox)
                             ActivityDataManager.Instance.allPlayTimes += response.Times;
-                        else if(activityCfg.type == ConstLimitTimeActivityType.ActLimitTsy)
+                        else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitTsy)
                             ActivityDataManager.Instance.allTsyPlayTimes += response.Times;
+                        else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                        {
+                            if (ActivityDataManager.Instance.allLimitStlycTimes < 20 && (ActivityDataManager.Instance.allLimitStlycTimes + response.Times) >= 20)
+                            {
+                                LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = true;
+                            }
+                            ActivityDataManager.Instance.allLimitStlycTimes += response.Times;
+                        }
                     }
+
                     LuckyBoxDataManager.Instance.times = response.Times;
                     // LuckyBoxDataManager.Instance.luckyBoxIndex = response.LuckyBoxId;
                     LuckyBoxDataManager.Instance.RewardList = ItemUtil.CreateItemDataList(response.bonusList);

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

@@ -28,6 +28,11 @@ namespace GFGGame
 
         public static async ETTask<bool> ReqGetChallengeReward(int activityId = 1)
         {
+            bool isOpen = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc) > 0;
+            if (!isOpen)
+            {
+                return false;
+            }
             var response = (S2C_GetActivityGameInfos)await MessageHelper.SendToServer(new C2S_GetActivityGameInfos { ActivityId = activityId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             MiniGameDateManager.Instance.gameinfoList = response.GameInfoList;

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

@@ -6,10 +6,14 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, G2C_UpdateQueue message)
         {
-            Log.Debug(JsonHelper.ToJson(message));
-            QueueDataManager.Instance.UpQueueData(message.Index, message.Count);
-            EventAgent.DispatchEvent(ConstMessage.UPDATE_QUEUE);
-            await ETTask.CompletedTask;
+            if(message.Index > 1)
+            {
+                AlertSystem.Show($"您前面还有{message.Index}位玩家", "当前服务器爆满，正在为您排队")
+                    .SetLeftButton(true, "取消", (obj) => {
+                        QueueSProxy.ReqSevenCancelQueue().Coroutine();
+                    });
+                await ETTask.CompletedTask;
+            }
         }
     }
 
@@ -19,10 +23,15 @@ namespace GFGGame
         /// 请求服务端取消排队
         /// </summary>
         /// <returns></returns>
-        public static async ETTask<bool> ReqSevenCancelQueue()
+        public static async ETTask ReqSevenCancelQueue()
         {
             var response = (G2C_CancelQueue)await MessageHelper.SendToServer(new C2G_CancelQueue());
-            return response is { Error: ErrorCode.ERR_Success };
+            if(response.Error == ErrorCode.ERR_Success)
+            {
+                ViewManager.Hide<ModalStatusView>();
+                GameGlobal.zoneScene.GetComponent<ObjectWait>().Notify(new ET.WaitType.Wait_SceneChangeStart() { Error = WaitTypeError.Cancel});
+                GameController.QuitToLoginView(false);
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -99,6 +99,10 @@ namespace GFGGame
         {
             return $"{TEXTURE_DIR_PATH}/Npc/PicF/{res}.{extName}";
         }
+        public static string GetNpcPicFacePath(string res, string extName = "png")
+        {
+            return $"{TEXTURE_DIR_PATH}/Npc/Face/{res}.{extName}";
+        }
         public static string GetPhotographBorderPath(string res, string extName = "png")
         {
             return $"{TEXTURE_DIR_PATH}/Photograph/border/{res}.{extName}";
@@ -189,6 +193,11 @@ namespace GFGGame
 
         public static string GetDressUpLayerEffectResPath(ItemCfg itemCfg, int layerId, bool inAniDir)
         {
+            if(DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemCfg.id))
+            {
+                //场景类型的物品特效都不分动画和静态
+                inAniDir = false;
+            }
             string res = GetDressUpLayerResName(itemCfg, layerId);
             return GetDressUpEffectPath(res, inAniDir);
         }
@@ -285,9 +294,9 @@ namespace GFGGame
             return $"{ANIMATION_DIR_PATH}/{dir}/{res}.{extName}";
         }
 
-        public static string GetMiniGamePicPath(string res, string extName = "png")
+        public static string GetMiniGamePicPath(string res, string dir = null, string extName = "png")
         {
-            return $"{MINIGAME_DIR_PATH}{res}.{extName}";
+            return $"{MINIGAME_DIR_PATH}{dir}/{res}.{extName}";
         }
 
         public static string GetHUARONGDAOPicPath(string res, string extName = "png")

GameClient/Assets/Game/HotUpdate/Utils/StoryUtil.cs

@@ -108,13 +108,13 @@ namespace GFGGame
                     {
                         obj.visible = i <= starCount;
                         
-                        if (currentIndex == 0)
+                        if (currentIndex == 1)
                         {
-                            (obj as GLoader).url = "ui://Main/tb_zx_pt_star";
+                            (obj as GLoader).url = "ui://Main/tb_zx_jy_star";
                         }
                         else
                         {
-                            (obj as GLoader).url = "ui://Main/tb_zx_jy_star";
+                            (obj as GLoader).url = "ui://Main/tb_zx_pt_star";
                         }
                     }
                 }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -229,7 +229,7 @@ namespace GFGGame
             }
             else
             {
-                timeLeftFormatted = string.Format("{0}天{1}小时{2}分", timeLeft.Days, timeLeft.Hours, timeLeft.Minutes);
+                timeLeftFormatted = string.Format("{0}天{1}时{2}分", timeLeft.Days, timeLeft.Hours, timeLeft.Minutes);
             }
 
             return timeLeftFormatted;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs

@@ -100,7 +100,7 @@ namespace GFGGame
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
-            _ui.m_txtTime.text = "Ê£Óà:" + strTime;
+            _ui.m_txtTime.text = "สฃำเ:" + strTime;
         }
         
         private void RenderListSyntheticItem(int index, GObject obj)