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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

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

@@ -77,7 +77,7 @@ namespace GFGEditor
                     var value = "";
                     foreach (var e in a.Value)
                     {
-                         value = value + e.Key + "*" + e.Value+ ";";
+                        value = value + e.Key + "*" + e.Value + ";";
                     }
                     var values = new string[] { string.Join(";", value) };
                     SQLiteHelper.Instance.UpdateValues(nameof(SuitCfgArray), names, values, nameof(a.Key.id), a.Key.id.ToString());
@@ -95,9 +95,9 @@ namespace GFGEditor
 
         private static void UpdateGlobalCfg(GlobalCfg globalCfg)
         {
-            var names = new string[] 
+            var names = new string[]
             { nameof(globalCfg.suitPartTotalCount), nameof(globalCfg.ClothingPartsCount), nameof(globalCfg.CardCount) };
-            var values = new string[] 
+            var values = new string[]
             { globalCfg.suitPartTotalCount.ToString(), globalCfg.ClothingPartsCount.ToString(), globalCfg.CardCount.ToString() };
             SQLiteHelper.Instance.UpdateValues(nameof(GlobalCfgArray), names, values, nameof(globalCfg.id), globalCfg.id.ToString());
         }
@@ -155,10 +155,12 @@ namespace GFGEditor
 
         private static void HandleItemAndDressUpTable(ItemCfg itemCfg, ref int count)
         {
-            if (itemCfg.isHide > 0 || itemCfg.mainScore == 0)
+            // 除去初始衣装
+            if (DressUpMenuItemDataManager.defaultID.Contains(itemCfg.id) || itemCfg.isHide > 0)
             {
                 return;
             }
+
             if (itemCfg.itemType == ConstItemType.DRESS_UP)
             {
                 // 服装
@@ -197,7 +199,7 @@ namespace GFGEditor
             }
         }
 
-        private static void HandleItemAndSuitTags(ItemCfg itemCfg, Dictionary<SuitCfg, Dictionary<string,string>> suitTagsDic)
+        private static void HandleItemAndSuitTags(ItemCfg itemCfg, Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic)
         {
             if (itemCfg.suitId <= 0)
             {
@@ -218,7 +220,7 @@ namespace GFGEditor
                         tags = new Dictionary<string, string>();
                         suitTagsDic[suitCfg] = tags;
                     }
-                
+
                     if (!tags.ContainsKey(itemCfg.tagsArr[i][0]))
                         tags[itemCfg.tagsArr[i][0]] = itemCfg.tagsArr[i][1];
                     else

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

@@ -1,7 +1,7 @@
 #if UNITY_2017_1_OR_NEWER
     using Mono.Data.Sqlite;
 #else
-using Microsoft.Data.Sqlite;
+	using Microsoft.Data.Sqlite;
 #endif
 
 namespace GFGGame
@@ -13,8 +13,8 @@ namespace GFGGame
 		public void setData(SqliteDataReader reader)
 		{
 {variable assignment}
-            
 
+            LogHelper.LogEditor("InitConfig:" + nameof({CfgName}));
 		}
 		
 	}

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

@@ -10,7 +10,7 @@ namespace GFGGame
         public const string ITEM_CHANGED = "ITEM_CHANGED";
         public const string ITEM_ATTRIBUTE_CHANGED = "ITEM_ATTRIBUTE_CHANGED";
 
-        public const string STORY_LEVEL_CHANGE = "STORY_LEVEL_CHANGE"; //ͨ���¾�����¹ؿ�
+        public const string STORY_LEVEL_CHANGE = "STORY_LEVEL_CHANGE"; //通关新剧情或新关卡
 
         public const string SUIT_BOX_STATUS_CHANGED = "SUIT_BOX_STATUS_CHANGED";
         public const string CJ_FINISH = "CJ_FINISH";
@@ -48,13 +48,13 @@ namespace GFGGame
         public const string GET_MAINTAIN_SUIT_BONUS = "GET_MAINTAIN_SUIT_BONUS";
         public const string MAKE_NEW_SUIT = "MAKE_NEW_SUIT";
 
-        //����ս��������ɣ�չʾ����
+        //剧情战斗快速完成，展示奖励
         public const string STORY_FIGHT_QUICKLY_SUCCESS = "STORY_FIGHT_QUICKLY_SUCCESS";
 
-        public const string NOTICE_LIMIT_CHANGED = "NOTICE_LIMIT_CHANGED"; //���ƴ����仯֪ͨ
+        public const string NOTICE_LIMIT_CHANGED = "NOTICE_LIMIT_CHANGED"; //限制次数变化通知
 
-        public const string FILING_SCORE_CHANGE = "FILING_SCORE_CHANGE"; //���Ľ������������仯
-        public const string FILLING_CHANGE_CHAPTER = "FILLING_CHANGE_CHAPTER"; //���Ľ����л�npc
+        public const string FILING_SCORE_CHANGE = "FILING_SCORE_CHANGE"; //查阅建档分数奖励变化
+        public const string FILLING_CHANGE_CHAPTER = "FILLING_CHANGE_CHAPTER"; //查阅建档切换npc
 
 
         public const string NOTICE_MAINSTORY_BOXBONUS_STATE = "NOTICE_MAINSTORY_BOXBONUS_STATE";
@@ -63,64 +63,64 @@ namespace GFGGame
 
         public const string LUCKY_BOX = "LUCKY_BOX";
 
-        public const string BUY_RECHARGE_SUCCESS = "BUY_RECHARGE_SUCCESS"; //��ֵ�ɹ�
-        public const string BUY_GIFT_SUCCESS = "BUY_GIFT_SUCCESS"; //��������ɹ�
-        public const string BUY_EXCHANGE_SUCCESS = "BUY_EXCHANGE_SUCCESS"; //�̳Ƕһ��ɹ�
+        public const string BUY_RECHARGE_SUCCESS = "BUY_RECHARGE_SUCCESS"; //充值成功
+        public const string BUY_GIFT_SUCCESS = "BUY_GIFT_SUCCESS"; //购买礼包成功
+        public const string BUY_EXCHANGE_SUCCESS = "BUY_EXCHANGE_SUCCESS"; //商城兑换成功
 
-        public const string LOGIN_SUCCESS = "LOGIN_SUCCESS"; //��¼�ɹ�
-        public const string LOGIN_FAIL = "LOGIN_FAIL"; //��¼ʧ��
-        public const string SERVER_CHANGE = "SERVER_CHANGE"; //��������
+        public const string LOGIN_SUCCESS = "LOGIN_SUCCESS"; //登录成功
+        public const string LOGIN_FAIL = "LOGIN_FAIL"; //登录失败
+        public const string SERVER_CHANGE = "SERVER_CHANGE"; //更换区服
 
-        public const string FIELD_RESULT = "FIELD_RESULT"; //��Ұ����
-        public const string FIELD_TASK = "FIELD_TASK"; //��Ұ����
+        public const string FIELD_RESULT = "FIELD_RESULT"; //田野结算
+        public const string FIELD_TASK = "FIELD_TASK"; //田野任务
 
-        public const string NOTICE_SYSTOM_ADD = "NOTICE_SYSTOM_ADD"; //��������
-        public const string NOTICE_SYSTOM_REMOVE = "NOTICE_SYSTOM_REMOVE"; //ɾ������
+        public const string NOTICE_SYSTOM_ADD = "NOTICE_SYSTOM_ADD"; //新增公告
+        public const string NOTICE_SYSTOM_REMOVE = "NOTICE_SYSTOM_REMOVE"; //删除公告
 
-        public const string SUIT_GUIDE_BOX_BONUS = "SUIT_GUIDE_BOX_BONUS"; //��ȡ��װ�ռ�����
-        public const string JUMP_TO_SOURCE = "JUMP_TO_SOURCE"; //��ת����Դ
+        public const string SUIT_GUIDE_BOX_BONUS = "SUIT_GUIDE_BOX_BONUS"; //领取套装收集奖励
+        public const string JUMP_TO_SOURCE = "JUMP_TO_SOURCE"; //跳转到来源
 
-        public const string FINSH_GUIDE_INDEX = "FINSH_GUIDE_INDEX"; //���һ������
-        public const string RED_CHANGE = "RED_CHANGE"; //���仯��������ɾ��
+        public const string FINSH_GUIDE_INDEX = "FINSH_GUIDE_INDEX"; //完成一步引导
+        public const string RED_CHANGE = "RED_CHANGE"; //红点变化，新增或删除
 
-        public const string FRIEND_REFRESH = "FRIEND_REFRESH"; //ˢ�º����б�
-        public const string FRIEND_ADD = "FRIEND_ADD"; //��������
-        public const string FRIEND_REMOVE = "FRIEND_REMOVE"; //ɾ������
-        public const string FRIEND_APPLY_CHANGE = "FRIEND_APPLY_CHANGE"; //���������б��仯
+        public const string FRIEND_REFRESH = "FRIEND_REFRESH"; //刷新好友列表
+        public const string FRIEND_ADD = "FRIEND_ADD"; //新增好友
+        public const string FRIEND_REMOVE = "FRIEND_REMOVE"; //删除好友
+        public const string FRIEND_APPLY_CHANGE = "FRIEND_APPLY_CHANGE"; //好友申请列表变化
 
-        public const string ITEM_READ = "ITEM_READ"; //��Ʒ�Ѷ��ظ�
+        public const string ITEM_READ = "ITEM_READ"; //物品已读回复
 
-        public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE"; //������ݱ仯
+        public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE"; //相册数据变化
 
-        public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME"; //�޸��������
-        public const string CHANGE_ROLE_HEAD = "CHANGE_ROLE_HEAD"; //�޸����ͷ��ͷ���
+        public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME"; //修改玩家名称
+        public const string CHANGE_ROLE_HEAD = "CHANGE_ROLE_HEAD"; //修改玩家头像、头像框
 
-        public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE"; //����״̬�仯
+        public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE"; //游历状态变化
 
-        public const string GALLERY_DATA_CHANGE = "GALLERY_DATA_CHANGE"; //�������ݱ仯
-        public const string GALLERY_RANK_DATA_CHANGE = "GALLERY_RANK_DATA_CHANGE"; //�������а����ݱ仯
+        public const string GALLERY_DATA_CHANGE = "GALLERY_DATA_CHANGE"; //画廊数据变化
+        public const string GALLERY_RANK_DATA_CHANGE = "GALLERY_RANK_DATA_CHANGE"; //画廊排行榜数据变化
 
-        public const string DOWNLOAD_FINISH = "DOWNLOAD_FINISH"; //�������
-        public const string DOWNLOAD_FINISH_ONE = "DOWNLOAD_FINISH_ONE"; //�������һ��
+        public const string DOWNLOAD_FINISH = "DOWNLOAD_FINISH"; //下载完成
+        public const string DOWNLOAD_FINISH_ONE = "DOWNLOAD_FINISH_ONE"; //下载完成一个
 
-        public const string ARENA_FIGHT_RESULT = "ARENA_FIGHT_RESULT"; //������ս������
+        public const string ARENA_FIGHT_RESULT = "ARENA_FIGHT_RESULT"; //竞技场战斗结算
 
-        public const string LEAGUE_MEMBER_CHANGE = "LEAGUE_MEMBER_CHANGE"; //���˳�Ա�仯
+        public const string LEAGUE_MEMBER_CHANGE = "LEAGUE_MEMBER_CHANGE"; //联盟成员变化
 
-        // public const string LEAGUE_MEMBER_POS_CHANGE = "LEAGUE_MEMBER_POS_CHANGE";//���˳�Աְλ�仯
-        public const string LEAGUE_LOG_CHANGE = "LEAGUE_LOG_CHANGE"; //������־�仯
-        public const string LEAGUE_INFO_CHANGE = "LEAGUE_INFO_CHANGE"; //������Ϣ�仯
-        public const string LEAGUE_NUMBERIC_CHANGE = "LEAGUE_NUMBERIC_CHANGE"; //������ֵ�仯
-        public const string LEAGUE_ANSWER_MEMBER_CHANGE = "LEAGUE_ANSWER_MEMBER_CHANGE"; //���˼����˳������Ŀ
-        public const string LEAGUE_ANSWER_RESULT_CHANGE = "LEAGUE_ANSWER_RESULT_CHANGE"; //�������˴����Ŀ
-        public const string LEAGUE_ANSWER_START = "LEAGUE_ANSWER_START"; //������һ�ִ��⿪ʼ
+        // public const string LEAGUE_MEMBER_POS_CHANGE = "LEAGUE_MEMBER_POS_CHANGE";//联盟成员职位变化
+        public const string LEAGUE_LOG_CHANGE = "LEAGUE_LOG_CHANGE"; //联盟日志变化
+        public const string LEAGUE_INFO_CHANGE = "LEAGUE_INFO_CHANGE";//联盟信息变化
+        public const string LEAGUE_NUMBERIC_CHANGE = "LEAGUE_NUMBERIC_CHANGE"; //联盟数值变化
+        public const string LEAGUE_ANSWER_MEMBER_CHANGE = "LEAGUE_ANSWER_MEMBER_CHANGE"; //有人加入退出答对题目
+        public const string LEAGUE_ANSWER_RESULT_CHANGE = "LEAGUE_ANSWER_RESULT_CHANGE"; //联盟有人答对题目
+        public const string LEAGUE_ANSWER_START = "LEAGUE_ANSWER_START"; //联盟新一轮答题开始
 
-        public const string LEAGUE_ANSWER_END = "LEAGUE_ANSWER_END"; //���˱��ִ������
+        public const string LEAGUE_ANSWER_END = "LEAGUE_ANSWER_END"; //联盟本轮答题结束
 
-        // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//���˴���״̬����
-        public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE"; //���������Ϣ�仯
-        public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE"; //֪ͨ������Ϣ
-        public const string ACTIVE_SKILL = "ACTIVE_SKILL"; //���ܼ���
+        // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//联盟答题状态更新
+        public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE"; //其他玩家信息变化
+        public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE"; //通知聊天信息
+        public const string ACTIVE_SKILL = "ACTIVE_SKILL";//技能激活
 
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT"; //领取连续返利礼包
         public const string CONTINUOUS_REBATE_GIFT_SHOP_BUY = "CONTINUOUS_REBATE_GIFT_SHOP_BUY";
@@ -180,5 +180,8 @@ namespace GFGGame
 
         // 服装散件图鉴配置加载完成
         public const string DRESS_PART_LOAD_FINISHED = "DRESS_PART_LOAD_FINISHED";
+
+        //通知阿福赠礼活动状态的更新
+        public const string AFU_GIFT_CHANGED = "AFU_GIFT_CHANGED";
     }
 }

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

@@ -185,12 +185,13 @@ namespace GFGGame
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
-            BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();
-            ActivityAfuGiftProxy.GetAfuGiftInfo().Coroutine();
+            BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
+            ActivityAfuGiftProxy.GetAfuGiftInfo().Coroutine();
+
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
@@ -277,6 +278,7 @@ namespace GFGGame
             BattlePassTaskDataManager.Instance.Clear();
             TaskDataManager.Instance.Clear();
             LeagueDataManager.Instance.Clear();
+            ActivityAfuGiftDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -1,4 +1,5 @@
-using System;
+using ET;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -8,69 +9,109 @@ namespace GFGGame
     public class ActivityAfuGiftDataManager : SingletonBase<ActivityAfuGiftDataManager>
     {
         private ActivityInfo info;
+        public ActivityInfo Info { get => info; set => info = value; }
+
+        private int _indexDay;
         private bool _isBuy;
         //已经领奖levelId
-        private HashSet<int> _normalRewards = new HashSet<int>();
+        private List<int> _normalRewards = new List<int>();
 
         //已经高级领奖levelId
-        private HashSet<int> _superRewards = new HashSet<int>();
+        private List<int> _superRewards = new List<int>();
         private List<ActivityLoginCfg> _rewardCfgs;
-
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
-        public ActivityInfo Info { get => info; set => info = value; }
+
+        private bool _isOpen;
+        public bool IsOpen { get => _isOpen; set => _isOpen = value; }
+
+        private bool _needRefresh;
+        public bool NeedRefresh { get => _needRefresh; set => _needRefresh = value; }
+
+        public bool CheckIconShow()
+        {
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
+                   activityInfo.EndTime > TimeHelper.ServerNow();
+        }
 
         public void InitActivityInfo()
         {
             Info = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
             RewardCfgs = ActivityLoginCfgArray.Instance.GetCfgsByid(Info.ActivityId);
         }
-         
-        public int GetActivityDay(int activityID)
+
+        public int GetNormalRewardStateByDay(int indexDay)
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityID);
-            return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
+            return _normalRewards[indexDay];
         }
 
-        public int GetMaxPassDay()
+        public int GetSuperRewardStateByDay(int indexDay)
         {
-            int rewardDay = ActivityLoginCfgArray.Instance.GetCfgsByid(Info.ActivityId).Count;
-            return Math.Min(rewardDay, GetActivityDay(Info.ActivityId));
+            return _superRewards[indexDay];
         }
 
-        public long GetEndTime()
+        public void SetRewardStateList(List<int> list, bool isVip)
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
-            return activityInfo.EndTime;
+            if (isVip)
+            {
+                _superRewards = new List<int>(list);
+            }
+            else
+            {
+                _normalRewards = new List<int>(list);
+            }
         }
 
-        public bool CanGetNormalReward(int id)
+        public void SetIsBuy(bool isBuy)
         {
-            return !_normalRewards.Contains(id);
+            _isBuy = isBuy;
         }
 
-        public bool CanGetSuperReward(int id)
+        public bool GetIsBuy()
         {
-            return _isBuy && !_superRewards.Contains(id);
+            return _isBuy;
         }
 
-        public void AddNormalReward(int levelId)
+        public void SetIndexDay(int indexDay)
         {
-            _normalRewards.Add(levelId);
+            _indexDay = indexDay;
         }
 
-        public void AddSuperReward(int levelId)
+        public int GetIndexDay()
         {
-            _superRewards.Add(levelId);
+            return _indexDay;
         }
 
-        public void SetIsBuy(bool isBuy)
+        public bool HaveCanGetReward()
         {
-            _isBuy = isBuy;
+            if (!_isOpen)
+            {
+                return false;
+            }
+
+            int passDay = GetIndexDay();
+
+            for (int i = passDay - 1; i >= 0; i--)
+            {
+                if (GetNormalRewardStateByDay(i) == ConstBonusStatus.CAN_GET 
+                    || GetSuperRewardStateByDay(i) == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
-        public bool GetIsBuy()
+        public void Clear()
         {
-            return _isBuy;
+            _isOpen = false;
+            _needRefresh = true;
+            //info = null;
+            //_isBuy = false;
+            //_indexDay = 1;
+            //_normalRewards.Clear();
+            //_superRewards.Clear();
         }
     }
 }

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

@@ -95,6 +95,21 @@ namespace GFGGame
             return activityInfoIds.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
         }
 
+        public List<ActivityInfo> GetActivityInfoByTypeAndID(int activityType, int outActivityID)
+        {
+            List<ActivityOpenCfg> list = ActivityOpenCfgArray.Instance.GetCfgsBytype(activityType);
+            List<int> infoList = new List<int>();
+            for(int i = 0; i < list.Count; i++)
+            {
+                if(list[i].params2Arr!=null && list[i].params2Arr.Length > 0 
+                    && list[i].params2Arr[0] == outActivityID)
+                {
+                    infoList.Add(list[i].id);
+                }
+            }
+            return infoList.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
+        }
+
         //获取活动数据根据类型
         public ActivityInfo GetActivityInfoOneByType(int activityType)
         {

GameClient/Assets/Game/HotUpdate/Data/LimitedRechargeDBGiftDataManager.cs → GameClient/Assets/Game/HotUpdate/Data/ActivityWanShiLiDataManager.cs

@@ -5,11 +5,11 @@ using UnityEngine;
 
 namespace Assets.Game.HotUpdate.Data
 {
-    public class LimitedRechargeDBGiftDataManager : SingletonBase<LimitedRechargeDBGiftDataManager>
+    public class ActivityWanShiLiDataManager : SingletonBase<ActivityWanShiLiDataManager>
     {
         public bool CanGetReward()
         {
-            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             if (_activityInfo == null) return false;
             ActivityRecharge2Cfg[] _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
             for (int i = 0; i < _rechargeCfgs.Length; i++)
@@ -24,14 +24,14 @@ namespace Assets.Game.HotUpdate.Data
 
         public bool CheckOpen()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
                    activityInfo.EndTime > TimeHelper.ServerNow();
         }
 
         public long GetEndTime()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             return activityInfo.EndTime;
         }
     }

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

@@ -759,14 +759,14 @@ namespace GFGGame
         }
 
         // 默认的不显示
-        private static List<int> defaultID = new List<int> { 10000, 20000, 30000, 50000, 60000 };
+        public static List<int> defaultID = new List<int> { 10000, 20000, 30000, 50000, 60000 };
         private static bool CanShow(ItemCfg item)
         {
             if (defaultID.Contains(item.id))
             {
                 return false;
             }
-            return (item.isHide <= 0 && item.mainScore > 0);
+            return item.isHide <= 0;
         }
 
         public static List<int> GetAllDressUpGuideIdListBySubTypes(List<int> subTypes)

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

@@ -329,9 +329,12 @@ namespace GFGGame
         //茶话会雅集奖励是否可以领取
         public int CheckTeaPartyLeagueRewardStatu(int targetScore)
         {
-            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
             var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId);
-
+            if (teapartyRewardLeagueCfgs == null)
+                return 0;
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo == null || roleTeapartyInfo.LeagueAwardStatusVs == null || roleTeapartyInfo.LeagueAwardStatusVs.Count <= 0)
+                return 0;
             for (int i = 0; i < teapartyRewardLeagueCfgs.Count; i++)
             {
                 if (teapartyRewardLeagueCfgs[i].targetScore == targetScore)

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

@@ -923,9 +923,9 @@ namespace GFGGame
             return false;
         }
 
-        public bool GetLimitedRechargeDBGiftRed()
+        public bool GetActivityWanShiLiRed()
         {
-            return LimitedRechargeDBGiftDataManager.Instance.CanGetReward();
+            return ActivityWanShiLiDataManager.Instance.CanGetReward();
         }
 
         /// <summary>

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

@@ -15,7 +15,7 @@ namespace GFGGame
 
         public int filingChapterId;//查阅建档当前副本Id
         public int npcFilingChapterId;//记录查阅建档工作室入口id，为与限时活动章节做区分。
-        public int luckyBoxFilingChapterId = 31000;//查阅建档这个章节是限时抽奖活动专属，为测试能快速更新先临时写死，后边再改
+        public int luckyBoxFilingChapterId;//查阅建档这个章节是限时抽奖活动专属
 
         public int PorcelainTheme = 1;//瓷器修复当天主题
 
@@ -134,7 +134,7 @@ namespace GFGGame
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
         }
 
-        public float GetAdditionBySuitId(int suitId)
+        private float GetAdditionBySuitId(int suitId)
         {
             float addition = 0;
             SuitCfg cfg = SuitCfgArray.Instance.GetCfg(suitId);
@@ -149,6 +149,34 @@ namespace GFGGame
             return addition;
         }
 
+        private float GetAdditionBySuitIds(int[] suitIds)
+        {
+            float addition = 0;
+            for (int i = 0; i < suitIds.Length; i++)
+            {
+                addition += GetAdditionBySuitId(suitIds[i]);
+            }
+            return addition;
+        }
+
+        public float GetAddition()
+        {
+            float addition;
+            StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
+
+            // 活动
+            if (IsluckyBoxFilingChapter())
+            {
+                addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
+            }
+            // 查阅建档
+            else
+            {
+                addition = GetAdditionBySuitId(filingCfg.suitId);
+            }
+            return addition;
+        }
+
         public bool GetFilingRewardState(int chapterId)
         {
             StudioData studioData = GetStudioDataById(chapterId);
@@ -180,5 +208,10 @@ namespace GFGGame
         }
 
 
+        public bool IsluckyBoxFilingChapter()
+        {
+            return filingChapterId == luckyBoxFilingChapterId;
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAFuGift/UI_ActivityAFuGiftUI.cs

@@ -8,6 +8,7 @@ namespace UI.ActivityAFuGift
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_btnGetState;
         public UI_Panel m_panel;
         public GButton m_btnGet;
         public GButton m_btnClose;
@@ -60,6 +61,7 @@ namespace UI.ActivityAFuGift
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btnGetState = comp.GetController("btnGetState");
             m_panel = (UI_Panel)UI_Panel.Create(comp.GetChild("panel"));
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnClose = (GButton)comp.GetChild("btnClose");
@@ -68,6 +70,7 @@ namespace UI.ActivityAFuGift
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnGetState = null;
             m_panel.Dispose();
             m_panel = null;
             m_btnGet = null;

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

@@ -7,13 +7,18 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GButton m_btnChapter;
-        public GButton m_btnTask;
-        public GButton m_btnShop;
+        public UI_Button1 m_btnChapter;
+        public UI_Button1 m_btnTask;
+        public UI_Button1 m_btnShop;
+        public GTextField m_timeDesc;
         public GTextField m_txtTime;
-        public GButton m_btnLuckyBox;
+        public GButton m_btnLuckyBox_old;
+        public UI_Button1 m_btnLuckyBox;
+        public GGraph m_bgEffectHolder;
+        public Transition m_In_1;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
         public const string RES_NAME = "ActivityThemeLuckyBoxUI";
@@ -61,23 +66,37 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnChapter = (GButton)comp.GetChild("btnChapter");
-            m_btnTask = (GButton)comp.GetChild("btnTask");
-            m_btnShop = (GButton)comp.GetChild("btnShop");
+            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_btnLuckyBox = (GButton)comp.GetChild("btnLuckyBox");
+            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");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
             m_btnBack = null;
+            m_btnChapter.Dispose();
             m_btnChapter = null;
+            m_btnTask.Dispose();
             m_btnTask = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_timeDesc = null;
             m_txtTime = null;
+            m_btnLuckyBox_old = null;
+            m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
+            m_bgEffectHolder = null;
+            m_In_1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_Button1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c89bb062d57852443bac6d8b98beecf8
+guid: 90ddd009270089145a0f6305903bc79a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ActivityWanShiLiUI.cs

@@ -0,0 +1,100 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ActivityWanShiLiUI
+    {
+        public GComponent target;
+        public UI_ProgressBar2 m_progress;
+        public UI_item m_DBGiftItem0;
+        public UI_item m_DBGiftItem1;
+        public UI_item m_DBGiftItem2;
+        public UI_item m_DBGiftItem3;
+        public GGroup m_DBGiftItemGroup;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GButton m_btnBack;
+        public const string URL = "ui://z8lqda6wc82k0";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ActivityWanShiLiUI";
+        private static UI_ActivityWanShiLiUI _proxy;
+
+        public static UI_ActivityWanShiLiUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityWanShiLiUI();
+            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_ActivityWanShiLiUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityWanShiLiUI();
+            }
+            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_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_DBGiftItem0 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem0"));
+            m_DBGiftItem1 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem1"));
+            m_DBGiftItem2 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem2"));
+            m_DBGiftItem3 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem3"));
+            m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_progress.Dispose();
+            m_progress = null;
+            m_DBGiftItem0.Dispose();
+            m_DBGiftItem0 = null;
+            m_DBGiftItem1.Dispose();
+            m_DBGiftItem1 = null;
+            m_DBGiftItem2.Dispose();
+            m_DBGiftItem2 = null;
+            m_DBGiftItem3.Dispose();
+            m_DBGiftItem3 = null;
+            m_DBGiftItemGroup = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ActivityWanShiLiUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ComProBonus2.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ComProBonus2
+    {
+        public GComponent target;
+        public Controller m_state;
+        public GButton m_loaIcon;
+        public GTextField m_count;
+        public GImage m_imgGot;
+        public const string URL = "ui://z8lqda6wevdh27";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ComProBonus2";
+        private static UI_ComProBonus2 _proxy;
+
+        public static UI_ComProBonus2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComProBonus2();
+            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_ComProBonus2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComProBonus2();
+            }
+            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_state = comp.GetController("state");
+            m_loaIcon = (GButton)comp.GetChild("loaIcon");
+            m_count = (GTextField)comp.GetChild("count");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_state = null;
+            m_loaIcon = null;
+            m_count = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ComProBonus2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ProgressBar2.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ProgressBar2
+    {
+        public GProgressBar target;
+        public UI_ComProBonus2 m_comProBonus0;
+        public UI_ComProBonus2 m_comProBonus1;
+        public UI_ComProBonus2 m_comProBonus2;
+        public UI_ComProBonus2 m_comProBonus3;
+        public GGroup m_comProBonusGroup;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public const string URL = "ui://z8lqda6wc82k1";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ProgressBar2";
+        private static UI_ProgressBar2 _proxy;
+
+        public static UI_ProgressBar2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar2();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
+            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
+            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
+            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
+            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProBonus0.Dispose();
+            m_comProBonus0 = null;
+            m_comProBonus1.Dispose();
+            m_comProBonus1 = null;
+            m_comProBonus2.Dispose();
+            m_comProBonus2 = null;
+            m_comProBonus3.Dispose();
+            m_comProBonus3 = null;
+            m_comProBonusGroup = null;
+            m_holder = null;
+            m_holderReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ProgressBar2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_item.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_item.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -19,6 +19,8 @@ namespace UI.ClothingSynthetic
         public GList m_listClothing;
         public GButton m_btnProduction;
         public GComponent m_comCostCurrency;
+        public Transition m_hide;
+        public Transition m_show;
         public const string URL = "ui://4f294tdkj5391";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "ClothingSyntheticUI";
@@ -78,6 +80,8 @@ namespace UI.ClothingSynthetic
             m_listClothing = (GList)comp.GetChild("listClothing");
             m_btnProduction = (GButton)comp.GetChild("btnProduction");
             m_comCostCurrency = (GComponent)comp.GetChild("comCostCurrency");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,6 +99,8 @@ namespace UI.ClothingSynthetic
             m_listClothing = null;
             m_btnProduction = null;
             m_comCostCurrency = null;
+            m_hide = null;
+            m_show = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -31,6 +31,7 @@ namespace UI.CommonGame
         public GImage m_imgShowTong;
         public GGroup m_grpGot;
         public GImage m_lock;
+        public GImage m_mask;
         public const string URL = "ui://eg2y0ldpwet2tae";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -102,6 +103,7 @@ namespace UI.CommonGame
             m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
             m_grpGot = (GGroup)comp.GetChild("grpGot");
             m_lock = (GImage)comp.GetChild("lock");
+            m_mask = (GImage)comp.GetChild("mask");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -129,6 +131,7 @@ namespace UI.CommonGame
             m_imgShowTong = null;
             m_grpGot = null;
             m_lock = null;
+            m_mask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs

@@ -0,0 +1,104 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ListShowItem
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GButton m_btnShow;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
+        public GList m_listGiftBag;
+        public GButton m_btnGetGiftBag;
+        public GTextField m_txtGiftBag;
+        public GLoader m_cardBg;
+        public GLoader m_cardIcon;
+        public const string URL = "ui://t8nwuj7idn9y2i";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ListShowItem";
+        private static UI_ListShowItem _proxy;
+
+        public static UI_ListShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListShowItem();
+            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_ListShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListShowItem();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
+            m_listGiftBag = (GList)comp.GetChild("listGiftBag");
+            m_btnGetGiftBag = (GButton)comp.GetChild("btnGetGiftBag");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_cardBg = (GLoader)comp.GetChild("cardBg");
+            m_cardIcon = (GLoader)comp.GetChild("cardIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_btnShow = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
+            m_listGiftBag = null;
+            m_btnGetGiftBag = null;
+            m_txtGiftBag = null;
+            m_cardBg = null;
+            m_cardIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_NewLimitChargeUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_packageName;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GList m_list;
+        public GButton m_btnRight;
+        public GButton m_btnLeft;
+        public GButton m_btnCharge;
+        public const string URL = "ui://t8nwuj7idn9y2h";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "NewLimitChargeUI";
+        private static UI_NewLimitChargeUI _proxy;
+
+        public static UI_NewLimitChargeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewLimitChargeUI();
+            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_NewLimitChargeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewLimitChargeUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_packageName = (GTextField)comp.GetChild("packageName");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_list = (GList)comp.GetChild("list");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnCharge = (GButton)comp.GetChild("btnCharge");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_packageName = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_list = null;
+            m_btnRight = null;
+            m_btnLeft = null;
+            m_btnCharge = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs.meta

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

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

@@ -7,10 +7,11 @@ namespace UI.LuckyBox
     public partial class UI_ComBox
     {
         public GComponent target;
+        public Controller m_c1;
         public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
-        public GImage m_imgActLuckyBox;
+        public GLoader m_imgActLuckyBox;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
@@ -64,10 +65,11 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
+            m_imgActLuckyBox = (GLoader)comp.GetChild("imgActLuckyBox");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
@@ -77,6 +79,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comModel.Dispose();
             m_comModel = null;
             m_btnPreview.Dispose();

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GButton target;
         public Controller m_c1;
+        public Controller m_c2;
         public GTextField m_txtTime;
         public const string URL = "ui://mfvz4q8kt6j1ow";
         public const string PACKAGE_NAME = "Main";
@@ -57,11 +58,13 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_txtTime = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,9 +8,9 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_holderSmokeIn;
         public GGraph m_holderLoop;
         public GGraph m_holder;
-        public GGraph m_holderSmokeIn;
         public GGraph m_holderSmokeOut;
         public GTextField m_txtCount;
         public GImage m_img3Second;
@@ -65,9 +65,9 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderSmokeOut = (GGraph)comp.GetChild("holderSmokeOut");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_img3Second = (GImage)comp.GetChild("img3Second");
@@ -78,9 +78,9 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_holderSmokeIn = null;
             m_holderLoop = null;
             m_holder = null;
-            m_holderSmokeIn = null;
             m_holderSmokeOut = null;
             m_txtCount = null;
             m_img3Second = null;

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

@@ -26,8 +26,8 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
-        public UI_BtnModle2 m_btnLimitedRechargeDBGift;
-        public UI_BtnModle1 m_btnActivityAfuGift;
+        public UI_BtnModle2 m_btnActivityAfuGift;
+        public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
@@ -113,8 +113,8 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
-            m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
-            m_btnActivityAfuGift = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityAfuGift"));
+            m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
+            m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
@@ -168,10 +168,10 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
-            m_btnLimitedRechargeDBGift.Dispose();
-            m_btnLimitedRechargeDBGift = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
+            m_btnWanShiLi.Dispose();
+            m_btnWanShiLi = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();

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

@@ -17,10 +17,8 @@ namespace UI.Main
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public GGraph m_effReduceScore;
-        public GTextField m_reduceTxt;
         public Transition m_t1;
         public Transition m_t2;
-        public Transition m_t3;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -78,10 +76,8 @@ namespace UI.Main
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
-            m_reduceTxt = (GTextField)comp.GetChild("reduceTxt");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
-            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,10 +95,8 @@ namespace UI.Main
             m_myHead = null;
             m_targetHead = null;
             m_effReduceScore = null;
-            m_reduceTxt = null;
             m_t1 = null;
             m_t2 = null;
-            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,8 +10,10 @@ namespace UI.Main
         public GImage m_bg;
         public UI_ComSkillShow m_comSkillShow;
         public GGraph m_effReduceScore;
+        public GTextField m_reduceTxt;
         public Transition m_t1;
         public Transition m_t2;
+        public Transition m_t3;
         public const string URL = "ui://mfvz4q8kpy009l";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StorySkillUI";
@@ -62,8 +64,10 @@ namespace UI.Main
             m_bg = (GImage)comp.GetChild("bg");
             m_comSkillShow = (UI_ComSkillShow)UI_ComSkillShow.Create(comp.GetChild("comSkillShow"));
             m_effReduceScore = (GGraph)comp.GetChild("effReduceScore");
+            m_reduceTxt = (GTextField)comp.GetChild("reduceTxt");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,8 +75,10 @@ namespace UI.Main
             m_comSkillShow.Dispose();
             m_comSkillShow = null;
             m_effReduceScore = null;
+            m_reduceTxt = null;
             m_t1 = null;
             m_t2 = null;
+            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_StudioFilingUI
     {
         public GComponent target;
+        public Controller m_type;
         public GLoader m_Bg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
@@ -22,6 +23,8 @@ namespace UI.Studio
         public GTextField m_txtSuitProgress;
         public GLoader m_suitIcon;
         public GButton m_btnReward;
+        public GTextField m_activityTipText;
+        public GTextField m_activityTitle;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -69,6 +72,7 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_type = comp.GetController("type");
             m_Bg = (GLoader)comp.GetChild("Bg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -84,9 +88,12 @@ namespace UI.Studio
             m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
             m_suitIcon = (GLoader)comp.GetChild("suitIcon");
             m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_activityTipText = (GTextField)comp.GetChild("activityTipText");
+            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_type = null;
             m_Bg = null;
             m_comValueBar = null;
             m_btnBack = null;
@@ -102,6 +109,8 @@ namespace UI.Studio
             m_txtSuitProgress = null;
             m_suitIcon = null;
             m_btnReward = null;
+            m_activityTipText = null;
+            m_activityTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,6 +10,8 @@ namespace UI.Task
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GList m_listAchieveItem;
+        public Transition m_fadeIn;
+        public Transition m_hide;
         public const string URL = "ui://5mpsibzzaigntny";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskAchieveUI";
@@ -60,12 +62,16 @@ namespace UI.Task
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listAchieveItem = (GList)comp.GetChild("listAchieveItem");
+            m_fadeIn = comp.GetTransition("fadeIn");
+            m_hide = comp.GetTransition("hide");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnBack = null;
             m_listAchieveItem = null;
+            m_fadeIn = null;
+            m_hide = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,20 +7,22 @@ namespace ET
 {
     public class ActivityLoginInfoProtoHandler : AMHandler<S2C_PushActivityLoginInfo>
     {
+        /// <summary>
+        /// 活动的开启/结束/充值
+        /// </summary>
+        /// <param name="session"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
         protected override async ETTask Run(Session session, S2C_PushActivityLoginInfo message)
         {
             var info =  message.ActivityLoginInfo;
             var afuGiftDataManager = ActivityAfuGiftDataManager.Instance;
             afuGiftDataManager.SetIsBuy(info.IsBuy);
-            foreach (var rewardID in info.FreeRewardStatusList)
-            {
-                afuGiftDataManager.AddNormalReward(rewardID);
-            }
-            foreach (var superRewardID in info.PayRewardStatusList)
-            {
-                afuGiftDataManager.AddSuperReward(superRewardID);
-            }
-            //EventAgent.DispatchEvent(ConstMessage.NOTICE_PASSPORT_OPEN);
+            afuGiftDataManager.IsOpen = info.ActivityIsOpen;
+            afuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            afuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
+
+            EventAgent.DispatchEvent(ConstMessage.AFU_GIFT_CHANGED);
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             await ETTask.CompletedTask;
         }
@@ -31,6 +33,10 @@ namespace GFGGame
 {
     public class ActivityAfuGiftProxy : MonoBehaviour
     {
+        /// <summary>
+        /// 登陆游戏初始化
+        /// </summary>
+        /// <returns></returns>
         public static async ETTask GetAfuGiftInfo()
         {
             var response =
@@ -39,34 +45,59 @@ namespace GFGGame
             var info = response.ActivityLoginInfo;
             var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
             activityAfuGiftDataManager.SetIsBuy(info.IsBuy);
-            foreach(var t in info.FreeRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddNormalReward(t);
-            }
-            foreach (var t in info.PayRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddSuperReward(t);
-            }
+            activityAfuGiftDataManager.SetIndexDay(info.IndexDay);
+            activityAfuGiftDataManager.IsOpen = info.ActivityIsOpen;
+
+            activityAfuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            activityAfuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
+            EventAgent.DispatchEvent(ConstMessage.AFU_GIFT_CHANGED);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
         }
 
+        /// <summary>
+        /// 单个领奖
+        /// </summary>
+        /// <param name="isPay"></param>
+        /// <param name="rewardDay"></param>
+        /// <returns></returns>
         public static async ETTask<bool> ReqGetReward(bool isPay, int rewardDay)
         {
             var response =
                 (S2C_GetActivityLoginReward)await MessageHelper.SendToServer(new C2S_GetActivityLoginReward()
                 { IsPay = isPay, RewardDay = rewardDay });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            //奖励弹窗
+
+            var info = response.ActivityLoginInfo;
+            var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
+            // 奖励弹窗
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+
+            activityAfuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            activityAfuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
+
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            return false;
+        }
+
+        /// <summary>
+        /// 一键领取
+        /// </summary>
+        /// <param name="isPay"></param>
+        /// <param name="rewardDay"></param>
+        /// <returns></returns>
+        public static async ETTask<bool> ReqGetAllReward()
+        {
+            var response =
+                (S2C_GetAllActivityLoginReward)await MessageHelper.SendToServer(new C2S_GetAllActivityLoginReward() { });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+
             var info = response.ActivityLoginInfo;
             var activityAfuGiftDataManager = ActivityAfuGiftDataManager.Instance;
-            foreach (var t in info.FreeRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddNormalReward(t);
-            }
-            foreach (var t in info.PayRewardStatusList)
-            {
-                activityAfuGiftDataManager.AddSuperReward(t);
-            }
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+
+            activityAfuGiftDataManager.SetRewardStateList(info.FreeRewardStatusList, false);
+            activityAfuGiftDataManager.SetRewardStateList(info.PayRewardStatusList, true);
 
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return false;

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

@@ -60,6 +60,7 @@ namespace GFGGame
                     LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
                     await ActivitySProxy.ReqSevenDayLoginInfos();
                     await ActivityGlobalSProxy.GetActivityInfo();
+                    await ActivityAfuGiftProxy.GetAfuGiftInfo();
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);
                     PromptController.Instance.ShowFloatTextPrompt("每日次数已重置", MessageType.SUCCESS);
                 }

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

@@ -90,5 +90,28 @@ namespace GFGGame
             }
             return false;
         }
+
+        //¼àÌýÌïÒ°µ÷²éÈÎÎñ״̬
+        public class FieldTaskState : AMHandler<S2C_FieldTaskBonus>
+        {
+            protected override async ETTask Run(Session session, S2C_FieldTaskBonus message)
+            {
+                if (FieldDataManager.Instance.fieldInfos.taskDic != null)
+                {
+                    for (int i = 0; i < message.kTaskIds.Count; i++)
+                    {
+                        if (!FieldDataManager.Instance.fieldInfos.taskDic.ContainsKey(message.kTaskIds[i]))
+                        {
+                            FieldDataManager.Instance.fieldInfos.taskDic.Add(message.kTaskIds[i], message.vTaskStatus[i]);
+                        }
+                        else
+                        {
+                            FieldDataManager.Instance.fieldInfos.taskDic[message.kTaskIds[i]] = message.vTaskStatus[i];
+                        }
+                    }
+                }
+                await ETTask.CompletedTask;
+            }
+        }
     }
 }

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

@@ -47,10 +47,13 @@ namespace GFGGame
                     if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
                     {
                         StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                        SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                        if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                        if(filingCfg.suitId != 0)
                         {
-                            PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
+                            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
+                            if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                            {
+                                PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
+                            }
                         }
                     }
                     EventAgent.DispatchEvent(ConstMessage.STORY_LEVEL_CHANGE);

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

@@ -84,7 +84,6 @@ namespace GFGGame
             ShopDataManager.Instance.UpdateGoodsData(buyId, totalTimes);
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyId);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
-            ItemCfg doubleItemIdCfg = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
 
             EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
             if (showItems)
@@ -97,7 +96,10 @@ namespace GFGGame
                 //}
                 List<ItemData> itemDatas = new List<ItemData>();
                 itemDatas.Add(ItemUtil.createItemData(itemCfg.id, times * shopCfg.itemNum * multiple));
-                itemDatas.Add(ItemUtil.createItemData(doubleItemIdCfg.id, times * shopCfg.itemNum * multiple));
+                if (shopCfg.doubleItemId > 0) { 
+                    ItemCfg doubleItemIdCfg = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
+                    itemDatas.Add(ItemUtil.createItemData(doubleItemIdCfg.id, times * shopCfg.itemNum * multiple));
+                }
                 BonusController.TryShowBonusList(itemDatas);
             }
             EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);

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

@@ -23,6 +23,7 @@ namespace GFGGame
         public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
         public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
         public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
+        public static readonly string STUDIO_FILING_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture/Studios/CYJD/";
 
         public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
@@ -232,5 +233,10 @@ namespace GFGGame
             return res;
         }
 
+        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        {
+            return $"{STUDIO_FILING_DIR_PATH}{"dangan_"}{res}.{extName}";
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -6,6 +6,7 @@ using FairyGUI;
 using System;
 using UI.CommonGame;
 using static GFGGame.ShopSProxy;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -16,8 +17,7 @@ namespace GFGGame
         private struct GetState
         {
             public int rewardID;
-            public int dayIndex;
-            public bool canGet; 
+            public bool canGet;
             public bool isVip;
         }
 
@@ -42,7 +42,7 @@ namespace GFGGame
 
             // Data
             ActivityAfuGiftDataManager.Instance.InitActivityInfo();
-            
+
             // UI
             _rewardListUI = _ui.m_panel.m_scrollPane.m_list;
             _rewardListUI.itemRenderer = RenderListReward;
@@ -54,9 +54,16 @@ namespace GFGGame
         {
             base.OnShown();
 
-            _ui.m_panel.m_scrollPane.target.scrollPane.posX = 0;
+            if (ActivityAfuGiftDataManager.Instance.NeedRefresh)
+            {
+                InitUI();
+                ActivityAfuGiftDataManager.Instance.NeedRefresh = false;
+            }
+            UpdateState();
+            ProgressAutoLocate();
             UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
+
         }
 
         protected override void OnHide()
@@ -77,47 +84,77 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateState);
         }
 
-
         private void InitUI()
         {
             _ui.m_c1.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 1 : 0);
-            // 使列表宽度等于子节点的总宽度
-            float itemWidth = _rewardListUI.GetChildAt(0).width;
-            float columnGap = _rewardListUI.columnGap;
-            _rewardListUI.width = CalculateListWidth(_rewardListUI.numItems, itemWidth, columnGap);
-            Timers.inst.StartCoroutine(InitProgressWidth());
+            _rewardListUI.ResizeToFit();
+            InitProgressWidth();
         }
 
-        private IEnumerator InitProgressWidth()
+        private void InitProgressWidth()
         {
-            yield return new WaitForSeconds(0.5f);
+            GProgressBar gProgressBar = _ui.m_panel.m_scrollPane.m_progress;
             // 根据列表 初始化进度条长度
             float marginLeft = 149;
-            GProgressBar gProgressBar = _ui.m_panel.m_scrollPane.m_progress;
             gProgressBar.width = marginLeft + _rewardListUI.GetChildAt(_rewardListUI.numChildren - 1).position.x - _rewardListUI.GetChildAt(0).position.x;
+            // 初始化进度条值
+            int indexDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
+            gProgressBar.value = CalculateProgressValue(indexDay, _rewardListUI.numChildren);
         }
 
-        private float CalculateListWidth(int num, float itemWidth, float columnGap)
+        /// <summary>
+        /// 滚动到最新日期
+        /// </summary>
+        private void ProgressAutoLocate()
         {
-            return num * itemWidth + (num - 1) * columnGap;
+            _ui.m_panel.m_scrollPane.target.scrollPane.posX 
+                = (ActivityAfuGiftDataManager.Instance.GetIndexDay() - 1) * (_rewardListUI.GetChildAt(0).width + _rewardListUI.columnGap);
+        }
+
+        private double CalculateProgressValue(int indexDay, int sumDay)
+        {
+            int defaultLen = 18;
+            if (indexDay == sumDay)
+            {
+                return 100;
+            }
+            if (indexDay == 1)
+            {
+                return defaultLen;
+            }
+
+            return defaultLen + (100 - defaultLen) / (sumDay - 1) * (indexDay - 1);
         }
 
         private void UpdateTime(object param)
         {
+            if (!ActivityAfuGiftDataManager.Instance.IsOpen)
+            {
+                return;
+            }
+
             long curTime = TimeHelper.ServerNow();
-            long endTime = ActivityAfuGiftDataManager.Instance.GetEndTime();
-            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
         }
 
         private void RenderListReward(int index, GObject item)
         {
+            item.data = index;
+            UI_reward.ProxyEnd();
             UI_reward rewardUI = UI_reward.Proxy(item);
             rewardUI.m_day.m_day.SetVar("day", (index + 1).ToString()).FlushVars();
 
             // 已经到达的日期
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
+            int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
             int arrive = (index + 1) <= passDay ? 0 : 1;
             rewardUI.m_day.m_light.SetSelectedIndex(arrive);
+            // 当日高亮
+            rewardUI.m_c1.SetSelectedIndex((index + 1) == passDay ? 1 : 0);
 
             int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][0];
             int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][0];
@@ -125,68 +162,94 @@ namespace GFGGame
 
             LoadItem(itemNormalId, rewardUI.m_reward_normal, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusFreeArr[0][1]);
             LoadItem(itemVipId1, rewardUI.m_reward_vip1, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[0][1], true);
-            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true);
-
-            UI_reward.ProxyEnd();
+            LoadItem(itemVipId2, rewardUI.m_reward_vip2, ActivityAfuGiftDataManager.Instance.RewardCfgs[index].bonusPayArr[1][1], true, true);
         }
 
-        private void LoadItem(int id, GObject obj, int num, bool isVip = false)
+        private void LoadItem(int itemID, GObject obj, int num, bool isVip = false, bool release = false)
         {
-            ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(id);
+            ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(itemID);
             UI_ComItem comItem = UI_ComItem.Proxy(obj);
+
             comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
             comItem.m_txtCount.text = num.ToString();
             comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
             comItem.target.onClick.Add(OnItemClick);
 
-            int isLock = 0;
-            if (isVip)
-            {
-                isLock = ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 0 : 1;
-            }
-            comItem.m_Lock.selectedIndex = isLock;
-
-            int dayIndex = _rewardListUI.GetChildIndex(obj) + 1;
+            int dayIndex = (int)obj.parent.data + 1;
             // 已经到达的日期
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
+            int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
             bool arrive = dayIndex <= passDay;
-            comItem.target.data = new GetState
-            {
-                rewardID = id,
-                canGet = arrive,
-                dayIndex = dayIndex,
-                isVip = isVip
-            };
-            if (arrive)
+            
+            // 显示锁/遮罩
+            if (isVip)
             {
-                ActivityInfo activityInfo = ActivityAfuGiftDataManager.Instance.Info;
-                bool canGet = false;
-                // Vip专属
-                if (isVip)
+                if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
                 {
-                    canGet = ActivityAfuGiftDataManager.Instance.CanGetSuperReward(dayIndex);
+                    comItem.m_Lock.SetSelectedIndex(arrive ? 0 : 2);
                 }
                 else
                 {
-                    canGet = ActivityAfuGiftDataManager.Instance.CanGetNormalReward(dayIndex);
+                    comItem.m_Lock.SetSelectedIndex(1);
                 }
-                // 已领
-                if (!canGet)
+            }
+            else
+            {
+                comItem.m_Lock.SetSelectedIndex(arrive ? 0 : 2);
+            }
+
+            bool canGet = false;
+            int getState;
+            if (arrive)
+            {
+                if (isVip)
                 {
-                    //bonus.m_imgGot.visible = true;
-                    obj.touchable = false;
-                    // 隐藏红点
-                    RedDotController.Instance.SetComRedDot(obj.asCom, false);
+                    getState = ActivityAfuGiftDataManager.Instance.GetSuperRewardStateByDay(dayIndex - 1);
                 }
-                // 未领
                 else
                 {
-                    //bonus.m_imgGot.visible = false;
-                    // 显示红点
-                    RedDotController.Instance.SetComRedDot(obj.asCom, true);
+                    getState = ActivityAfuGiftDataManager.Instance.GetNormalRewardStateByDay(dayIndex - 1);
                 }
 
+                switch (getState)
+                {
+                    case ConstBonusStatus.CAN_NOT_GET:
+                        comItem.m_grpGot.visible = false;
+                        obj.touchable = true;
+                        // 隐藏红点
+                        RedDotController.Instance.SetComRedDot(obj.asCom, false);
+                        break;
+
+                    case ConstBonusStatus.CAN_GET:
+                        canGet = true;
+                        comItem.m_grpGot.visible = false;
+                        obj.touchable = true;
+                        // 显示红点
+                        RedDotController.Instance.SetComRedDot(obj.asCom, true, "", -33, 27);
+                        break;
+
+                    case ConstBonusStatus.GOT:
+                        comItem.m_grpGot.visible = true;
+                        obj.touchable = false;
+                        // 隐藏红点
+                        RedDotController.Instance.SetComRedDot(obj.asCom, false);
+                        break;
+                }
+            }
+            else
+            {
+                canGet = false;
+                comItem.m_grpGot.visible = false;
+                obj.touchable = true;
+                // 隐藏红点
+                RedDotController.Instance.SetComRedDot(obj.asCom, false);
             }
+
+            obj.data = new GetState
+            {
+                rewardID = itemID,
+                isVip = isVip,
+                canGet = canGet
+            };
             UI_ComItem.ProxyEnd();
         }
 
@@ -197,17 +260,7 @@ namespace GFGGame
 
             if (getState.canGet)
             {
-                // Vip奖励同时领取两个
-                if (getState.isVip)
-                {
-                    int rewardID1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[0][1];
-                    int rewardID2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusPayArr[1][1];
-                }
-                else
-                {
-                    int ID = ActivityAfuGiftDataManager.Instance.RewardCfgs[getState.dayIndex - 1].bonusFreeArr[0][1];
-                }
-                //ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, getState.rewardID).Coroutine();
+                ActivityAfuGiftProxy.ReqGetReward(getState.isVip, (int)obj.parent.data + 1).Coroutine();
             }
             else
             {
@@ -220,6 +273,12 @@ namespace GFGGame
         /// </summary>
         private void OnClickBtnGet()
         {
+            if (!ActivityAfuGiftDataManager.Instance.IsOpen)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                return;
+            }
+
             if (!ActivityAfuGiftDataManager.Instance.GetIsBuy())
             {
                 // 跳转充值画面
@@ -227,26 +286,7 @@ namespace GFGGame
                 return;
             }
 
-            // 一键领取
-            int passDay = ActivityAfuGiftDataManager.Instance.GetMaxPassDay();
-            for(int i = passDay - 1; i >= 0; i++)
-            {
-                int itemNormalId = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusFreeArr[0][0];
-                int itemVipId1 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[0][0];
-                int itemVipId2 = ActivityAfuGiftDataManager.Instance.RewardCfgs[i].bonusPayArr[1][0];
-                if (ActivityAfuGiftDataManager.Instance.CanGetNormalReward(itemNormalId))
-                {
-
-                }
-                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId1))
-                {
-
-                }
-                if (ActivityAfuGiftDataManager.Instance.CanGetSuperReward(itemVipId2))
-                {
-
-                }
-            }
+            ActivityAfuGiftProxy.ReqGetAllReward().Coroutine();
         }
 
         /// <summary>
@@ -254,10 +294,35 @@ namespace GFGGame
         /// </summary>
         private void UpdateState()
         {
-            // 更新底部按钮
+            if (!ActivityAfuGiftDataManager.Instance.IsOpen)
+            {
+                //Hide();
+                return;
+            }
+
+            InitUI();
+            // 更新底部按钮文本
             _ui.m_c1.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.GetIsBuy() ? 1 : 0);
             // 更新锁 红点状态
             _rewardListUI.numItems = ActivityAfuGiftDataManager.Instance.RewardCfgs.Count;
+            UpdateButtonState();
+        }
+
+        /// <summary>
+        /// 更新一键领取按钮状态
+        /// </summary>
+        public void UpdateButtonState()
+        {
+            if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
+            {
+                // 0-普通 1-变灰
+                 _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
+            }
+            // 没有充值，保持常亮
+            else
+            {
+                _ui.m_btnGetState.SetSelectedIndex(0);
+            }
         }
     }
 }

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

@@ -1,10 +1,8 @@
 
-using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using System.Collections.Generic;
 using UI.ActivityThemeLuckyBox;
-using UI.CommonGame;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -12,11 +10,11 @@ namespace GFGGame
     {
         private UI_ActivityThemeLuckyBoxUI _ui;
         private ActivityOpenCfg _activityCfg;
-        private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -31,23 +29,22 @@ namespace GFGGame
             packageName = UI_ActivityThemeLuckyBoxUI.PACKAGE_NAME;
             _ui = UI_ActivityThemeLuckyBoxUI.Create();
             this.viewCom = _ui.target;
-            // this.modal = true;
-            // this.viewCom.Center();
             isfullScreen = true;
 
-            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
-            _ui.m_btnChapter.onClick.Add(OnBtnChapterClick);
-            _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
-
+            _ui.m_btnTask.target.onClick.Add(OnBtnTaskClick);
+            _ui.m_btnChapter.target.onClick.Add(OnBtnChapterClick);
+            _ui.m_btnLuckyBox.target.onClick.Add(OnBtnLuckyBoxClick);
+            _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
 
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -55,18 +52,35 @@ namespace GFGGame
             if (showTask)
             {
                 OnBtnTaskClick();
+           
             }
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+
+            // ½çÃæ¸ù¾ÝID¸Ä±ä
+            _ui.m_c1.SetSelectedPage(_activityId.ToString());
+            _ui.target.GetTransition("In_" + _activityId.ToString())?.Play();
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
+            StudioDataManager.Instance.luckyBoxFilingChapterId = _activityCfg.params3Arr != null ? _activityCfg.params3Arr[0] : 0;
+
+            UpdateEffect();
             UpdateRedDot();
+            UpdateTime();
             Timers.inst.Add(1, 0, UpdateTime);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
+
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
         }
         protected override void RemoveEventListener()
         {
@@ -93,6 +107,13 @@ namespace GFGGame
             if (endTime < curTime) return;
             ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData }, true);
         }
+
+        private void OnBtnShopClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
+ , new object[] { typeof(ActivityThemeLuckyBoxView).FullName, viewData });
+        }
+
         private void UpdateTime(object param = null)
         {
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
@@ -107,8 +128,21 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -90, 70);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTask, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox.target
+                , RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) 
+                || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTask.target, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
+        }
+
+        private void UpdateEffect()
+        {
+            if (_activityId == 1)
+            {
+                // Effect
+                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/New_CK_Flower", "All_tx"));
+                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/New_CK_Flower", "L"));
+                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/New_CK_Flower", "R"));
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI.meta

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

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs → GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs

@@ -2,17 +2,17 @@
 using FairyGUI;
 using System;
 using System.Collections.Generic;
-using UI.DailyWelfare;
+using UI.ActivityWanShiLi;
 using UnityEngine;
 
 namespace GFGGame
 {
-    public class LimitedRechargeDBGiftView : BaseWindow
+    public class ActivityWanShiLiView : BaseWindow
     {
-        private UI_LimitedRechargeDBGiftUI _ui;
+        private UI_ActivityWanShiLiUI _ui;
 
-        private int _minProgressOffset = 6;
-        private int _maxProgressOffset = -8;
+        private int _minProgressOffset = 11;
+        private int _maxProgressOffset = -11;
         private ActivityInfo _activityInfo;
         private ActivityRecharge2Cfg[] _rechargeCfgs;
 
@@ -29,17 +29,19 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_LimitedRechargeDBGiftUI.PACKAGE_NAME;
-            _ui = UI_LimitedRechargeDBGiftUI.Create();
+            packageName = UI_ActivityWanShiLiUI.PACKAGE_NAME;
+            _ui = UI_ActivityWanShiLiUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnTest.onClick.Add(OnBtnTestClick);
-            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
+            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.GetCfgsByactivityId(_activityInfo.ActivityId).ToArray();
             InitProgressValueList();
             InitReward();
+
+            _ui.m_btnBack.onClick.Add(Hide);
         }
 
         protected override void AddEventListener()
@@ -71,12 +73,6 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
         }
 
-        private void OnBtnTestClick(EventContext context)
-        {
-            UpdateProgress();
-        }
-
-
         private int[] _progressValuePart;
         private int _partNum = 4;
 
@@ -85,6 +81,11 @@ namespace GFGGame
         /// </summary>
         private void InitProgressValueList()
         {
+            if(_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
             _progressValuePart = new int[_partNum];
             _ui.m_progress.target.max = _rechargeCfgs[_rechargeCfgs.Length - 1].value;
             int max = (int)_ui.m_progress.target.max;
@@ -103,17 +104,19 @@ namespace GFGGame
         /// </summary>
         private void InitReward()
         {
+            if (_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
             for (int i = 0; i < _partNum; i++)
             {
-                GObject gift = _ui.target.GetChild("DBGiftItem" + (i + 1));
-                UI_DBGiftItem item = UI_DBGiftItem.Proxy(gift);
+                GObject gift = _ui.target.GetChild("DBGiftItem" + i);
                 // 大奖icon
-                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_rechargeCfgs[i].bonusArr[0][0]));
-                // 包子图
-                item.m_DBB.url = "ui://DailyWelfare/DBB_" + (i + 1);
+                UI_item item = UI_item.Proxy(gift);
+                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_rechargeCfgs[i].bonusArr[0][0]));
                 gift.data = _rechargeCfgs[i].bonusArr[0][0];
-                gift.onClick.Add(OnRewardIconClick);
-                UI_DBGiftItem.ProxyEnd();
+                UI_item.ProxyEnd();
 
                 // 进度条分段值Text
                 GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
@@ -166,13 +169,17 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
-            long endTime = _activityInfo.EndTime;
-            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
         }
 
         private void UpdateView()
         {
-            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             UpdateProgress();
         }
 
@@ -188,38 +195,76 @@ namespace GFGGame
         /// <param name="index">玩家可领取的最大奖励index</param>
         private void UpdateRewardState(int index)
         {
-            for(int i = 0; i < _partNum; i++)
+            if (_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
+            for (int i = 0; i < _partNum; i++)
             {
+                GObject gift = _ui.target.GetChild("DBGiftItem" + i);
                 bool arrive = (i <= index);
                 GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
                 UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(progressItem);
+
+                // 下方礼物icon加上data
                 bonus.target.data = new GetState
                 {
                     rewardID = _rechargeCfgs[i].id,
                     canGet = arrive
                 };
 
+
+                UI_item item = UI_item.Proxy(gift);
+                item.m_c1.SetSelectedIndex(0);
+
+                // 大奖icon加上data
+                item.target.data = new GetState
+                {
+                    rewardID = _rechargeCfgs[i].id,
+                    canGet = arrive
+                };
+
                 // 玩家已经达到的奖励
                 if (arrive)
                 {
                     // 已领
                     if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) >= 0)
                     {
-                        bonus.m_imgGot.visible = true;
+                        item.m_c1.SetSelectedIndex(1);
+                        bonus.m_state.SetSelectedIndex(2);
                         bonus.target.touchable = false;
+                        item.target.touchable = false;
                         // 隐藏红点
-                        RedDotController.Instance.SetComRedDot(bonus.target, false);
+                        RedDotController.Instance.SetComRedDot(bonus.m_loaIcon, false);
+                        RedDotController.Instance.SetComRedDot(item.target, false);
                     }
                     // 未领
                     else
                     {
-                        bonus.m_imgGot.visible = false;
+                        bonus.m_state.SetSelectedIndex(0);
+                        bonus.target.touchable = true;
+                        item.target.touchable = true;
                         // 显示红点
-                        RedDotController.Instance.SetComRedDot(bonus.target, true);
+                        RedDotController.Instance.SetComRedDot(bonus.m_loaIcon, true);
+                        RedDotController.Instance.SetComRedDot(item.target, true);
                     }
                 }
+                else
+                {
+                    bonus.target.touchable = true;
+                    item.target.touchable = true;
+                    bonus.m_state.SetSelectedIndex(1);
+                    
+                    // 隐藏红点
+                    RedDotController.Instance.SetComRedDot(bonus.m_loaIcon, false);
+                    RedDotController.Instance.SetComRedDot(item.target, false);
+                }
                 progressItem.onClick.Set(OnGiftClick);
+                item.target.onClick.Set(OnGiftClick);
+
                 UI_ComProBonus2.ProxyEnd();
+                UI_item.ProxyEnd();
             }
         }
 
@@ -239,27 +284,9 @@ namespace GFGGame
             else
             {
                 // 显示奖励详细列表
-                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(LimitedRechargeDBGiftView).FullName));
+                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(ActivityWanShiLiView).FullName));
             }
         }
 
-        /// <summary>
-        /// 点击上方的奖励icon，显示单个奖励介绍（奖励配置中的第一个奖励）
-        /// </summary>
-        /// <param name="eventContext"></param>
-        private void OnRewardIconClick(EventContext eventContext)
-        {
-            GObject gObject = eventContext.sender as GObject;
-            int id = (int)(gObject.data);
-            GoodsItemTipsController.ShowItemTips(id);
-        }
-
-        public bool CheckOpen()
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
     }
-
 }

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

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

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

@@ -43,7 +43,6 @@ namespace GFGGame
         private List<ItemData> _materiarsOfSelectedItem;
 
         private UI_MateriasListItem listTypeItem_CloSynthetic;
-        private bool _clearDressUpList;
 
 
         public override void Dispose()
@@ -123,11 +122,10 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _clearDressUpList = true;
             _valueBarController.OnHide();
             _ui.m_listMaterias.selectedIndex = 0;
             Timers.inst.Remove(CheckGuide);
-
+            _dressUpObjUI.dressUpObj.TakeOffAll();
         }
         protected override void RemoveEventListener()
         {
@@ -194,12 +192,6 @@ namespace GFGGame
         private EaseType ease = EaseType.CubicOut;
         private void UpdateRole(bool tween)
         {
-            if (_clearDressUpList)
-            {
-                _dressUpObjUI.dressUpObj.TakeOffAll();
-                _clearDressUpList = false;
-            }
-
             _dressUpObjUI.ResetSceneObj(45, true, true, null, false);
             _dressUpObjUI.dressUpObj.AddOrRemove(_selectedItemId, true);
             _imgSelected.visible = _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
@@ -209,6 +201,7 @@ namespace GFGGame
             if (!tween)
             {
                 duration = 0;
+                _ui.m_hide.Play();
             }
             var dy = _ui.m_compHolder.target.height - 642;
             if (Array.IndexOf(HEAD_Y_ARR, type) >= 0)
@@ -241,6 +234,22 @@ namespace GFGGame
                 _ui.m_compHolder.m_compMover.target.TweenMoveY(BODY_Y + dy, duration).SetEase(ease);
                 _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(BODY_SCALE, BODY_SCALE), duration).SetEase(ease);
             }
+
+            if (!tween)
+            {
+                Timers.inst.StartCoroutine(DelayShow());
+            }
+
+        }
+
+        /// <summary>
+        /// 延迟一帧 防止闪一下
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerator DelayShow()
+        {
+            yield return new WaitForEndOfFrame();
+            _ui.m_show.Play();
         }
 
         private void UpdateClothingList(bool tween)

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

@@ -0,0 +1,285 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+using System;
+using Hutool;
+using UI.DailyWelfare;
+
+namespace GFGGame
+{
+    public class NewLimitChargeView : BaseWindow
+    {
+        private UI_NewLimitChargeUI _ui;
+        private List<ShopCfg> _shopCfgs;
+        private DressUpObjUI _dressUpObjUI;
+        private List<DressUpObjUI> _dressUpObjUIs = new List<DressUpObjUI>();
+        private int _curSelectIndex = 0;
+
+        private int _activityId = 0;
+        private ActivityInfo _activityInfo;
+        private List<ActivityRechargeCfg> _rechargeCfgs;
+
+        public override void Dispose()
+        {
+            if (_dressUpObjUI != null)
+            {
+                _dressUpObjUI.Dispose();
+                _dressUpObjUI = null;
+            }
+            for (int i = 0; i < _dressUpObjUIs.Count; i++)
+            {
+                if (_dressUpObjUIs[i] != null)
+                {
+                    _dressUpObjUIs[i].Dispose();
+                    _dressUpObjUIs[i] = null;
+                }
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LimitChargeUI.PACKAGE_NAME;
+            _ui = UI_NewLimitChargeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+            this.bringToFontOnClick = false;
+
+            _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_list.SetVirtual();
+            _ui.m_list.scrollPane.onScrollEnd.Add(UpdateSuitView);
+            _ui.m_list.scrollPane.decelerationRate = 0.8f;
+
+            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
+            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            //EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            //_curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
+            //_ui.m_list.selectedIndex = _curSelectIndex;
+            //_ui.m_list.ScrollToView(_curSelectIndex);
+
+            //_activityId = 501;
+            _activityId = (int)(this.viewData as object[])[0];
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
+            //UpdateRedDot();
+            
+            RefreshList();
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
+
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            Timers.inst.Remove(UpdateTime);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            //EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+        }
+
+        private void RefreshList()
+        {
+            _ui.m_list.numItems = _rechargeCfgs.Count;
+        }
+        private void ListItemRenderer(int index, GObject obj)
+        {
+
+            ActivityRechargeCfg lastVipCfg = _rechargeCfgs[index]; 
+            ActivityRechargeCfg vipCfg = _rechargeCfgs[index]; 
+
+
+
+            UI_ListShowItem item = UI_ListShowItem.Proxy(obj);
+            string name = SuitCfgArray.Instance.GetCfg(vipCfg.suitId).name;
+            item.m_txtName0.text = name.Length > 0 ? name.Substring(0, 1) : "";
+            item.m_txtName1.text = name.Length > 1 ? name.Substring(1, 1) : "";
+            item.m_txtName2.text = name.Length > 2 ? name.Substring(2, 1) : "";
+            item.m_txtName3.text = name.Length > 3 ? name.Substring(3, 1) : "";
+            item.m_txtName4.text = name.Length > 4 ? name.Substring(4) : "";
+            _ui.m_packageName.text = name;
+            if (item.m_listGiftBag.data == null)
+            {
+                item.m_listGiftBag.itemRenderer = ListRewardItemRender;
+                item.m_listGiftBag.onClickItem.Add(OnListItemClick);
+            }
+            item.m_listGiftBag.data = lastVipCfg.bonusArr;
+            item.m_listGiftBag.numItems = lastVipCfg.bonusArr.Length;
+
+            if (item.m_holder.data == null)
+            {
+                DressUpObjUI dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
+                item.m_holder.data = dressUpObjUI;
+                _dressUpObjUIs.Add(dressUpObjUI);
+            }
+            _dressUpObjUI = item.m_holder.data as DressUpObjUI;
+            _dressUpObjUI.ResetSceneObj(80, false, true, null, false);
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+            _dressUpObjUI.UpdateWrapper(item.m_holder);
+
+            if (item.m_btnShow.data == null)
+            {
+                item.m_btnShow.onClick.Add(OnBtnShowClick);
+            }
+            item.m_btnShow.data = vipCfg.suitId;
+            if (item.m_btnGetGiftBag.data == null)
+            {
+                item.m_btnGetGiftBag.onClick.Add(OnBtnGetGiftBagClick);
+            }
+            item.m_btnGetGiftBag.data = vipCfg.id;
+            bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
+            long limitChargeExp = _activityInfo.CountValue;
+            item.m_btnGetGiftBag.grayed = limitChargeExp < _rechargeCfgs[index].value;
+            //RedDotController.Instance.SetComRedDot(item.m_btnGetGiftBag, !isGet && RoleDataManager.vipLv >= vipCfg.id);
+            //bool canGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv == vipCfg.id;
+
+            //long limitChargeExp = _activityInfo.CountValue;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+            item.m_txtGiftBag.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
+
+            UI_ListVipItem.ProxyEnd();
+        }
+
+        private void ListRewardItemRender(int index, GObject obj)
+        {
+            int[][] rewards = (int[][])obj.parent.data;
+            UI_ComItem item = UI_ComItem.Proxy(obj);
+            ItemData itemData = ItemUtil.createItemData(rewards[index]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_txtCount.text = itemData.num.ToString();
+            item.target.data = itemCfg;
+            item.m_QualityType.selectedIndex = itemData.rarity - 1;
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            UI_ComItem.ProxyEnd();
+        }
+
+        private void OnBtnShowClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int suitId = (int)obj.data;
+            int _suitTypeId = 0;
+            for (int i = 0; i < SuitGuideMenuCfgArray.Instance.dataArray.Length; i++)
+            {
+                string[] suitIds = SuitGuideMenuCfgArray.Instance.dataArray[i].suitIds.Split(';');
+                if (Array.IndexOf(suitIds, suitId.ToString()) >= 0)
+                {
+                    _suitTypeId = SuitGuideMenuCfgArray.Instance.dataArray[i].id;
+                    break;
+                }
+            }
+            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId }, false });
+        }
+
+        private void OnBtnGetGiftBagClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int id = (int)obj.data;
+            ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
+        }
+
+        private void OnBtnLeftClick()
+        {
+
+            if (_curSelectIndex == 0) return;
+            _curSelectIndex = _curSelectIndex - 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            //UpdateRedDot();
+        }
+        private void OnBtnRightClick()
+        {
+            if (_curSelectIndex == _ui.m_list.numItems - 1) return;
+            _curSelectIndex = _curSelectIndex + 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            //UpdateRedDot();
+
+        }
+        private void OnBtnChargeClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });
+        }
+        private void UpdateSuitView()
+        {
+            _curSelectIndex = _ui.m_list.GetFirstChildInView();
+            _ui.m_list.selectedIndex = _curSelectIndex;
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
+        }
+
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            long endTime = _activityInfo.EndTime;
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+
+        //private void UpdateRedDot()
+        //{
+
+        //    bool leftRed = false;
+        //    bool rightRed = false;
+        //    VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
+        //    for (int i = 1; i < vipCfgs.Length; i++)
+        //    {
+        //        bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
+        //        bool red = !isGet && RoleDataManager.vipLv >= vipCfgs[i].id;
+
+        //        if (red && _curSelectIndex > i - 1)
+        //        {
+        //            leftRed = true;
+        //            break;
+        //        }
+        //        if (red && _curSelectIndex + 1 < i)
+        //        {
+        //            rightRed = true;
+        //            break;
+        //        }
+        //    }
+
+        //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex > RoleDataManager.vipLv - 1) { leftRed = true; }
+        //    if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex + 1 < RoleDataManager.vipLv) { rightRed = true; }
+        //    RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, leftRed);
+        //    RedDotController.Instance.SetComRedDot(_ui.m_btnRight, rightRed);
+
+        //}
+
+        private void OnListItemClick(EventContext context)
+        {
+            GComponent comItem = (context.data as GComponent);
+            ItemCfg itemCfg = comItem.data as ItemCfg;
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(NewLimitChargeView).FullName);
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -312,7 +312,14 @@ namespace GFGGame
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
-                ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                {
+                    ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.luckyBoxFilingChapterId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                }
+                else
+                {
+                    ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                }
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Field)
             {

GameClient/Assets/Game/HotUpdate/Views/Field/FieldTaskView.cs

@@ -58,8 +58,8 @@ namespace GFGGame
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
             FieldCfg cfg = FieldCfgArray.Instance.GetCfg(_cfgs[index].chapterId);
-
-            item.m_txtDesc.text = string.Format("{0}难度挑战成功{1}轮", cfg.name, _cfgs[index].target);
+            StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_cfgs[index].chapterId);
+            item.m_txtDesc.text = string.Format("通关主线第{0}章", chapterCfg.order);
             item.m_btnGet.m_txtTitle.text = string.Format("每周上限+{0}", _cfgs[index].addRewardLimit);
             item.m_btnGet.m_c1.selectedIndex = FieldDataManager.Instance.GetTaskState(_cfgs[index].id);
             if (item.m_btnGet.target.data == null)

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using Hutool;
@@ -13,7 +14,7 @@ namespace GFGGame
         private UI_LeagueAnsweringUI _ui;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
-        private List<long> _memberIds;
+        private List<long> _memberIds; //该玩家id列表，会按照答题数量降序排列
 
         public override void Dispose()
         {
@@ -297,7 +298,10 @@ namespace GFGGame
         }
         private void UpdateJoinList()
         {
-            _memberIds = new List<long>(LeagueDataManager.Instance.ListAnsweringDatas.Keys);
+            _memberIds = LeagueDataManager.Instance.ListAnsweringDatas
+                .OrderByDescending(pair => pair.Value) // 按值（答题数量）降序排序
+                .Select(pair => pair.Key)
+                .ToList(); 
             _ui.m_listJoin.numItems = _memberIds.Count;
             _ui.m_txtJoinNum.text = string.Format("当前参与人员：{0}/{1}", _memberIds.Count, LeagueDataManager.Instance.LeagueData.LeagueMemberDatas.Count);
         }
@@ -323,10 +327,10 @@ namespace GFGGame
 
             item.target.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
             //测试 正确答案
-           // if (data == int.Parse(cfg.answerCorrect))
-           // {
-            //    item.target.title = string.Format("{0}.{1} 正确", data, cfg.answerArr[index]);
-            //}
+            if (data == int.Parse(cfg.answerCorrect))
+            {
+                item.target.title = string.Format("{0}.{1} 正确", data, cfg.answerArr[index]);
+            }
             
             string myAnswer = LeagueDataManager.Instance.LastAnswerRoleData.MyAnswer;
             bool isAnswer = !string.IsNullOrEmpty(LeagueDataManager.Instance.LastAnswerRoleData.MyAnswer) && LeagueDataManager.Instance.LastAnswerRoleData.LastQuestionId == LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
@@ -385,7 +389,7 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
             item.m_txtName.text = roleInfo.roleName;
             int roldRank = _memberIds.IndexOf(roleInfo.roleId);
-            item.m_c1.selectedIndex = roldRank < 3 && LeagueDataManager.Instance.ListAnsweringDatas[roleInfo.roleId] > 0 ? roldRank : 3;
+            item.m_c1.selectedIndex = roldRank < 3 && roldRank > 0 ? roldRank : 3;
             string content = "";
             for (int i = 0; i < chatData.Content.Length; i++)
             {

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

@@ -176,22 +176,20 @@ namespace GFGGame
             _ui.m_comHotel0.m_txtNextAdd.text = memberLimitAdd.ToString();
             _ui.m_comHotel0.m_c1.selectedIndex = memberLimitAdd > 0 ? 1 : 0;
 
-            int memberDayLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAdd - hotelCfg.limitDayAdd;
-            _ui.m_comHotel1.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
-            _ui.m_comHotel1.m_txtNextAdd.text = memberDayLimitAdd.ToString();
-            _ui.m_comHotel1.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
-
-            int memberDayExtraLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAddExtra - hotelCfg.limitDayAddExtra;
-            _ui.m_comHotel2.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
-            _ui.m_comHotel2.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
-            _ui.m_comHotel2.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
-
             int flowerLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitPosition - hotelCfg.limitPosition;
-            _ui.m_comHotel3.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
-            _ui.m_comHotel3.m_txtNextAdd.text = flowerLimitAdd.ToString();
-            _ui.m_comHotel3.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
+            _ui.m_comHotel1.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
+            _ui.m_comHotel1.m_txtNextAdd.text = flowerLimitAdd.ToString();
+            _ui.m_comHotel1.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
 
+            int memberDayLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAdd - hotelCfg.limitDayAdd;
+            _ui.m_comHotel2.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
+            _ui.m_comHotel2.m_txtNextAdd.text = memberDayLimitAdd.ToString();
+            _ui.m_comHotel2.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
 
+            int memberDayExtraLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAddExtra - hotelCfg.limitDayAddExtra;
+            _ui.m_comHotel3.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
+            _ui.m_comHotel3.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
+            _ui.m_comHotel3.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
 
             if (nextHotelCfg == null)
             {

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

@@ -51,9 +51,9 @@ namespace GFGGame
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnReward.onClick.Add(OnClikcBtnReward);
-            _ui.m_btnShop.onClick.Add(OnClikcBtnShop);
-            _ui.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+            _ui.m_btnReward.onClick.Add(OnClickBtnReward);
+            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
+            _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
 
         }
         protected override void AddEventListener()
@@ -78,6 +78,7 @@ namespace GFGGame
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateListItemData();
             UpdateRedDot();
+            _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
@@ -110,7 +111,7 @@ namespace GFGGame
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
-            // comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            //comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
             comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
 
@@ -156,8 +157,8 @@ namespace GFGGame
         }
         private void UpGiftBox()
         {
-            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
-
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, _activityId);
+            
             var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
@@ -245,17 +246,18 @@ namespace GFGGame
             });
         }
 
-        private void OnClikcBtnReward()
+        private void OnClickBtnReward()
         {
             ViewManager.Show<ActivityThemeLuckyBoxBonusView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
         }
-        private void OnClikcBtnShop()
+        private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
+            , new object[] { typeof(LuckyBoxActivityView).FullName, viewData});
         }
 
         //限时礼包按钮点击执行方法
-        private void OnClikcBtnGiftBag()
+        private void OnClickBtnGiftBag()
         {
             var activityInfoByTypeList =
                 ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);

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

@@ -61,8 +61,7 @@ namespace GFGGame
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
-                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                float addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * FightDataManager.Instance.totalScore;
                 FightDataManager.Instance.totalScore += (int)Math.Round(addition);
             }

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

@@ -208,7 +208,7 @@ namespace GFGGame
             if (_showCard)
             {
                
-                ViewManager.Show<StorySkillView>(new object[] { skillsToShowDic ,null });
+                ViewManager.Show<StorySkillView>(skillsToShowDic);
                 //这里可以写卡牌加分
                 _score += _skillScore;
                 Timers.inst.Add(2.0f, 1, UpdateProgressA);

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

@@ -269,8 +269,7 @@ namespace GFGGame
             List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, 0, null, roundTimes, new List<int>());
             if (showCard)
             {
-                _ui.m_reduceTxt.SetVar("value", _targetSkillScore.ToString()).FlushVars();
-                ViewManager.Show<StorySkillView>(new object[] { skillScoreDic, _ui.m_t3});
+                ViewManager.Show<StorySkillView>(skillScoreDic);
                 _score += _skillScore;
                 _targetScore += _targetSkillScore;
                 _skillScore = 0;

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

@@ -283,14 +283,26 @@ namespace GFGGame
             else if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
                 _ui.m_ctrlNeed.selectedIndex = 3;
-                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                _ui.m_grpAdditionDesc.visible = false;
+
+                // 如果是活动界面，不显示收集进度
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                {
+                    _ui.m_btnAdditionDesc.visible = false;
+                }
+                else
+                {
+                    StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
+                    DressUpMenuSuitDataManager.GetSuitProgressBySuitId(filingCfg.suitId, out int count, out int totalCount);
+                    _ui.m_txtAdditionDesc.text = string.Format("{0}套装收集进度:{1}/{2}", suitCfg.name, count, totalCount);
+                    _ui.m_btnAdditionDesc.visible = true;
+                }
+
+                float addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * 100;
                 _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
-                DressUpMenuSuitDataManager.GetSuitProgressBySuitId(filingCfg.suitId, out int count, out int totalCount);
-                _ui.m_txtAdditionDesc.text = string.Format("{0}套装收集进度:{1}/{2}", suitCfg.name, count, totalCount);
-                _ui.m_grpAdditionDesc.visible = false;
+
             }
         }
 

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

@@ -11,12 +11,11 @@ namespace GFGGame
     {
         private UI_StorySkillUI _ui;
         private Dictionary<int, int> skillScoreDic;
-        private EffectUI _effectUI1;
-        private EffectUI _effectUI2;
+        //private EffectUI _effectUI1;
+        //private EffectUI _effectUI2;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
         private EffectUI _effectUI5;
-        private Transition m_ReduceTxt;
 
         private bool isFirst;
         private GameObject mainCamera;
@@ -24,10 +23,10 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
+            //EffectUIPool.Recycle(_effectUI1);
+            //_effectUI1 = null;
+            //EffectUIPool.Recycle(_effectUI2);
+            //_effectUI2 = null;
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
@@ -64,9 +63,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            skillScoreDic = (this.viewData as object[])[0] as Dictionary<int, int>;
-            m_ReduceTxt = (this.viewData as object[])[1] as Transition;
-            
+            skillScoreDic = this.viewData as Dictionary<int, int>;
+
             UpdateView();
         }
         private void UpdateView()
@@ -87,6 +85,7 @@ namespace GFGGame
                 _ui.m_comSkillShow.m_ComSkillScore.m_c1.selectedIndex = skillScoreDic[skillId] >= 0 ? 0 : 1;
 
                 _ui.m_comSkillShow.m_SkillScore.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
+                _ui.m_reduceTxt.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
 
                 string res = skillCfg.res;
 
@@ -146,11 +145,7 @@ namespace GFGGame
         private void SetEffReduceScore(object param)
         {
             _ui.m_effReduceScore.visible = true;
-            if (m_ReduceTxt != null)
-            { 
-                m_ReduceTxt.Play();
-            }
-            
+            _ui.m_t3.Play();   
         }
         
         private void SetEffVisible(object param)

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

@@ -176,30 +176,23 @@ namespace GFGGame
                 else
                 {
                     ViewManager.Show<FieldView>();
-                    bool result = await FieldSProxy.ReqFieldInstanceResult();
                     FieldDataManager _dataManager = FieldDataManager.Instance;
                     //这里判断如果获取的马蹄金超过上限了，就终止挑战
                     if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
                     {
                         AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                        .SetLeftButton(true, "取消",async (object data) =>
+                        .SetLeftButton(true, "取消", (object data) =>
                         {
-                            if (result)
-                            {
                                 ViewManager.Show<FieldFightEndView>();
-                            }
                         })
                         .SetRightButton(true, "确认",(object data) =>
                         {
-                            if (result)
-                            {
                                 InstanceZonesDataManager.currentCardId = FieldFightDataManager.Instance.CurrentCardId;
                                 InstanceZonesDataManager.currentScoreType = FieldFightDataManager.Instance.CurrentScoreType;
                                 InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.currentLevelCfgId;
 
                                 ViewManager.Hide<FieldView>();
                                 ViewManager.Show<StoryFightTargetView>();
-                            }
                         });
                     }
                     else

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -3,10 +3,7 @@ using UI.Main;
 using UnityEngine;
 using System.Collections.Generic;
 using ET;
-using System;
 using System.Linq;
-using Hutool;
-using UI.CommonGame;
 using Assets.Game.HotUpdate.Data;
 
 namespace GFGGame
@@ -128,7 +125,7 @@ namespace GFGGame
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
-            _ui.m_btnLimitedRechargeDBGift.target.onClick.Add(OnClickBtnLimitedRechargeDBGift);
+            _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -136,9 +133,7 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
-            _ui.m_btnActivityAfuGift.target.visible = false;
             _ui.m_btnActivityAfuGift.target.onClick.Add(OnClickBtnAfuGift);
-            _ui.m_btnActivityAfuGift.target.visible = false;
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);
             _ui.m_btnFirstRecharge.target.onClick.Add(OnClickBtnFirstRecharge);
             // _btnStudio.onClick.Add(OnClickBtnStudio);
@@ -179,7 +174,10 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.AddEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
+            EventAgent.AddEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
         }
+
+
         private void ResetDailyData()
         {
             //ViewManager.Show<MainUIView>();
@@ -212,7 +210,6 @@ namespace GFGGame
             CheckProbabilityUp();
             _valueBarController.OnShown();
 
-
             //long lastTime = GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
 
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
@@ -272,6 +269,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
+            EventAgent.RemoveEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
         }
 
         private void AddEffect()
@@ -492,9 +490,9 @@ namespace GFGGame
                 true);
         }
 
-        private void OnClickBtnLimitedRechargeDBGift()
+        private void OnClickBtnWanShiLi()
         {
-            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<ActivityWanShiLiView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnCiPai()
@@ -618,6 +616,10 @@ namespace GFGGame
 
         private void OnClickBtnAfuGift()
         {
+            if (!ActivityAfuGiftDataManager.Instance.IsOpen)
+            {
+                return;
+            }
             ViewManager.Show<ActivityAfuGiftView>(null, new[] { typeof(MainUIView).FullName, this.viewData });
         }
         private void OnClickBtnDay7()
@@ -767,6 +769,7 @@ namespace GFGGame
 
             int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            //_ui.m_btnActivityLuckyBox.target.visible = false;
             if (actLuckyBoxId > 0)
             {
                 if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
@@ -816,8 +819,7 @@ namespace GFGGame
         private void UpdateLimitedActvityState()
         {
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
-            //_ui.m_btnLimitedRechargeDBGift.target.visible = LimitedRechargeDBGiftDataManager.Instance.CheckOpen();
-            _ui.m_btnLimitedRechargeDBGift.target.visible = false;
+            _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
         }
 
         private void UpdateTime()
@@ -828,10 +830,25 @@ namespace GFGGame
                 _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
 
-            if (_ui.m_btnLimitedRechargeDBGift.target.visible)
+            if (_ui.m_btnWanShiLi.target.visible)
+            {
+                long time = ActivityWanShiLiDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+                _ui.m_btnWanShiLi.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            }
+
+            if (_ui.m_btnActivityAfuGift.target.visible)
             {
-                long time = LimitedRechargeDBGiftDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
-                _ui.m_btnLimitedRechargeDBGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+                if(activityInfo == null)
+                {
+                    _ui.m_btnActivityAfuGift.target.visible = false;
+                }
+                else
+                {
+                    long time = activityInfo.EndTime - TimeHelper.ServerNow();
+                    _ui.m_btnActivityAfuGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                }
+
             }
         }
 
@@ -942,6 +959,10 @@ namespace GFGGame
             {
                 param = new object[] { adCfg.activityId };
             }
+            if (adCfg.jumpId == nameof(NewLimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
             ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
         }
         private void OnListAdScrollEnd()
@@ -987,6 +1008,8 @@ namespace GFGGame
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
 
             _btnActivityDay7.visible = ActivityDay7DataManager.Instance.CheckOpen();
+            _ui.m_btnActivityAfuGift.target.visible = ActivityAfuGiftDataManager.Instance.CheckIconShow();
+
             _ui.m_list.ResizeToFit();
         }
 
@@ -1009,15 +1032,23 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", 9, -1);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() 
+                || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) 
+                || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -11, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLimitedRechargeDBGift.target, RedDotDataManager.Instance.GetLimitedRechargeDBGiftRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -25, -7);
             
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
             RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);
-
             RedDotController.Instance.SetComRedDot(_ui.m_btnZhaiXing.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes());
+
+            // 阿福赠礼
+            if (_ui.m_btnActivityAfuGift.target.visible)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -43, 2);
+            }
+            
         }
 
         private void CheckProbabilityUp()
@@ -1132,5 +1163,11 @@ namespace GFGGame
                 _ui.m_grpLeagueTips.SetPosition(pos.x - _ui.m_grpLeagueTips.width + 20, pos.y + 20, 0);
             }
         }
+
+
+        private void ChangeAfuActivityState()
+        {
+            _ui.m_btnActivityAfuGift.target.visible = ActivityAfuGiftDataManager.Instance.IsOpen;
+        }
     }
 }

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

@@ -76,7 +76,7 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_ComIcon.m_loaIcon.url = $"Assets/Res/Texture/Studios/CYJD/{"dangan_"}{cfg.res}.{"png"}";
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioFilingPicPath(cfg.res);
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.m_grpName.visible = isPass;

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

@@ -67,12 +67,10 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             _viewData = this.viewData != null ? (int)this.viewData : 0;
-            _ui.m_btnChange.visible = _viewData != StudioDataManager.Instance.luckyBoxFilingChapterId;
             StudioDataManager.Instance.filingChapterId = _viewData > 0 ? _viewData : StudioDataManager.Instance.npcFilingChapterId;
 
             UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
-
             UpdateItem();
         }
 
@@ -115,17 +113,28 @@ namespace GFGGame
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
             _ui.m_btnAdd.visible = limitCfg.itemID > 0;
-            _ui.m_loaBg.url = $"Assets/Res/Texture/Studios/CYJD/{_studioCfg.res}.{"png"}";//ResPathUtil.GetBgImgPath(_studioCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
 
-            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_studioCfg.suitId);
-            _ui.m_txtSuitName.text = suitCfg.name;
+            // 如果是活动界面，不显示套装获取进度
+            if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+            {
+                _ui.m_type.SetSelectedIndex(1);
+                _ui.m_activityTipText.SetVar("name", _studioCfg.name).FlushVars();
+                _ui.m_activityTitle.text = _studioCfg.name;
+            }
+            else
+            {
+                _ui.m_type.SetSelectedIndex(0);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_studioCfg.suitId);
+                _ui.m_txtSuitName.text = suitCfg.name;
 
-            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_studioCfg.suitId, out int count, out int totalCount);
-            _ui.m_txtSuitProgress.text = string.Format("({0}/{1})", count, totalCount);
+                DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_studioCfg.suitId, out int count, out int totalCount);
+                _ui.m_txtSuitProgress.text = string.Format("({0}/{1})", count, totalCount);
 
-            _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+                _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+            }
 
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_studioCfg.type, _studioCfg.subType, StudioDataManager.Instance.filingChapterId);
             _ui.m_list.numItems = _storyLevelCfgs.Count;

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

@@ -72,8 +72,10 @@ namespace GFGGame
         }
         protected async void UpdateInfo()
         {
+            _ui.m_hide.Play();
             var result = await TaskSProxy.GetTaskTypePro();
             if (!result) return;
+            _ui.m_fadeIn.Play();
         }
 
         protected override void OnHide()

GameClient/Assets/ResIn/UI/ActivityWanShiLi.meta

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

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: f79bed5f52d43e94abe29f62504848c4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 4085fda4cc387db4b9cf8c9297f8860e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 773bab35dd6fbf447ba962ec275080e4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: fc944ffafb54aa6499289ab2959e2d5b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: