Merge branch 'master' of http://10.108.64.190:3000/gfg/client into dev

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -167,6 +167,10 @@ namespace GFGEditor
         public static string MiniGameMergeTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/MergeGame/";
         public static string MiniGameMergeMd5FileSaveName = "MiniGameMergeMd5";
 
+        public static string[] LuckyBoxTitleImgPaths { get { return new string[] { ResRootPath + "UI/LuckyBoxTitleImg/" }; } }
+        public static string LuckyBoxTitleImgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/LuckyBoxTitleImg/";
+        public static string LuckyBoxTitleImgMd5FileSaveName = "LuckyBoxTitleImgMd5";
+
         public static void Test()
         {
             ImportClip(NpcFaceSrcPaths, NpcFaceTargetPath, NpcFacepMd5FileSaveName);
@@ -304,6 +308,10 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
             ImportRes(MiniGameMergePaths, MiniGameMergeTargetPath, MiniGameMergeMd5FileSaveName);
 
+            //摘星标题资源
+            EditorUtility.DisplayProgressBar("进度", "正在导入摘星标题资源", 1);
+            ImportRes(LuckyBoxTitleImgPaths, LuckyBoxTitleImgTargetPath, LuckyBoxTitleImgMd5FileSaveName);
+
             EditorUtility.ClearProgressBar();
             AssetDatabase.Refresh();
             Debug.LogWarning("导入美术资源成功!");

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,GetHeavenApproach ,GetOpenServerFightApproach };
+            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>>();
@@ -408,6 +408,34 @@ namespace GFGEditor
         }
 
         /// <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>
         /// 尝试获取剧情关卡产出途径
         /// </summary>
         /// <param name="itemId"></param>

GameClient/Assets/Editor/ToolsMenu.cs

@@ -296,6 +296,9 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LuckyBoxTitleImgTargetPath, new string[] { ImportArtResTool.LuckyBoxTitleImgMd5FileSaveName });
+
+            
             DeleteFileHelper.TrySvnRemoveDeleteFile();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/HotUpdate/Assets/PreloadManager.cs → GameClient/Assets/Game/HotUpdate/Assets/PreDownloadManager.cs

@@ -11,7 +11,8 @@ namespace GFGGame
         Both
     }
 
-    public class PreloadManager : SingletonMonoBase<PreloadManager>
+    //负责提供获得卡牌和衣服部件时开启后台预下载的接口
+    public class PreDownloadManager : SingletonMonoBase<PreDownloadManager>
     {
         private List<string> waitList = new List<string>();
         private ResourceDownloaderOperation downloaderOperation;
@@ -32,7 +33,7 @@ namespace GFGGame
         /// <param name="resType">可以选择预加载静态图或者动画或者全部</param>
         /// <param name="excludeType">排除一些类型，由ConstDressUpItemType定义</param>
         /// <param name="includeOptional">是否包含可选部件</param>
-        public void PreloadSuitRes(int suitId, ResType resType, int[] excludeType, bool includeOptional)
+        public void PreDownloadSuitRes(int suitId, ResType resType, int[] excludeType, bool includeOptional)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             if (suitCfg == null)
@@ -43,61 +44,61 @@ namespace GFGGame
             List<int> targetItemList = DressUpUtil.GetSuitItems(suitId, resType != ResType.Sprite, excludeType, includeOptional, false);
             foreach (var itemId in targetItemList)
             {
-                PreloadDressUpRes(itemId, resType);
+                PreDownloadDressUpRes(itemId, resType);
             }
             if (resType != ResType.Sprite)
             {
                 if (!string.IsNullOrEmpty(suitCfg.aniRes))
                 {
                     string assetPath = ResPathUtil.GetDressUpAnimationPath(suitCfg.aniRes);
-                    PreloadManager.Instance.TryAdd(assetPath);
+                    PreDownloadManager.Instance.TryAdd(assetPath);
                     assetPath = ResPathUtil.GetDressUpEffectPath(suitCfg.aniRes, true);
-                    PreloadManager.Instance.TryAdd(assetPath);
+                    PreDownloadManager.Instance.TryAdd(assetPath);
                 }
             }
         }
 
-        public void PreloadDressUpRes(int itemId, ResType resType = ResType.Sprite)
+        public void PreDownloadDressUpRes(int itemId, ResType resType = ResType.Sprite)
         {
             ItemCfg dressUpCfg = ItemCfgArray.Instance.GetCfg(itemId);
             string assetPath;
             if (resType != ResType.Animation)
             {
                 assetPath = ResPathUtil.GetDressUpLayerSpriteResPath(dressUpCfg, 1);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerSpriteResPath(dressUpCfg, 2);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerSpriteResPath(dressUpCfg, 3);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, false);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, false);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, false);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
             }
             if (resType != ResType.Sprite)
             {
                 assetPath = ResPathUtil.GetDressUpLayerAnimationResPath(dressUpCfg, 1);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerAnimationResPath(dressUpCfg, 2);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerAnimationResPath(dressUpCfg, 3);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 1, true);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 2, true);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
                 assetPath = ResPathUtil.GetDressUpLayerEffectResPath(dressUpCfg, 3, true);
-                PreloadManager.Instance.TryAdd(assetPath);
+                PreDownloadManager.Instance.TryAdd(assetPath);
             }
         }
 
-        public void PreloadCardAnimationRes(int itemId)
+        public void PreDownloadCardAnimationRes(int itemId)
         {
             ItemCfg cardCfg = ItemCfgArray.Instance.GetCfg(itemId);
             string assetPath = ResPathUtil.GetCardAnimationPath(cardCfg.res);
-            PreloadManager.Instance.TryAdd(assetPath);
+            PreDownloadManager.Instance.TryAdd(assetPath);
         }
 
         private void Update()

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

@@ -113,5 +113,10 @@ namespace GFGGame
         ///新年筹备
         /// </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

@@ -83,6 +83,7 @@ namespace GFGGame
 
         public const string FINSH_GUIDE_INDEX = "FINSH_GUIDE_INDEX"; //完成一步引导
         public const string RED_CHANGE = "RED_CHANGE"; //红点变化，新增或删除
+        public const string ACTIVITY_RED_CHANGE = "ACTIVITY_RED_CHANGE"; //红点变化，新增或删除
 
         public const string FRIEND_REFRESH = "FRIEND_REFRESH"; //刷新好友列表
         public const string FRIEND_ADD = "FRIEND_ADD"; //新增好友
@@ -123,6 +124,8 @@ namespace GFGGame
         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";
@@ -238,5 +241,10 @@ namespace GFGGame
 
         //快速完成关卡
         public const string FIGHT_QUICKLY = "FIGHT_QUICKLY";
+
+        //时光回溯副本更新
+        public const string TIMETRACINGUPDATE = "TIMETRACING_UPDATE";
+        //时光回溯红点更新
+        public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
     }
 }

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

@@ -148,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) =>
@@ -246,6 +246,10 @@ namespace GFGGame
             ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
+            TimeTracingDataManager.Instance.InitRewardDic();
+            TimeTracingSProxy.ReqGetLevelRewardStatus().Coroutine();
+            TimeTracingSProxy.ReqGetSuitRewardStatus().Coroutine();
+            TimeTracingSProxy.ReqGetDataRecord().Coroutine();
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
@@ -330,6 +334,7 @@ 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();
@@ -342,11 +347,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();
@@ -354,6 +360,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()
@@ -379,33 +392,49 @@ namespace GFGGame
                     });
         }
 
-        public static void CheckUpdateVersion()
+        public static void CheckUpdateVersion(bool force = false)
         {
-            if (ET.TimeHelper.ClientNowSeconds() - GameGlobal.pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            if (ET.TimeHelper.ClientNowSeconds() - GameGlobal.pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL || force)
             {
-                Timers.inst.StartCoroutine(CheckVersion(VersionController.DefaultPackage));
+                Timers.inst.StartCoroutine(CheckVersion(VersionController.DefaultPackage, force));
             }
         }
 
-        private static IEnumerator CheckVersion(string packageName)
+        private static IEnumerator CheckVersion(string packageName, bool force)
         {
             var package = YooAssets.GetPackage(packageName);
-            string oldVersion = package.GetPackageVersion();
+            if (string.IsNullOrEmpty(GameGlobal.promotedVersion))
+            {
+                GameGlobal.promotedVersion = package.GetPackageVersion();
+            }
             var operation = package.UpdatePackageVersionAsync();
             yield return operation;
 
             if (operation.Status == EOperationStatus.Succeed)
             {
-                VersionController.Instance.PackageVersion = operation.PackageVersion;
-                LogUtil.LogDev($"版本对比: {oldVersion} {operation.PackageVersion}");
-                if (!operation.PackageVersion.Equals(oldVersion))
+                LogUtil.LogDev($"版本对比: {GameGlobal.promotedVersion} {operation.PackageVersion}");
+                if (!string.IsNullOrEmpty(operation.PackageVersion) 
+                    && !string.IsNullOrEmpty(operation.PackageVersion) 
+                    && !operation.PackageVersion.Equals(GameGlobal.promotedVersion))
                 {
-                    AlertSystem.Show("游戏已有更新，您可以立即重启游戏获取最佳游戏体验，也可以稍后重启更新。")
-                        .SetLeftButton(true, "稍后更新")
+                    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

@@ -12,10 +12,10 @@ namespace GFGGame
             ViewManager.Show<LoginView>();
         }
 
-        public static async ET.ETTask LoginTest(string account)
+        public static async ET.ETTask LoginTest(string account, bool cancelDelete = false)
         {
             ViewManager.Show<ModalStatusView>("登录中...");
-            int errorCode = await ET.LoginHelper.LoginTest(GameGlobal.zoneScene, GameConfig.LoginAddress, account);
+            (int errorCode, long deleteTime) = await ET.LoginHelper.LoginTest(GameGlobal.zoneScene, GameConfig.LoginAddress, account, cancelDelete);
 
             if (errorCode == ET.ErrorCode.ERR_Success)
             {
@@ -42,15 +42,15 @@ namespace GFGGame
             }
             else
             {
-                OnLoginFail(errorCode, account);
+                OnLoginFail(errorCode, account, deleteTime, null, false);
             }
         }
 
 
-        public static async ET.ETTask Login(string account, string password, bool isMD5 = false)
+        public static async ET.ETTask Login(string account, string password, bool isMD5 = false, bool cancelDelete = false)
         {
             ViewManager.Show<ModalStatusView>("登录中...");
-            int errorCode = await ET.LoginHelper.Login(GameGlobal.zoneScene, GameConfig.LoginAddress, account, password, isMD5);
+            (int errorCode, long deleteTime) = await ET.LoginHelper.Login(GameGlobal.zoneScene, GameConfig.LoginAddress, account, password, isMD5, cancelDelete);
 
             if (errorCode == ET.ErrorCode.ERR_Success)
             {
@@ -82,7 +82,7 @@ namespace GFGGame
             }
             else
             {
-                OnLoginFail(errorCode, account);
+                OnLoginFail(errorCode, account, deleteTime, password, isMD5);
             }
         }
 
@@ -101,6 +101,38 @@ namespace GFGGame
 
             ViewManager.Hide<ModalStatusView>();
         }
+        private static void OnLoginFail(int errorCode, string account, long deleteTime, string password, bool isMD5)
+        {
+            ViewManager.Hide<ModalStatusView>();
+            if(errorCode == ErrorCode.ERR_LoginIsLimit && deleteTime > 0)
+            {
+                //删除账号提示
+                AlertSystem.Show("账号注销处理中，若确定登录将取消账号注销，是否确定登录游戏？")
+                    .SetLeftButton(true, "取消", (o)=>
+                    {
+                        GameController.QuitToLoginView(true);
+                        EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
+                    })
+                    .SetRightButton(true, "确定", (o)=>
+                    {
+                        if(string.IsNullOrEmpty(password))
+                        {
+                            LoginTest(account, true).Coroutine();
+                        }
+                        else
+                        {
+                            Login(account, password, isMD5, true).Coroutine();
+                        }
+                    });
+                return;
+            }
+            if (ErrorCodeController.Handler(errorCode))
+            {
+                GameController.QuitToLoginView(true);
+            }
+            EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
+        }
+
         private static async ETTask ReqNoticeInfo()
         {
             int result = await LoginHelper.ReqGetLatestNotice();
@@ -124,16 +156,6 @@ namespace GFGGame
             return;
         }
 
-        private static void OnLoginFail(int errorCode, string account)
-        {
-            ViewManager.Hide<ModalStatusView>();
-            if (ErrorCodeController.Handler(errorCode))
-            {
-                GameController.QuitToLoginView(true);
-            }
-            EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
-        }
-
         public static async ETTask Register(string account, string password, string name, string identityNum, string code)
         {
             ViewManager.Show<ModalStatusView>("注册中...");

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

@@ -16,7 +16,7 @@ namespace GFGGame
             }
             comRedDotPool.Clear();
         }
-        public void SetComRedDot(GComponent parentCom, bool isRed, string res = "", int left = 0, int top = 0)
+        public void SetComRedDot(GComponent parentCom, bool isRed, string res = "", int left = 0, int top = 0, bool dispatchEvent = true)
         {
             GComponent comRedDot;
 
@@ -47,7 +47,11 @@ namespace GFGGame
                 string path = ResPathUtil.GetCommonGameResPath(res == "" ? "zx_hogndian" : res);
                 GLoader loaIcon = comRedDot.GetChild("loaIcon").asLoader;
                 loaIcon.url = path;
-                EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+
+                if (dispatchEvent)
+                {
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                }
             }
             else
             {
@@ -56,7 +60,10 @@ namespace GFGGame
                     comRedDot = parentCom.GetChild("comResDot").asCom;
                     comRedDotPool.Add(comRedDot);
                     parentCom.RemoveChild(comRedDot);
-                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                    if (dispatchEvent)
+                    {
+                        EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                    }
 
                 }
             }

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

@@ -29,15 +29,8 @@ namespace GFGGame
         /// <returns></returns>
         public int GetCurOpenActiveByType(int type)
         {
-            List<ActivityOpenCfg> activityOpenCfgs = ActivityOpenCfgArray.Instance.GetCfgsBytype(type);
-            for (int i = 0; i < activityOpenCfgs.Count; i++)
-            {
-                if (TimeUtil.IsBeforeCurTime(activityOpenCfgs[i].openTime) && TimeUtil.IsLaterCurTime(activityOpenCfgs[i].endTime))
-                {
-                    return activityOpenCfgs[i].id;
-                }
-            }
-            return 0;
+            ActivityInfo info = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(type);
+            return (info == null) ? 0 : info.ActivityId;
         }
         /**********************************************************活动弹窗*************************************************/
         public int todayActivityTips = 0;

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

@@ -0,0 +1,47 @@
+using ET;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ActivityFYJYDataManager:SingletonBase<ActivityFYJYDataManager>
+    {
+        public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
+
+        public bool CheckOpen()
+        {
+            return (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) > 0);
+        }
+
+        public bool CheckRed()
+        {
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) == 0)
+            {
+                return false;
+            }
+            RoleLimitData limitData;
+            limitData = RoleLimitDataManager.GetLimitData(300);
+            int times = limitData.TotalPlayMax - limitData.PlayTimes;
+            if (times > 0)
+            {
+                //当有关卡没通过时
+                for (int i = 0; i < gameinfoList.Count; i++)
+                {
+                    if (gameinfoList[i].GameType == 3)
+                    {
+                        if (!gameinfoList[i].IsCleared)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs.meta → GameClient/Assets/Game/HotUpdate/Data/ActivityFYJYDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 354aba8614c5deb489b7100d9fe72d4f
+guid: 449b8608052a06643955664ef23ffb43
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -77,7 +77,7 @@ namespace Assets.Game.HotUpdate.Data
             {
                 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])
+                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;

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

@@ -548,10 +548,11 @@ namespace GFGGame
         {
             _roleData.itemScoreList.Clear();
             _roleData.itemScoreDic.Clear();
+
             for (int i = 0; i < _roleData.itemList.Count; i++)
             {
                 int score = GetItemAdditionScore(_roleData.itemList[i], _roleData.scoreType);
-                if(arreProto != null && arreProto.SuitScore[i] != 0)
+                if(arreProto != null && arreProto.SuitScore.Count == _roleData.itemList.Count)
                 {
                     score = arreProto.SuitScore[i];
                 }

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

@@ -32,7 +32,7 @@ namespace GFGGame
 
 
 
-        public static void Add(CardInfoProto cardInfoProto)
+        public static void Add(CardInfoProto cardInfoProto, bool fromeList = false)
         {
             CardData cardData = new CardData();
 
@@ -64,9 +64,9 @@ namespace GFGGame
             }
             _cardDicByType[0][cardData.id] = cardData;
             _cardDicByType[cardData.mainScore][cardData.id] = cardData;
-            if(GameGlobal.AfterDataInited)
+            if(GameGlobal.AfterDataInited && !fromeList)
             {
-                PreloadManager.Instance.PreloadCardAnimationRes(cardData.id);
+                PreDownloadManager.Instance.PreDownloadCardAnimationRes(cardData.id);
             }
         }
 

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

@@ -25,6 +25,12 @@ namespace GFGGame
                 {
                     PrivateChatDatas[type] = new List<ChatData>();
                 }
+                PrivateChatDatas[(int)type].Sort((ChatData a, ChatData b) =>
+                {
+                    if (a.Time < b.Time)
+                        return -1;
+                    return 1;
+                });
                 return PrivateChatDatas[type];
             }
             else
@@ -33,6 +39,12 @@ namespace GFGGame
                 {
                     ChatDatas[(int)type] = new List<ChatData>();
                 }
+                ChatDatas[(int)type].Sort((ChatData a, ChatData b) =>
+                {
+                    if (a.Time < b.Time)
+                        return -1;
+                    return 1;
+                });
                 return ChatDatas[(int)type];
             }
         }

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

@@ -82,7 +82,7 @@ namespace GFGGame
                 {
                     AddNewDressItem(value);
                     DressUpMenuSuitDataManager.CheckItemInSuit(value);
-                    PreloadManager.Instance.PreloadDressUpRes(value, ResType.Both);
+                    PreDownloadManager.Instance.PreDownloadDressUpRes(value, ResType.Both);
                 }
                 else
                 {

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

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

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);
             }
         }
 
@@ -410,5 +412,40 @@ 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;
+                }
+            }
+        }
+
+        public static bool dataDicOfItemid(int itemId)
+        {
+            if (_dataDic.ContainsKey(itemId))
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -2,13 +2,13 @@
 {
     public class NewYearRedEnvelopeDataManager : SingletonBase<NewYearRedEnvelopeDataManager>
     {
-        public static int Status = RedPacketStatus.None;  //红包领取状态
+        public static int Status = -1;  //红包领取状态,默认值设置为-1,方便初始隐藏按钮
         public static int ItemId = 0;  //红包奖励物品
         public static long ItemNum = 0;  //奖励数量（单倍）
 
         public void Clear()
         {
-            Status = RedPacketStatus.None;
+            Status = -1;//红包领取状态,默认值设置为-1,方便初始隐藏按钮
             ItemId = 0;
             ItemNum = 0;
         }

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

@@ -816,6 +816,21 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 限时抽奖剧情奖励
+        /// </summary>
+        /// <returns></returns>
+        public bool GetActLuckyBoxStudioFilingRed()
+        {
+            if (ActivityDataManager.Instance.actLuckyBoxId <= 0) return false;
+            var filingChapterId = StudioDataManager.Instance.GetLuckyBoxActivityID();
+            StudioDataManager.Instance.filingChapterId = filingChapterId;
+            var studioCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(studioCfg.limit);
+            if (StudioDataManager.Instance.GetStudioFilingRewardRed() || limitData.TotalPlayMax - limitData.PlayTimes > 0)
+                return true;
+            return false;
+        }
 
         /// <summary>
         /// 开服活动（神都宸游）
@@ -1068,6 +1083,17 @@ namespace GFGGame
             return ActivityWanShiLiDataManager.Instance.CanGetReward();
         }
 
+        public bool GetActivityYuanXiaoRed()
+        {
+            return ActivityGetYuanXiaoDataManager.Instance.HaveNewLevelCanPlay()
+            || ActivityGetYuanXiaoDataManager.Instance.ShowTaskRedDots(TaskFuncType.YuanXiaoActivity);
+        }
+
+        public bool GetActivityFYJYRed()
+        {
+            return ActivityFYJYDataManager.Instance.CheckRed();
+        }
+
         /// <summary>
         /// 摘星免费抽奖
         /// </summary>
@@ -1091,5 +1117,27 @@ namespace GFGGame
             }
             return false;
         }
+
+        public bool CheckActivityLuckyBoxCanChallenge(int limit, int activityID)
+        {
+            int chapterID = ActivityOpenCfgArray.Instance.GetCfg(activityID).params3Arr[0];
+            ActivityFightCfg chapterCfg = ActivityFightCfgArray.Instance.GetCfg(chapterID);
+
+            var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id);
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(limit);
+            int times = limitData.TotalPlayMax - limitData.PlayTimes;
+
+            bool canChallenge = ((times > 0) && (!InstanceZonesDataManager.CheckLevelPass(list[list.Count - 1].id)));
+            return canChallenge;
+        }
+
+        public bool GetActivityLuckyBoxRed(int activityID)
+        {
+            int chapterID = ActivityOpenCfgArray.Instance.GetCfg(activityID).params3Arr[0];
+
+            return GetMeiRiTeHuiRed()
+                || GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox)
+                || GetActLuckyBoxTaskdRed() || CheckActivityLuckyBoxCanChallenge(300, chapterID) || GetGiftBagRewardRed();
+        }
     }
 }

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

@@ -387,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/ShopDataManager.cs

@@ -185,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;
         }

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

@@ -115,7 +115,7 @@ namespace GFGGame
                     else//道具
                     {
                         ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.CostIdReal);
-                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
+                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costItemCfg);
                         item.m_btnBuy.m_loaIcon.visible = true;
                         item.m_btnBuy.m_txtIcon.visible = false;
                     }

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

@@ -81,13 +81,14 @@ namespace GFGGame
             }
             content = "";
             if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
-            if (!isLastPast) content = string.Format("需通关{0}", storyLevelCfgs[index - 1].name);
+            if (!isLastPast) content = "需通关前置关卡";
             StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(storyLevelCfg.needStoryLevelId);
             if (!isPass) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
             canFight = isPass && isRoleLv && isLastPast;
         }
 
 
+
         public void IsCanFight(int levelId, out bool canFight, out string content)
         {
 
@@ -144,6 +145,13 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
         }
+        public async void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
+        {
+            await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+            await TimeTracingSProxy.ReqGetLevelRewardStatus();
+            await TimeTracingSProxy.ReqGetSuitRewardStatus();
+            ViewManager.Show<TimeTracingLevelView>(new object[] { TimeTracingDataManager._currentChapterId, TimeTracingDataManager.SuitID});
+        }
 
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
@@ -242,5 +250,19 @@ namespace GFGGame
             return luckyBoxFilingChapterId;
         }
 
+
+        public bool GetStudioFilingRewardRed()
+        {
+            var rewardList = StudioDataManager.Instance.GetFilingRewardList(StudioDataManager.Instance.filingChapterId);
+            for (int i = 0; i < rewardList.Count; i++) { 
+                if (i < rewardList.Count && rewardList[i] == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
     }
 }

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

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class TimeTracingSuitRankData//时光回溯套装排行数据
+    {
+        public int Rank; //排名
+        public int time; //时间
+        public int CompletedNum;//完成度
+        public int TotalNum;//套装部件总数量
+        //玩家数据
+        public string name;
+        public int HeadItemID;
+        public int HeadBorderItemId;
+        public string LeagueName;//雅集
+    }
+
+    public class TimeTracingLevelRankData//时光回溯关卡排行数据
+    {
+        public int Rank;//排名
+        public long score; //积分
+        //玩家数据
+        public string name;
+        public int HeadItemID;
+        public int HeadBorderItemId;
+        public string LeagueName;//雅集
+    }
+
+}

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

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

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

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using ET;
+
+namespace GFGGame
+{
+    public class TimeTracingDataManager : SingletonBase<TimeTracingDataManager>
+    {
+        public List<int> IdList = new List<int>() { 5017, 5018, 5019 };
+        public List<int> chapterIdList = new List<int>();
+        //时光回溯,关卡编号
+        public static int _currentChapterId = 62001;
+        //时光回溯，合成套装副本当前展示套装
+        public static int SuitID = 201027;
+        //时光回溯刷新时间
+        public static long RefreshTime = 0;
+        //章节积分奖励列表
+        public static List<int> ChapterRewardDic = new List<int>();
+        //关卡评分奖励列表
+        public static Dictionary<int , Dictionary<int, int>> LevelRewardDic = new Dictionary<int, Dictionary<int, int>>();
+        //关卡信息
+        public static Dictionary<int, Dictionary<int, LevelRoleInfoProto>> _LevelMaxInfoDic = new Dictionary<int, Dictionary<int, LevelRoleInfoProto>>();
+
+        public SuitCollectRankProto mySuitRankInfo;
+        public LevelRankProto myLevelRankInfo;
+        //套装排行榜数据
+        public Dictionary<int, List<SuitCollectRankProto>> SuitRankDatasDic = new Dictionary<int, List<SuitCollectRankProto>>()
+        {
+            {0,new List<SuitCollectRankProto>() },
+            {1,new List<SuitCollectRankProto>() },
+        };
+        //关卡排行榜数据
+        public Dictionary<int, List<LevelRankProto>> LevelRankDatasDic = new Dictionary<int, List<LevelRankProto>>() 
+        {
+            {0,new List<LevelRankProto>()},
+            {1,new List<LevelRankProto>()},
+        };
+        public void InitRewardDic()
+        {
+            chapterIdList.Clear();
+            if (chapterIdList.Count > 0)
+            {
+                return;
+            }
+            foreach (int i in IdList)
+            {
+                chapterIdList.Add(ActivityOpenCfgArray.Instance.GetCfg(i).params3Arr[0]);
+            }
+        }
+        //获取关卡奖励状态
+        public bool GetLevelRewardStatus(int levelID = 0)
+        {
+            if(ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0)
+            {
+                return false;
+            }
+            if (levelID == 0)
+            {
+                return GetAllLevelRewardStatus(true);
+            }
+            else
+            {
+                if(!LevelRewardDic.ContainsKey(levelID))
+                {
+                    return false;
+                }
+                foreach (var status in LevelRewardDic[levelID])
+                {
+                    if (status.Value == ConstBonusStatus.CAN_GET)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        //获取套装奖励状态
+        public bool GetChapterRewardStatus(int levelID,int rewardID,int itemID)
+        {
+            //这里对已领取的id进行判断
+            if (levelID != 0)
+            {
+                foreach (var item in ChapterRewardDic)
+                {
+                    if(rewardID == item)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        //获取对应id奖励状态
+        public int GetChapterRewardIDStatus(int rewardID, int itemID)
+        {
+            long num = 0;
+            ItemData itemdata;
+            CompositebonusCfg comCfg = CompositebonusCfgArray.Instance.GetCfg(rewardID);
+            if (BagDataManager.Instance.GetBagData().TryGetValue(itemID, out itemdata))
+            {
+                num = itemdata.num;
+            }
+            else
+            {
+                num = 0;
+            }
+            if(num < comCfg.count)
+            {
+                return ConstBonusStatus.CAN_NOT_GET;
+            }
+            //这里对已领取的id进行判断
+            foreach (var item in ChapterRewardDic)
+            {
+                if (rewardID == item)
+                {
+                    return ConstBonusStatus.GOT;
+                }
+            }
+            return ConstBonusStatus.CAN_GET;
+        }
+        //获取所有奖励(只用于红点判断)
+        public bool GetAllLevelRewardStatus(bool isLevel = true)
+        {
+            if (isLevel)
+            {
+                foreach (var item in LevelRewardDic)
+                {
+                    Dictionary<int, int> rewardStatusDic = new Dictionary<int, int>(0);
+                    int key = item.Key;
+                    rewardStatusDic = item.Value;
+                    foreach (var id in rewardStatusDic)
+                    {
+                        if (id.Value == ConstBonusStatus.CAN_GET)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        //通过章节id判断所有奖励状态
+        public bool GetChapterIDRewardStatus(int chapID)
+        {
+            List<CompositebonusCfg> comBonusList = CompositebonusCfgArray.Instance.GetCfgsBychapterId(chapID);
+            foreach(CompositebonusCfg item in comBonusList)
+            {
+                if (GetChapterRewardIDStatus(item.id, item.paramsArr[0]) == 1)
+                {
+                    return true;
+                }
+            }
+            List<StoryLevelCfg> levelList = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(6, 2, chapID);
+            foreach(StoryLevelCfg levelItem in levelList)
+            {
+               if(GetLevelRewardStatus(levelItem.id))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool GetAllChapterReward()
+        {
+            if (ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0)
+            {
+                return false;
+            }
+            foreach (int i in chapterIdList)
+            {
+                if(GetChapterIDRewardStatus(i))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public string ChangeTime(long totalSeconds)
+        {
+            string timeStr = "";
+            TimeSpan t = TimeSpan.FromSeconds(totalSeconds);
+            if(t.Days != 0)
+            {
+                timeStr = string.Format("{0}天{1}时", t.Days, t.Hours);
+            }
+            else if(t.Hours != 0)
+            {
+                timeStr = string.Format("{0}时{1}分", t.Hours, t.Minutes);
+            }
+            else
+            {
+                timeStr = string.Format("{0}分{1}秒", t.Minutes, t.Seconds);
+            }
+            return timeStr;
+        }
+    }
+}

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

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

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

@@ -5,6 +5,7 @@ using YooAsset;
 
 namespace GFGGame
 {
+    //换装部件操作器，负责部件换装的资源加载、预渲染等
     public class DressUpLayerOperation : DressUpOperationBase
     {
         internal enum EAction
@@ -294,13 +295,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/DressUpObj.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         Remove
     }
 
+    //用于换装对象的数据存储和方法封装
     public class DressUpObj
     {
 
@@ -687,6 +688,7 @@ namespace GFGGame
             TryAddHandler(handler);
         }
 
+        //遍历各部件操作器，检查状态并统一处理
         private void OnUpdate(object param = null)
         {
             if(_sceneObj == null)

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

@@ -4,6 +4,7 @@ using UnityEngine;
 
 namespace GFGGame
 {
+    //实现换装对象在UI界面上显示
     public class DressUpObjUI
     {
 

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

@@ -2,6 +2,7 @@
 
 namespace GFGGame
 {
+    //换装部件偏移信息记录
     public class DressUpOffsetInfo : MonoBehaviour
     {
         public Vector3 OffsetPosition;

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

@@ -2,6 +2,7 @@
 
 namespace GFGGame
 {
+    //换装部件操作器的基类
     public abstract class DressUpOperationBase : AsyncOperationBase
     {
         protected enum EDressUpSteps

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

@@ -4,6 +4,7 @@ using static FairyGUI.ControllerAction;
 
 namespace GFGGame
 {
+    //换装部件移除行为的操作器，负责缓存一个移除行为，有可能在后续的逻辑中被覆盖或取消
     public class DressUpRemoveOperation : DressUpOperationBase
     {
         internal int itemID;

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

@@ -8,6 +8,7 @@ using System;
 
 namespace GFGGame
 {
+    //提供各种换装相关的方法
     public class DressUpUtil
     {
         public const string HEAD_DEFAULT_RES_NAME = "head";
@@ -226,10 +227,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,6 +336,9 @@ namespace GFGGame
             }
             if (objName == BODY_ANIMATION_NAME)
             {
+                //这里有个需求是一些特殊动作需要自定义位置和角度，
+                //实现方法就是美术在动作预制体上设置这个位置，
+                //然后程序记录下这个位置，把他设置到role节点上，并把动作节点的位置重置成默认值。
                 DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
                 if(dressUpOffsetInfo == null)
                 {
@@ -388,6 +388,7 @@ namespace GFGGame
             DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
             if (dressUpOffsetInfo == null)
             {
+                //这里因为特效资源初始是有位移偏移的，记录下来每次设置为初始位置和角度，以防unity自身的坐标转换导致位置偏移
                 dressUpOffsetInfo = gameObj.AddComponent<DressUpOffsetInfo>();
                 dressUpOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
                 dressUpOffsetInfo.Rotation = gameObj.transform.localRotation;

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

@@ -4,6 +4,7 @@ using ET;
 
 namespace GFGGame
 {
+    //玩家换装助手，用于跨界面流程的换装对象数据存储及部分方法封装
     public class MyDressUpHelper
     {
         private static DressUpObj _dressUpObj;

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

@@ -5,7 +5,7 @@ namespace ET
 {
     public static class LoginHelper
     {
-        public static async ETTask<int> LoginTest(Scene zoneScene, string address, string account)
+        public static async ETTask<(int, long)> LoginTest(Scene zoneScene, string address, string account, bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -18,27 +18,28 @@ namespace ET
                     Account = account,
                     Version = GameConst.SERVER_VERSION,
                     PlatformId = LauncherConfig.platformId,
-                    ChannelId = LauncherConfig.ChannelId
+                    ChannelId = LauncherConfig.ChannelId,
+                    CancelDelete = cancelDelete
                 });
             }
             catch (Exception e)
             {
                 accountSession?.Dispose();
                 Log.Debug(e.ToString());
-                return ErrorCode.ERR_NetWorkError;
+                return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
                 accountSession?.Dispose();
-                return a2CLoginAccount.Error;
+                return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
-            return ErrorCode.ERR_Success;
+            return (ErrorCode.ERR_Success, 0);
         }
 
-        public static async ETTask<int> Login(Scene zoneScene, string address, string account, string password, bool isMD5)
+        public static async ETTask<(int, long)> Login(Scene zoneScene, string address, string account, string password, bool isMD5, bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -57,24 +58,25 @@ namespace ET
                     Password = passwordMD5,
                     Version = GameConst.SERVER_VERSION,
                     PlatformId = LauncherConfig.platformId,
-                    ChannelId = LauncherConfig.ChannelId
+                    ChannelId = LauncherConfig.ChannelId,
+                    CancelDelete = cancelDelete
                 });
             }
             catch (Exception e)
             {
                 accountSession?.Dispose();
                 Log.Debug(e.ToString());
-                return ErrorCode.ERR_NetWorkError;
+                return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
                 accountSession?.Dispose();
-                return a2CLoginAccount.Error;
+                return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
-            return ErrorCode.ERR_Success;
+            return (ErrorCode.ERR_Success, 0);
         }
 
         public static void OnLoginSuccess(Scene zoneScene, A2C_LoginAccount a2CLoginAccount, Session accountSession, string account)

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

@@ -8,6 +8,8 @@ namespace UI.ActivityDay7
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
+        public GLoader m_Top_img2;
         public GButton m_btnBack;
         public GTextField m_TimeStr;
         public GButton m_tip;
@@ -66,6 +68,8 @@ namespace UI.ActivityDay7
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
+            m_Top_img2 = (GLoader)comp.GetChild("Top_img2");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_TimeStr = (GTextField)comp.GetChild("TimeStr");
             m_tip = (GButton)comp.GetChild("tip");
@@ -80,6 +84,8 @@ namespace UI.ActivityDay7
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
+            m_Top_img2 = null;
             m_btnBack = null;
             m_TimeStr = null;
             m_tip = null;

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

@@ -11,6 +11,7 @@ namespace UI.ActivityGetYuanXiao
         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;
@@ -20,7 +21,9 @@ namespace UI.ActivityGetYuanXiao
         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";
@@ -72,6 +75,7 @@ namespace UI.ActivityGetYuanXiao
             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");
@@ -81,7 +85,9 @@ namespace UI.ActivityGetYuanXiao
             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)
         {
@@ -89,6 +95,7 @@ namespace UI.ActivityGetYuanXiao
             m_bgEffect = null;
             m_leafEffect = null;
             m_yuanXiaoEffect = null;
+            m_doubaoEffect = null;
             m_btnTask = null;
             m_btnShop = null;
             m_cloudEffect = null;
@@ -98,7 +105,9 @@ namespace UI.ActivityGetYuanXiao
             m_valueBar = null;
             m_btnBack = null;
             m_btnStart = null;
+            m_txtTime = null;
             m_t0 = null;
+            m_listShow = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -24,6 +24,8 @@ namespace UI.ActivityGetYuanXiao
         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";
@@ -88,6 +90,8 @@ namespace UI.ActivityGetYuanXiao
             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)
         {
@@ -110,6 +114,8 @@ namespace UI.ActivityGetYuanXiao
             m_progress = null;
             m_targetScore = null;
             m_startEffect = null;
+            m_startLeft = null;
+            m_startRight = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,10 +8,12 @@ namespace UI.ActivityGetYuanXiao
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GButton m_btnGet;
         public GTextField m_desc;
-        public GButton m_btnLock;
         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";
@@ -60,18 +62,22 @@ namespace UI.ActivityGetYuanXiao
         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_btnLock = (GButton)comp.GetChild("btnLock");
             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_btnLock = null;
             m_rewardList = null;
+            m_btnGo = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -7,14 +7,17 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_ActivityHuaRongDaoEntryUI
     {
         public GComponent target;
+        public Controller m_activityID;
+        public GGraph m_mask;
+        public GButton m_btnClose;
         public GLoader m_loaBg;
+        public GButton m_btnBack;
         public GButton m_btnRule;
         public UI_scrollPane m_scrollPane;
-        public GTextField m_challengeTimes;
         public GTextField m_curLevel;
         public GTextField m_txtTime;
         public GButton m_btnStart;
-        public GButton m_btnBack;
+        public GTextField m_challengeTimes;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://wf8geywtltoy4";
@@ -64,28 +67,34 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
+            m_activityID = comp.GetController("activityID");
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
-            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_curLevel = (GTextField)comp.GetChild("curLevel");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnStart = (GButton)comp.GetChild("btnStart");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_activityID = null;
+            m_mask = null;
+            m_btnClose = null;
             m_loaBg = null;
+            m_btnBack = null;
             m_btnRule = null;
             m_scrollPane.Dispose();
             m_scrollPane = null;
-            m_challengeTimes = null;
             m_curLevel = null;
             m_txtTime = null;
             m_btnStart = null;
-            m_btnBack = null;
+            m_challengeTimes = null;
             m_hide = null;
             m_show = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -8,7 +8,11 @@ namespace UI.ActivityHuaRongDao
     {
         public GComponent target;
         public Controller m_state;
+        public Controller m_activityID;
+        public GGraph m_mask;
+        public GButton m_btnClose;
         public GLoader m_loaBg;
+        public GButton m_btnBack;
         public UI_item m_item;
         public GTextField m_seconds;
         public GGroup m_tips;
@@ -18,9 +22,8 @@ namespace UI.ActivityHuaRongDao
         public UI_items m_items;
         public UI_items m_itemsOrigin;
         public GGraph m_maskTouch;
-        public GGraph m_mask;
+        public GGraph m_mask_2;
         public GGraph m_maskGlobal;
-        public GButton m_btnBack;
         public Transition m_showMask;
         public Transition m_hideMask;
         public const string URL = "ui://wf8geywtnx120";
@@ -71,7 +74,11 @@ namespace UI.ActivityHuaRongDao
         private void Init(GComponent comp)
         {
             m_state = comp.GetController("state");
+            m_activityID = comp.GetController("activityID");
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_item = (UI_item)UI_item.Create(comp.GetChild("item"));
             m_seconds = (GTextField)comp.GetChild("seconds");
             m_tips = (GGroup)comp.GetChild("tips");
@@ -81,16 +88,19 @@ namespace UI.ActivityHuaRongDao
             m_items = (UI_items)UI_items.Create(comp.GetChild("items"));
             m_itemsOrigin = (UI_items)UI_items.Create(comp.GetChild("itemsOrigin"));
             m_maskTouch = (GGraph)comp.GetChild("maskTouch");
-            m_mask = (GGraph)comp.GetChild("mask");
+            m_mask_2 = (GGraph)comp.GetChild("mask");
             m_maskGlobal = (GGraph)comp.GetChild("maskGlobal");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_state = null;
+            m_activityID = null;
+            m_mask = null;
+            m_btnClose = null;
             m_loaBg = null;
+            m_btnBack = null;
             m_item.Dispose();
             m_item = null;
             m_seconds = null;
@@ -103,9 +113,8 @@ namespace UI.ActivityHuaRongDao
             m_itemsOrigin.Dispose();
             m_itemsOrigin = null;
             m_maskTouch = null;
-            m_mask = null;
+            m_mask_2 = null;
             m_maskGlobal = null;
-            m_btnBack = null;
             m_showMask = null;
             m_hideMask = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -9,16 +9,18 @@ namespace UI.ActivityThemeLuckyBox
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GGraph m_bgEffectHolder;
         public GButton m_btnBack;
         public UI_Button1 m_btnChapter;
         public UI_Button1 m_btnTask;
         public UI_Button1 m_btnShop;
         public GTextField m_timeDesc;
         public GTextField m_txtTime;
+        public GTextField m_txtTime_4;
         public GButton m_btnLuckyBox_old;
         public UI_Button1 m_btnLuckyBox;
-        public GGraph m_bgEffectHolder;
-        public Transition m_In_1;
+        public Transition m_In_2;
+        public Transition m_In_4;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
         public const string RES_NAME = "ActivityThemeLuckyBoxUI";
@@ -68,21 +70,24 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChapter = (UI_Button1)UI_Button1.Create(comp.GetChild("btnChapter"));
             m_btnTask = (UI_Button1)UI_Button1.Create(comp.GetChild("btnTask"));
             m_btnShop = (UI_Button1)UI_Button1.Create(comp.GetChild("btnShop"));
             m_timeDesc = (GTextField)comp.GetChild("timeDesc");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtTime_4 = (GTextField)comp.GetChild("txtTime_4");
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
             m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
-            m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
-            m_In_1 = comp.GetTransition("In_1");
+            m_In_2 = comp.GetTransition("In_2");
+            m_In_4 = comp.GetTransition("In_4");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
+            m_bgEffectHolder = null;
             m_btnBack = null;
             m_btnChapter.Dispose();
             m_btnChapter = null;
@@ -92,11 +97,12 @@ namespace UI.ActivityThemeLuckyBox
             m_btnShop = null;
             m_timeDesc = null;
             m_txtTime = null;
+            m_txtTime_4 = null;
             m_btnLuckyBox_old = null;
             m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
-            m_bgEffectHolder = null;
-            m_In_1 = null;
+            m_In_2 = null;
+            m_In_4 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs

@@ -8,6 +8,7 @@ namespace UI.Bag
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GComponent m_comValueBar;
         public GList m_list;
         public GButton m_btnBack;
@@ -60,6 +61,7 @@ namespace UI.Bag
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_list = (GList)comp.GetChild("list");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -68,6 +70,7 @@ namespace UI.Bag
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_comValueBar = null;
             m_list = null;
             m_btnBack = null;

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

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GButton m_btnFilter;
         public GList m_listRole;
@@ -63,6 +64,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnFilter = (GButton)comp.GetChild("btnFilter");
             m_listRole = (GList)comp.GetChild("listRole");
@@ -74,6 +76,7 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_btnFilter = null;
             m_listRole = null;

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

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_Top_img;
         public GButton m_btnback;
         public GComponent m_comValueBar;
         public GButton m_btnStory;
@@ -61,6 +62,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnStory = (GButton)comp.GetChild("btnStory");
@@ -70,6 +72,7 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_Top_img = null;
             m_btnback = null;
             m_comValueBar = null;
             m_btnStory = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -9,7 +9,9 @@ namespace UI.ClothingDecompose
         public GComponent target;
         public Controller m_c1;
         public Controller m_TouchSelect;
-        public GLoader m_bg;
+        public Controller m_clothesType;
+        public GLoader m_loadBg;
+        public GLoader m_Top_img;
         public UI_Button6 m_btnClothing;
         public UI_Button6 m_btnSkillBook;
         public GComponent m_valueBar;
@@ -24,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";
@@ -73,7 +76,9 @@ namespace UI.ClothingDecompose
         {
             m_c1 = comp.GetController("c1");
             m_TouchSelect = comp.GetController("TouchSelect");
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_clothesType = comp.GetController("clothesType");
+            m_loadBg = (GLoader)comp.GetChild("loadBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnClothing = (UI_Button6)UI_Button6.Create(comp.GetChild("btnClothing"));
             m_btnSkillBook = (UI_Button6)UI_Button6.Create(comp.GetChild("btnSkillBook"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
@@ -88,12 +93,15 @@ 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_bg = null;
+            m_clothesType = null;
+            m_loadBg = null;
+            m_Top_img = null;
             m_btnClothing.Dispose();
             m_btnClothing = null;
             m_btnSkillBook.Dispose();
@@ -110,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/ClothingShop/UI_ClothingShopUI.cs

@@ -11,6 +11,7 @@ namespace UI.ClothingShop
         public GLoader m_loaBg;
         public UI_ComClothingRole m_compHolder;
         public UI_ComClothingShopItemInfo m_compItemInfo;
+        public GLoader m_Top_img;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GTextField m_txtTitle;
@@ -74,6 +75,7 @@ namespace UI.ClothingShop
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_compHolder = (UI_ComClothingRole)UI_ComClothingRole.Create(comp.GetChild("compHolder"));
             m_compItemInfo = (UI_ComClothingShopItemInfo)UI_ComClothingShopItemInfo.Create(comp.GetChild("compItemInfo"));
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -95,6 +97,7 @@ namespace UI.ClothingShop
             m_compHolder = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
+            m_Top_img = null;
             m_valueBar = null;
             m_btnBack = null;
             m_txtTitle = null;

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

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_GetSuitItemUI
     {
         public GComponent target;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GGraph m_holderEffect;
         public GGraph m_holder;
         public GTextField m_txtName;
@@ -60,7 +60,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_holderEffect = (GGraph)comp.GetChild("holderEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -69,7 +69,7 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_holderEffect = null;
             m_holder = null;
             m_txtName = null;

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

@@ -9,11 +9,12 @@ namespace UI.CommonGame
         public GComponent target;
         public Controller m_starNumType;
         public Controller m_showType;
+        public Controller m_rarity;
         public UI_ComCardMask m_comCard;
         public GLoader m_loaBorder;
         public GLoader m_loaRarity;
-        public GGraph m_holderPurpleBg;
-        public GGraph m_holderGoldBg;
+        public UI_holderBg m_holderPurpleBg;
+        public UI_holderBg m_holderGoldBg;
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public GLoader m_loaMainScore;
@@ -71,11 +72,12 @@ namespace UI.CommonGame
         {
             m_starNumType = comp.GetController("starNumType");
             m_showType = comp.GetController("showType");
+            m_rarity = comp.GetController("rarity");
             m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_holderPurpleBg = (GGraph)comp.GetChild("holderPurpleBg");
-            m_holderGoldBg = (GGraph)comp.GetChild("holderGoldBg");
+            m_holderPurpleBg = (UI_holderBg)UI_holderBg.Create(comp.GetChild("holderPurpleBg"));
+            m_holderGoldBg = (UI_holderBg)UI_holderBg.Create(comp.GetChild("holderGoldBg"));
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
@@ -89,11 +91,14 @@ namespace UI.CommonGame
         {
             m_starNumType = null;
             m_showType = null;
+            m_rarity = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_loaBorder = null;
             m_loaRarity = null;
+            m_holderPurpleBg.Dispose();
             m_holderPurpleBg = null;
+            m_holderGoldBg.Dispose();
             m_holderGoldBg = null;
             m_txtLv = null;
             m_txtName = null;

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

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GLoader m_loaItem;
@@ -16,6 +17,7 @@ namespace UI.CommonGame
         public GImage m_imgLockBg;
         public GImage m_imgLock;
         public GGroup m_grpLock;
+        public GGroup m_flow;
         public GGroup m_Panel;
         public Transition m_ToLeft;
         public Transition m_ToRight;
@@ -68,6 +70,7 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
@@ -76,6 +79,7 @@ namespace UI.CommonGame
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_flow = (GGroup)comp.GetChild("flow");
             m_Panel = (GGroup)comp.GetChild("Panel");
             m_ToLeft = comp.GetTransition("ToLeft");
             m_ToRight = comp.GetTransition("ToRight");
@@ -84,6 +88,7 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_loaBg = null;
             m_loaIcon = null;
             m_loaItem = null;
@@ -93,6 +98,7 @@ namespace UI.CommonGame
             m_imgLockBg = null;
             m_imgLock = null;
             m_grpLock = null;
+            m_flow = null;
             m_Panel = null;
             m_ToLeft = null;
             m_ToRight = null;

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

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_SuitItemUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GLoader m_loaBg;
         public GLoader m_iconBg;
         public GGraph m_downEffect;
@@ -65,6 +66,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_downEffect = (GGraph)comp.GetChild("downEffect");
@@ -79,6 +81,7 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_loaBg = null;
             m_iconBg = null;
             m_downEffect = null;

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_holderBg.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_CreateRoleUI.cs

@@ -10,6 +10,7 @@ namespace UI.CreateRole
         public GLoader m_loaBg;
         public UI_EnvelopeModel m_envelopeModel;
         public GGraph m_BgEffectHolder;
+        public GGraph m_mask;
         public Transition m_t_Open;
         public Transition m_t_In;
         public Transition m_t_AfterOpen;
@@ -63,6 +64,7 @@ namespace UI.CreateRole
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_envelopeModel = (UI_EnvelopeModel)UI_EnvelopeModel.Create(comp.GetChild("envelopeModel"));
             m_BgEffectHolder = (GGraph)comp.GetChild("BgEffectHolder");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t_Open = comp.GetTransition("t_Open");
             m_t_In = comp.GetTransition("t_In");
             m_t_AfterOpen = comp.GetTransition("t_AfterOpen");
@@ -73,6 +75,7 @@ namespace UI.CreateRole
             m_envelopeModel.Dispose();
             m_envelopeModel = null;
             m_BgEffectHolder = null;
+            m_mask = null;
             m_t_Open = null;
             m_t_In = null;
             m_t_AfterOpen = null;

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

@@ -23,6 +23,7 @@ namespace UI.DeleteAccount
         public GTextField m_txtAccount;
         public GTextField m_txtLvl;
         public GGroup m_groupSure;
+        public GTextField m_txtSuccess;
         public UI_Button19 m_btnQuit;
         public GGroup m_groupResult;
         public UI_ComTextProtocal m_txtComp_2;
@@ -93,6 +94,7 @@ namespace UI.DeleteAccount
             m_txtAccount = (GTextField)comp.GetChild("txtAccount");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_groupSure = (GGroup)comp.GetChild("groupSure");
+            m_txtSuccess = (GTextField)comp.GetChild("txtSuccess");
             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"));
@@ -123,6 +125,7 @@ namespace UI.DeleteAccount
             m_txtAccount = null;
             m_txtLvl = null;
             m_groupSure = null;
+            m_txtSuccess = null;
             m_btnQuit.Dispose();
             m_btnQuit = null;
             m_groupResult = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideUI.cs

@@ -8,6 +8,7 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GList m_listCard;
         public GList m_listRole;
@@ -62,6 +63,7 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listCard = (GList)comp.GetChild("listCard");
             m_listRole = (GList)comp.GetChild("listRole");
@@ -72,6 +74,7 @@ namespace UI.FieldGuide
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_listCard = null;
             m_listRole = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_DressUpGuideUI.cs

@@ -9,6 +9,7 @@ namespace UI.FieldGuide
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GList m_listType1;
         public GList m_listType2;
@@ -68,6 +69,7 @@ namespace UI.FieldGuide
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listType1 = (GList)comp.GetChild("listType1");
             m_listType2 = (GList)comp.GetChild("listType2");
@@ -83,6 +85,7 @@ namespace UI.FieldGuide
         {
             m_c1 = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_listType1 = null;
             m_listType2 = null;

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

@@ -8,14 +8,15 @@ namespace UI.Friend
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
         public GTextField m_txtCount;
         public GButton m_btnInfo;
         public GButton m_btnDelete;
         public GButton m_btnAdd;
         public GList m_list;
-        public GButton m_btnSendAll;
+        public GButton m_btnSendAll2;
         public GTextField m_txtPowerCount;
+        public GButton m_btnBack;
+        public GButton m_btnSendAll;
         public const string URL = "ui://wez2ujnnjdju0";
         public const string PACKAGE_NAME = "Friend";
         public const string RES_NAME = "FriendUI";
@@ -64,26 +65,28 @@ namespace UI.Friend
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_btnInfo = (GButton)comp.GetChild("btnInfo");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_list = (GList)comp.GetChild("list");
-            m_btnSendAll = (GButton)comp.GetChild("btnSendAll");
+            m_btnSendAll2 = (GButton)comp.GetChild("btnSendAll2");
             m_txtPowerCount = (GTextField)comp.GetChild("txtPowerCount");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnSendAll = (GButton)comp.GetChild("btnSendAll");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnBack = null;
             m_txtCount = null;
             m_btnInfo = null;
             m_btnDelete = null;
             m_btnAdd = null;
             m_list = null;
-            m_btnSendAll = null;
+            m_btnSendAll2 = null;
             m_txtPowerCount = null;
+            m_btnBack = null;
+            m_btnSendAll = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

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

@@ -7,6 +7,7 @@ namespace UI.Guide
     public partial class UI_Component2
     {
         public GComponent target;
+        public GGraph m_mask;
         public GGraph m_guideArea;
         public const string URL = "ui://vxxz0ya7tu96e";
         public const string PACKAGE_NAME = "Guide";
@@ -55,10 +56,12 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_guideArea = (GGraph)comp.GetChild("guideArea");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_guideArea = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Guide/UI_GuideUI.cs

@@ -7,8 +7,8 @@ namespace UI.Guide
     public partial class UI_GuideUI
     {
         public GComponent target;
-        public GGraph m_grhMask;
-        public UI_Component2 m_mask;
+        public GGraph m_mask;
+        public UI_Component2 m_maskCom;
         public GLoader m_loaMask;
         public UI_ComHolder m_comHolder;
         public UI_Component1 m_compTxt;
@@ -59,17 +59,17 @@ namespace UI.Guide
 
         private void Init(GComponent comp)
         {
-            m_grhMask = (GGraph)comp.GetChild("grhMask");
-            m_mask = (UI_Component2)UI_Component2.Create(comp.GetChild("mask"));
+            m_mask = (GGraph)comp.GetChild("mask");
+            m_maskCom = (UI_Component2)UI_Component2.Create(comp.GetChild("maskCom"));
             m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_comHolder = (UI_ComHolder)UI_ComHolder.Create(comp.GetChild("comHolder"));
             m_compTxt = (UI_Component1)UI_Component1.Create(comp.GetChild("compTxt"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_grhMask = null;
-            m_mask.Dispose();
             m_mask = null;
+            m_maskCom.Dispose();
+            m_maskCom = null;
             m_loaMask = null;
             m_comHolder.Dispose();
             m_comHolder = null;

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_ComBox.cs

@@ -10,9 +10,9 @@ namespace UI.LuckyBox
         public Controller m_c1;
         public UI_ComModel m_comModel;
         public GLoader m_btnOpenServer;
+        public GTextField m_txtOpenServerOwned;
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
-        public GTextField m_txtOpenServerOwned;
         public GLoader m_imgActLuckyBox;
         public UI_ComCost2 m_comCostOne;
         public UI_ComCost2 m_comCostTen;
@@ -23,8 +23,8 @@ namespace UI.LuckyBox
         public GGraph m_Special_eff;
         public GImage m_imgSpecial;
         public GGroup m_grpSpecial;
-        public GTextField m_txtCount;
         public GTextField m_txtOpenServerCount;
+        public GTextField m_txtCount;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox";
@@ -75,9 +75,9 @@ namespace UI.LuckyBox
             m_c1 = comp.GetController("c1");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnOpenServer = (GLoader)comp.GetChild("btnOpenServer");
+            m_txtOpenServerOwned = (GTextField)comp.GetChild("txtOpenServerOwned");
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_txtOpenServerOwned = (GTextField)comp.GetChild("txtOpenServerOwned");
             m_imgActLuckyBox = (GLoader)comp.GetChild("imgActLuckyBox");
             m_comCostOne = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostTen"));
@@ -88,8 +88,8 @@ namespace UI.LuckyBox
             m_Special_eff = (GGraph)comp.GetChild("Special_eff");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtOpenServerCount = (GTextField)comp.GetChild("txtOpenServerCount");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -97,10 +97,10 @@ namespace UI.LuckyBox
             m_comModel.Dispose();
             m_comModel = null;
             m_btnOpenServer = null;
+            m_txtOpenServerOwned = null;
             m_btnPreview.Dispose();
             m_btnPreview = null;
             m_txtOwned = null;
-            m_txtOpenServerOwned = null;
             m_imgActLuckyBox = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
@@ -113,8 +113,8 @@ namespace UI.LuckyBox
             m_Special_eff = null;
             m_imgSpecial = null;
             m_grpSpecial = null;
-            m_txtCount = null;
             m_txtOpenServerCount = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,21 +9,21 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_showActivityType;
         public UI_ComModel m_comModel;
-        public GTextField m_txtTsyTime;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
-        public GGroup m_grpTitle;
         public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
         public UI_Button5 m_btnShop;
         public UI_Button5 m_btnReward;
-        public GButton m_btnPreview;
-        public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
         public GTextField m_txtCount;
         public GTextField m_txtHasTime;
         public GGroup m_grpActivityTips;
         public GLoader m_ImgUp;
+        public GTextField m_txtTsyTime;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GGroup m_grpTitle;
+        public GButton m_btnPreview;
+        public GTextField m_txtOwned;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -73,31 +73,27 @@ namespace UI.LuckyBox
         {
             m_showActivityType = comp.GetController("showActivityType");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_txtTsyTime = (GTextField)comp.GetChild("txtTsyTime");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_grpTitle = (GGroup)comp.GetChild("grpTitle");
             m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
             m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
             m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
-            m_btnPreview = (GButton)comp.GetChild("btnPreview");
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasTime = (GTextField)comp.GetChild("txtHasTime");
             m_grpActivityTips = (GGroup)comp.GetChild("grpActivityTips");
             m_ImgUp = (GLoader)comp.GetChild("ImgUp");
+            m_txtTsyTime = (GTextField)comp.GetChild("txtTsyTime");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_grpTitle = (GGroup)comp.GetChild("grpTitle");
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_showActivityType = null;
             m_comModel.Dispose();
             m_comModel = null;
-            m_txtTsyTime = null;
-            m_txtTime = null;
-            m_grpTime = null;
-            m_grpTitle = null;
             m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
@@ -106,14 +102,18 @@ namespace UI.LuckyBox
             m_btnShop = null;
             m_btnReward.Dispose();
             m_btnReward = null;
-            m_btnPreview = null;
-            m_txtOwned = null;
             m_comLuckBoxBtn.Dispose();
             m_comLuckBoxBtn = null;
             m_txtCount = null;
             m_txtHasTime = null;
             m_grpActivityTips = null;
             m_ImgUp = null;
+            m_txtTsyTime = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_grpTitle = null;
+            m_btnPreview = null;
+            m_txtOwned = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,7 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GMovieClip m_effEnd;
         public GGraph m_holder_star;
         public GGraph m_holder_star_sky;
@@ -53,6 +53,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
         public GGroup m_star;
+        public GGraph m_mask;
         public Transition m_t0;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -103,7 +104,7 @@ namespace UI.LuckyBox
         {
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
             m_holder_star = (GGraph)comp.GetChild("holder_star");
             m_holder_star_sky = (GGraph)comp.GetChild("holder_star_sky");
@@ -147,13 +148,14 @@ namespace UI.LuckyBox
             m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_star = (GGroup)comp.GetChild("star");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
-            m_bg = null;
+            m_loaBg = null;
             m_effEnd = null;
             m_holder_star = null;
             m_holder_star_sky = null;
@@ -230,6 +232,7 @@ namespace UI.LuckyBox
             m_comStar1_2_9 = null;
             m_grpComStar2 = null;
             m_star = null;
+            m_mask = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ActivityStoryChapterUI
+    {
+        public GComponent target;
+        public Controller m_activityID;
+        public GLoader m_loaBg;
+        public GGraph m_bgEffect;
+        public UI_CompChapter m_chapter;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GTextField m_txtTime;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kpllz9fys";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ActivityStoryChapterUI";
+        private static UI_ActivityStoryChapterUI _proxy;
+
+        public static UI_ActivityStoryChapterUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityStoryChapterUI();
+            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_ActivityStoryChapterUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityStoryChapterUI();
+            }
+            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_activityID = comp.GetController("activityID");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_chapter = (UI_CompChapter)UI_CompChapter.Create(comp.GetChild("chapter"));
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_activityID = null;
+            m_loaBg = null;
+            m_bgEffect = null;
+            m_chapter.Dispose();
+            m_chapter = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_txtTime = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_mask;
         public GGraph m_holderSmokeIn;
         public GGraph m_holderLoop;
         public GGraph m_holder;
@@ -71,6 +72,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -90,6 +92,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_mask = null;
             m_holderSmokeIn = null;
             m_holderLoop = null;
             m_holder = null;

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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public Controller m_activityID;
         public UI_ComDialogBg m_comDialogBg;
         public GLoader m_loaDialogBg;
         public GTextField m_txtDialogOrder;
@@ -70,6 +71,7 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_activityID = comp.GetController("activityID");
             m_comDialogBg = (UI_ComDialogBg)UI_ComDialogBg.Create(comp.GetChild("comDialogBg"));
             m_loaDialogBg = (GLoader)comp.GetChild("loaDialogBg");
             m_txtDialogOrder = (GTextField)comp.GetChild("txtDialogOrder");
@@ -87,6 +89,7 @@ namespace UI.Main
         {
             m_c1 = null;
             m_c2 = null;
+            m_activityID = null;
             m_comDialogBg.Dispose();
             m_comDialogBg = null;
             m_loaDialogBg = null;

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

@@ -22,9 +22,10 @@ namespace UI.Main
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle2 m_btnTea;
         public UI_BtnModle2 m_btnOpenServerActivity;
-        public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle1 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityZCJB;
         public UI_BtnModle2 m_btnGetYuanXiao;
+        public UI_BtnModle2 m_btnActivityFYJY;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -108,9 +109,10 @@ namespace UI.Main
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
             m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
-            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.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_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -162,6 +164,8 @@ namespace UI.Main
             m_btnActivityZCJB = null;
             m_btnGetYuanXiao.Dispose();
             m_btnGetYuanXiao = null;
+            m_btnActivityFYJY.Dispose();
+            m_btnActivityFYJY = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

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

@@ -24,6 +24,7 @@ namespace UI.Main
         public GButton m_btnSpeedUp;
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
+        public GGraph m_mask;
         public Transition m_t0;
         public Transition m_showMask;
         public Transition m_hideMask;
@@ -94,6 +95,7 @@ namespace UI.Main
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
             m_hideMask = comp.GetTransition("hideMask");
@@ -124,6 +126,7 @@ namespace UI.Main
             m_btnSpeedUp = null;
             m_txtPlayName = null;
             m_comPlayName = null;
+            m_mask = null;
             m_t0 = null;
             m_showMask = null;
             m_hideMask = null;

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

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GGraph m_bgEffect;
         public GGraph m_holder;
         public UI_ComClick m_comClick;
@@ -70,7 +70,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
@@ -89,7 +89,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_bgEffect = null;
             m_holder = null;
             m_comClick.Dispose();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StorySkillUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GImage m_bg;
         public UI_ComSkillShow m_comSkillShow;
         public GGraph m_effReduceScore;
@@ -65,6 +66,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_bg = (GImage)comp.GetChild("bg");
             m_comSkillShow = (UI_ComSkillShow)UI_ComSkillShow.Create(comp.GetChild("comSkillShow"));
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
@@ -79,6 +81,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_bg = null;
             m_comSkillShow.Dispose();
             m_comSkillShow = 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_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/OpenServerActivity/UI_StoryItem.cs

@@ -9,6 +9,7 @@ namespace UI.OpenServerActivity
         public GComponent target;
         public Controller m_storyImageType;
         public Controller m_posType;
+        public Controller m_openCloseType;
         public GLoader m_loaItemBg;
         public UI_item m_rewardItem;
         public GTextField m_txtTitle;
@@ -65,6 +66,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = comp.GetController("storyImageType");
             m_posType = comp.GetController("posType");
+            m_openCloseType = comp.GetController("openCloseType");
             m_loaItemBg = (GLoader)comp.GetChild("loaItemBg");
             m_rewardItem = (UI_item)UI_item.Create(comp.GetChild("rewardItem"));
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -77,6 +79,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = null;
             m_posType = null;
+            m_openCloseType = null;
             m_loaItemBg = null;
             m_rewardItem.Dispose();
             m_rewardItem = null;

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

@@ -9,6 +9,7 @@ namespace UI.RoleInfo
         public GComponent target;
         public Controller m_type;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GTextField m_txtVersion;
         public GButton m_btnHelp;
         public GButton m_btnBack;
@@ -82,6 +83,7 @@ namespace UI.RoleInfo
         {
             m_type = comp.GetController("type");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -111,6 +113,7 @@ namespace UI.RoleInfo
         {
             m_type = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_txtVersion = null;
             m_btnHelp = null;
             m_btnBack = null;

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

@@ -8,6 +8,7 @@ namespace UI.Store
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_Icon;
         public GTextField m_LeftTime;
         public GButton m_tip;
         public UI_ExpProcess m_LevelProcess;
@@ -68,6 +69,7 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_Icon = (GLoader)comp.GetChild("Icon");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
             m_tip = (GButton)comp.GetChild("tip");
             m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
@@ -84,6 +86,7 @@ namespace UI.Store
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_Icon = null;
             m_LeftTime = null;
             m_tip = null;
             m_LevelProcess.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComFabric.cs

@@ -13,7 +13,9 @@ namespace UI.Studio
         public GTextField m_txtNum;
         public GTextField m_txtTime;
         public GButton m_btnBuy;
-        public GTextField m_Name;
+        public GLoader m_Name;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf30";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComFabric";
@@ -67,7 +69,9 @@ namespace UI.Studio
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_Name = (GTextField)comp.GetChild("Name");
+            m_Name = (GLoader)comp.GetChild("Name");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.Studio
             m_txtTime = null;
             m_btnBuy = null;
             m_Name = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComPorcelain.cs

@@ -10,10 +10,13 @@ namespace UI.Studio
         public GLoader m_loaBg;
         public GLoader m_btnChageLine;
         public GList m_list;
+        public GTextField m_loaName;
         public GTextField m_txtTime;
+        public GLoader m_titleIcon;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        public GTextField m_loaName;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf2w";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComPorcelain";
@@ -64,20 +67,26 @@ namespace UI.Studio
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_list = (GList)comp.GetChild("list");
+            m_loaName = (GTextField)comp.GetChild("loaName");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_titleIcon = (GLoader)comp.GetChild("titleIcon");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_loaName = (GTextField)comp.GetChild("loaName");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnChageLine = null;
             m_list = null;
+            m_loaName = null;
             m_txtTime = null;
+            m_titleIcon = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_loaName = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComProperty.cs

@@ -8,16 +8,18 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_bg0;
+        public GLoader m_loaBg;
         public GList m_list;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        public GLoader m_btnChageLine;
         public GTextField m_txtTime;
         public GButton m_btn0;
         public GButton m_btn1;
         public GButton m_btn2;
         public GButton m_btn3;
+        public GLoader m_btnChageLine;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf2z";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComProperty";
@@ -66,30 +68,34 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg0 = (GLoader)comp.GetChild("bg0");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btn0 = (GButton)comp.GetChild("btn0");
             m_btn1 = (GButton)comp.GetChild("btn1");
             m_btn2 = (GButton)comp.GetChild("btn2");
             m_btn3 = (GButton)comp.GetChild("btn3");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bg0 = null;
+            m_loaBg = null;
             m_list = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_btnChageLine = null;
             m_txtTime = null;
             m_btn0 = null;
             m_btn1 = null;
             m_btn2 = null;
             m_btn3 = null;
+            m_btnChageLine = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,9 +10,9 @@ namespace UI.Studio
         public Controller m_star;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
-        public GImage m_imgLock;
         public GTextField m_txtTitle;
         public GImage m_imgLockBg;
+        public GImage m_imgLock;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecn3xha";
         public const string PACKAGE_NAME = "Studio";
@@ -64,9 +64,9 @@ namespace UI.Studio
             m_star = comp.GetController("star");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,9 +74,9 @@ namespace UI.Studio
             m_star = null;
             m_loaBg = null;
             m_loaIcon = null;
-            m_imgLock = null;
             m_txtTitle = null;
             m_imgLockBg = null;
+            m_imgLock = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPorcelainItem.cs

@@ -13,8 +13,8 @@ namespace UI.Studio
         public GTextField m_txtName;
         public GLoader m_loaIcon;
         public GLoader m_loaBg;
-        public GImage m_imgLockBg;
         public GImage m_imgLock;
+        public GImage m_imgLockBg;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecf2bf2x";
         public const string PACKAGE_NAME = "Studio";
@@ -69,8 +69,8 @@ namespace UI.Studio
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -81,8 +81,8 @@ namespace UI.Studio
             m_txtName = null;
             m_loaIcon = null;
             m_loaBg = null;
-            m_imgLockBg = null;
             m_imgLock = null;
+            m_imgLockBg = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs

@@ -1,92 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Studio
-{
-    public partial class UI_PropertyItem
-    {
-        public GComponent target;
-        public Controller m_star;
-        public GImage m_bg;
-        public GLoader m_loaIcon;
-        public GImage m_lock;
-        public GImage m_imgLock;
-        public GTextField m_txtTitle;
-        public GLoader m_loaBg;
-        public Transition m_test;
-        public const string URL = "ui://xz8kxrecpj8w4j";
-        public const string PACKAGE_NAME = "Studio";
-        public const string RES_NAME = "PropertyItem";
-        private static UI_PropertyItem _proxy;
-
-        public static UI_PropertyItem Create(GObject gObject = null)
-        {
-            var ui = new UI_PropertyItem();
-            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_PropertyItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_PropertyItem();
-            }
-            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_star = comp.GetController("star");
-            m_bg = (GImage)comp.GetChild("bg");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_lock = (GImage)comp.GetChild("lock");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_test = comp.GetTransition("test");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_star = null;
-            m_bg = null;
-            m_loaIcon = null;
-            m_lock = null;
-            m_imgLock = null;
-            m_txtTitle = null;
-            m_loaBg = null;
-            m_test = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioActivityUI.cs

@@ -7,11 +7,11 @@ namespace UI.Studio
     public partial class UI_StudioActivityUI
     {
         public GComponent target;
-        public GLoader m_Bg;
+        public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GLoader m_btnChageLine;
-        public GLoader m_loaBg;
+        public GLoader m_loaRole;
         public GTextField m_activityTitle;
         public GList m_list;
         public GButton m_btnReward;
@@ -64,11 +64,11 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_Bg = (GLoader)comp.GetChild("Bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_activityTitle = (GTextField)comp.GetChild("activityTitle");
             m_list = (GList)comp.GetChild("list");
             m_btnReward = (GButton)comp.GetChild("btnReward");
@@ -77,11 +77,11 @@ namespace UI.Studio
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_Bg = null;
+            m_loaBg = null;
             m_comValueBar = null;
             m_btnBack = null;
             m_btnChageLine = null;
-            m_loaBg = null;
+            m_loaRole = null;
             m_activityTitle = null;
             m_list = null;
             m_btnReward = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GLoader m_Top_img;
         public GButton m_btnBack;
         public GButton m_btnTask;
         public GButton m_btnWeekly;
@@ -63,6 +64,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnWeekly = (GButton)comp.GetChild("btnWeekly");
@@ -73,6 +75,7 @@ namespace UI.Task
         {
             m_c1 = null;
             m_loaBg = null;
+            m_Top_img = null;
             m_btnBack = null;
             m_btnTask = null;
             m_btnWeekly = null;

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_Button2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.TimeTracing
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public GLoader m_makeSuitBtn;
+        public const string URL = "ui://gayfh946l815d";
+        public const string PACKAGE_NAME = "TimeTracing";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            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_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            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_makeSuitBtn = (GLoader)comp.GetChild("makeSuitBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_makeSuitBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_Button2.cs.meta

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