Merge remote-tracking branch 'origin/master' into ios

# Conflicts:
#	GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes
#	GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_fui.bytes
#	GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes
#	GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes
#	GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes
#	GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes

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/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach  };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -378,7 +378,62 @@ namespace GFGEditor
             }
             return null;
         }
-            
+
+        /// <summary>
+        /// 尝试获取天堂产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetHeavenApproach(int itemId)
+        {
+            if (itemId == ConstItemID.GET_TICKETS)
+            {
+                return "HEAVEN_SMALL_GAMW";
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试获取明堂产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetOpenServerFightApproach(int itemId)
+        {
+            if (itemId == ConstItemID.PAIR_CARD)
+            {
+                return "OPEN_SERVER_FIGHT";
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试获取元宵小游戏消耗门票的产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetYuanXiaoGameConsumeApproach(int itemId)
+        {
+            if (itemId == ConstItemID.YUANXIAO_GAME_CONSUME)
+            {
+                return "ACTIVITY_GET_YUAN_XIAO_TASK";
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试获取元宵小游戏奖励的产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetYuanXiaoRewardItemApproach(int itemId)
+        {
+            if (itemId == ConstItemID.YUANXIAO_REWARD)
+            {
+                return "ACTIVITY_GET_YUAN_XIAO";
+            }
+            return null;
+        }
 
         /// <summary>
         /// 尝试获取剧情关卡产出途径

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/Editor/ToolsMenu.cs

@@ -29,7 +29,7 @@ namespace GFGEditor
         }
 
 #if PT_DEV
-        [MenuItem("外网/")]
+        [MenuItem("外网DEV/")]
         public static void VersionTag()
         {
             

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/ConstFunctionId.cs

@@ -105,5 +105,18 @@ namespace GFGGame
         ///技能书
         /// </summary>
         public const string SKILLBOOK = "SKILLBOOK";
+        /// <summary>
+        ///天堂
+        /// </summary>
+        public const string  HEAVEN_SMALL_GAMW = "HEAVEN_SMALL_GAMW";
+        /// <summary>
+        ///新年筹备
+        /// </summary>
+        public const string OPEN_SERVER_FIGHT = "OPEN_SERVER_FIGHT";
+
+        public const string ACTIVITY_GET_YUAN_XIAO_TASK = "ACTIVITY_GET_YUAN_XIAO_TASK";
+
+        public const string ACTIVITY_GET_YUAN_XIAO = "ACTIVITY_GET_YUAN_XIAO";
+
     }
 }

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

@@ -121,7 +121,10 @@ 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 GET_LEAGUE_INFO = "GET_LEAGUE_INFO";//获得联盟信息
+        public const string LEAGUE_ANSWER_INFO = "LEAGUE_ANSWER_INFO";//联盟答题信息请求
 
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT"; //领取连续返利礼包
         public const string CONTINUOUS_REBATE_GIFT_SHOP_BUY = "CONTINUOUS_REBATE_GIFT_SHOP_BUY";
@@ -221,10 +224,21 @@ 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";
+
+        //快速完成关卡
+        public const string FIGHT_QUICKLY = "FIGHT_QUICKLY";
     }
 }

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

@@ -2,6 +2,9 @@ using UnityEngine;
 using ET;
 using static GFGGame.LauncherConfig;
 using System;
+using YooAsset;
+using System.Collections;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -145,7 +148,7 @@ namespace GFGGame
 
             int skipGuide = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_SKIP_GUIDE);
 
-            if (skipGuide <= 0 && LauncherConfig.netType == EnumNetType.LOCAL)
+            if (skipGuide <= 0 && (LauncherConfig.netType == EnumNetType.LOCAL && LauncherConfig.ChannelId == (int)ChannelID.Test))
             {
                 AlertUI.Show("是否跳过引导？如果您是第一次体验，建议不要跳过引导！")
                            .SetLeftButton(true, "不用", (obj) =>
@@ -259,6 +262,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,6 +330,8 @@ namespace GFGGame
             LeagueDataManager.Instance.Clear();
             ActivityAfuGiftDataManager.Instance.Clear();
             FightDataManager.Instance.Clear();
+            MainDataManager.Instance.Clear();
+            NewYearRedEnvelopeDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
@@ -337,11 +343,12 @@ namespace GFGGame
             if(!ViewManager.isViewOpen(typeof(LoginView).FullName))
             {
                 ViewManager.Show<LoginView>(null, true);
+                GameController.CheckUpdateVersion(true);
             }
         }
 
         //断线重连后需要处理的事情
-        public static void OnReconnected()
+        public static async void OnReconnected()
         {
             //重连成功请求邮件和公告等离线后会变更的数据
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
@@ -349,6 +356,13 @@ namespace GFGGame
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
             TaskSProxy.GetTaskInfos();
+            ArenaDataManager.Instance.ReqArenaInfo();
+            if (LeagueDataManager.Instance.Type == LeagueJoinType.Join) {
+                await LeagueSproxy.ReqGetLeagueInfo();
+                LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
+                LeagueSproxy.GetTeapartyInfos().Coroutine();
+                LeagueSproxy.ReqJoinAnswer().Coroutine();
+            }
         }
 
         public static void GoBackToMainView()
@@ -373,5 +387,53 @@ namespace GFGGame
                         }
                     });
         }
+
+        public static void CheckUpdateVersion(bool force = false)
+        {
+            if (ET.TimeHelper.ClientNowSeconds() - GameGlobal.pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL || force)
+            {
+                Timers.inst.StartCoroutine(CheckVersion(VersionController.DefaultPackage, force));
+            }
+        }
+
+        private static IEnumerator CheckVersion(string packageName, bool force)
+        {
+            var package = YooAssets.GetPackage(packageName);
+            if (string.IsNullOrEmpty(GameGlobal.promotedVersion))
+            {
+                GameGlobal.promotedVersion = package.GetPackageVersion();
+            }
+            var operation = package.UpdatePackageVersionAsync();
+            yield return operation;
+
+            if (operation.Status == EOperationStatus.Succeed)
+            {
+                LogUtil.LogDev($"版本对比: {GameGlobal.promotedVersion} {operation.PackageVersion}");
+                if (!string.IsNullOrEmpty(operation.PackageVersion) 
+                    && !string.IsNullOrEmpty(operation.PackageVersion) 
+                    && !operation.PackageVersion.Equals(GameGlobal.promotedVersion))
+                {
+                    GameGlobal.promotedVersion = operation.PackageVersion;
+                    if(force)
+                    {
+                        AlertSystem.Show("游戏已有更新，请重启游戏获取最佳游戏体验。")
+                        .SetRightButton(true, "重启游戏", (obj) =>
+                        {
+                            Application.Quit();
+                        });
+                    }
+                    else
+                    {
+                        AlertSystem.Show("游戏已有更新，您可以立即重启游戏获取最佳游戏体验，也可以稍后重启更新。")
+                            .SetLeftButton(true, "稍后更新")
+                            .SetRightButton(true, "重启游戏", (obj) =>
+                            {
+                                Application.Quit();
+                            });
+                    }
+                }
+            }
+        }
+
     }
 }

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

@@ -261,7 +261,7 @@ namespace GFGGame
             LoadingView.Instance.SetDesc("正在加载数据...");
             LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
             await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
-            AlertSystem.hide();
+            AlertSystem.Hide();
             await GameController.PreEnterGameAsync();
             LogServerHelper.SendNodeLog((int)LogNode.OnEnterGame);
         }
@@ -299,8 +299,9 @@ namespace GFGGame
             await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
             EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE, NumericType.All);
             GameController.OnReconnected();
-            AlertSystem.hide();
+            AlertSystem.Hide();
             ViewManager.Hide<ModalStatusView>();
+            GameController.CheckUpdateVersion();
         }
     }
 }

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/ActivityGlobalDataManager.cs

@@ -34,7 +34,7 @@ namespace GFGGame
         }
 
         //添加活动数据
-        public void AddActivityInfo(ActivityInfoProto activityInfoProto)
+        public void AddActivityInfo(ActivityInfoProto activityInfoProto, bool dispatchEvent = true)
         {
             if (activityInfoProto == null) return;
             if (activityInfos.ContainsKey(activityInfoProto.ActivityId)) return;
@@ -53,11 +53,14 @@ namespace GFGGame
             }
             activityInfosByType[activityInfo.Type].Add(activityInfo.ActivityId);
             LogUtil.LogEditor($"AddActivityInfo {activityInfo.Type}");
-            //ACTIVITY_ADD
-            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.ActivityId);
             var remainTime = activityInfo.EndTime - TimeHelper.ServerNow();
             if (remainTime > 0)
             {
+                //ACTIVITY_ADD
+                if(dispatchEvent)
+                {
+                    EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD);
+                }
                 Timers.inst.Add(activityInfo.EndTime - TimeHelper.ServerNow(), 1, ClientRemoveActivityInfo,
                     activityInfo.ActivityId);
             }

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

@@ -14,34 +14,14 @@ namespace Assets.Game.HotUpdate.Data
         /**********************************************************新春活动*************************************************/
         public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
 
-        public bool CheckOpen()
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.TEA);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public bool CheckOpenOne(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
-
-        public long GetEndTime(int id)
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
-            return activityInfo.EndTime;
-        }
-
         public bool GetRewardRed()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearVisit))
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 return false;
             }
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-           int time = limitData.TotalPlayMax - limitData.PlayTimes;
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
 
             foreach (NpcVisitProto t in NpcInfoList)
             {
@@ -55,17 +35,84 @@ namespace Assets.Game.HotUpdate.Data
         //获取华容道可用次数
         public bool CheckHRDRed()
         {
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
+            {
+                return false;
+            }
             RoleLimitData limitData;
             limitData = RoleLimitDataManager.GetLimitData(300);
             int times = limitData.TotalPlayMax - limitData.PlayTimes;
-            if(times > 0 && ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            if(times > 0)
             {
-                return true;
+                //当有关卡没通过时
+                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 bool GetActivitySyntheticRed()
+        {
+            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] && ItemDataManager.GetItemNum(suitCfg.partsArr[i]) <= 0)
+                    return true;
+            }
+            return false;
+        }
+
+        //新年拜访任务红点
+        public bool CheckVisitTaskRed(int npcID = 0)
+        {
+            if (npcID == 0)
+            {
+                for (int i = 0; i < ActivityVisitCfgArray.Instance.dataArray.Length; i++)
+                {
+                    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,41 @@ 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.Count == _roleData.itemList.Count)
+                {
+                    score = arreProto.SuitScore[i];
+                }
+                _roleData.itemScoreList.Add(score);
+                _roleData.itemScoreDic[_roleData.itemList[i]] = score;
+            }
+        }
     }
 }

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

@@ -48,7 +48,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    ItemData itemData = ItemUtil.createItemData(dropOutCfgs[i].item, dropOutCfgs[i].maxNum);// GetDropItemData(dropId, doRandome);
+                    ItemData itemData = ItemUtil.createItemData(dropOutCfgs[i].item, dropOutCfgs[i].maxNum, dropOutCfgs[i].minNum);// GetDropItemData(dropId, doRandome);
                     if (dropOutCfgs[i].item > 0 && itemData != null)
                     {
                         result.Add(itemData);

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

@@ -103,13 +103,31 @@ namespace GFGGame
                 _friendDic[roleId].takeGiftState = takeState;
             }
         }
+
         public void UpdateFriendList(bool sort)
         {
             // _list = _friendDic.Values.ToList<FriendInfoData>();
             if (!sort) return;
+            // 按照时间戳大->小排序，时间戳为0的（在线）置顶
             _list.Sort((long a, long b) =>
             {
-                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[a].roleInfo.offlineTimeSec;
+                if(_friendDic[a].roleInfo.offlineTimeSec == 0 
+                && _friendDic[b].roleInfo.offlineTimeSec == 0)
+                {
+                    return 0;
+                }
+
+                if(_friendDic[a].roleInfo.offlineTimeSec == 0)
+                {
+                    return -1;
+                }
+
+                if (_friendDic[b].roleInfo.offlineTimeSec == 0)
+                {
+                    return 1;
+                }
+
+                long count = _friendDic[a].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
                 if (count > 0)
                 {
                     return -1;

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

@@ -213,6 +213,7 @@ namespace GFGGame
                 if (_dataDic.TryGetValue(info.ConfigId, out var itemData))
                 {
                     itemData.SetAttributes(info.Ks, info.Vs);
+                    relativeSuitPerPromote(info.ConfigId,0,0,info.Ks, info.Vs);
                 }
             }
         }
@@ -244,6 +245,7 @@ namespace GFGGame
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {
                 itemData.SetAttribute(key, value);
+                relativeSuitPerPromote(itemId, key, value);
             }
         }
 
@@ -283,23 +285,51 @@ namespace GFGGame
         /// <returns></returns>
         public static int GetItemAdditionScore(int itemId, int scoreType, string[] tags = null)
         {
-            //这里计算应该用总的物品表,因为自己没有所有物品
-            ItemCfg itemdate = ItemCfgArray.Instance.GetCfg(itemId);
-            ItemData itemDate = new ItemData() { };
-            if (itemdate != null)
+            if (_dataDic.TryGetValue(itemId, out var itemData))
             {
-                itemDate.id = itemdate.id;
                 int scroe = 0;
                 if (tags != null)
                 {
                     scroe += GetItemTagScore(itemId, tags);
                 }
-                scroe += itemDate.GetScore(scoreType);
+                scroe += itemData.GetScore(scoreType);
                 return scroe;
             }
             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>
@@ -382,5 +412,31 @@ namespace GFGGame
 
             return isExistGiftBag;
         }
+
+        /// <summary>
+        /// 相对应的染色套装也需要乘以(服装升级)相应提升百分比
+        /// </summary>
+        /// <returns></returns>
+        public static void relativeSuitPerPromote(int itemId, int keyInt = 0, int valueInt = 0, List<int> keyList = null, List<int> valueList = null)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(itemCfg.suitId);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fosterCfgs[0].suitId2);
+            for (int i = 0; i < suitCfg.partsArr.Length; i++)
+            {
+                ItemCfg itemPartCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
+                if (itemPartCfg.subType == itemCfg.subType)
+                {
+                    if (_dataDic.TryGetValue(itemPartCfg.id, out var itemPartData))
+                    {
+                        if(keyInt > 0)
+                            itemPartData.SetAttribute(keyInt, valueInt);
+                        else if (keyList.Count > 0)
+                            itemPartData.SetAttributes(keyList, valueList);
+                    }
+                    break;
+                }
+            }
+        }
     }
 }

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/MainDataManager.cs

@@ -3,6 +3,12 @@ namespace GFGGame
     public class MainDataManager : SingletonBase<MainDataManager>
     {
         private int _viewType = 0;
+
+        public void Clear()
+        {
+            _needUpdateProxyData = true;
+        }
+
         /// <summary>
         /// 界面类型，0：主界面，1：二级界面
         /// </summary>
@@ -33,5 +39,18 @@ namespace GFGGame
                 _canSwipe = value;
             }
         }
+
+        private bool _needUpdateProxyData = true;
+        public bool needUpdateProxyData
+        {
+            get
+            {
+                return _needUpdateProxyData;
+            }
+            set
+            {
+                _needUpdateProxyData = value;
+            }
+        }
     }
 }

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 = -1;  //红包领取状态,默认值设置为-1,方便初始隐藏按钮
+        public static int ItemId = 0;  //红包奖励物品
+        public static long ItemNum = 0;  //奖励数量（单倍）
+
+        public void Clear()
+        {
+            Status = -1;//红包领取状态,默认值设置为-1,方便初始隐藏按钮
+            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/FairyGUI/GenCode/poem/UI_Button7.cs.meta → GameClient/Assets/Game/HotUpdate/Data/NewYearRedEnvelopeDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5580fab9c66fa04439feef5e49193383
+guid: 01c18af169f1161428dd30a3f59e22e3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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;
@@ -1035,6 +1068,12 @@ namespace GFGGame
             return ActivityWanShiLiDataManager.Instance.CanGetReward();
         }
 
+        public bool GetActivityYuanXiaoRed()
+        {
+            return ActivityGetYuanXiaoDataManager.Instance.HaveNewLevelCanPlay()
+            || ActivityGetYuanXiaoDataManager.Instance.ShowTaskRedDots(TaskFuncType.YuanXiaoActivity);
+        }
+
         /// <summary>
         /// 摘星免费抽奖
         /// </summary>

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);
             }
@@ -386,5 +387,39 @@ namespace GFGGame
             mainBgID = bgID;
             RoleInfoSProxy.ReqSaveMainBgID(bgID);
         }
+
+        public static void UpdatePhotoData()
+        {
+            List<long> numArr = new List<long>();
+            // 提取有数据的位置
+            for (int i = 0; i < RoleDataManager.photoDatas.Count; i++)
+            {
+                if (RoleDataManager.photoDatas[i] > 0)
+                {
+                    numArr.Add(RoleDataManager.photoDatas[i]);
+                }
+            }
+
+            // 找到可用空位赋值
+            int index = 0;
+            for (int i = 0; i < photoDatas.Count; i++)
+            {
+                if (RoleInfoManager.GetPosType(i) == MonthCardType.Gold && !CheckIsMonthCardOpenByType(MonthCardType.Gold)
+|| RoleInfoManager.GetPosType(i) == MonthCardType.BlackGold && !CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+                {
+                    photoDatas[i] = -1;
+                    continue;
+                }
+
+                if (index < numArr.Count)
+                {
+                    photoDatas[i] = numArr[index++];
+                }
+                else
+                {
+                    photoDatas[i] = 0;
+                }
+            }
+        }
     }
 }

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;
@@ -180,7 +185,7 @@ namespace GFGGame
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
-                return ArenaDataManager.Instance.Grade >= lockValue;
+                return ArenaDataManager.Instance.HighestGrade >= lockValue;
             }
             return true;
         }
@@ -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,8 +114,8 @@ namespace GFGGame
                     }
                     else//道具
                     {
-                        ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
-                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
+                        ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.CostIdReal);
+                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costItemCfg);
                         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/Data/VO/ItemData.cs

@@ -6,6 +6,7 @@ namespace GFGGame
     {
         public int id;
         public long num;
+        public long numRandomeMin;
         public bool isOnceBonus;
         public int itemType;
         public int subType;

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

@@ -294,13 +294,13 @@ namespace GFGGame
                 else
                 {
                     DressUpUtil.AddSpriteObj(this.resPath, spritObjName, parentObj, sortingOrder, needSetMask);
-                    if (removeBodyAni)
-                    {
-                        parentObj.transform.localPosition = Vector3.zero;
-                        parentObj.transform.localRotation = Quaternion.identity;
-                    }
                 }
             }
+            if(!this.showAni && removeBodyAni)
+            {
+                parentObj.transform.localPosition = Vector3.zero;
+                parentObj.transform.localRotation = Quaternion.identity;
+            }
             if (!string.IsNullOrEmpty(effectResPath))
             {
                 DressUpUtil.TryAddEffectObj(effectResPath, effectObjName, parentObj, sortingOrder);

GameClient/Assets/Game/HotUpdate/DressUp/DressUpBodyOffsetInfo.cs → GameClient/Assets/Game/HotUpdate/DressUp/DressUpOffsetInfo.cs

@@ -2,7 +2,7 @@
 
 namespace GFGGame
 {
-    public class DressUpBodyOffsetInfo : MonoBehaviour
+    public class DressUpOffsetInfo : MonoBehaviour
     {
         public Vector3 OffsetPosition;
         public Quaternion Rotation;

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

@@ -226,10 +226,6 @@ namespace GFGGame
                 }
 
             }
-            if (!string.IsNullOrEmpty(resPath) && !YooAssets.CheckResExist(resPath))
-            {
-                return null;
-            }
             DressUpLayerOperation handler = new DressUpLayerOperation(parentObj, needSetMask, showAni, resPath, effectResPath);
             handler.InitBody();
             handler.Begin();
@@ -339,16 +335,16 @@ namespace GFGGame
             }
             if (objName == BODY_ANIMATION_NAME)
             {
-                DressUpBodyOffsetInfo dressUpBodyOffsetInfo = gameObj.GetComponent<DressUpBodyOffsetInfo>();
-                if(dressUpBodyOffsetInfo == null)
+                DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
+                if(dressUpOffsetInfo == null)
                 {
-                    dressUpBodyOffsetInfo = gameObj.AddComponent<DressUpBodyOffsetInfo>();
-                    dressUpBodyOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
-                    dressUpBodyOffsetInfo.Rotation = gameObj.transform.localRotation;
+                    dressUpOffsetInfo = gameObj.AddComponent<DressUpOffsetInfo>();
+                    dressUpOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
+                    dressUpOffsetInfo.Rotation = gameObj.transform.localRotation;
                 }
                 //如果是动作动画，就根据动画位置及角度信息设置给Role对象
-                parentObj.transform.localPosition = dressUpBodyOffsetInfo.OffsetPosition;
-                parentObj.transform.rotation = dressUpBodyOffsetInfo.Rotation;
+                parentObj.transform.localPosition = dressUpOffsetInfo.OffsetPosition;
+                parentObj.transform.rotation = dressUpOffsetInfo.Rotation;
                 //.SetPositionAndRotation(Vector3.zero, Quaternion.identity); 
             }
             gameObj.transform.localPosition = Vector3.zero;
@@ -384,6 +380,16 @@ namespace GFGGame
             {
                 return null;
             }
+
+            DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
+            if (dressUpOffsetInfo == null)
+            {
+                dressUpOffsetInfo = gameObj.AddComponent<DressUpOffsetInfo>();
+                dressUpOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
+                dressUpOffsetInfo.Rotation = gameObj.transform.localRotation;
+            }
+            gameObj.transform.localPosition = dressUpOffsetInfo.OffsetPosition;
+            gameObj.transform.rotation = dressUpOffsetInfo.Rotation;
             gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
             var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();

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

@@ -12,7 +12,6 @@ namespace UI.ActivityAfternoonTea
         public UI_CompDialogText m_DialogText;
         public GLoader m_nextChatBtn;
         public GButton m_btnBack;
-        public GTextField m_name;
         public GTextField m_titleIcon;
         public UI_Component2 m_taskIcon;
         public GLoader m_listBg;
@@ -70,7 +69,6 @@ namespace UI.ActivityAfternoonTea
             m_DialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("DialogText"));
             m_nextChatBtn = (GLoader)comp.GetChild("nextChatBtn");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_name = (GTextField)comp.GetChild("name");
             m_titleIcon = (GTextField)comp.GetChild("titleIcon");
             m_taskIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("taskIcon"));
             m_listBg = (GLoader)comp.GetChild("listBg");
@@ -85,7 +83,6 @@ namespace UI.ActivityAfternoonTea
             m_DialogText = null;
             m_nextChatBtn = null;
             m_btnBack = null;
-            m_name = null;
             m_titleIcon = null;
             m_taskIcon.Dispose();
             m_taskIcon = 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,119 @@
+/** 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 GGraph m_doubaoEffect;
+        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 GTextField m_txtTime;
+        public Transition m_t0;
+        public Transition m_listShow;
+        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_doubaoEffect = (GGraph)comp.GetChild("doubaoEffect");
+            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_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_t0 = comp.GetTransition("t0");
+            m_listShow = comp.GetTransition("listShow");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_leafEffect = null;
+            m_yuanXiaoEffect = null;
+            m_doubaoEffect = null;
+            m_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_txtTime = null;
+            m_t0 = null;
+            m_listShow = 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,127 @@
+/** 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 GGraph m_startLeft;
+        public GGraph m_startRight;
+        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");
+            m_startLeft = (GGraph)comp.GetChild("startLeft");
+            m_startRight = (GGraph)comp.GetChild("startRight");
+        }
+        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;
+            m_startLeft = null;
+            m_startRight = 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,89 @@
+/** 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 Controller m_c2;
+        public GButton m_btnGet;
+        public GTextField m_desc;
+        public GList m_rewardList;
+        public GButton m_btnGo;
+        public GTextField m_txtCount;
+        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_c2 = comp.GetController("c2");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_btnGet = null;
+            m_desc = null;
+            m_rewardList = null;
+            m_btnGo = null;
+            m_txtCount = 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/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -9,6 +9,7 @@ namespace UI.ClothingDecompose
         public GComponent target;
         public Controller m_c1;
         public Controller m_TouchSelect;
+        public Controller m_clothesType;
         public GLoader m_bg;
         public GLoader m_Top_img;
         public UI_Button6 m_btnClothing;
@@ -25,6 +26,7 @@ namespace UI.ClothingDecompose
         public GTextField m_txtConsume;
         public GTextField m_txtTips;
         public GButton m_btnSelect;
+        public GTextField m_txtGetRewardTips;
         public const string URL = "ui://h9mv1l71wlc20";
         public const string PACKAGE_NAME = "ClothingDecompose";
         public const string RES_NAME = "ClothingDecomposeUI";
@@ -74,6 +76,7 @@ namespace UI.ClothingDecompose
         {
             m_c1 = comp.GetController("c1");
             m_TouchSelect = comp.GetController("TouchSelect");
+            m_clothesType = comp.GetController("clothesType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnClothing = (UI_Button6)UI_Button6.Create(comp.GetChild("btnClothing"));
@@ -90,11 +93,13 @@ namespace UI.ClothingDecompose
             m_txtConsume = (GTextField)comp.GetChild("txtConsume");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnSelect = (GButton)comp.GetChild("btnSelect");
+            m_txtGetRewardTips = (GTextField)comp.GetChild("txtGetRewardTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_TouchSelect = null;
+            m_clothesType = null;
             m_bg = null;
             m_Top_img = null;
             m_btnClothing.Dispose();
@@ -113,6 +118,7 @@ namespace UI.ClothingDecompose
             m_txtConsume = null;
             m_txtTips = null;
             m_btnSelect = null;
+            m_txtGetRewardTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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/CommonGame/UI_GetSuitItemUI.cs

@@ -11,6 +11,7 @@ namespace UI.CommonGame
         public GGraph m_holderEffect;
         public GGraph m_holder;
         public GTextField m_txtName;
+        public GLoader m_icon;
         public GComponent m_item;
         public const string URL = "ui://eg2y0ldptu965e";
         public const string PACKAGE_NAME = "CommonGame";
@@ -63,6 +64,7 @@ namespace UI.CommonGame
             m_holderEffect = (GGraph)comp.GetChild("holderEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_item = (GComponent)comp.GetChild("item");
         }
         public void Dispose(bool disposeTarget = false)
@@ -71,6 +73,7 @@ namespace UI.CommonGame
             m_holderEffect = null;
             m_holder = null;
             m_txtName = null;
+            m_icon = null;
             m_item = null;
             if(disposeTarget && target != 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_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_txtTime;
         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_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.Friend
             m_txtName = null;
             m_btnSend = null;
             m_loaState = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ComboBox1_popup.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ComboBox1_popup.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_LoginInputUI.cs

@@ -13,6 +13,7 @@ namespace UI.Login
         public GTextInput m_inputPassword;
         public GButton m_btnCancel;
         public GButton m_btnSure;
+        public GComboBox m_boxChooseCanal;
         public const string URL = "ui://myoktu7pq08xc";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginInputUI";
@@ -66,6 +67,7 @@ namespace UI.Login
             m_inputPassword = (GTextInput)comp.GetChild("inputPassword");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_boxChooseCanal = (GComboBox)comp.GetChild("boxChooseCanal");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.Login
             m_inputPassword = null;
             m_btnCancel = null;
             m_btnSure = null;
+            m_boxChooseCanal = 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,10 +13,10 @@ 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;
@@ -77,10 +77,10 @@ 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"));
@@ -98,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;

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,21 +24,23 @@ 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;
         public UI_BtnModle m_btnFirstRecharge;
         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_ButtonModle1 m_btnZhaiXing;
+        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 GGroup m_AllUI;
         public GGraph m_touchMask;
         public Transition m_openViewAction;
@@ -108,21 +110,23 @@ 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"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
-            m_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_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            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_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();
@@ -166,14 +172,12 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             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_btnZhaiXing.Dispose();
+            m_btnZhaiXing = null;
+            m_btnMain.Dispose();
+            m_btnMain = null;
             m_btnCiPai.Dispose();
             m_btnCiPai = null;
             m_btnXiuFang.Dispose();
@@ -182,8 +186,12 @@ 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_AllUI = null;
             m_touchMask = null;
             m_openViewAction = null;

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

@@ -12,8 +12,9 @@ namespace UI.MiniGame
         public UI_Component2 m_rewardBtn;
         public GLoader m_shopBtn;
         public GLoader m_ticket;
-        public GLoader m_addIcon;
+        public GLoader m_addIconImg;
         public GTextField m_ticketNum;
+        public GLoader m_addIcon;
         public GLoader m_game1;
         public GGraph m_effectIcon1;
         public GGraph m_effectText1;
@@ -78,8 +79,9 @@ namespace UI.MiniGame
             m_rewardBtn = (UI_Component2)UI_Component2.Create(comp.GetChild("rewardBtn"));
             m_shopBtn = (GLoader)comp.GetChild("shopBtn");
             m_ticket = (GLoader)comp.GetChild("ticket");
-            m_addIcon = (GLoader)comp.GetChild("addIcon");
+            m_addIconImg = (GLoader)comp.GetChild("addIconImg");
             m_ticketNum = (GTextField)comp.GetChild("ticketNum");
+            m_addIcon = (GLoader)comp.GetChild("addIcon");
             m_game1 = (GLoader)comp.GetChild("game1");
             m_effectIcon1 = (GGraph)comp.GetChild("effectIcon1");
             m_effectText1 = (GGraph)comp.GetChild("effectText1");
@@ -101,8 +103,9 @@ namespace UI.MiniGame
             m_rewardBtn = null;
             m_shopBtn = null;
             m_ticket = null;
-            m_addIcon = null;
+            m_addIconImg = null;
             m_ticketNum = null;
+            m_addIcon = null;
             m_game1 = null;
             m_effectIcon1 = null;
             m_effectText1 = 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/MiniGame/UI_TZFEGameView.cs

@@ -9,6 +9,7 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_bg;
         public GList m_numList;
+        public GGraph m_mask;
         public GLoader m_backBtn;
         public GTextField m_score;
         public GGraph m_effectTitle;
@@ -69,6 +70,7 @@ namespace UI.MiniGame
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_numList = (GList)comp.GetChild("numList");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_score = (GTextField)comp.GetChild("score");
             m_effectTitle = (GGraph)comp.GetChild("effectTitle");
@@ -85,6 +87,7 @@ namespace UI.MiniGame
         {
             m_bg = null;
             m_numList = null;
+            m_mask = null;
             m_backBtn = null;
             m_score = null;
             m_effectTitle = 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;
+        }
+    }
+}