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

GameClient/Assets/Editor/Bat/updateArtRes.bat

@@ -1,3 +1,4 @@
 echo %1
 cd ../../../../../../gfg/%1
-svn up --force --accept tc
+svn cleanup
+svn up --force --accept tc

GameClient/Assets/Editor/Bat/updateGameRes.bat

@@ -1,2 +1,3 @@
 cd ../../../Assets/Res
+svn cleanup
 svn up --force --accept tc

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -105,7 +105,7 @@ namespace GFGEditor
             foreach (ShopCfg cfg in dataArray)
             {
                 CheckItemIdExist(cfg.itemId, "商城ClothingShopCfg.itemID");
-                CheckItemIdExist(cfg.costId, "商城ClothingShopCfg.costID");
+                CheckItemIdExist(cfg.CostIdReal, "商城ClothingShopCfg.costID");
             }
         }
 

GameClient/Assets/Editor/Excel/Template/Config.txt

@@ -6,7 +6,7 @@
 
 namespace GFGGame
 {
-	public class {CfgName} : ICfg
+	public partial class {CfgName} : ICfg
 	{
 {variable declaration}
 

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

@@ -6,11 +6,13 @@ namespace GFGGame
     public class ConstDressRarity
     {
 
-        public const int Rarity_TIANYI = 4;
+        public const int Rarity_TIANYI = 5;
+        public const int Rarity_GUOSE = 4;
         public const int Rarity_DIANCANG = 3;
         public const int Rarity_ZHENXI = 2;
         public const int Rarity_FANPIN = 1;
         public const string TITLE_TIANYI = "天衣";
+        public const string TITLE_GUOSE = "国色";
         public const string TITLE_DIANCANG = "典藏";
         public const string TITLE_ZHENXI = "珍稀";
         public const string TITLE_FANPIN = "凡品";
@@ -26,6 +28,7 @@ namespace GFGGame
                 ConstDressRarity._dressRarityList.Add(ConstDressRarity.Rarity_FANPIN, ConstDressRarity.TITLE_FANPIN);
                 ConstDressRarity._dressRarityList.Add(ConstDressRarity.Rarity_ZHENXI, ConstDressRarity.TITLE_ZHENXI);
                 ConstDressRarity._dressRarityList.Add(ConstDressRarity.Rarity_DIANCANG, ConstDressRarity.TITLE_DIANCANG);
+                ConstDressRarity._dressRarityList.Add(ConstDressRarity.Rarity_GUOSE, ConstDressRarity.TITLE_GUOSE);
                 ConstDressRarity._dressRarityList.Add(ConstDressRarity.Rarity_TIANYI, ConstDressRarity.TITLE_TIANYI);
             }
             return ConstDressRarity._dressRarityList;

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

@@ -2,7 +2,6 @@ namespace GFGGame
 {
     public class ConstMessage
     {
-        public const string ON_PLATFORM_SDK_INITED = "INIT_PLATFORM_SDK_SUCCESS";
         public const string ON_PLATFORM_SDK_LOGINED = "ON_PLATFORM_SDK_LOGINED";
 
         public const string DRESS_UP_SCORE_CHANGED = "DRESS_UP_SCORE_CHANGED";
@@ -122,6 +121,7 @@ namespace GFGGame
         // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//联盟答题状态更新
         public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE"; //其他玩家信息变化
         public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE"; //通知聊天信息
+        public const string OPEN_CHAT_MESSAGE = "OPEN_CHAT_MESSAGE"; //打开查看聊天信息
         public const string ACTIVE_SKILL = "ACTIVE_SKILL";//技能激活
 
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT"; //领取连续返利礼包
@@ -222,10 +222,18 @@ namespace GFGGame
         // 更新华容道活动界面数据
         public const string ACTIVITY_HUARONGDAO_UPDATE = "ACTIVITY_HUARONGDAO_UPDATE";
 
+        // 重置接元宵小游戏数据
+        public const string ACTIVITY_GETYUANXIAO_RESET = "ACTIVITY_GETYUANXIAO_RESET";
+        // 开始元宵小游戏
+        public const string ACTIVITY_GETYUANXIAO_START = "ACTIVITY_GETYUANXIAO_START";
+
         //更新2048游戏关卡状态
         public const string TZFE_GAME_UPDATE = "TZFE_GAME_UPDATE";
 
         //显示系统公告界面
         public const string SHOW_SYSTEM_NOTICE = "SHOW_SYSTEM_NOTICE";
+
+        //新年红包领取加倍按钮
+        public const string NEW_YEAR_RED_ENVELOPE_INFO = "NEW_YEAR_RED_ENVELOPE_INFO";
     }
 }

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

@@ -13,7 +13,7 @@ namespace GFGGame
                     return true;
                 case ET.ErrorCode.ERR_NetWorkError:
                     {
-                        AlertSystem.Show("网络异常，也有可能是服务器异常，请稍后再试！")
+                        AlertSystem.Show("网络异常，请稍后再试！")
                         .SetRightButton(true, "好的", (object data) =>
                         {
                             GameController.QuitToLoginView(false);

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

@@ -259,6 +259,7 @@ namespace GFGGame
             LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
+            ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;
@@ -326,22 +327,19 @@ namespace GFGGame
             LeagueDataManager.Instance.Clear();
             ActivityAfuGiftDataManager.Instance.Clear();
             FightDataManager.Instance.Clear();
+            NewYearRedEnvelopeDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
             if (logout)
             {
-                if (PlayerPrefs.HasKey(GameConst.PASSWORD_LAST_LOGIN_KEY))
-                {
-                    PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
-                }
-                if (!fromSdkLogoutCallback)
-                {
-                    QDManager.Logout();
-                }
+                    QDManager.Logout(fromSdkLogoutCallback);
             }
             ViewManager.Hide<GuideView>();
-            ViewManager.Show<LoginView>(null, true);
+            if(!ViewManager.isViewOpen(typeof(LoginView).FullName))
+            {
+                ViewManager.Show<LoginView>(null, true);
+            }
         }
 
         //断线重连后需要处理的事情

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

@@ -273,14 +273,26 @@ namespace GFGGame
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             {
-                if (errorCode != ErrorCode.ERR_SessionStateError && errorCode != ErrorCode.ERR_NetWorkError)
+                string errMessage = "与服务器连接失败。";
+                Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                if(errorCode == ErrorCode.ERR_TokenError)
                 {
-                    Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                    errMessage = "登录已过期，请重新登录";
+                    AlertSystem.Show(errMessage)
+                            .SetRightButton(true, "好的", (object data) =>
+                            {
+                                GameController.QuitToLoginView(false);
+                            });
+                    return;
                 }
-                AlertSystem.Show("重新连接失败，游戏或已更新，请重新进入游戏获得最佳体验。")
-                        .SetRightButton(true, "好的", (object data) =>
+                else if(errorCode == ErrorCode.ERR_NetWorkError)
+                {
+                    errMessage = "网络异常，与服务器连接失败。";
+                }
+                AlertSystem.Show(errMessage)
+                        .SetRightButton(true, "重新连接", (object data) =>
                         {
-                            Application.Quit();
+                            ReqReConnectGate().Coroutine();
                         });
                 return;
             }

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

@@ -18,6 +18,8 @@ namespace GFGGame
             limitStlycActBonusState.Clear();
             allLimitStlycTimes = 0;
             lastActLimitStlycId = 0;
+
+            NewYearLoginInfoDic.Clear();
         }
 
         /**********************************************************活动*************************************************/
@@ -267,5 +269,20 @@ namespace GFGGame
             }
             return false;
         }
+
+        /**********************************************************每日登录修改*************************************************/
+        /// <summary>
+        /// 新年签到 登录第几天列表  奖励状态列表
+        /// </summary>
+        /// <value></value>
+        public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
+        public bool CanGetNewYearLoginRed()
+        {
+            foreach (var a in NewYearLoginInfoDic)
+            {
+                if (a.Value == 1) return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -14,36 +14,102 @@ namespace Assets.Game.HotUpdate.Data
         /**********************************************************新春活动*************************************************/
         public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
 
-        public bool CheckOpen()
+        public bool GetRewardRed()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
+            {
+                return false;
+            }
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
 
-        public bool CheckOpenOne(int id)
+            foreach (NpcVisitProto t in NpcInfoList)
+            {
+                if (t.RewrdStatus == 1 || (t.UnlockStatus == 1 && time>0 ))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //获取华容道可用次数
+        public bool CheckHRDRed()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
+            {
+                return false;
+            }
+            RoleLimitData limitData;
+            limitData = RoleLimitDataManager.GetLimitData(300);
+            int times = limitData.TotalPlayMax - limitData.PlayTimes;
+            if(times > 0)
+            {
+                //当有关卡没通过时
+                for (int i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+                {
+                    if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 3)
+                    {
+                        if (!MiniGameDateManager.Instance.gameinfoList[i].IsCleared)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+            else
+            {
+                return false;
+            }
         }
 
-        public long GetEndTime(int id)
+        //合成红点
+        public bool GetActivitySyntheticRed()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo.EndTime;
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.ItemSynthetic) == 0)
+            {
+                return false;
+            }
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.ItemSynthetic);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+            var suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            for (int i = 0; i < suitCfg.partsArr.Length; i++)
+            {
+                ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
+                var materiarsArr = itemSyntheticCfg.syntheticMateriarsArr;
+                if (ItemDataManager.GetItemNum(materiarsArr[0][0]) >= materiarsArr[0][1] && ItemDataManager.GetItemNum(materiarsArr[1][0]) >= materiarsArr[1][1])
+                    return true;
+            }
+            return false;
         }
 
-        public bool GetRewardRed()
+        //新年拜访任务红点
+        public bool CheckVisitTaskRed(int npcID = 0)
         {
-            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-           int time = limitData.TotalPlayMax - limitData.PlayTimes;
-
-            foreach (NpcVisitProto t in NpcInfoList)
+            if (npcID == 0)
             {
-                if (t.RewrdStatus == 1 || (t.UnlockStatus == 1 && time>0 ))
+                for (int i = 0; i < ActivityVisitCfgArray.Instance.dataArray.Length; i++)
                 {
-                    return true;
+                    if ((NpcInfoList.Count > i) && NpcInfoList[i].UnlockStatus == 2)
+                    {
+                        foreach (int j in ActivityVisitCfgArray.Instance.dataArray[i].taskIdArr)
+                        {
+                            if (TaskDataManager.Instance.GetTaskStateById(j) == 1)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (int j in ActivityVisitCfgArray.Instance.GetCfg(npcID).taskIdArr)
+                {
+                    if (TaskDataManager.Instance.GetTaskStateById(j) == 1)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;

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

@@ -524,5 +524,40 @@ namespace GFGGame
         {
             Timers.inst.Remove(OnTimeUpdate);
         }
+
+
+        public int GetItemAdditionScore(int itemId, int scoreType, string[] tags = null)
+        {
+            ItemCfg itemdate = ItemCfgArray.Instance.GetCfg(itemId);
+            ItemData itemDate = new ItemData() { };
+            if (itemdate != null)
+            {
+                itemDate.id = itemdate.id;
+                int scroe = 0;
+                if (tags != null)
+                {
+                    scroe += ItemDataManager.GetItemTagScore(itemId, tags);
+                }
+                scroe += itemDate.GetScore(scoreType);
+                return scroe;
+            }
+            return 0;
+        }
+
+        public void SetItemScoreList(FightData _roleData, ArenaDressupAttrProto arreProto = null)
+        {
+            _roleData.itemScoreList.Clear();
+            _roleData.itemScoreDic.Clear();
+            for (int i = 0; i < _roleData.itemList.Count; i++)
+            {
+                int score = GetItemAdditionScore(_roleData.itemList[i], _roleData.scoreType);
+                if(arreProto != null && arreProto.SuitScore[i] != 0)
+                {
+                    score = arreProto.SuitScore[i];
+                }
+                _roleData.itemScoreList.Add(score);
+                _roleData.itemScoreDic[_roleData.itemList[i]] = score;
+            }
+        }
     }
 }

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

@@ -9,6 +9,7 @@ namespace GFGGame
     {
         public Dictionary<int, List<ChatData>> ChatDatas = new Dictionary<int, List<ChatData>>();//int:ChatType
         public Dictionary<long, List<ChatData>> PrivateChatDatas = new Dictionary<long, List<ChatData>>();//int:RoleId
+        public bool NewChatInfo = false;  //ÓÐеÄÑż¯ÁÄÌìÐÅÏ¢
 
         public void Clear()
         {

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

@@ -41,7 +41,7 @@ namespace GFGGame
 
             for (int i = 0; i < roleData.itemList.Count; i++)
             {
-                score += ItemDataManager.GetItemAdditionScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
+                score += ItemDataManager.GetArenaScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
             }
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
@@ -187,7 +187,7 @@ namespace GFGGame
             _roleData.itemScoreDic.Clear();
             for (int i = 0; i < _roleData.itemList.Count; i++)
             {
-                int score = ItemDataManager.GetItemAdditionScore(_roleData.itemList[i], _roleData.scoreType);
+                int score = ItemDataManager.GetArenaScore(_roleData.itemList[i], _roleData.scoreType);
                 _roleData.itemScoreList.Add(score);
                 _roleData.itemScoreDic[_roleData.itemList[i]] = score;
             }
@@ -198,7 +198,7 @@ namespace GFGGame
             float itemSum = 0;
             for (int i = 0; i < itemList.Count; i++)
             {
-                itemSum += ItemDataManager.GetItemAdditionScore(itemList[i], scoreType);
+                itemSum += ItemDataManager.GetArenaScore(itemList[i], scoreType);
             }
             return itemSum;
         }

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

@@ -109,23 +109,18 @@ namespace GFGGame
             if (!sort) return;
             _list.Sort((long a, long b) =>
             {
-                if(_friendDic[a].roleInfo.offlineTimeSec == 0)
+                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[a].roleInfo.offlineTimeSec;
+                if (count > 0)
                 {
                     return -1;
                 }
-                if(_friendDic[b].roleInfo.offlineTimeSec == 0)
+                else if(count < 0)
                 {
                     return 1;
                 }
-
-                long count = _friendDic[a].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
-                if (count > 0)
-                {
-                    return -1;
-                }
                 else
                 {
-                    return 1;
+                    return 0;
                 }
             });
         }
@@ -181,9 +176,9 @@ namespace GFGGame
 
         public bool CheckInApplyList(long roleId)
         {
-            foreach(var friendInfo in _applyDatas)
+            foreach (var friendInfo in _applyDatas)
             {
-                if(friendInfo.roleInfo.roleId == roleId)
+                if (friendInfo.roleInfo.roleId == roleId)
                 {
                     return true;
                 }

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

@@ -390,6 +390,12 @@ namespace GFGGame
                 var limitData = RoleLimitDataManager.GetLimitData(studioCfg.limit);
                 times = Math.Min(times, limitData.TotalPlayMax - limitData.PlayTimes);
             }
+            else if(type == ConstInstanceZonesType.PureFight && subType == 1)
+            {
+                var zcjbFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                var limitData = RoleLimitDataManager.GetLimitData(zcjbFightCfg.limit);
+                times = Math.Min(times, 10);
+            }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }
         public static void GetTotalProgress(out int count, out int totalCount)

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

@@ -296,6 +296,38 @@ namespace GFGGame
             return 0;
         }
 
+        /// 飞花令临时接口
+        public static int GetArenaScore(int itemId, int scoreType, string[] tags = null)
+        {
+            if (_dataDic.TryGetValue(itemId, out var itemData))
+            {
+                int scroe = 0;
+                if (tags != null)
+                {
+                    scroe += GetItemTagScore(itemId, tags);
+                }
+                scroe += itemData.GetScore(scoreType);
+                return scroe;
+            }
+            else
+            {
+                ItemCfg itemdate = ItemCfgArray.Instance.GetCfg(itemId);
+                ItemData itemDate = new ItemData() { };
+                if (itemdate != null)
+                {
+                    itemDate.id = itemdate.id;
+                    int scroe = 0;
+                    if (tags != null)
+                    {
+                        scroe += ItemDataManager.GetItemTagScore(itemId, tags);
+                    }
+                    scroe += itemDate.GetScore(scoreType);
+                    return scroe;
+                }
+            }
+            return 0;
+        }
+
         /// <summary>
         /// 获取茶话会item物品的属性
         /// </summary>

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

@@ -351,6 +351,17 @@ namespace GFGGame
         //茶话会奖励是否可以领取
         public bool CheckTeaPartyRewardCanGet()
         {
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo == null)
+                return false;
+
+            //该活动暂未开启
+            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && roleTeapartyInfo.IsNoActDayEnterLeague)
+                return false;
+            //该玩法不可以重复参加哦
+            if (roleTeapartyInfo.IsQuitTeaParty && roleTeapartyInfo.LastOpenCfgId != 0 && roleTeapartyInfo.LastOpenCfgId == LeagueDataManager.Instance.TeaPartyId)
+                return false;
+
             var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
             var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId);
 

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

@@ -34,8 +34,10 @@ namespace GFGGame
         //存储奖池免费时间，大于存储时间免费
         public Dictionary<int, long> luckyBoxFreeTimeMillDic = new Dictionary<int, long>();
 
+        //存储奖池摘星次数
+        public Dictionary<int, long> luckyBoxPlayTimesDic = new Dictionary<int, long>();
+
 
-        public int times = 0;
         public int luckyBoxIndex;
         public List<ItemData> RewardList
         {
@@ -86,6 +88,25 @@ namespace GFGGame
             {
                 luckyBoxFreeTimeMillDic[response.KsLuckyBoxId[i]] = response.VsFreeTime[i];
             }
+            luckyBoxPlayTimesDic.Clear();
+            count = response.KsPlayedId.Count;
+            for (var i = 0; i < count; i++)
+            {
+                luckyBoxPlayTimesDic[response.KsPlayedId[i]] = response.VsPlayedTimes[i];
+            }
+        }
+
+        public void UpdatePlayTimes(int luckyBoxId, long playTimes)
+        {
+            luckyBoxPlayTimesDic.TryGetValue(luckyBoxId, out long times);
+            times += playTimes;
+            luckyBoxPlayTimesDic[luckyBoxId] = times;
+        }
+
+        public long GetPlayTimes(int luckyBoxId)
+        {
+            luckyBoxPlayTimesDic.TryGetValue(luckyBoxId, out long times);
+            return times;
         }
 
         public void UpdateFreeTime(int luckyBoxId, long freeTimeMill)

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

@@ -18,6 +18,10 @@ namespace GFGGame
 
         public bool GetRewardRot()
         {
+            if(gameinfoList.Count == 0)
+            {
+                return false;
+            }
             foreach(GameInfoProto t in gameinfoList)
             {
                 if(t.FirstPassRewardStatus == 1)

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

@@ -0,0 +1,27 @@
+namespace GFGGame
+{
+    public class NewYearRedEnvelopeDataManager : SingletonBase<NewYearRedEnvelopeDataManager>
+    {
+        public static int Status = RedPacketStatus.None;  //红包领取状态
+        public static int ItemId = 0;  //红包奖励物品
+        public static long ItemNum = 0;  //奖励数量（单倍）
+
+        public void Clear()
+        {
+            Status = RedPacketStatus.None;
+            ItemId = 0;
+            ItemNum = 0;
+        }
+
+        public bool CheckNewYearRedEnvelopeRed()
+        {
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            if (actRedPacketId > 0 && NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}

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

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

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

@@ -605,7 +605,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -632,7 +632,7 @@ namespace GFGGame
             shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs);
             for (int i = 0; i < shopCfgs.Count; i++)
             {
-                if (shopCfgs[i].price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgs[i].id) < shopCfgs[i].maxBuyNum) return true;
+                if (shopCfgs[i].Price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgs[i].id) < shopCfgs[i].maxBuyNum) return true;
             }
             return false;
         }
@@ -650,6 +650,39 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 商城-月卡-成长基金
+        /// </summary>
+        /// <returns></returns>
+        public bool GetGrowthFundBuy()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.BuyGrowthFund) == 0;
+        }
+
+        public bool GetGrowthFundRewardRed()
+        {
+            if (ShopDataManager.Instance.GrowthFundRewardList.Count == GrowthFundCfgArray.Instance.dataArray.Length)
+            {
+                return false;
+            }
+            if (GetGrowthFundBuy())
+            {
+                return false;
+            }
+            for (int i = 0; i < GrowthFundCfgArray.Instance.dataArray.Length - 1; i++)
+            {
+                if (RoleDataManager.lvl < GrowthFundCfgArray.Instance.dataArray[i].level)
+                {
+                    //可领取数量和已领取数量比较
+                    if (i != ShopDataManager.Instance.GrowthFundRewardList.Count)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
         /// 商城-月卡-红包卡
         /// </summary>
         /// <returns></returns>
@@ -790,7 +823,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetOpenServerRed()
         {
-           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed())
+           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed() || ActivityDataManager.Instance.CanGetNewYearLoginRed())
                 return true;
 
             return false;

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

@@ -373,9 +373,10 @@ namespace GFGGame
         /// <param name="dressUpBgID"></param>
         public static void CheckSaveDressUpBgToMainBg(int dressUpBgID)
         {
-            // 小月卡
-            float endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
-            if (endTime > TimeHelper.ServerNow() && saveDressUpBgToMainBg == 1)
+            bool canChange =
+                GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime) > TimeHelper.ServerNow()
+                || GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime) > TimeHelper.ServerNow();
+            if (canChange && saveDressUpBgToMainBg == 1)
             {
                 SaveMainBgID(dressUpBgID);
             }

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

@@ -196,12 +196,7 @@ namespace GFGGame
         public void UpdateHeadWithLv1(GComponent component, int headId, int roleBorderId, int lv)
         {
             UI_ComHeadWithLv1 comHeadWithLv = UI_ComHeadWithLv1.Proxy(component);
-
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
-            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
-
-            comHeadWithLv.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-            comHeadWithLv.m_loaHeadBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UpdateHead(comHeadWithLv.m_comHead.target, headId, roleBorderId);
             comHeadWithLv.m_txtLv.text = lv > 0 ? lv.ToString() : "--";
             UI_ComHeadWithLv1.ProxyEnd();
 

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

@@ -361,7 +361,7 @@ namespace GFGGame
                 }
                 else if (validSkills[i].target == 2 && targetMainScore > 0)//作用对方
                 {
-                    double score = targetMainScore * validSkills[i].ratio / 10000;
+                    double score = mainScore * validSkills[i].ratio / 10000;
                     _targetSkillScore += score;
                     skillsToShowDic.Add(validSkills[i].skillId, (int)Math.Ceiling(score));
                 }

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

@@ -11,6 +11,8 @@ namespace GFGGame
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 
         private Dictionary<int, int> _goodsDic = new Dictionary<int, int>();
+
+        public List<int> GrowthFundRewardList = new List<int>();
         public void Clear()
         {
             _goodsDic.Clear();
@@ -50,8 +52,8 @@ namespace GFGGame
         {
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
 
-            costId = shopCfg.costId;
-            costNum = shopCfg.price * count;
+            costId = shopCfg.CostIdReal;
+            costNum = shopCfg.Price * count;
             buyNum = count;
         }
 
@@ -128,7 +130,10 @@ namespace GFGGame
                 int buyTypeB = (b.maxBuyNum == 0 || b.maxBuyNum - GetGoodsBuyNumById(b.id) > 0) ? 1 : -1;
                 if (buyTypeA > buyTypeB) return -1;
                 if (buyTypeA < buyTypeB) return 1;
-
+                int sortTypeA = a.sort == 0 ? 999 : a.sort;
+                int sortTypeB = b.sort == 0 ? 999 : b.sort; 
+                if (sortTypeA > sortTypeB) return 1;
+                if (sortTypeA < sortTypeB) return -1;
                 return a.id - b.id;
             });
             return shopCfgs;
@@ -139,10 +144,10 @@ namespace GFGGame
             List<int> costIds = new List<int>();
             for (int i = 0; i < shopCfgs.Count; i++)
             {
-                if (shopCfgs[i].costId == 0) continue;
-                if (costIds.IndexOf(shopCfgs[i].costId) < 0)
+                if (shopCfgs[i].CostIdReal == 0) continue;
+                if (costIds.IndexOf(shopCfgs[i].CostIdReal) < 0)
                 {
-                    costIds.Add(shopCfgs[i].costId);
+                    costIds.Add(shopCfgs[i].CostIdReal);
                 }
             }
             return costIds;
@@ -238,8 +243,8 @@ namespace GFGGame
         public int GetShopGoodsDiscount(int goodsId)
         {
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
-            if (shopCfg.price == 0) return 0;
-            return (int)(((double)shopCfg.originalPrice / (double)shopCfg.price) * 100);
+            if (shopCfg.Price == 0) return 0;
+            return (int)(((double)shopCfg.originalPrice / (double)shopCfg.Price) * 100);
         }
 
 

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

@@ -77,14 +77,14 @@ namespace GFGGame
             item.m_txtName.text = shopCfg.itemName;
             item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
 
-            item.m_grpDiscount.visible = shopCfg.price < shopCfg.originalPrice;
+            item.m_grpDiscount.visible = shopCfg.Price < shopCfg.originalPrice;
             if (item.m_grpDiscount.visible)
             {
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_Value");
                 _effectUIs.Add(_effectUI);
-                item.m_holderfEff.visible = shopCfg.price < shopCfg.originalPrice;
+                item.m_holderfEff.visible = shopCfg.Price < shopCfg.originalPrice;
             }
-            item.m_txtDesc.text = shopCfg.price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.id).ToString();
+            item.m_txtDesc.text = shopCfg.Price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.id).ToString();
 
             item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.id)).FlushVars();
             item.m_txtEndTime.visible = shopCfg.endTime != "";
@@ -100,13 +100,13 @@ namespace GFGGame
             if (item.m_c1.selectedIndex == 0)//可购买
             {
                 item.m_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.originalPrice);
-                if (shopCfg.price > 0 && shopCfg.costType != CostType.FREE)//不免费
+                if (shopCfg.Price > 0 && shopCfg.CostTypeReal != CostType.FREE)//不免费
                 {
-                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0 && shopCfg.originalPrice != shopCfg.price;
+                    item.m_btnBuy.m_grpOriginalPrice.visible = shopCfg.originalPrice > 0 && shopCfg.originalPrice != shopCfg.Price;
                     item.m_btnBuy.m_loaIcon.visible = true;
-                    item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.price);// cfg.price.ToString();
+                    item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(shopCfg.Price);// cfg.price.ToString();
 
-                    if (shopCfg.costType == CostType.RMB)//人民币
+                    if (shopCfg.CostTypeReal == CostType.RMB)//人民币
                     {
                         item.m_btnBuy.m_loaIcon.visible = false;
                         item.m_btnBuy.m_txtIcon.visible = true;
@@ -114,7 +114,7 @@ namespace GFGGame
                     }
                     else//道具
                     {
-                        ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
+                        ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.CostIdReal);
                         item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
                         item.m_btnBuy.m_loaIcon.visible = true;
                         item.m_btnBuy.m_txtIcon.visible = false;
@@ -134,7 +134,7 @@ namespace GFGGame
                 item.target.onClick.Add(OnBtnBugItem);
             }
             item.target.data = shopCfg;
-            bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.price == 0;
+            bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && shopCfg.Price == 0;
 
             RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
             UI_ListShopItem.ProxyEnd();
@@ -155,7 +155,7 @@ namespace GFGGame
             //     return;
             // }
 
-            if (cfg.costType == CostType.FREE)
+            if (cfg.CostTypeReal == CostType.FREE)
             {
                 ShopSProxy.ReqShopBuy(cfg.id, 1).Coroutine();
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);

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

@@ -102,6 +102,7 @@ namespace GFGGame
             }
         }
 
+        public static string _lastDialogPic;
         public static async void UpdateDialogPic(string value, GameObject sceneObj)
         {
             StoryDialogDataManager.Instance.waitPicFade = false;
@@ -110,6 +111,14 @@ namespace GFGGame
 
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             SpriteRenderer sprFace = face.GetComponent<SpriteRenderer>();
+
+            // 立绘切换 脸消失
+            if(_lastDialogPic != value)
+            {
+                SpriteHelper.RemoveSpriteFrom(sprFace);
+            }
+            _lastDialogPic = value;
+
             if (value == "0")
             {
                 SpriteHelper.RemoveSpriteFrom(spr);
@@ -151,11 +160,11 @@ namespace GFGGame
                     StoryDialogDataManager.Instance.waitPicFade = false;
                 }
             }
+
         }
 
         public static void UpdateDialogAnim(string value, ref GameObject animObj)
         {
-            StoryDialogDataManager.Instance.waiting = false;
             if (value == "0")
             {
                 if(animObj != null)

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

@@ -19,7 +19,7 @@ namespace ET
 
                     if (!Application.isFocused)
                     {
-                        AlertSystem.Show("连接已断开。")
+                        AlertSystem.Show("与服务器连接已断开。")
                         .SetRightButton(true, "重新连接", (object data) =>
                         {
                             LoginController.ReqReConnectGate().Coroutine();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -7,8 +7,9 @@ namespace UI.ActivityAfternoonTea
     public partial class UI_ActivityTeaMainUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GLoader m_Bg;
         public GButton m_btnBack;
+        public GLoader m_BgOne;
         public GLoader m_titleBg;
         public GLoader m_oneTimeIcon;
         public GButton m_oneViewIcon;
@@ -67,8 +68,9 @@ namespace UI.ActivityAfternoonTea
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Bg = (GLoader)comp.GetChild("Bg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_BgOne = (GLoader)comp.GetChild("BgOne");
             m_titleBg = (GLoader)comp.GetChild("titleBg");
             m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
             m_oneViewIcon = (GButton)comp.GetChild("oneViewIcon");
@@ -83,8 +85,9 @@ namespace UI.ActivityAfternoonTea
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_Bg = null;
             m_btnBack = null;
+            m_BgOne = null;
             m_titleBg = null;
             m_oneTimeIcon = null;
             m_oneViewIcon = null;

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

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

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

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoEntryUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_bgEffect;
+        public GGraph m_leafEffect;
+        public GGraph m_yuanXiaoEffect;
+        public GButton m_btnTask;
+        public GButton m_btnShop;
+        public GGraph m_cloudEffect;
+        public GList m_list;
+        public GGraph m_startBtnEffect;
+        public GGraph m_titleTextEffect;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GGraph m_btnStart;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uqkvg4";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoEntryUI";
+        private static UI_ActivityGetYuanXiaoEntryUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoEntryUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoEntryUI();
+            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_ActivityGetYuanXiaoEntryUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoEntryUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_leafEffect = (GGraph)comp.GetChild("leafEffect");
+            m_yuanXiaoEffect = (GGraph)comp.GetChild("yuanXiaoEffect");
+            m_btnTask = (GButton)comp.GetChild("btnTask");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_cloudEffect = (GGraph)comp.GetChild("cloudEffect");
+            m_list = (GList)comp.GetChild("list");
+            m_startBtnEffect = (GGraph)comp.GetChild("startBtnEffect");
+            m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnStart = (GGraph)comp.GetChild("btnStart");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_leafEffect = null;
+            m_yuanXiaoEffect = null;
+            m_btnTask = null;
+            m_btnShop = null;
+            m_cloudEffect = null;
+            m_list = null;
+            m_startBtnEffect = null;
+            m_titleTextEffect = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_btnStart = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoFailUI
+    {
+        public GComponent target;
+        public GGraph m_titleEffect;
+        public GGraph m_starEffect;
+        public GButton m_btnExit;
+        public GButton m_btnRetry;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uhmj625";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoFailUI";
+        private static UI_ActivityGetYuanXiaoFailUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoFailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoFailUI();
+            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_ActivityGetYuanXiaoFailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoFailUI();
+            }
+            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_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnRetry = (GButton)comp.GetChild("btnRetry");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_titleEffect = null;
+            m_starEffect = null;
+            m_btnExit = null;
+            m_btnRetry = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoSuccessUI
+    {
+        public GComponent target;
+        public GButton m_btnExit;
+        public GButton m_btnRetry;
+        public GList m_listReward;
+        public GGraph m_starEffect;
+        public GGraph m_titleEffect;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7uhmj62c";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoSuccessUI";
+        private static UI_ActivityGetYuanXiaoSuccessUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoSuccessUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoSuccessUI();
+            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_ActivityGetYuanXiaoSuccessUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoSuccessUI();
+            }
+            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_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnRetry = (GButton)comp.GetChild("btnRetry");
+            m_listReward = (GList)comp.GetChild("listReward");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnExit = null;
+            m_btnRetry = null;
+            m_listReward = null;
+            m_starEffect = null;
+            m_titleEffect = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoTargetUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnCancel;
+        public GButton m_btnConfirm;
+        public GTextField m_score;
+        public GList m_collectList;
+        public const string URL = "ui://tguohf7uhmj61s";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoTargetUI";
+        private static UI_ActivityGetYuanXiaoTargetUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoTargetUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoTargetUI();
+            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_ActivityGetYuanXiaoTargetUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoTargetUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_score = (GTextField)comp.GetChild("score");
+            m_collectList = (GList)comp.GetChild("collectList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnCancel = null;
+            m_btnConfirm = null;
+            m_score = null;
+            m_collectList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoTaskUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_score;
+        public GList m_itemList;
+        public const string URL = "ui://tguohf7uhmj62k";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoTaskUI";
+        private static UI_ActivityGetYuanXiaoTaskUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoTaskUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoTaskUI();
+            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_ActivityGetYuanXiaoTaskUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoTaskUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_score = (GTextField)comp.GetChild("score");
+            m_itemList = (GList)comp.GetChild("itemList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_score = null;
+            m_itemList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,121 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_ActivityGetYuanXiaoUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GGraph m_bgEffect;
+        public UI_catchers m_catcher;
+        public UI_YuanXiaoParent m_YuanXiaoParent;
+        public GGraph m_end0;
+        public GTextField m_time;
+        public GList m_collectList;
+        public GTextField m_score;
+        public GButton m_btnBack;
+        public GGraph m_start0;
+        public GGraph m_start1;
+        public GGraph m_start2;
+        public GGraph m_start3;
+        public GTextField m_progress;
+        public GTextField m_targetScore;
+        public GGraph m_startEffect;
+        public const string URL = "ui://tguohf7ux0ey0";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "ActivityGetYuanXiaoUI";
+        private static UI_ActivityGetYuanXiaoUI _proxy;
+
+        public static UI_ActivityGetYuanXiaoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityGetYuanXiaoUI();
+            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_ActivityGetYuanXiaoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityGetYuanXiaoUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_catcher = (UI_catchers)UI_catchers.Create(comp.GetChild("catcher"));
+            m_YuanXiaoParent = (UI_YuanXiaoParent)UI_YuanXiaoParent.Create(comp.GetChild("YuanXiaoParent"));
+            m_end0 = (GGraph)comp.GetChild("end0");
+            m_time = (GTextField)comp.GetChild("time");
+            m_collectList = (GList)comp.GetChild("collectList");
+            m_score = (GTextField)comp.GetChild("score");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_start0 = (GGraph)comp.GetChild("start0");
+            m_start1 = (GGraph)comp.GetChild("start1");
+            m_start2 = (GGraph)comp.GetChild("start2");
+            m_start3 = (GGraph)comp.GetChild("start3");
+            m_progress = (GTextField)comp.GetChild("progress");
+            m_targetScore = (GTextField)comp.GetChild("targetScore");
+            m_startEffect = (GGraph)comp.GetChild("startEffect");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_catcher.Dispose();
+            m_catcher = null;
+            m_YuanXiaoParent.Dispose();
+            m_YuanXiaoParent = null;
+            m_end0 = null;
+            m_time = null;
+            m_collectList = null;
+            m_score = null;
+            m_btnBack = null;
+            m_start0 = null;
+            m_start1 = null;
+            m_start2 = null;
+            m_start3 = null;
+            m_progress = null;
+            m_targetScore = null;
+            m_startEffect = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_YuanXiaoItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_YuanXiao;
+        public const string URL = "ui://tguohf7uaev23";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "YuanXiaoItem";
+        private static UI_YuanXiaoItem _proxy;
+
+        public static UI_YuanXiaoItem Create(GObject gObject = null)
+        {
+            var ui = new UI_YuanXiaoItem();
+            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_YuanXiaoItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_YuanXiaoItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_YuanXiao = (GLoader)comp.GetChild("YuanXiao");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_YuanXiao = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_YuanXiaoParent
+    {
+        public GComponent target;
+        public GGraph m_YuanXiaoParent;
+        public const string URL = "ui://tguohf7uqkvg18";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "YuanXiaoParent";
+        private static UI_YuanXiaoParent _proxy;
+
+        public static UI_YuanXiaoParent Create(GObject gObject = null)
+        {
+            var ui = new UI_YuanXiaoParent();
+            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_YuanXiaoParent Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_YuanXiaoParent();
+            }
+            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_YuanXiaoParent = (GGraph)comp.GetChild("YuanXiaoParent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_YuanXiaoParent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,90 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_catchers
+    {
+        public GComponent target;
+        public Controller m_c2;
+        public GGraph m_catcher;
+        public GLoader m_catcherImg;
+        public GLoader m_catcherImg2;
+        public GGraph m_getEffect;
+        public UI_flyScore m_flyscore;
+        public GGroup m_catchers;
+        public const string URL = "ui://tguohf7uqkvg1a";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "catchers";
+        private static UI_catchers _proxy;
+
+        public static UI_catchers Create(GObject gObject = null)
+        {
+            var ui = new UI_catchers();
+            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_catchers Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_catchers();
+            }
+            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_c2 = comp.GetController("c2");
+            m_catcher = (GGraph)comp.GetChild("catcher");
+            m_catcherImg = (GLoader)comp.GetChild("catcherImg");
+            m_catcherImg2 = (GLoader)comp.GetChild("catcherImg2");
+            m_getEffect = (GGraph)comp.GetChild("getEffect");
+            m_flyscore = (UI_flyScore)UI_flyScore.Create(comp.GetChild("flyscore"));
+            m_catchers = (GGroup)comp.GetChild("catchers");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c2 = null;
+            m_catcher = null;
+            m_catcherImg = null;
+            m_catcherImg2 = null;
+            m_getEffect = null;
+            m_flyscore.Dispose();
+            m_flyscore = null;
+            m_catchers = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_flyScore
+    {
+        public GComponent target;
+        public GTextField m_score;
+        public Transition m_t0;
+        public const string URL = "ui://tguohf7umgu71p";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "flyScore";
+        private static UI_flyScore _proxy;
+
+        public static UI_flyScore Create(GObject gObject = null)
+        {
+            var ui = new UI_flyScore();
+            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_flyScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_flyScore();
+            }
+            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_score = (GTextField)comp.GetChild("score");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_score = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_gameTarget
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_iconType;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uhmj62j";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "gameTarget";
+        private static UI_gameTarget _proxy;
+
+        public static UI_gameTarget Create(GObject gObject = null)
+        {
+            var ui = new UI_gameTarget();
+            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_gameTarget Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_gameTarget();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_iconType = (GLoader)comp.GetChild("iconType");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconType = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_level
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_iconLevel;
+        public GLoader m_spendIcon;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uqkvg14";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "level";
+        private static UI_level _proxy;
+
+        public static UI_level Create(GObject gObject = null)
+        {
+            var ui = new UI_level();
+            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_level Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_level();
+            }
+            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_iconLevel = (GLoader)comp.GetChild("iconLevel");
+            m_spendIcon = (GLoader)comp.GetChild("spendIcon");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconLevel = null;
+            m_spendIcon = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_targetItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_iconType;
+        public GTextField m_num;
+        public const string URL = "ui://tguohf7uqkvgu";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "targetItem";
+        private static UI_targetItem _proxy;
+
+        public static UI_targetItem Create(GObject gObject = null)
+        {
+            var ui = new UI_targetItem();
+            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_targetItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_targetItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_iconType = (GLoader)comp.GetChild("iconType");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_iconType = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityGetYuanXiao
+{
+    public partial class UI_taskItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnGet;
+        public GTextField m_desc;
+        public GButton m_btnLock;
+        public GList m_rewardList;
+        public const string URL = "ui://tguohf7uhmj62r";
+        public const string PACKAGE_NAME = "ActivityGetYuanXiao";
+        public const string RES_NAME = "taskItem";
+        private static UI_taskItem _proxy;
+
+        public static UI_taskItem Create(GObject gObject = null)
+        {
+            var ui = new UI_taskItem();
+            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_taskItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_taskItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_btnLock = (GButton)comp.GetChild("btnLock");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnGet = null;
+            m_desc = null;
+            m_btnLock = null;
+            m_rewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -10,6 +10,7 @@ namespace UI.ActivityMain
         public GLoader m_btnChange;
         public GLoader m_icon;
         public GTextField m_activityDesc;
+        public GImage m_tipImg;
         public GLoader m_notTips;
         public GLoader m_backBtn;
         public Transition m_t0;
@@ -65,6 +66,7 @@ namespace UI.ActivityMain
             m_btnChange = (GLoader)comp.GetChild("btnChange");
             m_icon = (GLoader)comp.GetChild("icon");
             m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_tipImg = (GImage)comp.GetChild("tipImg");
             m_notTips = (GLoader)comp.GetChild("notTips");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
@@ -76,6 +78,7 @@ namespace UI.ActivityMain
             m_btnChange = null;
             m_icon = null;
             m_activityDesc = null;
+            m_tipImg = null;
             m_notTips = null;
             m_backBtn = null;
             m_t0 = null;

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

@@ -11,6 +11,7 @@ namespace UI.ActivityMain
         public GList m_List;
         public UI_Button7 m_RewardBtn;
         public GTextField m_rewardName;
+        public GTextField m_rewardNum;
         public const string URL = "ui://4ht5s77uqbf4u";
         public const string PACKAGE_NAME = "ActivityMain";
         public const string RES_NAME = "ActivityRewardItemUI";
@@ -62,6 +63,7 @@ namespace UI.ActivityMain
             m_List = (GList)comp.GetChild("List");
             m_RewardBtn = (UI_Button7)UI_Button7.Create(comp.GetChild("RewardBtn"));
             m_rewardName = (GTextField)comp.GetChild("rewardName");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +72,7 @@ namespace UI.ActivityMain
             m_RewardBtn.Dispose();
             m_RewardBtn = null;
             m_rewardName = null;
+            m_rewardNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,6 +13,7 @@ namespace UI.ActivityMain
         public GTextField m_activityTime;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
+        public GLoader m_shopBtn;
         public GGraph m_bgEffect;
         public GGraph m_btnEffect;
         public const string URL = "ui://4ht5s77uqbf4l";
@@ -68,6 +69,7 @@ namespace UI.ActivityMain
             m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+            m_shopBtn = (GLoader)comp.GetChild("shopBtn");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_btnEffect = (GGraph)comp.GetChild("btnEffect");
         }
@@ -79,6 +81,7 @@ namespace UI.ActivityMain
             m_activityTime = null;
             m_backBtn = null;
             m_viewBtn = null;
+            m_shopBtn = null;
             m_bgEffect = null;
             m_btnEffect = null;
             if(disposeTarget && target != null)

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

@@ -12,6 +12,7 @@ namespace UI.ActivityMain
         public GLoader m_btnBuy;
         public GLoader m_btnBuyTxt;
         public GList m_rewardList;
+        public GImage m_TipImg;
         public GLoader m_notTips;
         public GLoader m_backBtn;
         public Transition m_t0;
@@ -67,6 +68,7 @@ namespace UI.ActivityMain
             m_btnBuy = (GLoader)comp.GetChild("btnBuy");
             m_btnBuyTxt = (GLoader)comp.GetChild("btnBuyTxt");
             m_rewardList = (GList)comp.GetChild("rewardList");
+            m_TipImg = (GImage)comp.GetChild("TipImg");
             m_notTips = (GLoader)comp.GetChild("notTips");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
@@ -78,6 +80,7 @@ namespace UI.ActivityMain
             m_btnBuy = null;
             m_btnBuyTxt = null;
             m_rewardList = null;
+            m_TipImg = null;
             m_notTips = null;
             m_backBtn = null;
             m_t0 = null;

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Common
+{
+    public partial class UI_AlertMiniGameUI
+    {
+        public GComponent target;
+        public Controller m_checkType;
+        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://mk0fwx0xhmj6tk3";
+        public const string PACKAGE_NAME = "Common";
+        public const string RES_NAME = "AlertMiniGameUI";
+        private static UI_AlertMiniGameUI _proxy;
+
+        public static UI_AlertMiniGameUI Create(GObject gObject = null)
+        {
+            var ui = new UI_AlertMiniGameUI();
+            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_AlertMiniGameUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_AlertMiniGameUI();
+            }
+            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_checkType = comp.GetController("checkType");
+            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_txtContent = null;
+            m_txtTips = null;
+            m_btnLeft = null;
+            m_btnRight = null;
+            m_btnCheck = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertMiniGameUI.cs.meta

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

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

@@ -8,7 +8,7 @@ namespace UI.Common
     {
         public GComponent target;
         public Controller m_checkType;
-        public GGraph m_graphBg;
+        public GGraph m_mask;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
         public GButton m_btnLeft;
@@ -62,7 +62,7 @@ namespace UI.Common
         private void Init(GComponent comp)
         {
             m_checkType = comp.GetController("checkType");
-            m_graphBg = (GGraph)comp.GetChild("graphBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -72,7 +72,7 @@ namespace UI.Common
         public void Dispose(bool disposeTarget = false)
         {
             m_checkType = null;
-            m_graphBg = null;
+            m_mask = null;
             m_txtContent = null;
             m_txtTips = null;
             m_btnLeft = null;

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

@@ -7,6 +7,7 @@ namespace UI.Common
     public partial class UI_ModalStatusUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GTextField m_txtMessage;
         public GGraph m_holder;
         public const string URL = "ui://mk0fwx0xd4iw4m";
@@ -56,11 +57,13 @@ namespace UI.Common
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_txtMessage = (GTextField)comp.GetChild("txtMessage");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_txtMessage = null;
             m_holder = null;
             if(disposeTarget && target != null)

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

@@ -7,8 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComHeadWithLv1
     {
         public GComponent target;
-        public UI_ComHeadIcon m_comHead;
-        public GLoader m_loaHeadBorder;
+        public UI_ComHead m_comHead;
         public GTextField m_txtLv;
         public const string URL = "ui://eg2y0ldpqkjstl8";
         public const string PACKAGE_NAME = "CommonGame";
@@ -57,15 +56,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
-            m_loaHeadBorder = (GLoader)comp.GetChild("loaHeadBorder");
+            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead.Dispose();
             m_comHead = null;
-            m_loaHeadBorder = null;
             m_txtLv = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_RewardUI
     {
         public GComponent target;
-        public GGraph m_bg;
+        public GGraph m_mask;
         public GGraph m_holderBgCom;
         public GGraph m_holderTitle;
         public GGroup m_downTipsText;
@@ -61,7 +61,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_bg = (GGraph)comp.GetChild("bg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
@@ -71,7 +71,7 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_mask = null;
             m_holderBgCom = null;
             m_holderTitle = null;
             m_downTipsText = null;

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_Button19.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DeleteAccount
+{
+    public partial class UI_Button19
+    {
+        public GButton target;
+        public Controller m_ColorType;
+        public const string URL = "ui://foz986b69xh85";
+        public const string PACKAGE_NAME = "DeleteAccount";
+        public const string RES_NAME = "Button19";
+        private static UI_Button19 _proxy;
+
+        public static UI_Button19 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button19();
+            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_Button19 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button19();
+            }
+            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_ColorType = comp.GetController("ColorType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ColorType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_Button19.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_ComTextCondition.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DeleteAccount
+{
+    public partial class UI_ComTextCondition
+    {
+        public GComponent target;
+        public GRichTextField m_txtContent;
+        public const string URL = "ui://foz986b69xh81";
+        public const string PACKAGE_NAME = "DeleteAccount";
+        public const string RES_NAME = "ComTextCondition";
+        private static UI_ComTextCondition _proxy;
+
+        public static UI_ComTextCondition Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTextCondition();
+            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_ComTextCondition Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTextCondition();
+            }
+            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_txtContent = (GRichTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_ComTextCondition.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_ComTextProtocal.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DeleteAccount
+{
+    public partial class UI_ComTextProtocal
+    {
+        public GComponent target;
+        public GRichTextField m_txtContent;
+        public const string URL = "ui://foz986b69xh8b";
+        public const string PACKAGE_NAME = "DeleteAccount";
+        public const string RES_NAME = "ComTextProtocal";
+        private static UI_ComTextProtocal _proxy;
+
+        public static UI_ComTextProtocal Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTextProtocal();
+            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_ComTextProtocal Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTextProtocal();
+            }
+            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_txtContent = (GRichTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_ComTextProtocal.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_DeleteAccountUI.cs

@@ -0,0 +1,144 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DeleteAccount
+{
+    public partial class UI_DeleteAccountUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GComponent m_bg;
+        public GButton m_btnBack;
+        public UI_ComTextCondition m_txtComp;
+        public GButton m_btnAgree;
+        public GTextField m_txtAgree;
+        public UI_Button19 m_btnNext;
+        public GGroup m_groupAgree1;
+        public UI_Button19 m_btnSure;
+        public UI_Button19 m_btnCancel;
+        public GTextInput m_inputIDNumber;
+        public GTextInput m_inputName;
+        public GTextField m_txtRoleName;
+        public GTextField m_txtAccount;
+        public GTextField m_txtLvl;
+        public GGroup m_groupSure;
+        public UI_Button19 m_btnQuit;
+        public GGroup m_groupResult;
+        public UI_ComTextProtocal m_txtComp_2;
+        public GButton m_btnAgree2;
+        public GTextField m_txtAgree2;
+        public UI_Button19 m_btnNext2;
+        public GGroup m_groupAgree2;
+        public const string URL = "ui://foz986b69xh80";
+        public const string PACKAGE_NAME = "DeleteAccount";
+        public const string RES_NAME = "DeleteAccountUI";
+        private static UI_DeleteAccountUI _proxy;
+
+        public static UI_DeleteAccountUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DeleteAccountUI();
+            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_DeleteAccountUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DeleteAccountUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_bg = (GComponent)comp.GetChild("bg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtComp = (UI_ComTextCondition)UI_ComTextCondition.Create(comp.GetChild("txtComp"));
+            m_btnAgree = (GButton)comp.GetChild("btnAgree");
+            m_txtAgree = (GTextField)comp.GetChild("txtAgree");
+            m_btnNext = (UI_Button19)UI_Button19.Create(comp.GetChild("btnNext"));
+            m_groupAgree1 = (GGroup)comp.GetChild("groupAgree1");
+            m_btnSure = (UI_Button19)UI_Button19.Create(comp.GetChild("btnSure"));
+            m_btnCancel = (UI_Button19)UI_Button19.Create(comp.GetChild("btnCancel"));
+            m_inputIDNumber = (GTextInput)comp.GetChild("inputIDNumber");
+            m_inputName = (GTextInput)comp.GetChild("inputName");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+            m_txtAccount = (GTextField)comp.GetChild("txtAccount");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_groupSure = (GGroup)comp.GetChild("groupSure");
+            m_btnQuit = (UI_Button19)UI_Button19.Create(comp.GetChild("btnQuit"));
+            m_groupResult = (GGroup)comp.GetChild("groupResult");
+            m_txtComp_2 = (UI_ComTextProtocal)UI_ComTextProtocal.Create(comp.GetChild("txtComp"));
+            m_btnAgree2 = (GButton)comp.GetChild("btnAgree2");
+            m_txtAgree2 = (GTextField)comp.GetChild("txtAgree2");
+            m_btnNext2 = (UI_Button19)UI_Button19.Create(comp.GetChild("btnNext2"));
+            m_groupAgree2 = (GGroup)comp.GetChild("groupAgree2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_btnBack = null;
+            m_txtComp.Dispose();
+            m_txtComp = null;
+            m_btnAgree = null;
+            m_txtAgree = null;
+            m_btnNext.Dispose();
+            m_btnNext = null;
+            m_groupAgree1 = null;
+            m_btnSure.Dispose();
+            m_btnSure = null;
+            m_btnCancel.Dispose();
+            m_btnCancel = null;
+            m_inputIDNumber = null;
+            m_inputName = null;
+            m_txtRoleName = null;
+            m_txtAccount = null;
+            m_txtLvl = null;
+            m_groupSure = null;
+            m_btnQuit.Dispose();
+            m_btnQuit = null;
+            m_groupResult = null;
+            m_txtComp_2.Dispose();
+            m_txtComp_2 = null;
+            m_btnAgree2 = null;
+            m_txtAgree2 = null;
+            m_btnNext2.Dispose();
+            m_btnNext2 = null;
+            m_groupAgree2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_DeleteAccountUI.cs.meta

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

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

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_PhotographSaveUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GImage m_imgRes;
         public GImage m_imgBorder;
         public GButton m_btnClose;
@@ -62,6 +63,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_imgRes = (GImage)comp.GetChild("imgRes");
             m_imgBorder = (GImage)comp.GetChild("imgBorder");
             m_btnClose = (GButton)comp.GetChild("btnClose");
@@ -73,6 +75,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_imgRes = null;
             m_imgBorder = null;
             m_btnClose = null;

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

@@ -15,6 +15,7 @@ namespace UI.DressUp
         public GButton m_btnChoose;
         public GButton m_btnUp;
         public GButton m_btnDown;
+        public GButton m_btnDelete;
         public GButton m_btnGalleryJoin;
         public GTextField m_txtCount;
         public UI_ComItemList m_ComSelectRes;
@@ -73,6 +74,7 @@ namespace UI.DressUp
             m_btnChoose = (GButton)comp.GetChild("btnChoose");
             m_btnUp = (GButton)comp.GetChild("btnUp");
             m_btnDown = (GButton)comp.GetChild("btnDown");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnGalleryJoin = (GButton)comp.GetChild("btnGalleryJoin");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_ComSelectRes = (UI_ComItemList)UI_ComItemList.Create(comp.GetChild("ComSelectRes"));
@@ -88,6 +90,7 @@ namespace UI.DressUp
             m_btnChoose = null;
             m_btnUp = null;
             m_btnDown = null;
+            m_btnDelete = null;
             m_btnGalleryJoin = null;
             m_txtCount = null;
             m_ComSelectRes.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs

@@ -14,6 +14,7 @@ namespace UI.Friend
         public GTextField m_txtName;
         public GButton m_btnSend;
         public GLoader m_loaState;
+        public GTextField m_txtName_2;
         public const string URL = "ui://wez2ujnnpdeo9";
         public const string PACKAGE_NAME = "Friend";
         public const string RES_NAME = "ListItem";
@@ -68,6 +69,7 @@ namespace UI.Friend
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnSend = (GButton)comp.GetChild("btnSend");
             m_loaState = (GLoader)comp.GetChild("loaState");
+            m_txtName_2 = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.Friend
             m_txtName = null;
             m_btnSend = null;
             m_loaState = null;
+            m_txtName_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.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_Button5
+    {
+        public GButton target;
+        public Controller m_buttonType;
+        public const string URL = "ui://drx9d1usmbf1taf";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            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_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            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_buttonType = comp.GetController("buttonType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_buttonType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_Button9
     {
         public GButton target;
-        public Transition m_btnLuckyDiscount_loop;
+        public GGraph m_holderEff;
         public const string URL = "ui://drx9d1usahsjtqx";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "Button9";
@@ -55,11 +55,11 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_btnLuckyDiscount_loop = comp.GetTransition("btnLuckyDiscount_loop");
+            m_holderEff = (GGraph)comp.GetChild("holderEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnLuckyDiscount_loop = null;
+            m_holderEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,16 +13,17 @@ namespace UI.LuckyBox
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GGroup m_grpTitle;
-        public GButton m_btnGiftBag;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public GButton m_btnPreview;
         public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
         public GTextField m_txtCount;
         public GTextField m_txtHasTime;
         public GGroup m_grpActivityTips;
+        public GLoader m_ImgUp;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -76,16 +77,17 @@ namespace UI.LuckyBox
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
-            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
             m_btnPreview = (GButton)comp.GetChild("btnPreview");
             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");
+            m_ImgUp = (GLoader)comp.GetChild("ImgUp");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,10 +98,13 @@ namespace UI.LuckyBox
             m_txtTime = null;
             m_grpTime = null;
             m_grpTitle = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             m_btnPreview = null;
             m_txtOwned = null;
@@ -108,6 +113,7 @@ namespace UI.LuckyBox
             m_txtCount = null;
             m_txtHasTime = null;
             m_grpActivityTips = null;
+            m_ImgUp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,10 +13,12 @@ namespace UI.LuckyBox
         public GComponent m_valueBar;
         public GTextField m_txtTime;
         public UI_Button9 m_btnLuckyDiscount;
-        public GButton m_btnGiftBag;
+        public UI_ComBagTime m_comDiscountTime;
+        public GGroup m_comLuckyDiscount;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxActivityUI";
@@ -70,10 +72,12 @@ namespace UI.LuckyBox
             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_comDiscountTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comDiscountTime"));
+            m_comLuckyDiscount = (GGroup)comp.GetChild("comLuckyDiscount");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -85,10 +89,16 @@ namespace UI.LuckyBox
             m_txtTime = null;
             m_btnLuckyDiscount.Dispose();
             m_btnLuckyDiscount = null;
+            m_comDiscountTime.Dispose();
+            m_comDiscountTime = null;
+            m_comLuckyDiscount = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             if(disposeTarget && target != null)
             {

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

@@ -12,6 +12,7 @@ namespace UI.LuckyBox
         public UI_ButtonTab1 m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
+        public GTextField m_txtPlayTimes;
         public const string URL = "ui://drx9d1usga16e";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxPreShowUI";
@@ -64,6 +65,7 @@ namespace UI.LuckyBox
             m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
+            m_txtPlayTimes = (GTextField)comp.GetChild("txtPlayTimes");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.LuckyBox
             m_list = null;
             m_compText.Dispose();
             m_compText = null;
+            m_txtPlayTimes = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -24,6 +24,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityZCJB;
+        public UI_BtnModle2 m_btnGetYuanXiao;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -31,14 +32,15 @@ namespace UI.Main
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
         public UI_ButtonModle1 m_btnZhaiXing;
-        public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle1 m_btnActivityDay7;
-        public UI_BtnModle1 m_btnShow;
+        public UI_ButtonModleEffect m_btnMain;
         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 UI_BtnModle1 m_btnNewYearRedEnvelope;
+        public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle1 m_btnActivityDay7;
+        public UI_BtnModle1 m_btnShow;
         public GGroup m_AllUI;
         public GGraph m_touchMask;
         public Transition m_openViewAction;
@@ -108,6 +110,7 @@ namespace UI.Main
             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_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -115,14 +118,15 @@ namespace UI.Main
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             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_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
             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_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
+            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_AllUI = (GGroup)comp.GetChild("AllUI");
             m_touchMask = (GGraph)comp.GetChild("touchMask");
             m_openViewAction = comp.GetTransition("openViewAction");
@@ -156,6 +160,8 @@ namespace UI.Main
             m_btnActivityLuckyBox = null;
             m_btnActivityZCJB.Dispose();
             m_btnActivityZCJB = null;
+            m_btnGetYuanXiao.Dispose();
+            m_btnGetYuanXiao = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();
@@ -168,12 +174,8 @@ namespace UI.Main
             m_btnGiftBag2 = 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_btnMain.Dispose();
+            m_btnMain = null;
             m_btnCiPai.Dispose();
             m_btnCiPai = null;
             m_btnXiuFang.Dispose();
@@ -182,8 +184,14 @@ namespace UI.Main
             m_btnHuanZhuang = null;
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
-            m_btnMain.Dispose();
-            m_btnMain = null;
+            m_btnNewYearRedEnvelope.Dispose();
+            m_btnNewYearRedEnvelope = null;
+            m_btnDailyWelfare.Dispose();
+            m_btnDailyWelfare = null;
+            m_btnActivityDay7.Dispose();
+            m_btnActivityDay7 = null;
+            m_btnShow.Dispose();
+            m_btnShow = null;
             m_AllUI = null;
             m_touchMask = null;
             m_openViewAction = null;

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightSingleScoreUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GLoader m_bg;
         public GGraph m_bgEffect;
         public GGraph m_holder;
@@ -62,6 +63,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_bg = (GLoader)comp.GetChild("bg");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -73,6 +75,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_bg = null;
             m_bgEffect = null;
             m_holder = null;

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

@@ -17,6 +17,8 @@ namespace UI.MiniGame
         public GLoader m_icon128;
         public GLoader m_icon256;
         public GLoader m_icon512;
+        public GImage m_dic64;
+        public GImage m_dic128;
         public GLoader m_dic256;
         public GLoader m_dic512;
         public const string URL = "ui://wgkh30qjlw8c1n";
@@ -76,6 +78,8 @@ namespace UI.MiniGame
             m_icon128 = (GLoader)comp.GetChild("icon128");
             m_icon256 = (GLoader)comp.GetChild("icon256");
             m_icon512 = (GLoader)comp.GetChild("icon512");
+            m_dic64 = (GImage)comp.GetChild("dic64");
+            m_dic128 = (GImage)comp.GetChild("dic128");
             m_dic256 = (GLoader)comp.GetChild("dic256");
             m_dic512 = (GLoader)comp.GetChild("dic512");
         }
@@ -91,6 +95,8 @@ namespace UI.MiniGame
             m_icon128 = null;
             m_icon256 = null;
             m_icon512 = null;
+            m_dic64 = null;
+            m_dic128 = null;
             m_dic256 = null;
             m_dic512 = null;
             if(disposeTarget && target != null)

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearLogin
+{
+    public partial class UI_ComLoginItem
+    {
+        public GComponent target;
+        public Controller m_bgType;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDay;
+        public GTextField m_txtNum;
+        public GTextField m_txtName;
+        public GImage m_imgGot;
+        public const string URL = "ui://euyo6bk3t2f05";
+        public const string PACKAGE_NAME = "NewYearLogin";
+        public const string RES_NAME = "ComLoginItem";
+        private static UI_ComLoginItem _proxy;
+
+        public static UI_ComLoginItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComLoginItem();
+            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_ComLoginItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComLoginItem();
+            }
+            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_bgType = comp.GetController("bgType");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bgType = null;
+            m_loaIcon = null;
+            m_txtDay = null;
+            m_txtNum = null;
+            m_txtName = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearLogin
+{
+    public partial class UI_NewYearLoginUI
+    {
+        public GComponent target;
+        public GList m_listLogin;
+        public const string URL = "ui://euyo6bk3t2f00";
+        public const string PACKAGE_NAME = "NewYearLogin";
+        public const string RES_NAME = "NewYearLoginUI";
+        private static UI_NewYearLoginUI _proxy;
+
+        public static UI_NewYearLoginUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewYearLoginUI();
+            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_NewYearLoginUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewYearLoginUI();
+            }
+            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_listLogin = (GList)comp.GetChild("listLogin");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listLogin = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs.meta

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

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

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

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

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_NewYearRedEnvelopeUI.cs

@@ -0,0 +1,117 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearRedEnvelope
+{
+    public partial class UI_NewYearRedEnvelopeUI
+    {
+        public GComponent target;
+        public Controller m_titleImgType;
+        public Controller m_openType;
+        public GGraph m_holderTitle;
+        public GGraph m_holderdoubao1;
+        public GGraph m_holderdoubao2;
+        public GGraph m_holderAllBg;
+        public GGraph m_holderAFu;
+        public GLoader m_imgTitle;
+        public GButton m_btnOpen;
+        public GRichTextField m_txtTime;
+        public UI_Button1 m_btnDoubleGet;
+        public GGraph m_holderOpenBtn;
+        public GComponent m_itemReward;
+        public GRichTextField m_textGetNum;
+        public GRichTextField m_txtGet;
+        public Transition m_textShow;
+        public const string URL = "ui://pt3t9f1ujsko0";
+        public const string PACKAGE_NAME = "NewYearRedEnvelope";
+        public const string RES_NAME = "NewYearRedEnvelopeUI";
+        private static UI_NewYearRedEnvelopeUI _proxy;
+
+        public static UI_NewYearRedEnvelopeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewYearRedEnvelopeUI();
+            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_NewYearRedEnvelopeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewYearRedEnvelopeUI();
+            }
+            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_titleImgType = comp.GetController("titleImgType");
+            m_openType = comp.GetController("openType");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
+            m_holderdoubao1 = (GGraph)comp.GetChild("holderdoubao1");
+            m_holderdoubao2 = (GGraph)comp.GetChild("holderdoubao2");
+            m_holderAllBg = (GGraph)comp.GetChild("holderAllBg");
+            m_holderAFu = (GGraph)comp.GetChild("holderAFu");
+            m_imgTitle = (GLoader)comp.GetChild("imgTitle");
+            m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_txtTime = (GRichTextField)comp.GetChild("txtTime");
+            m_btnDoubleGet = (UI_Button1)UI_Button1.Create(comp.GetChild("btnDoubleGet"));
+            m_holderOpenBtn = (GGraph)comp.GetChild("holderOpenBtn");
+            m_itemReward = (GComponent)comp.GetChild("itemReward");
+            m_textGetNum = (GRichTextField)comp.GetChild("textGetNum");
+            m_txtGet = (GRichTextField)comp.GetChild("txtGet");
+            m_textShow = comp.GetTransition("textShow");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_titleImgType = null;
+            m_openType = null;
+            m_holderTitle = null;
+            m_holderdoubao1 = null;
+            m_holderdoubao2 = null;
+            m_holderAllBg = null;
+            m_holderAFu = null;
+            m_imgTitle = null;
+            m_btnOpen = null;
+            m_txtTime = null;
+            m_btnDoubleGet.Dispose();
+            m_btnDoubleGet = null;
+            m_holderOpenBtn = null;
+            m_itemReward = null;
+            m_textGetNum = null;
+            m_txtGet = null;
+            m_textShow = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}