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

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

@@ -4,6 +4,9 @@ namespace GFGGame
     {
         public const int SUIT_GUIDE = 1;//套装图鉴
         public const int CHAPTER_ITEM = 2;//博物图鉴
-        public const int TRAVEL_GUIDE = 3;//千山万水
+        public const int DRESS_UP_GUIDE = 3;//服装图鉴
+        public const int CARD_GUIDE = 4;//词牌图鉴
+        public const int TRAVEL_GUIDE = 5;//千山万水
+
     }
 }

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

@@ -116,6 +116,7 @@ namespace GFGGame
             await RoleInfoSProxy.ReqPersonalInfo();
             await ActivityGlobalSProxy.GetActivityInfo();
             await LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo();
+            await LeagueSproxy.GetTeapartyInfos();
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
             long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);

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

@@ -203,8 +203,10 @@ namespace GFGGame
                     targetList = null;
                 }
                 MainDataManager.Instance.CanSwipe = true;
-
+                
+                LogServerHelper.SendNodeLog(GuideDataManager.currentGuideId * 100 + 2);
                 GuideDataManager.currentGuideId = 0;
+                
                 HideGuide();
             }
         }

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

@@ -107,6 +107,40 @@ namespace GFGGame
             set { _sevenDayLoginBonusStatus = value; }
         }
         /******************************************************************************************************************/
+
+
+        /**********************************************************每日登录修改*************************************************/
+        public List<int> sevenDayLoginLoginIdList = new List<int>();
+        /// <summary>
+        /// 七日登录 当日奖励id
+        /// </summary>
+        /// <value></value>
+
+        public List<int> sevenDayLoginBonusStatusList = new List<int>();
+        /// <summary>
+        /// 七日登录 当前奖励状态
+        /// </summary>
+        /// <value></value>
+        /// 
+        public bool CanGetSevenDayBonus()
+        {
+            foreach(int a in sevenDayLoginBonusStatusList)
+            {
+                if (a == 1) return true;
+            }
+            return false;
+        }
+
+        public bool AllSevenDayBonusGot()
+        {
+            foreach (int a in sevenDayLoginBonusStatusList)
+            {
+                if (a != 2) return false;
+            }
+            return true;
+        }
+        /******************************************************************************************************************/
+
         private int _firstChargeBonusStatus = 0;
         /// <summary>
         /// 首冲奖励 当前奖励状态,ConstBonusStatus 0不可领，1可领，2已领

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

@@ -161,7 +161,7 @@ namespace GFGGame
         public int GetRecommentCardId(int scoreType, List<int> itemList, List<int> wearCardIds)
         {
             float dressListAllAcore = FightDataManager.Instance.GetDressListAllScore(itemList, scoreType);
-            List<CardData> cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRarity(0),
+            List<CardData> cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRoleType(0),
                 dressListAllAcore, scoreType);
             cardDatas = cardDatas.Where(a => !wearCardIds.Contains(a.id)).ToList();
             if (cardDatas.Count == 0) return 0;

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

@@ -72,7 +72,7 @@ namespace GFGGame
             _cardDicByType[cardData.itemCfg.mainScore][cardData.id] = cardData;
         }
 
-        private static List<string> GetCardResources(ItemCfg itemCfg)
+        public static List<string> GetCardResources(ItemCfg itemCfg)
         {
             List<string> resources = new List<string>();
             resources.Add(itemCfg.res);
@@ -99,22 +99,25 @@ namespace GFGGame
                 {
                     return -1;
                 }
-                else {
+                else
+                {
                     if (a.star < b.star)
                     {
                         return 1;
                     }
-                    else if (a.star > b.star) { 
+                    else if (a.star > b.star)
+                    {
                         return -1;
                     }
-                    else {
+                    else
+                    {
                         if (a.lv < b.lv)
                             return 1;
                         else if (a.lv > b.lv)
                             return -1;
                         else
                         {
-                            if (a.mainScore> b.mainScore)
+                            if (a.mainScore > b.mainScore)
                                 return 1;
                             else if (a.mainScore < b.mainScore)
                                 return -1;
@@ -136,15 +139,17 @@ namespace GFGGame
         /// <returns></returns>
         public static CardData GetCardDataById(int cardId)
         {
-            if (_cardDicByType.Count == 0 || !_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) { 
+            if (_cardDicByType.Count == 0 || !_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId))
+            {
                 return null;
             }
             return _cardDicByType[0][cardId];
         }
+
         /// <summary>
         /// 根据男主类型获取词牌列表
         /// </summary>
-        public static List<CardData> GetCardListByRarity(int mainScore)
+        public static List<CardData> GetCardListByRoleType(int mainScore)
         {
             if (_cardDicByType.ContainsKey(mainScore))
             {
@@ -270,5 +275,73 @@ namespace GFGGame
 
             return true;
         }
+
+        /// <summary>
+        /// 根据主属性获取有序牌ID列表（排序规则： 已获得词牌按稀有度从高到低 > 未获得词牌按稀有度从高到低 > 按词牌名字拼音）
+        /// </summary>
+        /// <param name="mainScore">
+        /// 0 - 全部
+        /// </param>
+        /// <returns></returns>
+        public static List<int> GetAllCardIdListByRoleType(int mainScore)
+        {
+            List<int> result = new List<int>();
+
+            List<ItemCfg> itemCfgs = ItemCfgArray.Instance.GetCfgsByitemType(ConstItemType.CARD);
+            itemCfgs.Sort((a, b) =>
+            {
+                bool haveA = GetCardDataById(a.id) != null;
+                bool haveB = GetCardDataById(b.id) != null;
+
+                if (haveB && !haveA)
+                {
+                    return 1;
+                }
+                else if (!haveB && haveA)
+                {
+                    return -1;
+                }
+
+                if (a.rarity != b.rarity)
+                {
+                    return a.rarity > b.rarity ? -1 : 1;
+                }
+
+                return a.res.CompareTo(b.res);
+
+            });
+
+            for (int i = 0; i < itemCfgs.Count; i++)
+            {
+                if (mainScore == 0 || itemCfgs[i].mainScore == mainScore)
+                {
+                    result.Add(itemCfgs[i].id);
+                }
+            }
+
+            return result;
+        }
+
+        public static void GetTotalProgress(out int haveCount, out int totalCount, int mainScore = 0)
+        {
+            List<ItemCfg> itemCfgs = ItemCfgArray.Instance.GetCfgsByitemType(ConstItemType.CARD);
+            totalCount = itemCfgs.Count;
+
+            if (mainScore != 0)
+            {
+                totalCount = 0;
+                for (int i = 0; i < itemCfgs.Count; i++)
+                {
+                    if (itemCfgs[i].mainScore == mainScore)
+                    {
+                        ++totalCount;
+                    }
+                }
+            }
+
+            haveCount = _cardDicByType.ContainsKey(mainScore) ? _cardDicByType[mainScore].Count : 0;
+        }
+
+
     }
 }

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

@@ -622,5 +622,160 @@ namespace GFGGame
                 ItemCfgArray.Instance.GetCfg(itemId);
             }
         }
+
+        private static int[] dressUpGuideSubType = {
+            ConstDressUpItemType.FA_XING, ConstDressUpItemType.LIAN_YI_QUN , ConstDressUpItemType.NEI_DA,
+            ConstDressUpItemType.WAI_TAO,ConstDressUpItemType.SHANG_YI,ConstDressUpItemType.XIA_ZHUANG,ConstDressUpItemType.WA_ZI,
+            ConstDressUpItemType.XIE_ZI,ConstDressUpItemType.SHOU_CHI_WU, ConstDressUpItemType.ZHUANG_RONG};
+
+        private static int[] dressUpGuideAccessoriesType = {
+            ConstDressUpItemType.TOU_SHI, ConstDressUpItemType.ER_SHI , ConstDressUpItemType.JING_SHI,
+            ConstDressUpItemType.MIAN_BU,ConstDressUpItemType.YAO_SHI,ConstDressUpItemType.SHOU_SHI,ConstDressUpItemType.PI_BO};
+        
+        /// <summary>
+        /// 根据主属性获取有序服装散件ID列表（排序规则： 已获得按稀有度从高到低 > 未获得按稀有度从高到低 > 名字拼音）
+        /// 包含已获得和未获得
+        /// </summary>
+        /// <param name="subType">0-全部</param>
+        /// <param name="sorted">true-有序</param>
+        /// <returns></returns>
+        public static List<int> GetAllDressUpGuideIdListBySubType(int subType, bool sorted = true)
+        {
+            List<int> result = new List<int>();
+            List<ItemCfg> itemCfgs = new List<ItemCfg>();
+           
+
+            if (subType == 0)
+            {
+                // 除饰品外的散件
+                for (int i = 0; i < dressUpGuideSubType.Length; i++)
+                {
+                    itemCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.DRESS_UP, dressUpGuideSubType[i]));
+                }
+
+                // 饰品
+                for (int i = 0; i < dressUpGuideAccessoriesType.Length; i++)
+                {
+                    itemCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.DRESS_UP, dressUpGuideAccessoriesType[i]));
+                }
+            }
+            else
+            {
+                if(subType == ConstDressUpItemType.TE_SHU)
+                {
+                    ItemTypeCfg[] itemTypeCfg = ItemTypeCfgArray.Instance.dataArray;
+                    for(int i = 0;i< itemTypeCfg.Length; i++)
+                    {
+                        if(itemTypeCfg[i].type > ConstDressUpItemType.TE_SHU)
+                        {
+                            itemCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.DRESS_UP, itemTypeCfg[i].type));
+                        }
+                    }
+                }
+                else
+                {
+                    itemCfgs = ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.DRESS_UP, subType);
+                }
+                
+            }
+
+            if (sorted)
+            {
+                itemCfgs.Sort((a, b) =>
+                {
+                    bool haveA = CheckHasItem(a.id);
+                    bool haveB = CheckHasItem(b.id);
+
+                    if (haveB && !haveA)
+                    {
+                        return 1;
+                    }
+                    else if (!haveB && haveA)
+                    {
+                        return -1;
+                    }
+
+                    if (a.rarity != b.rarity)
+                    {
+                        return a.rarity > b.rarity ? -1 : 1;
+                    }
+
+                    return a.res.CompareTo(b.res);
+
+                });
+            }
+            
+
+
+            for (int i = 0; i < itemCfgs.Count; i++)
+            {
+                result.Add(itemCfgs[i].id);
+            }
+
+            return result;
+        }
+
+        public static void SortDressUpGuideIdList(List<int> list)
+        {
+            list.Sort((a, b) =>
+            {
+                ItemCfg itemA = ItemCfgArray.Instance.GetCfg(a);
+                ItemCfg itemB = ItemCfgArray.Instance.GetCfg(b);
+
+                bool haveA = CheckHasItem(itemA.id);
+                bool haveB = CheckHasItem(itemB.id);
+
+                if (haveB && !haveA)
+                {
+                    return 1;
+                }
+                else if (!haveB && haveA)
+                {
+                    return -1;
+                }
+
+                if (itemA.rarity != itemB.rarity)
+                {
+                    return itemA.rarity > itemB.rarity ? -1 : 1;
+                }
+
+                return itemA.res.CompareTo(itemB.res);
+
+            });
+        }
+
+
+        public static void GetTotalProgress(out int haveCount, out int totalCount, int subType = 0)
+        {
+            List<int> itemCfgs = GetAllDressUpGuideIdListBySubType(subType);
+            totalCount = itemCfgs.Count;
+            haveCount = 0;
+
+            if (subType == 0)
+            {
+                // 除饰品外的散件
+                for (int i = 0; i < dressUpGuideSubType.Length; i++)
+                {
+                    if (_itemDatasBySubTypeDic.ContainsKey(dressUpGuideSubType[i]))
+                    {
+                        haveCount += _itemDatasBySubTypeDic[dressUpGuideSubType[i]].Count;
+                    }
+                }
+
+                // 饰品
+                for (int i = 0; i < dressUpGuideAccessoriesType.Length; i++)
+                {
+                    if (_itemDatasBySubTypeDic.ContainsKey(dressUpGuideAccessoriesType[i]))
+                    {
+                        haveCount += _itemDatasBySubTypeDic[dressUpGuideAccessoriesType[i]].Count;
+                    }
+                }
+            }
+            else
+            {
+                haveCount = _itemDatasBySubTypeDic.ContainsKey(subType) ? _itemDatasBySubTypeDic[subType].Count : 0;
+            }
+        }
+ 
     }
 }

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

@@ -37,7 +37,6 @@ namespace GFGGame
             }
             if (currentGuideId == guideId)
             {
-                LogServerHelper.SendNodeLog(GuideDataManager.currentGuideId * 100 + 2);
                 bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + guideId, 1);
                 return result;
             }

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

@@ -82,7 +82,6 @@ namespace GFGGame
         //获取玩家战斗数据
         private static FightData GetMyFightRoleData()
         {
-
             _roleData.name = RoleDataManager.roleName;
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
@@ -92,9 +91,8 @@ namespace GFGGame
             CardData cardData = CardDataManager.GetCardDataById(_roleData.cardId);
             _roleData.cardScore = _roleData.cardId <= 0 || cardData == null ? 0 : cardData.scores[_roleData.scoreType];//词牌对应主题的属性分数
 
-
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (!string.IsNullOrEmpty(levelCfg.fightID))
+            if (levelCfg != null && !string.IsNullOrEmpty(levelCfg.fightID))
             {
                 StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
                 _roleData.tags = fightCfg.needTagsArr;////本次战斗要求的标签

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

@@ -30,6 +30,12 @@ namespace GFGGame
         public LeagueLastAnswerRoleData LastAnswerRoleData = new LeagueLastAnswerRoleData();//上题回答数据
         public Dictionary<long, int> ListAnsweringDatas = new Dictionary<long, int>();//当前答题玩家数据，roleId，答题数量。
         public Dictionary<int, List<LeagueAnswerData>> ListAnswerRankDatas = new Dictionary<int, List<LeagueAnswerData>>();//答题排行榜数据,int:type//0:周排行 1:上周排行
+        public int TeaPartyId = 0; //茶会期数 --未开启则期数为0
+        public int TeaPartyStatus = 0; // 0未开启 1集结中 2已集结
+        public RoleTeapartyInfoProto RoleTeapartyInfoProto = new RoleTeapartyInfoProto(); // 玩家本期茶话会参与信息
+        public List<RoleContainerProto> RoleContainerList = new List<RoleContainerProto>(); // 茶会每个扮演角色坑位信息
+        public long TeaPartyCloseTime = 0; // 茶话会结束时间
+        public int ChooseTeaPartId = 0; // 选择的茶话会类型
 
 
         public void Clear()
@@ -254,7 +260,78 @@ namespace GFGGame
                 giftBuyDatas.Add(giftBuyData);
             }
             return giftBuyDatas;
+        }
+
+
+        //茶话会匹配度计算
+        public int GetTeaPartyMatchedValue(FightData roleData)
+        {
+            int matchedValue = 0;
+
+            var teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(TeaPartyId);
+            string[] tags = teapartyRoleCfg[ChooseTeaPartId - 1].tagArr;
+
+            for (int i = 0; i < roleData.itemList.Count; i++)
+            {
+                int itemId = roleData.itemList[i];
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                if (itemCfg == null)
+                {
+                    ET.Log.Error("物品：" + itemId + "不存在");
+                    return matchedValue;
+                }
+                for (int t = 0; t < itemCfg.tagsArr.Length; t++)
+                {
+                    for (int j = 0; j < tags.Length; j++)
+                    {
+                        if (itemCfg.tagsArr[t][0] == tags[j])
+                        {
+                            matchedValue += 1;
+                        }
+                    }
+                }
+            }
+
+            return matchedValue;
+        }
+
+
+        //茶话会个人奖励是否可以领取
+        public bool CheckTeaPartyPersonRewardCanGet(int targetScore)
+        {
+            var roleTeapartyInfoProto = LeagueDataManager.Instance.RoleTeapartyInfoProto;
 
+            ET.Log.Debug("打印测试----------infoinfo-------" + roleTeapartyInfoProto.PerAwardStatusVs.Count);
+
+            foreach (var info in roleTeapartyInfoProto.PerAwardStatusVs) {
+
+
+                //if (targetScore) { 
+                    
+
+                    
+                //}
+
+
+            }
+            return false;
+        }
+
+        //茶话会个人奖励是否可以领取
+        public bool CheckTeaPartyRewardCanGet(int targetScore)
+        {
+            var roleTeapartyInfoProto = LeagueDataManager.Instance.RoleTeapartyInfoProto;
+
+            foreach (var info in roleTeapartyInfoProto.LeagueAwardStatusVs)
+            {
+                ET.Log.Debug("打印测试----------infoinfo-------" + info);
+                //if (targetScore) { 
+
+
+
+                //}
+            }
+            return false;
         }
     }
 }

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

@@ -274,7 +274,7 @@ namespace GFGGame
         public bool GetCardRed()
         {
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(CardDetailView), false)) return false;
-            List<CardData> cardDatas = CardDataManager.GetCardListByRarity(0);
+            List<CardData> cardDatas = CardDataManager.GetCardListByRoleType(0);
             for (int i = 0; i < cardDatas.Count; i++)
             {
                 if (GetCardRed(cardDatas[i].id)) return true;
@@ -791,7 +791,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetSevenDayLoginRed()
         {
-            return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
+            return ActivityDataManager.Instance.CanGetSevenDayBonus();
         }
         /// <summary>
         /// 福利大厅-每日签到

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

@@ -14,11 +14,13 @@ namespace GFGGame
 
         private bool _waitPicFade = false;
         private bool _waitBgChange = false;
-
+        private float _dialogShowDelay = 0.0f;
 
         // Dialog wait pic's animation finished 
         public bool waitPicFade { get { return _waitPicFade; } set { _waitPicFade = value; } }
         public bool waitBgChange { get { return _waitBgChange; } set { _waitBgChange = value; } }
+        public float dialogShowDelay { get { return _dialogShowDelay; } set { _dialogShowDelay = value; } }
+
     }
 }
 

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

@@ -423,6 +423,7 @@ namespace GFGGame
                     targetItemList.Add(itemId);
                 }
             }
+
             if (targetDressUpData.bgId > 0 && (excludeType == null || Array.IndexOf(excludeType, ConstDressUpItemType.BEI_JING) < 0))
             {
                 targetItemList.Add(targetDressUpData.bgId);
@@ -434,9 +435,13 @@ namespace GFGGame
         }
 
         //穿戴默认换装数据
-        public void PutOnDefaultDressUpData()
+        public void PutOnDefaultDressUpData(bool bgType = false)
         {
-            PutOnDressUpData(DressUpData.CreateDefault());
+            var dressUpData = DressUpData.CreateDefault();
+            if (bgType) {
+                dressUpData.bgId = 180002;
+            }
+            PutOnDressUpData(dressUpData);
         }
 
         //穿戴一组散件数据（会脱掉不包含的部分）

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

@@ -65,6 +65,7 @@ namespace GFGGame
                 else
                 {
                     StoryDialogDataManager.Instance.waitBgChange = true;
+                    StoryDialogDataManager.Instance.dialogShowDelay = 0.4f;
                     SetSpriteRendererAlpha(bgSpr, 1f);
                     bgNextSpr.sprite = sp;
                     FairyGUI.Timers.inst.StartCoroutine(LastBgFadeOut());
@@ -96,8 +97,6 @@ namespace GFGGame
                         StoryDialogDataManager.Instance.waitBgChange = false;
                     }
                 }
-
-
             }
         }
 
@@ -141,6 +140,7 @@ namespace GFGGame
                         }
                         yield return new WaitForEndOfFrame();
                     }
+                    StoryDialogDataManager.Instance.waitPicFade = false;
                 }
             }
         }

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

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GLoader m_loaSkill;
         public GTextField m_txtName;
         public UI_ComSkillDiscribe m_comCurLV;
@@ -15,6 +16,7 @@ namespace UI.Card
         public GList m_listConsume;
         public GComponent m_comConsume;
         public GButton m_btnUpLv;
+        public GGroup m_lvInfo;
         public const string URL = "ui://7l6lvkayrhha9m";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "CardSkillUI";
@@ -63,6 +65,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_comCurLV = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comCurLV"));
@@ -70,10 +73,12 @@ namespace UI.Card
             m_listConsume = (GList)comp.GetChild("listConsume");
             m_comConsume = (GComponent)comp.GetChild("comConsume");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_lvInfo = (GGroup)comp.GetChild("lvInfo");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_loaSkill = null;
             m_txtName = null;
             m_comCurLV.Dispose();
@@ -83,6 +88,7 @@ namespace UI.Card
             m_listConsume = null;
             m_comConsume = null;
             m_btnUpLv = null;
+            m_lvInfo = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,6 +11,7 @@ namespace UI.Card
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
         public Controller m_ctrlSkillCount;
+        public Controller m_c_from;
         public GGraph m_holderfBgEff;
         public GLoader m_loaRarity;
         public GTextField m_txtName0;
@@ -54,6 +55,7 @@ namespace UI.Card
         public GGraph m_holderflower;
         public GGraph m_holderTouchFlower;
         public GList m_listProperty;
+        public GButton m_btnSkill_2;
         public Transition m_starItemAlpha;
         public Transition m_openViewShow;
         public const string URL = "ui://7l6lvkayj4c69d";
@@ -107,6 +109,7 @@ namespace UI.Card
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
             m_ctrlSkillCount = comp.GetController("ctrlSkillCount");
+            m_c_from = comp.GetController("c_from");
             m_holderfBgEff = (GGraph)comp.GetChild("holderfBgEff");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName0 = (GTextField)comp.GetChild("txtName0");
@@ -150,6 +153,7 @@ namespace UI.Card
             m_holderflower = (GGraph)comp.GetChild("holderflower");
             m_holderTouchFlower = (GGraph)comp.GetChild("holderTouchFlower");
             m_listProperty = (GList)comp.GetChild("listProperty");
+            m_btnSkill_2 = (GButton)comp.GetChild("btnSkill");
             m_starItemAlpha = comp.GetTransition("starItemAlpha");
             m_openViewShow = comp.GetTransition("openViewShow");
         }
@@ -159,6 +163,7 @@ namespace UI.Card
             m_ctrlFullLv = null;
             m_ctrlTab = null;
             m_ctrlSkillCount = null;
+            m_c_from = null;
             m_holderfBgEff = null;
             m_loaRarity = null;
             m_txtName0 = null;
@@ -207,6 +212,7 @@ namespace UI.Card
             m_holderflower = null;
             m_holderTouchFlower = null;
             m_listProperty = null;
+            m_btnSkill_2 = null;
             m_starItemAlpha = null;
             m_openViewShow = null;
             if(disposeTarget && target != null)

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

@@ -7,6 +7,7 @@ namespace UI.Card
     public partial class UI_ComFosterTop
     {
         public GComponent target;
+        public Controller m_c1;
         public GButton m_btnback;
         public GComponent m_comValueBar;
         public GButton m_btnStory;
@@ -59,6 +60,7 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnStory = (GButton)comp.GetChild("btnStory");
@@ -67,6 +69,7 @@ namespace UI.Card
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_btnback = null;
             m_comValueBar = null;
             m_btnStory = null;

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

@@ -7,6 +7,7 @@ namespace UI.Card
     public partial class UI_ListSkillItem
     {
         public GButton target;
+        public Controller m_c1;
         public GLoader m_loaSkill;
         public GTextField m_txtLv;
         public GTextField m_txtName;
@@ -57,12 +58,14 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaSkill = null;
             m_txtLv = null;
             m_txtName = null;

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

@@ -10,6 +10,7 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GLoader m_loaRarity;
         public GTextField m_txtType;
+        public GImage m_unlock;
         public GTextField m_txtOwned;
         public GTextField m_txtDesc;
         public GTextField m_txtGong;
@@ -70,6 +71,7 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtType = (GTextField)comp.GetChild("txtType");
+            m_unlock = (GImage)comp.GetChild("unlock");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtGong = (GTextField)comp.GetChild("txtGong");
@@ -86,6 +88,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_loaRarity = null;
             m_txtType = null;
+            m_unlock = null;
             m_txtOwned = null;
             m_txtDesc = null;
             m_txtGong = null;

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ComTagItem
+    {
+        public GComponent target;
+        public GTextField m_txtScore;
+        public GGroup m_grpScore;
+        public GComponent m_loaTag;
+        public const string URL = "ui://mbo439wbhyzlfc";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComTagItem";
+        private static UI_ComTagItem _proxy;
+
+        public static UI_ComTagItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTagItem();
+            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_ComTagItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTagItem();
+            }
+            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_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
+            m_loaTag = (GComponent)comp.GetChild("loaTag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtScore = null;
+            m_grpScore = null;
+            m_loaTag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CompBanner.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComTagItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 81006af8fb4c96c49acd43278bdf96d0
+guid: 2d81389d80bc4b149b6db23637b8f272
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -39,6 +39,9 @@ namespace UI.DressUp
         public GTextField m_txtRecommendCount;
         public GGroup m_graContent;
         public GLoader m_loaGuide;
+        public GButton m_btnSubmission;
+        public GTextField m_txtMatch;
+        public GTextField m_txtTeaPartyName;
         public const string URL = "ui://mbo439wbqsvd2m";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "DressUpFightUI";
@@ -118,6 +121,9 @@ namespace UI.DressUp
             m_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
+            m_btnSubmission = (GButton)comp.GetChild("btnSubmission");
+            m_txtMatch = (GTextField)comp.GetChild("txtMatch");
+            m_txtTeaPartyName = (GTextField)comp.GetChild("txtTeaPartyName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -159,6 +165,9 @@ namespace UI.DressUp
             m_txtRecommendCount = null;
             m_graContent = null;
             m_loaGuide = null;
+            m_btnSubmission = null;
+            m_txtMatch = null;
+            m_txtTeaPartyName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_PartsListItem
     {
         public GComponent target;
+        public Controller m_itemType;
         public GLoader m_loaBorder;
         public GImage m_iconSelected;
         public GLoader m_icon;
@@ -18,6 +19,7 @@ namespace UI.DressUp
         public GImage m_imgNew;
         public GTextField m_txtTitle;
         public GButton m_btnAni;
+        public GList m_ListTag;
         public const string URL = "ui://mbo439wbk6he26";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PartsListItem";
@@ -65,6 +67,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_itemType = comp.GetController("itemType");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -76,9 +79,11 @@ namespace UI.DressUp
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnAni = (GButton)comp.GetChild("btnAni");
+            m_ListTag = (GList)comp.GetChild("ListTag");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_itemType = null;
             m_loaBorder = null;
             m_iconSelected = null;
             m_icon = null;
@@ -90,6 +95,7 @@ namespace UI.DressUp
             m_imgNew = null;
             m_txtTitle = null;
             m_btnAni = null;
+            m_ListTag = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_TypeItem
     {
         public GComponent target;
+        public Controller m_itemType;
         public GLoader m_icon;
         public GImage m_imgNeed;
         public GImage m_imgNew;
@@ -58,6 +59,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_itemType = comp.GetController("itemType");
             m_icon = (GLoader)comp.GetChild("icon");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -65,6 +67,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_itemType = null;
             m_icon = null;
             m_imgNeed = null;
             m_imgNew = null;

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_BonusBox.cs.meta

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_Button6.cs.meta

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_CardGuideComDodgeStar
+    {
+        public GComponent target;
+        public Controller m_lightType;
+        public GGraph m_holderStarLight;
+        public GGraph m_holderUpStarMove;
+        public const string URL = "ui://vqq9h9h493pb4j";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "CardGuideComDodgeStar";
+        private static UI_CardGuideComDodgeStar _proxy;
+
+        public static UI_CardGuideComDodgeStar Create(GObject gObject = null)
+        {
+            var ui = new UI_CardGuideComDodgeStar();
+            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_CardGuideComDodgeStar Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CardGuideComDodgeStar();
+            }
+            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_lightType = comp.GetController("lightType");
+            m_holderStarLight = (GGraph)comp.GetChild("holderStarLight");
+            m_holderUpStarMove = (GGraph)comp.GetChild("holderUpStarMove");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_lightType = null;
+            m_holderStarLight = null;
+            m_holderUpStarMove = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs.meta

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

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

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_CardGuideUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listRole;
+        public GList m_listCard;
+        public UI_ProgressBar2 m_progress;
+        public const string URL = "ui://vqq9h9h4e3ot5t";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "CardGuideUI";
+        private static UI_CardGuideUI _proxy;
+
+        public static UI_CardGuideUI Create(GObject gObject = null)
+        {
+            var ui = new UI_CardGuideUI();
+            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_CardGuideUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CardGuideUI();
+            }
+            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_listRole = (GList)comp.GetChild("listRole");
+            m_listCard = (GList)comp.GetChild("listCard");
+            m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listRole = null;
+            m_listCard = null;
+            m_progress.Dispose();
+            m_progress = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CompBanner.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs

@@ -4,19 +4,18 @@ using FairyGUI;
 
 namespace UI.FieldGuide
 {
-    public partial class UI_CompBanner
+    public partial class UI_ComCardMask
     {
         public GComponent target;
-        public GLoader m_loaderPic;
-        public GList m_listTab;
-        public const string URL = "ui://vqq9h9h4pjipg";
+        public GLoader m_loaCard;
+        public const string URL = "ui://vqq9h9h493pb4h";
         public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "CompBanner";
-        private static UI_CompBanner _proxy;
+        public const string RES_NAME = "ComCardMask";
+        private static UI_ComCardMask _proxy;
 
-        public static UI_CompBanner Create(GObject gObject = null)
+        public static UI_ComCardMask Create(GObject gObject = null)
         {
-            var ui = new UI_CompBanner();
+            var ui = new UI_ComCardMask();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +24,11 @@ namespace UI.FieldGuide
             return ui;
         }
 
-        public static UI_CompBanner Proxy(GObject gObject = null)
+        public static UI_ComCardMask Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompBanner();
+                _proxy = new UI_ComCardMask();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +55,11 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
-            m_loaderPic = (GLoader)comp.GetChild("loaderPic");
-            m_listTab = (GList)comp.GetChild("listTab");
+            m_loaCard = (GLoader)comp.GetChild("loaCard");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaderPic = null;
-            m_listTab = null;
+            m_loaCard = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs.meta

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

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

@@ -8,8 +8,8 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaderPic;
-        public GLoader m_loaderTitle;
         public GTextField m_txtProgress;
+        public GTextField m_progressSymbol;
         public const string URL = "ui://vqq9h9h4pjipe";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "CompGuideItem";
@@ -58,14 +58,14 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaderPic = (GLoader)comp.GetChild("loaderPic");
-            m_loaderTitle = (GLoader)comp.GetChild("loaderTitle");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
+            m_progressSymbol = (GTextField)comp.GetChild("progressSymbol");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaderPic = null;
-            m_loaderTitle = null;
             m_txtProgress = null;
+            m_progressSymbol = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,15 +7,15 @@ namespace UI.FieldGuide
     public partial class UI_CompSuitItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_bg;
         public GLoader m_loaderPic;
-        public GLoader m_loaderBonusBox;
-        public GTextField m_txtName;
+        public UI_BonusBox m_loaderBonusBox;
         public GProgressBar m_progBar;
         public GLoader m_rarity;
-        public GImage m_imgLockBg;
-        public GImage m_imgLock;
-        public const string URL = "ui://vqq9h9h4pjip14";
+        public GTextField m_txtName;
+        public GImage m_unlockMask;
+        public const string URL = "ui://vqq9h9h4e3ot6n";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "CompSuitItem";
         private static UI_CompSuitItem _proxy;
@@ -62,25 +62,26 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_bg = (GLoader)comp.GetChild("bg");
             m_loaderPic = (GLoader)comp.GetChild("loaderPic");
-            m_loaderBonusBox = (GLoader)comp.GetChild("loaderBonusBox");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaderBonusBox = (UI_BonusBox)UI_BonusBox.Create(comp.GetChild("loaderBonusBox"));
             m_progBar = (GProgressBar)comp.GetChild("progBar");
             m_rarity = (GLoader)comp.GetChild("rarity");
-            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_bg = null;
             m_loaderPic = null;
+            m_loaderBonusBox.Dispose();
             m_loaderBonusBox = null;
-            m_txtName = null;
             m_progBar = null;
             m_rarity = null;
-            m_imgLockBg = null;
-            m_imgLock = null;
+            m_txtName = null;
+            m_unlockMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_DressUpGuideUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listType1;
+        public GList m_listType2;
+        public GButton m_btnAccessories;
+        public GList m_listDressUp;
+        public GTextField m_txtTips;
+        public UI_ProgressBar2 m_progressBar;
+        public GButton m_btnSearch;
+        public const string URL = "ui://vqq9h9h493pb49";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "DressUpGuideUI";
+        private static UI_DressUpGuideUI _proxy;
+
+        public static UI_DressUpGuideUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DressUpGuideUI();
+            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_DressUpGuideUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DressUpGuideUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listType1 = (GList)comp.GetChild("listType1");
+            m_listType2 = (GList)comp.GetChild("listType2");
+            m_btnAccessories = (GButton)comp.GetChild("btnAccessories");
+            m_listDressUp = (GList)comp.GetChild("listDressUp");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_progressBar = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progressBar"));
+            m_btnSearch = (GButton)comp.GetChild("btnSearch");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listType1 = null;
+            m_listType2 = null;
+            m_btnAccessories = null;
+            m_listDressUp = null;
+            m_txtTips = null;
+            m_progressBar.Dispose();
+            m_progressBar = null;
+            m_btnSearch = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,7 +8,6 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public UI_CompBanner m_compBanner;
         public GButton m_btnBack;
         public GList m_listGuide;
         public const string URL = "ui://vqq9h9h4pjip1";
@@ -59,15 +58,12 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_compBanner = (UI_CompBanner)UI_CompBanner.Create(comp.GetChild("compBanner"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listGuide = (GList)comp.GetChild("listGuide");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_compBanner.Dispose();
-            m_compBanner = null;
             m_btnBack = null;
             m_listGuide = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,106 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ListCardGuideItem
+    {
+        public GComponent target;
+        public UI_ComCardMask m_comCard;
+        public GLoader m_loaBorder;
+        public GLoader m_loaRarity;
+        public GTextField m_txtLv;
+        public GTextField m_txtName;
+        public GLoader m_loaMainScore;
+        public UI_CardGuideComDodgeStar m_dodgeStar0;
+        public UI_CardGuideComDodgeStar m_dodgeStar1;
+        public UI_CardGuideComDodgeStar m_dodgeStar2;
+        public UI_CardGuideComDodgeStar m_dodgeStar3;
+        public GImage m_unlockMask;
+        public const string URL = "ui://vqq9h9h4nt1l5l";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ListCardGuideItem";
+        private static UI_ListCardGuideItem _proxy;
+
+        public static UI_ListCardGuideItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListCardGuideItem();
+            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_ListCardGuideItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListCardGuideItem();
+            }
+            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_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
+            m_dodgeStar0 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar0"));
+            m_dodgeStar1 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar1"));
+            m_dodgeStar2 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar2"));
+            m_dodgeStar3 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comCard.Dispose();
+            m_comCard = null;
+            m_loaBorder = null;
+            m_loaRarity = null;
+            m_txtLv = null;
+            m_txtName = null;
+            m_loaMainScore = null;
+            m_dodgeStar0.Dispose();
+            m_dodgeStar0 = null;
+            m_dodgeStar1.Dispose();
+            m_dodgeStar1 = null;
+            m_dodgeStar2.Dispose();
+            m_dodgeStar2 = null;
+            m_dodgeStar3.Dispose();
+            m_dodgeStar3 = null;
+            m_unlockMask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs.meta

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

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ListDressUpPartsItem
+    {
+        public GComponent target;
+        public GLoader m_loaBorder;
+        public GImage m_iconSelected;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GLoader m_ScoreType;
+        public GTextField m_txtTitle;
+        public GImage m_unlockMask;
+        public const string URL = "ui://vqq9h9h4yq5y4n";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ListDressUpPartsItem";
+        private static UI_ListDressUpPartsItem _proxy;
+
+        public static UI_ListDressUpPartsItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListDressUpPartsItem();
+            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_ListDressUpPartsItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListDressUpPartsItem();
+            }
+            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_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_iconSelected = (GImage)comp.GetChild("iconSelected");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_ScoreType = (GLoader)comp.GetChild("ScoreType");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBorder = null;
+            m_iconSelected = null;
+            m_icon = null;
+            m_rarity = null;
+            m_ScoreType = null;
+            m_txtTitle = null;
+            m_unlockMask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListDressUpPartsItem.cs.meta

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ProgressBar2
+    {
+        public GProgressBar target;
+        public GImage m_barFrame;
+        public GTextField m_title1;
+        public GTextField m_rate;
+        public const string URL = "ui://vqq9h9h4yq5y4m";
+        public const string PACKAGE_NAME = "FieldGuide";
+        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_barFrame = (GImage)comp.GetChild("barFrame");
+            m_title1 = (GTextField)comp.GetChild("title1");
+            m_rate = (GTextField)comp.GetChild("rate");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_barFrame = null;
+            m_title1 = null;
+            m_rate = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ProgressBar3
+    {
+        public GProgressBar target;
+        public GTextField m_rate;
+        public GTextField m_num;
+        public const string URL = "ui://vqq9h9h4e3ot6b";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ProgressBar3";
+        private static UI_ProgressBar3 _proxy;
+
+        public static UI_ProgressBar3 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar3();
+            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_ProgressBar3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar3();
+            }
+            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_rate = (GTextField)comp.GetChild("rate");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rate = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ProgressBar3.cs.meta

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ProgressBar4
+    {
+        public GProgressBar target;
+        public GImage m_barFrame;
+        public GTextField m_title1;
+        public GTextField m_rate;
+        public const string URL = "ui://vqq9h9h4e3ot6m";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ProgressBar4";
+        private static UI_ProgressBar4 _proxy;
+
+        public static UI_ProgressBar4 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar4();
+            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_ProgressBar4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar4();
+            }
+            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_barFrame = (GImage)comp.GetChild("barFrame");
+            m_title1 = (GTextField)comp.GetChild("title1");
+            m_rate = (GTextField)comp.GetChild("rate");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_barFrame = null;
+            m_title1 = null;
+            m_rate = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ProgressBar4.cs.meta

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

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

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitGuideDetailUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listSuit;
+        public GTextField m_title;
+        public GButton m_btnSearch;
+        public UI_ProgressBar4 m_progress;
+        public const string URL = "ui://vqq9h9h4e3ot6l";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitGuideDetailUI";
+        private static UI_SuitGuideDetailUI _proxy;
+
+        public static UI_SuitGuideDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitGuideDetailUI();
+            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_SuitGuideDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitGuideDetailUI();
+            }
+            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_listSuit = (GList)comp.GetChild("listSuit");
+            m_title = (GTextField)comp.GetChild("title");
+            m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listSuit = null;
+            m_title = null;
+            m_btnSearch = null;
+            m_progress.Dispose();
+            m_progress = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideDetailUI.cs.meta

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

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

@@ -10,12 +10,9 @@ namespace UI.FieldGuide
         public Controller m_c1;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GList m_listType;
-        public GList m_listSuit;
-        public GButton m_btnNotGet;
-        public GButton m_btnHaveGot;
-        public GComboBox m_comBoxSort;
-        public GButton m_btnSwitch;
+        public GList m_suitTypeList;
+        public UI_SuitTypeItems m_suitTypeItems;
+        public GList m_suitType2Items;
         public const string URL = "ui://vqq9h9h4z3os0";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitGuideUI";
@@ -66,24 +63,19 @@ namespace UI.FieldGuide
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_listType = (GList)comp.GetChild("listType");
-            m_listSuit = (GList)comp.GetChild("listSuit");
-            m_btnNotGet = (GButton)comp.GetChild("btnNotGet");
-            m_btnHaveGot = (GButton)comp.GetChild("btnHaveGot");
-            m_comBoxSort = (GComboBox)comp.GetChild("comBoxSort");
-            m_btnSwitch = (GButton)comp.GetChild("btnSwitch");
+            m_suitTypeList = (GList)comp.GetChild("suitTypeList");
+            m_suitTypeItems = (UI_SuitTypeItems)UI_SuitTypeItems.Create(comp.GetChild("suitTypeItems"));
+            m_suitType2Items = (GList)comp.GetChild("suitType2Items");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
             m_btnBack = null;
-            m_listType = null;
-            m_listSuit = null;
-            m_btnNotGet = null;
-            m_btnHaveGot = null;
-            m_comBoxSort = null;
-            m_btnSwitch = null;
+            m_suitTypeList = null;
+            m_suitTypeItems.Dispose();
+            m_suitTypeItems = null;
+            m_suitType2Items = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitStoryItem
+    {
+        public GComponent target;
+        public GImage m_icon;
+        public GTextField m_title;
+        public GTextField m_progressNum;
+        public const string URL = "ui://vqq9h9h4e3ot6k";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitStoryItem";
+        private static UI_SuitStoryItem _proxy;
+
+        public static UI_SuitStoryItem Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitStoryItem();
+            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_SuitStoryItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitStoryItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GImage)comp.GetChild("icon");
+            m_title = (GTextField)comp.GetChild("title");
+            m_progressNum = (GTextField)comp.GetChild("progressNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_title = null;
+            m_progressNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitStoryItem.cs.meta

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

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitTypeItem
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public GTextField m_title;
+        public UI_ProgressBar3 m_progress;
+        public const string URL = "ui://vqq9h9h4e3ot6e";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitTypeItem";
+        private static UI_SuitTypeItem _proxy;
+
+        public static UI_SuitTypeItem Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitTypeItem();
+            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_SuitTypeItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitTypeItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_title = (GTextField)comp.GetChild("title");
+            m_progress = (UI_ProgressBar3)UI_ProgressBar3.Create(comp.GetChild("progress"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_title = null;
+            m_progress.Dispose();
+            m_progress = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitTypeItem.cs.meta

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

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

@@ -0,0 +1,96 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitTypeItems
+    {
+        public GComponent target;
+        public UI_SuitTypeItem m_item1;
+        public UI_SuitTypeItem m_item2;
+        public UI_SuitTypeItem m_item3;
+        public UI_SuitTypeItem m_item4;
+        public UI_SuitTypeItem m_item5;
+        public UI_SuitTypeItem m_item6;
+        public UI_SuitTypeItem m_item7;
+        public const string URL = "ui://vqq9h9h4e3ot6f";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitTypeItems";
+        private static UI_SuitTypeItems _proxy;
+
+        public static UI_SuitTypeItems Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitTypeItems();
+            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_SuitTypeItems Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitTypeItems();
+            }
+            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_item1 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_SuitTypeItem)UI_SuitTypeItem.Create(comp.GetChild("item7"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitTypeItems.cs.meta

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

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_ButtonModle5
     {
         public GButton target;
+        public Controller m_showText;
         public GGraph m_holder;
         public GGraph m_holder1;
         public GLoader m_icon1;
@@ -59,6 +60,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_showText = comp.GetController("showText");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
@@ -67,6 +69,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showText = null;
             m_holder = null;
             m_holder1 = null;
             m_icon1 = null;

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeagueAnswerUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GButton m_btnClose;
         public GButton m_btnRank;
         public UI_ComHeadIcon m_comHead;
@@ -14,6 +15,7 @@ namespace UI.League
         public GTextField m_txtRule;
         public GTextField m_txtTime;
         public GButton m_btnAnswer;
+        public GTextField m_txtRule_2;
         public const string URL = "ui://tw70qm9dpvb452";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueAnswerUI";
@@ -61,6 +63,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRank = (GButton)comp.GetChild("btnRank");
             m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
@@ -68,9 +71,11 @@ namespace UI.League
             m_txtRule = (GTextField)comp.GetChild("txtRule");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnAnswer = (GButton)comp.GetChild("btnAnswer");
+            m_txtRule_2 = (GTextField)comp.GetChild("txtRule");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_btnClose = null;
             m_btnRank = null;
             m_comHead.Dispose();
@@ -79,6 +84,7 @@ namespace UI.League
             m_txtRule = null;
             m_txtTime = null;
             m_btnAnswer = null;
+            m_txtRule_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyOverUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem5;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem6;
+        public GButton m_btnReward;
+        public GButton m_btnRule;
+        public GTextField m_txtTeaName;
+        public const string URL = "ui://tw70qm9dic4otq4";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyOverUI";
+        private static UI_LeagueTeaPartyOverUI _proxy;
+
+        public static UI_LeagueTeaPartyOverUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyOverUI();
+            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_LeagueTeaPartyOverUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyOverUI();
+            }
+            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_TeaPartyOverItem1 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem1"));
+            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
+            m_TeaPartyOverItem3 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem3"));
+            m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
+            m_TeaPartyOverItem5 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem5"));
+            m_TeaPartyOverItem6 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem6"));
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_TeaPartyOverItem1.Dispose();
+            m_TeaPartyOverItem1 = null;
+            m_TeaPartyOverItem2.Dispose();
+            m_TeaPartyOverItem2 = null;
+            m_TeaPartyOverItem3.Dispose();
+            m_TeaPartyOverItem3 = null;
+            m_TeaPartyOverItem4.Dispose();
+            m_TeaPartyOverItem4 = null;
+            m_TeaPartyOverItem5.Dispose();
+            m_TeaPartyOverItem5 = null;
+            m_TeaPartyOverItem6.Dispose();
+            m_TeaPartyOverItem6 = null;
+            m_btnReward = null;
+            m_btnRule = null;
+            m_txtTeaName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs.meta

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

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

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyRewardUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GProgressBar m_barPerson;
+        public GProgressBar m_barGroups;
+        public GLoader m_EndIndex;
+        public GLoader m_StartIndex;
+        public GLoader m_EndLeagueIndex;
+        public GLoader m_StartLeagueIndex;
+        public const string URL = "ui://tw70qm9dic4otpz";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyRewardUI";
+        private static UI_LeagueTeaPartyRewardUI _proxy;
+
+        public static UI_LeagueTeaPartyRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyRewardUI();
+            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_LeagueTeaPartyRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_barPerson = (GProgressBar)comp.GetChild("barPerson");
+            m_barGroups = (GProgressBar)comp.GetChild("barGroups");
+            m_EndIndex = (GLoader)comp.GetChild("EndIndex");
+            m_StartIndex = (GLoader)comp.GetChild("StartIndex");
+            m_EndLeagueIndex = (GLoader)comp.GetChild("EndLeagueIndex");
+            m_StartLeagueIndex = (GLoader)comp.GetChild("StartLeagueIndex");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_barPerson = null;
+            m_barGroups = null;
+            m_EndIndex = null;
+            m_StartIndex = null;
+            m_EndLeagueIndex = null;
+            m_StartLeagueIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs.meta

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

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

@@ -8,16 +8,14 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GList m_ListTeaParty;
         public GButton m_btnBack;
         public GButton m_btnChallenge;
         public GButton m_btnChat;
+        public GButton m_btnReward;
+        public GButton m_btnRule;
         public GTextField m_txtTeaName;
-        public UI_comTeaPartyItem m_teaPartyItem1;
-        public UI_comTeaPartyItem m_teaPartyItem2;
-        public UI_comTeaPartyItem m_teaPartyItem3;
-        public UI_comTeaPartyItem m_teaPartyItem4;
-        public UI_comTeaPartyItem m_teaPartyItem5;
-        public UI_comTeaPartyItem m_teaPartyItem6;
+        public GTextField m_txtOverTime;
         public UI_TeaPartyItemTips m_teaPartyItemTips;
         public const string URL = "ui://tw70qm9dchwotpk";
         public const string PACKAGE_NAME = "League";
@@ -67,37 +65,27 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChallenge = (GButton)comp.GetChild("btnChallenge");
             m_btnChat = (GButton)comp.GetChild("btnChat");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
-            m_teaPartyItem1 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem1"));
-            m_teaPartyItem2 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem2"));
-            m_teaPartyItem3 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem3"));
-            m_teaPartyItem4 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem4"));
-            m_teaPartyItem5 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem5"));
-            m_teaPartyItem6 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem6"));
+            m_txtOverTime = (GTextField)comp.GetChild("txtOverTime");
             m_teaPartyItemTips = (UI_TeaPartyItemTips)UI_TeaPartyItemTips.Create(comp.GetChild("teaPartyItemTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_ListTeaParty = null;
             m_btnBack = null;
             m_btnChallenge = null;
             m_btnChat = null;
+            m_btnReward = null;
+            m_btnRule = null;
             m_txtTeaName = null;
-            m_teaPartyItem1.Dispose();
-            m_teaPartyItem1 = null;
-            m_teaPartyItem2.Dispose();
-            m_teaPartyItem2 = null;
-            m_teaPartyItem3.Dispose();
-            m_teaPartyItem3 = null;
-            m_teaPartyItem4.Dispose();
-            m_teaPartyItem4 = null;
-            m_teaPartyItem5.Dispose();
-            m_teaPartyItem5 = null;
-            m_teaPartyItem6.Dispose();
-            m_teaPartyItem6 = null;
+            m_txtOverTime = null;
             m_teaPartyItemTips.Dispose();
             m_teaPartyItemTips = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LinessRewardProcessItemBt
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_Score;
+        public GTextField m_Num;
+        public const string URL = "ui://tw70qm9dwd7qtqj";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LinessRewardProcessItemBt";
+        private static UI_LinessRewardProcessItemBt _proxy;
+
+        public static UI_LinessRewardProcessItemBt Create(GObject gObject = null)
+        {
+            var ui = new UI_LinessRewardProcessItemBt();
+            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_LinessRewardProcessItemBt Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LinessRewardProcessItemBt();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_Score = (GTextField)comp.GetChild("Score");
+            m_Num = (GTextField)comp.GetChild("Num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_Score = null;
+            m_Num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LinessRewardProcessItemBt.cs.meta

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

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

@@ -8,10 +8,12 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_iconRole;
-        public GLoader m_btnDetail;
         public GTextField m_txtRoleName;
         public GTextField m_txtMaxValue;
         public GImage m_imgChoose;
+        public GTextField m_txtNumber;
+        public GTextField m_txtMaxName;
+        public GLoader m_btnDetail;
         public const string URL = "ui://tw70qm9dchwotpl";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyItem";
@@ -60,18 +62,22 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_iconRole = (GLoader)comp.GetChild("iconRole");
-            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtMaxValue = (GTextField)comp.GetChild("txtMaxValue");
             m_imgChoose = (GImage)comp.GetChild("imgChoose");
+            m_txtNumber = (GTextField)comp.GetChild("txtNumber");
+            m_txtMaxName = (GTextField)comp.GetChild("txtMaxName");
+            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconRole = null;
-            m_btnDetail = null;
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;
+            m_txtNumber = null;
+            m_txtMaxName = null;
+            m_btnDetail = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_comTeaPartyOverItem
+    {
+        public GComponent target;
+        public GLoader m_iconRole;
+        public GTextField m_txtRoleName;
+        public GTextField m_txtGuildName;
+        public const string URL = "ui://tw70qm9dic4otq5";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "comTeaPartyOverItem";
+        private static UI_comTeaPartyOverItem _proxy;
+
+        public static UI_comTeaPartyOverItem Create(GObject gObject = null)
+        {
+            var ui = new UI_comTeaPartyOverItem();
+            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_comTeaPartyOverItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTeaPartyOverItem();
+            }
+            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_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+            m_txtGuildName = (GTextField)comp.GetChild("txtGuildName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconRole = null;
+            m_txtRoleName = null;
+            m_txtGuildName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -20,6 +20,7 @@ namespace UI.Main
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
         public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kxuzk2i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryDialogUI";
@@ -80,6 +81,7 @@ namespace UI.Main
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,6 +101,7 @@ namespace UI.Main
             m_btnSpeedUp = null;
             m_btnSkip = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs

@@ -17,6 +17,7 @@ namespace UI.Notice
         public GList m_listActivity;
         public GList m_listNotice;
         public GTextField m_txtTips;
+        public Transition m_openViewAction;
         public const string URL = "ui://d8t5ezjbkjq3i";
         public const string PACKAGE_NAME = "Notice";
         public const string RES_NAME = "NoticeUI";
@@ -74,6 +75,7 @@ namespace UI.Notice
             m_listActivity = (GList)comp.GetChild("listActivity");
             m_listNotice = (GList)comp.GetChild("listNotice");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_openViewAction = comp.GetTransition("openViewAction");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +89,7 @@ namespace UI.Notice
             m_listActivity = null;
             m_listNotice = null;
             m_txtTips = null;
+            m_openViewAction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -34,6 +34,7 @@ namespace UI.RoleInfo
         public GButton m_btnSetLeaguNum;
         public GTextInput m_SetLeagueNumType;
         public GTextInput m_SetNum;
+        public GButton m_btnTeaPartyStart;
         public const string URL = "ui://374k3dwvlqp0dm";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
@@ -108,6 +109,7 @@ namespace UI.RoleInfo
             m_btnSetLeaguNum = (GButton)comp.GetChild("btnSetLeaguNum");
             m_SetLeagueNumType = (GTextInput)comp.GetChild("SetLeagueNumType");
             m_SetNum = (GTextInput)comp.GetChild("SetNum");
+            m_btnTeaPartyStart = (GButton)comp.GetChild("btnTeaPartyStart");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -138,6 +140,7 @@ namespace UI.RoleInfo
             m_btnSetLeaguNum = null;
             m_SetLeagueNumType = null;
             m_SetNum = null;
+            m_btnTeaPartyStart = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,10 +7,13 @@ namespace UI.Studio
     public partial class UI_ComFabric
     {
         public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_btnChageLine;
         public GList m_list;
         public GTextField m_txtNum;
         public GTextField m_txtTime;
         public GButton m_btnBuy;
+        public GTextField m_Name;
         public const string URL = "ui://xz8kxrecf2bf30";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComFabric";
@@ -58,17 +61,23 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_Name = (GTextField)comp.GetChild("Name");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
+            m_btnChageLine = null;
             m_list = null;
             m_txtNum = null;
             m_txtTime = null;
             m_btnBuy = null;
+            m_Name = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,11 +8,12 @@ namespace UI.Studio
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_btnChageLine;
         public GList m_list;
         public GTextField m_txtTime;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        public GLoader m_loaScore;
+        public GTextField m_loaName;
         public const string URL = "ui://xz8kxrecf2bf2w";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComPorcelain";
@@ -61,20 +62,22 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_list = (GList)comp.GetChild("list");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_loaName = (GTextField)comp.GetChild("loaName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_btnChageLine = null;
             m_list = null;
             m_txtTime = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_loaScore = null;
+            m_loaName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,7 +9,6 @@ namespace UI.Studio
         public GComponent target;
         public Controller m_c1;
         public GLoader m_bg0;
-        public GLoader m_bg1;
         public GList m_list;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
@@ -68,7 +67,6 @@ namespace UI.Studio
         {
             m_c1 = comp.GetController("c1");
             m_bg0 = (GLoader)comp.GetChild("bg0");
-            m_bg1 = (GLoader)comp.GetChild("bg1");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
@@ -83,7 +81,6 @@ namespace UI.Studio
         {
             m_c1 = null;
             m_bg0 = null;
-            m_bg1 = null;
             m_list = null;
             m_txtNum = null;
             m_btnBuy = null;

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

@@ -12,6 +12,7 @@ namespace UI.Studio
         public GLoader m_loaIcon;
         public GImage m_imgLock;
         public GTextField m_txtTitle;
+        public GImage m_imgLockBg;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecn3xha";
         public const string PACKAGE_NAME = "Studio";
@@ -65,6 +66,7 @@ namespace UI.Studio
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,6 +76,7 @@ namespace UI.Studio
             m_loaIcon = null;
             m_imgLock = null;
             m_txtTitle = null;
+            m_imgLockBg = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

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

@@ -9,10 +9,11 @@ namespace UI.Studio
         public GComponent target;
         public Controller m_star;
         public GTextField m_txtTitle;
-        public GLoader m_loaBg;
         public GLoader m_loaName;
         public GTextField m_txtName;
         public GLoader m_loaIcon;
+        public GLoader m_loaBg;
+        public GImage m_imgLockBg;
         public GImage m_imgLock;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecf2bf2x";
@@ -64,10 +65,11 @@ namespace UI.Studio
         {
             m_star = comp.GetController("star");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaName = (GLoader)comp.GetChild("loaName");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_test = comp.GetTransition("test");
         }
@@ -75,10 +77,11 @@ namespace UI.Studio
         {
             m_star = null;
             m_txtTitle = null;
-            m_loaBg = null;
             m_loaName = null;
             m_txtName = null;
             m_loaIcon = null;
+            m_loaBg = null;
+            m_imgLockBg = null;
             m_imgLock = null;
             m_test = null;
             if(disposeTarget && target != null)

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

@@ -18,6 +18,8 @@ namespace UI.Studio
         public GComponent m_comCostCurrent;
         public GButton m_btnBuy;
         public GButton m_btnBack;
+        public GGraph m_LeftTopEffect;
+        public GGraph m_RightDownEffect;
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioBuyNumUI";
@@ -76,6 +78,8 @@ namespace UI.Studio
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_LeftTopEffect = (GGraph)comp.GetChild("LeftTopEffect");
+            m_RightDownEffect = (GGraph)comp.GetChild("RightDownEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +94,8 @@ namespace UI.Studio
             m_comCostCurrent = null;
             m_btnBuy = null;
             m_btnBack = null;
+            m_LeftTopEffect = null;
+            m_RightDownEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,6 +12,8 @@ namespace UI.Studio
         public GList m_list;
         public GButton m_btnGet;
         public GButton m_btnBack;
+        public GGraph m_LeftTopEffect;
+        public GGraph m_RightDownEffect;
         public const string URL = "ui://xz8kxrecrqo41k";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingRewardUI";
@@ -64,6 +66,8 @@ namespace UI.Studio
             m_list = (GList)comp.GetChild("list");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_LeftTopEffect = (GGraph)comp.GetChild("LeftTopEffect");
+            m_RightDownEffect = (GGraph)comp.GetChild("RightDownEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +76,8 @@ namespace UI.Studio
             m_list = null;
             m_btnGet = null;
             m_btnBack = null;
+            m_LeftTopEffect = null;
+            m_RightDownEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -23,14 +23,14 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqSevenDayLoginInfos()
         {
-            M2C_GetDailySignInBonusInfos response = null;
-            response = (M2C_GetDailySignInBonusInfos)await MessageHelper.SendToServer(new C2M_GetDailySignInBonusInfos());
+            M2C_GetDailySignInBonusInfoList response = null;
+            response = (M2C_GetDailySignInBonusInfoList)await MessageHelper.SendToServer(new C2M_GetDailySignInBonusInfoList());
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.sevenDayLoginLoginId = response.CuurentBonusId;
-                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginLoginIdList = response.KsBonusId;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatusList = response.VsBonusStatus;
                     return true;
                 }
             }
@@ -44,7 +44,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatusList[response.BonusId - 1] = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
                     BonusController.TryShowBonusList(rewards, onSuccess: () =>
@@ -54,7 +54,10 @@ namespace GFGGame
                             TimeUtil.GetCurDay());
                         if (!isGot)
                         {
-                            ViewManager.Show<DailySignView>(new object[] { 1 });
+                            if (RedDotDataManager.Instance.DailySignRed())
+                            {
+                                ViewManager.Show<DailySignView>(new object[] { 1 });
+                            }  
                         }
                     });
 

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

@@ -4,7 +4,16 @@ using ET;
 
 namespace GFGGame
 {
-
+    //通知茶会状态
+    public class TeapartyStatus : AMHandler<S2C_TeapartyStatus>
+    {
+        protected override async ETTask Run(Session session, S2C_TeapartyStatus message)
+        {
+            LeagueDataManager.Instance.TeaPartyId = message.TeapartyId;
+            LeagueDataManager.Instance.TeaPartyStatus = message.Status;
+            await ETTask.CompletedTask;
+        }
+    }
     //通知联盟解散了
     public class NoticeDisbandLeague : AMHandler<L2C_NoticeDisbandLeague>
     {
@@ -818,5 +827,122 @@ namespace GFGGame
             return logData;
         }
 
+        //茶话会获取本期信息
+        public static async ETTask<bool> GetTeapartyInfos()
+        {
+            S2C_GetTeapartyInfos response = null;
+            response = (S2C_GetTeapartyInfos)await MessageHelper.SendToServer(new C2S_GetTeapartyInfos() { RoleId = RoleDataManager.roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.TeaPartyId = response.TeapartyId;
+                    LeagueDataManager.Instance.TeaPartyStatus = response.Status;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取玩家本期茶话会参与信息
+        public static async ETTask<bool> GetTeapartyMatchingInfos(long roleId)
+        {
+            S2C_TeapartyMatchingInfos response = null;
+            response = (S2C_TeapartyMatchingInfos)await MessageHelper.SendToServer(new C2S_GetTeapartyMatchingInfos() { RoleId = roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.RoleTeapartyInfoProto = response.RoleTeapartyInfo;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取茶会每个扮演角色坑位信息
+        public static async ETTask<bool> GetRoleContainerInfos(long roleId)
+        {
+            S2C_GetRoleContainerInfos response = null;
+
+            response = (S2C_GetRoleContainerInfos)await MessageHelper.SendToServer(new C2S_GetRoleContainerInfos() { RoleId = roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.RoleContainerList = response.RoleContainerList;
+                    LeagueDataManager.Instance.TeaPartyCloseTime = response.TeaPartyCloseTime;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //更换角色坑位以及搭配
+        public static async ETTask<bool> ChangeTeapartyDressup(long roleId,int teapartyRoleId, List<int> equipIds)
+        {
+            S2C_ChangeTeapartyDressup response = null;
+            response = (S2C_ChangeTeapartyDressup)await MessageHelper.SendToServer(new C2S_ChangeTeapartyDressup() { RoleId = roleId, TeapartyRoleId = teapartyRoleId, EquipIds  = equipIds });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    //LeagueDataManager.Instance.TeapartyRoleId = response.TeapartyRoleId;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //会长点击挑战,开启挑战
+        public static async ETTask<bool> TeapartyStartChallenge(long roleId)
+        {
+            S2C_TeapartyStartChallenge response = null;
+
+            response = (S2C_TeapartyStartChallenge)await MessageHelper.SendToServer(new C2S_TeapartyStartChallenge() { RoleId = roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.RoleContainerList = response.RoleContainerList;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //领取个人评分奖励
+        public static async ETTask<bool> GetPerRatingAward(int score)
+        {
+            S2C_GetPerRatingAward response = null;
+
+            response = (S2C_GetPerRatingAward)await MessageHelper.SendToServer(new C2S_GetPerRatingAward() { Score = score });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    //LeagueDataManager.Instance.RoleContainerList = response.PerScore;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //领取雅集评分奖励
+        public static async ETTask<bool> GetLeagueRatingAward(int score)
+        {
+            S2C_GetLeagueRatingAward response = null;
+
+            response = (S2C_GetLeagueRatingAward)await MessageHelper.SendToServer(new C2S_GetLeagueRatingAward() { Score = score });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    //LeagueDataManager.Instance.RoleContainerList = response.PerScore;
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -96,6 +96,15 @@ namespace GFGGame
                 {
                     return -1;
                 }
+
+                if (suitCfgB.rarity > suitCfgA.rarity)
+                {
+                    return 1;
+                }
+                else if (suitCfgB.rarity < suitCfgA.rarity)
+                {
+                    return -1;
+                }
                 return string.Compare(suitCfgA.res, suitCfgB.res);
             });
             return arrayList;

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -80,7 +80,7 @@ namespace GFGGame
         }
         private void UpdateCardList()
         {
-            List<CardData> cardList = CardDataManager.GetCardListByRarity(_ui.m_listRole.selectedIndex);
+            List<CardData> cardList = CardDataManager.GetCardListByRoleType(_ui.m_listRole.selectedIndex);
             if (CardDataManager.isFilter == true)
             {
                 //筛选

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -12,8 +12,13 @@ using ET;
 
 namespace GFGGame
 {
-    public class CardFosterView : BaseView
+    public class CardFosterView : BaseWindow
     {
+        private enum Source
+        {
+            COMMON, // 由普通词牌界面进入
+            DISPLAY // 由词牌图鉴进入
+        }
         private UI_CardFosterUI _ui;
         private UI_ComFosterBottom _comFosterBottom;
         private ValueBarController _valueBarController;
@@ -24,11 +29,13 @@ namespace GFGGame
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<GGraph> _listEffectHolder = new List<GGraph>();
-        private List<CardData> cardList = new List<CardData>();
-        private int wordRow = 4;  //字行数
-        private int wordNumber = 5;//字每行个数
-        private int nowIndex = 0;
-        private bool refDodgeStar = true;
+        private List<CardData> _cardList = new List<CardData>();
+        private int _wordRow = 4;  //字行数
+        private int _wordNumber = 5;//字每行个数
+        private int _nowIndex = 0;
+        private bool _refDodgeStar = true;
+        private int _isAutoSelect = 0;
+        
         private EffectUI _effectUI1;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
@@ -116,6 +123,7 @@ namespace GFGGame
             _ui.m_ComFosterBottom.m_listLvConsume.itemRenderer = RenderListLvConsumeItem;
             _ui.m_ComFosterBottom.m_listStarConsume.itemRenderer = RenderListStarConsumeItem;
             _ui.m_ComFosterBottom.m_listSkill.itemRenderer = RenderListSkillItem;
+            _ui.m_ComFosterBottom.m_listSkill.onClickItem.Add(OnClickListSkillItem);
 
             //满星级后卡面列表
             _ui.m_ComFosterBottom.m_listShowCard.itemRenderer = RenderListShowCardItem;
@@ -145,7 +153,7 @@ namespace GFGGame
 
         private void RefLeftAndRight()
         {
-            if (nowIndex <= 0)
+            if (_nowIndex <= 0)
             {
                 _ui.m_btnLeft.grayed = true;
                 _ui.m_btnLeft.touchable = false;
@@ -155,7 +163,7 @@ namespace GFGGame
                 _ui.m_btnLeft.touchable = true;
             }
 
-            if (nowIndex >= cardList.Count - 1)
+            if (_nowIndex >= _cardList.Count - 1)
             {
                 _ui.m_btnRight.grayed = true;
                 _ui.m_btnRight.touchable = false;
@@ -169,17 +177,17 @@ namespace GFGGame
 
         private void OnClickBtnLeft()
         {
-            nowIndex -= 1;
+            _nowIndex -= 1;
             RefLeftAndRight();
-            _cardData = cardList[nowIndex];
+            _cardData = _cardList[_nowIndex];
             RefCardFosterInfo();
         }
 
         private void OnClickBtnRight()
         {
-            nowIndex += 1;
+            _nowIndex += 1;
             RefLeftAndRight();
-            _cardData = cardList[nowIndex];
+            _cardData = _cardList[_nowIndex];
             RefCardFosterInfo();
         }
 
@@ -227,18 +235,36 @@ namespace GFGGame
             base.OnShown();
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cp_beijing");
-
-            _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
-            nowIndex = _cardData.index;
             _comFosterBottom = _ui.m_ComFosterBottom;
 
-            cardList = CardDataManager.GetCardListByRarity(_cardData.pageIndex);
+            // old
+            if ((this.viewData as object[]) == null)
+            {
+                _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
+                _ui.m_ComFosterBottom.m_c_from.selectedIndex = (int)Source.COMMON;
+                _selectTab = 0;
+            }
+            // New
+            else
+            {
+                _cardData = CardDataManager.GetCardDataById((int)(this.viewData as object[])[0]);
+                string fromViewName = (string)((this.viewData as object[])[1]);
+                if (fromViewName.Equals(typeof(CardGuideView).FullName))
+                {
+                    _ui.m_ComFosterBottom.m_c_from.selectedIndex = (int)Source.DISPLAY;
+                    _selectTab = 2; // 默认选中技能tab
+                }
+            }
+
+            _ui.m_ComFosterTop.m_c1.selectedIndex = _ui.m_ComFosterBottom.m_c_from.selectedIndex;
+            _nowIndex = _cardData.index;
+            _cardList = CardDataManager.GetCardListByRoleType(_cardData.pageIndex);
             if (CardDataManager.isFilter == true)
             {
                 //筛选
-                cardList = CardDataManager.FilterCardList(cardList);
+                _cardList = CardDataManager.FilterCardList(_cardList);
             }
-            cardList = CardDataManager.SortItemList(cardList);
+            _cardList = CardDataManager.SortItemList(_cardList);
 
             RefCardFosterInfo();
         }
@@ -701,14 +727,14 @@ namespace GFGGame
                 ET.Log.Error("词牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
                 return;
             }
-
-            _comFosterBottom.m_btnCheckAuto.selected = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 1;
+            _isAutoSelect = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect);
+            _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
 
             //升星后星数正5才不进入
-            if (refDodgeStar || _cardData.star % 5 != 0) { 
+            if (_refDodgeStar || _cardData.star % 5 != 0) { 
                 UpdateUpStarOfStarAndText();
             }
-            refDodgeStar = true;
+            _refDodgeStar = true;
 
             _comFosterBottom.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _comFosterBottom.m_btnRule.data = 300021;
@@ -747,8 +773,8 @@ namespace GFGGame
 
         private void UpdateUpStarOfStar()
         {
-            int starLevelDodge = _cardData.star / wordNumber;
-            for (int i = 0; i < wordRow; i++)
+            int starLevelDodge = _cardData.star / _wordNumber;
+            for (int i = 0; i < _wordRow; i++)
             {
                 UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
                 dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
@@ -758,10 +784,10 @@ namespace GFGGame
 
         private void UpdateUpStarOfText()
         {
-            int starLevel = _cardData.star / wordNumber;
-            if (starLevel >= wordRow)
-                starLevel = wordRow - 1;
-            int index = starLevel * wordNumber;
+            int starLevel = _cardData.star / _wordNumber;
+            if (starLevel >= _wordRow)
+                starLevel = _wordRow - 1;
+            int index = starLevel * _wordNumber;
             UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
             string starDesc = "";
             for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
@@ -789,6 +815,12 @@ namespace GFGGame
             listItem.m_QualityType.selectedIndex = 4;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
+            if (_isAutoSelect == 1) { 
+                if(index == 0)
+                    hasCount += ItemDataManager.GetItemNum(6003001);
+                else
+                    hasCount += ItemDataManager.GetItemNum(6003002);
+            }
 
             listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
             listItem.m_txtDecomHasCount.text = "/" + needCount.ToString();   //;  hasCount.ToString();     
@@ -878,12 +910,12 @@ namespace GFGGame
         }
         private async void UpStar()
         {
-            _comFosterBottom.m_btnCheckAuto.selected = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsAutoSelect) == 1;
+            _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
             bool result = await CardSProxy.UpgradeCardStar(_cardData.id, _comFosterBottom.m_btnCheckAuto.selected);
             if (result)
             {
                 UpdateCommon();
-                refDodgeStar = false;
+                _refDodgeStar = false;
                 UpdateUpStarView();
                 UpdateCardRes();
                 // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
@@ -892,8 +924,8 @@ namespace GFGGame
                 UpdateRedDot();
 
                 if (_cardData.star % 5 == 0) {
-                    int starLevelDodge = _cardData.star / wordNumber;
-                    int starLevel = _cardData.star / wordNumber - 1;
+                    int starLevelDodge = _cardData.star / _wordNumber;
+                    int starLevel = _cardData.star / _wordNumber - 1;
                     UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem"));
                     string starDesc = "";
                     for (int j = 0; j < _cardData.itemCfg.starDescArr[starLevel].Length; j++)
@@ -932,7 +964,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI9);
                 _effectUI9 = null;
             }
-            int starLevelDodge = _cardData.star / wordNumber;
+            int starLevelDodge = _cardData.star / _wordNumber;
             UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
             //升星字体拖尾特效
             _effectUI9 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderUpStarMove, "ui_Activity", "SX_Text_Taril_02");
@@ -952,7 +984,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI10);
                 _effectUI10 = null;
             }
-            int starLevelDodge = _cardData.star / wordNumber;
+            int starLevelDodge = _cardData.star / _wordNumber;
             UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + (starLevelDodge - 1)));
             //星星特效
             _effectUI10 = EffectUIPool.CreateEffectUI(dodgeStar.m_holderStarLight, "ui_Activity", "SX_Text_STAR_03");
@@ -986,6 +1018,15 @@ namespace GFGGame
         private void RenderListSkillItem(int index, GObject obj)
         {
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
+            item.m_c1.selectedIndex = _comFosterBottom.m_c_from.selectedIndex;
+            if (_comFosterBottom.m_c_from.selectedIndex == (int)Source.DISPLAY)
+            {
+                item.target.mode = ButtonMode.Common;
+            }
+            else
+            {
+                item.target.mode = ButtonMode.Radio;
+            }
             PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id)[index];
             int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardData.id, skillCfg.skillId);
             CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);
@@ -996,24 +1037,40 @@ namespace GFGGame
             // item.m_txtDesc.text = skillLvlCfg.describe;
             // item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillCfg.skillId) != null;
             RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", -10, 10);
-
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(OnBtnUpSkill);
-            }
         }
 
-        private void OnBtnCheckAuto()
+        private void OnBtnUpSkill()
         {
-            var success = CardSProxy.SaveIsAutoSelect(_comFosterBottom.m_btnCheckAuto.selected);
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id);
+
+            ViewManager.Show<CardSkillView>(new object[] { _cardData.id, skillCfgs[_comFosterBottom.m_listSkill.selectedIndex].skillId, _comFosterBottom.m_c_from.selectedIndex });
         }
 
-        private void OnBtnUpSkill()
+        private void OnClickListSkillItem(EventContext eventContext)
         {
+            int index = _comFosterBottom.m_listSkill.GetChildIndex(eventContext.data as GObject);
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id);
+            ViewManager.Show<CardSkillView>(new object[] { _cardData.id, skillCfgs[index].skillId, _comFosterBottom.m_c_from.selectedIndex });
+        }
+
+        private void OnBtnCheckAuto()
+        {
+            var success = CardSProxy.SaveIsAutoSelect(_comFosterBottom.m_btnCheckAuto.selected);
+            CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
+            if (cardStarCfg == null)
+            {
+                ET.Log.Error("词牌：" + _cardData.id + "   无" + _cardData.star + "星升星配置");
+                return;
+            }
+            if (_isAutoSelect == 0)
+                _isAutoSelect = 1;
+            else
+                _isAutoSelect = 0;
 
-            ViewManager.Show<CardSkillView>(new object[] { _cardData.id, skillCfgs[_comFosterBottom.m_listSkill.selectedIndex].skillId });
+            _comFosterBottom.m_listStarConsume.data = cardStarCfg;
+            _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
         }
+
         private float touchBeginX = 0;
 
         private void onTouchCardBegin(EventContext context)
@@ -1028,7 +1085,7 @@ namespace GFGGame
             float diffValueX = touchBeginX - inputEvent.x;
             if (diffValueX > 20 && showCard == false)
             {
-                if (nowIndex < cardList.Count - 1)
+                if (_nowIndex < _cardList.Count - 1)
                 {
                     OnClickBtnRight();
                     RefLeftAndRight();
@@ -1036,7 +1093,7 @@ namespace GFGGame
             }
             else if (diffValueX < -20 && showCard == false)
             {
-                if (nowIndex > 0)
+                if (_nowIndex > 0)
                 {
                     OnClickBtnLeft();
                     RefLeftAndRight();

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -50,6 +50,7 @@ namespace GFGGame
 
             _cardId = (int)(viewData as object[])[0];
             _skillId = (int)(viewData as object[])[1];
+            _ui.m_c2.selectedIndex = (int)((viewData as object[])[2]);
             _skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardId, _skillId);
 
             // SkillData skillData = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -271,8 +271,16 @@ namespace GFGGame
         {
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
+
+            if (_effectUI1 != null)
+            {
+                EffectUIPool.Recycle(_effectUI1);
+                _effectUI1 = null;
+            }
+
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_comFosterAni.m_holder, "ui_gcdh", "ui_gcdh_" + (_index + 1));
 
+
             _ui.m_comFosterAni.m_t0.Play(() =>
             {
                 ViewManager.Show<ClothingFosterFinishView>(new object[] { _suitId, _index, _propertyList });

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GoodsItemTipsController.cs

@@ -2,7 +2,7 @@ namespace GFGGame
 {
     public class GoodsItemTipsController
     {
-        public static void ShowItemTips(int id, object[] sourceDatas = null)
+        public static void ShowItemTips(int id, object[] sourceDatas = null, bool have = true)
         {
             if (SuitCfgArray.Instance.GetCfg(id) != null)
             {
@@ -16,7 +16,7 @@ namespace GFGGame
             else
             {
                 //sourceDatas{物品id，gobackData，物品需求量}
-                ViewManager.Show<GoodsItemTipsView>(new object[] { id, sourceDatas });
+                ViewManager.Show<GoodsItemTipsView>(new object[] { id, sourceDatas, have });
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -41,7 +41,6 @@ namespace GFGGame
         }
         public void OnShow(object[] viewData)
         {
-
             _viewData = viewData;
             _itemId = (int)viewData[0];
             _fromeViewDatas = viewData[1] as object[];

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -58,6 +58,7 @@ namespace GFGGame
             UpdateTags();
             UpdateItems();
             UpdateSourec(sourceDatas);
+
             // this.viewCom.height = _ui.m_grpTips.height;
             // this.viewCom.Center();
             Timers.inst.AddUpdate(CheckGuide);
@@ -95,6 +96,10 @@ namespace GFGGame
             {
                 _ui.m_comTipsBase.m_txtType.text = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).name;
             }
+            if ((viewData as object[]).Length >= 2)
+            {
+                _ui.m_comTipsBase.m_unlock.visible = !(bool)(viewData as object[])[2];
+            }
             RarityIconController.UpdateRarityIcon(_ui.m_comTipsBase.m_loaRarity, itemCfg.id, false);
 
             ET.Log.Debug(itemCfg.name + "  itemId:" + itemCfg.id);

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

@@ -22,6 +22,7 @@ namespace GFGGame
         private float _signCount;
         private int _month;
         private int _day;
+        private bool isOpenPanel = true;
 
         public override void Dispose()
         {
@@ -111,6 +112,7 @@ namespace GFGGame
             base.OnHide();
             _ui.m_t0.Stop();
             m_holderSign = null;
+            GameGlobal.isLogon = false;
         }
 
         protected override void RemoveEventListener()

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

@@ -67,7 +67,7 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
+            || ActivityDataManager.Instance.AllSevenDayBonusGot());
 
             _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
             _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;

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

@@ -55,13 +55,18 @@ namespace GFGGame
         {
             _ui.m_list.numItems = _cfgs.Count;
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, _cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
+            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] == ConstBonusStatus.CAN_GET);
         }
         protected override void OnHide()
         {
             base.OnHide();
+            if (GameGlobal.isLogon && RedDotDataManager.Instance.DailySignRed())
+            {
+                ViewManager.Show<DailySignView>(new object[] { 1 });
+            }
             _ui.m_list.numItems = 0;
             ViewManager.SetMaskAlpha(0.6f);
+            GameGlobal.isLogon = false;
         }
         private void ListItemRender(int index, GObject obj)
         {
@@ -72,11 +77,10 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;
             item.m_txtNum.text = "x" + NumberUtil.ChangeNumberUnit(cfg.rewardsArr[0][1], 10000);
-            int dailyLoginId = ActivityDataManager.Instance.sevenDayLoginLoginId;
-            item.m_imgGot.visible = cfg.id < dailyLoginId || cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT;
+            item.m_imgGot.visible = ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.GOT;
             // if (cfg.id == dailyLoginId)
             // {
-            RedDotController.Instance.SetComRedDot(item.target, cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
+           RedDotController.Instance.SetComRedDot(item.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET);
             // }
             if (item.target.data == null)
             {
@@ -89,13 +93,14 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
 
-            if (cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET)
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
             {
                 bool result = await ActivitySProxy.ReqSevenDayLoginRewards(cfg.id);
                 if (result)
                 {
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
                     UpdateView();
+                    GameGlobal.isLogon = false;
                 }
             }
             else

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

@@ -450,7 +450,7 @@ namespace GFGGame
         private async void DressUpFinish()
         {
 
-            if (CardDataManager.GetCardListByRarity(0).Count > 0)
+            if (CardDataManager.GetCardListByRoleType(0).Count > 0)
             {
                 ViewManager.Show<StoryCardChoose>(InstanceZonesDataManager.currentScoreType);
             }

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

@@ -58,7 +58,20 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_c1.selectedIndex = (bool)(this.viewData as object) == true ? 0 : 1;
+
+            // old
+            if ((this.viewData as object[]) == null)
+            {
+                _ui.m_c1.selectedIndex = (bool)(this.viewData as object) == true ? 0 : 1;
+            }
+            // New
+            else
+            {
+                _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
+                // For change m_comSearch.m_c1
+                _ui.m_comSearch.m_c1.selectedIndex = (int)(this.viewData as object[])[1];
+            }
+
             _selectRarityList = DressUpMenuItemDataManager.selectRarityList;// new List<int>();
             _selectScoreList = DressUpMenuItemDataManager.selectScoreList;// new List<int>();
             _selectTagList = DressUpMenuItemDataManager.selectTagList;// new List<string>();

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

@@ -8,11 +8,18 @@ using System.Collections;
 
 namespace GFGGame
 {
+    public class DressUpFightType
+    {
+        public int levelID;
+        public int teaPartID;
+    }
+
     public class DressUpFightView : BaseView
     {
         private UI_DressUpFightUI _ui;
         private int _fightID;
         private int _levelID;
+        private int _TeaPartyID;
         private float listType1X = 0;
         private float partsListX = 0;
         private float partsListScrollingPosY = 0;
@@ -27,6 +34,7 @@ namespace GFGGame
         private StoryLevelCfg _levelCfg;
         private StoryFightCfg _fightCfg;
         private int scoreType = 0;  //目标分数类型保存
+        private bool IsTeaPart = false;
 
         private const int SORT_BY_HIGH_SCORE = 0;
         private const int SORT_BY_LOW_SCORE = 1;
@@ -97,7 +105,8 @@ namespace GFGGame
             _ui.m_btnAutoPlay.onClick.Add(OnClickBtnAutoPlay);
             _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
             _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
-
+            _ui.m_btnSubmission.onClick.Add(OnClickBtnSubmission);
+            
             _ui.m_compNeed.target.onClick.Add(OnClickComNeed);
             _ui.m_compNeed.m_listTag.itemRenderer = RenderListTagItem;
 
@@ -111,7 +120,6 @@ namespace GFGGame
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
             _ui.m_partsList2.m_imgTop.visible = true;
             _ui.m_partsList.m_imgTop.visible = false;
-
         }
 
         protected override void AddEventListener()
@@ -123,7 +131,6 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
-
         }
 
         protected override void RemoveEventListener()
@@ -135,12 +142,25 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
-
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+
+            var objData = (DressUpFightType)this.viewData;
+
+            if (objData.teaPartID > 0) { 
+                IsTeaPart = true;
+                _TeaPartyID = objData.teaPartID;
+            }
+
+            _levelID = objData.levelID;
+            if (!IsTeaPart)
+                _ui.m_c1.selectedIndex = 0;
+            else
+                _ui.m_c1.selectedIndex = 2;
+
             _ui.m_loaGuide.visible = true;
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
@@ -150,43 +170,44 @@ namespace GFGGame
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = FightDataManager.Instance.autoPlay;
             _ui.m_btnAutoPlay.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
-            _ui.m_btnRecommend.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false); ;
+            _ui.m_btnRecommend.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
 
-            _levelID = (int)viewData;
-            InstanceZonesDataManager.currentLevelCfgId = _levelID;
-            _levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
-            _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            if (_levelCfg.type == ConstInstanceZonesType.Field)
-            {
-                scoreType = FieldDataManager.Instance.fieldInfos.theme;
-                _ui.m_btnAutoPlay.visible = false;
-            }
-            else {
-                scoreType = _fightCfg.scoreType;
-            }
-            InstanceZonesDataManager.FightScene = _levelCfg.type;
-
-            _ui.m_compNeed.target.visible = _fightCfg.needItemId > 0 || _fightCfg.needSuitId > 0 || _fightCfg.needTagsArr.Length > 0;
-            if (_ui.m_compNeed.target.visible)
-            {
-                _ui.m_compNeed.m_c1.selectedIndex = 0;
-                if (_fightCfg.needItemId > 0)
+            if (!IsTeaPart) { 
+                InstanceZonesDataManager.currentLevelCfgId = _levelID;
+                _levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+                _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
+                if (_levelCfg.type == ConstInstanceZonesType.Field)
                 {
-                    _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
-                    _ui.m_compNeed.target.data = _fightCfg.needItemId;
-                    _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
+                    scoreType = FieldDataManager.Instance.fieldInfos.theme;
+                    _ui.m_btnAutoPlay.visible = false;
                 }
-                else if (_fightCfg.needSuitId > 0)
-                {
-                    _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
-                    _ui.m_compNeed.target.data = _fightCfg.needSuitId;
-                    _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
+                else {
+                    scoreType = _fightCfg.scoreType;
                 }
-                else
+                InstanceZonesDataManager.FightScene = _levelCfg.type;
+
+                _ui.m_compNeed.target.visible = _fightCfg.needItemId > 0 || _fightCfg.needSuitId > 0 || _fightCfg.needTagsArr.Length > 0;
+                if (_ui.m_compNeed.target.visible)
                 {
-                    _ui.m_compNeed.m_c1.selectedIndex = 1;
-                    _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
-                    _ui.m_compNeed.m_imgGot.visible = false;
+                    _ui.m_compNeed.m_c1.selectedIndex = 0;
+                    if (_fightCfg.needItemId > 0)
+                    {
+                        _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
+                        _ui.m_compNeed.target.data = _fightCfg.needItemId;
+                        _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
+                    }
+                    else if (_fightCfg.needSuitId > 0)
+                    {
+                        _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
+                        _ui.m_compNeed.target.data = _fightCfg.needSuitId;
+                        _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
+                    }
+                    else
+                    {
+                        _ui.m_compNeed.m_c1.selectedIndex = 1;
+                        _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
+                        _ui.m_compNeed.m_imgGot.visible = false;
+                    }
                 }
             }
             InstanceZonesDataManager.currentScoreType = scoreType;
@@ -210,14 +231,21 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
+                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaPart);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
             UpdateStepBtn(true);
-
             UpdateScore();
-            SendLog();
+
+            if (!IsTeaPart)
+                SendLog();
+            else
+            {
+                var teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
+                _ui.m_txtTeaPartyName.text = teapartyRoleCfg[objData.teaPartID - 1].name;
+            }
+
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -253,35 +281,59 @@ namespace GFGGame
 
         }
 
+        //茶话会提交搭配
+        private void OnClickBtnSubmission()
+        {
+            ChangeTeapartyDressup();
+        }
+
+        private async void ChangeTeapartyDressup()
+        {
+            DressUpData dressUpData = MyDressUpHelper.dressUpObj.DressUpDataClone();
+            bool result = await LeagueSproxy.ChangeTeapartyDressup(RoleDataManager.roleId, _TeaPartyID, dressUpData.itemList);
+            if (result)
+            {
+                backView();
+            }
+        }
+
+        private void backView()
+        {
+            if (IsTeaPart)
+            {
+                ViewManager.Show<LeagueTeaPartyView>();
+            }
+            else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
+            {
+                ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
+            }
+            else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            {
+                ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+            }
+            else if (_levelCfg.type == ConstInstanceZonesType.Field)
+            {
+                ViewManager.GoBackFrom(ViewName.DRESS_UP_FIGHT_VIEW);
+            }
+            else
+            {
+                // ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
+                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW }
+            }
+            //MyDressUpHelper.dressUpObj.TakeOffAll();
+
+            this.Hide();
+        }
+
         private void OnClickBtnBack()
         {
             AlertUI.Show("是否确定退出？")
             .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
             {
-                if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
-                {
-                    ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
-                }
-                else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
-                {
-                    ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
-                }
-                else if (_levelCfg.type == ConstInstanceZonesType.Field)
-                {
-                    ViewManager.GoBackFrom(ViewName.DRESS_UP_FIGHT_VIEW);
-                }
-                else
-                {
-                    // ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
-                    ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW }
-                }
-                //MyDressUpHelper.dressUpObj.TakeOffAll();
-
-                this.Hide();
+                backView();
             });
 
             //ViewManager.Show<StoryChapterView>(StoryDataManager.currentChapter);
-
         }
 
         private void OnClickBtnHome()
@@ -571,7 +623,7 @@ namespace GFGGame
 
             yield return new WaitForEndOfFrame();
 
-            if (CardDataManager.GetCardListByRarity(0).Count > 0)
+            if (CardDataManager.GetCardListByRoleType(0).Count > 0)
             {
 
                 ViewManager.Show<StoryCardChoose>(scoreType);
@@ -781,7 +833,7 @@ namespace GFGGame
             // }
 
             //必穿品放在列表最前面
-            if (_fightCfg.needItemId > 0)
+            if (_fightCfg!= null && _fightCfg.needItemId > 0)
             {
                 int index = _currentList3.IndexOf(_fightCfg.needItemId);
                 if (index >= 0)
@@ -791,7 +843,7 @@ namespace GFGGame
                     _currentList3.Insert(0, item);
                 }
             }
-            else if (_fightCfg.needSuitId > 0)
+            else if (_fightCfg != null && _fightCfg.needSuitId > 0)
             {
                 int index = _currentList3.IndexOf(_fightCfg.needSuitId);
                 if (index >= 0)
@@ -941,7 +993,15 @@ namespace GFGGame
             typeItem.m_txtname.text = item1.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             typeItem.target.data = item1.id;
-            typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
+            if (!IsTeaPart)
+            {
+                typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
+                typeItem.m_itemType.selectedIndex = 0;
+            }
+            else
+                typeItem.m_itemType.selectedIndex = 1;
+
+
             typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsFirstMenuNew(item1.id);
             UI_TypeItem.ProxyEnd();
         }
@@ -954,13 +1014,33 @@ namespace GFGGame
             typeItem.m_txtname.text = item2.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
-            var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
-            typeItem.m_imgNeed.visible = subType == item2.type;
-            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
+            if (!IsTeaPart) { 
+                typeItem.m_itemType.selectedIndex = 0;
+                var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
+                typeItem.m_imgNeed.visible = subType == item2.type;
+                typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
+            }
+            else
+                typeItem.m_itemType.selectedIndex = 1;
 
             UI_TypeItem.ProxyEnd();
         }
 
+        private void ListTagItem(int index, GObject item)
+        {
+            ItemCfg itemCfg = (ItemCfg)item.parent.data;
+            UI_ComTagItem listItem = UI_ComTagItem.Proxy(item);
+            string name = itemCfg.tagsArr[index][0].ToString();
+            int tagType = TagCfgArray.Instance.GetCfg(name).type;
+            UI.CommonGame.UI_ComTag itemTag = UI.CommonGame.UI_ComTag.Proxy(listItem.m_loaTag);
+            itemTag.m_txtTag.text = name;
+            itemTag.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tagType);
+            itemTag.m_loaTag.scale = new Vector2(0.8f, 0.8f);
+            UI.CommonGame.UI_ComTag.ProxyEnd();
+            listItem.m_txtScore.text = itemCfg.tagsArr[index][1];
+            UI_ComTagItem.ProxyEnd();
+        }
+
         private void ListPartsItem(int index, GObject item)
         {
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(item);
@@ -985,7 +1065,17 @@ namespace GFGGame
                 iconRes = itemCfg.res;
                 partName = itemCfg.name;
                 listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
-                listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+                if (!IsTeaPart)
+                    listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+                else {
+                    if (listItem.m_ListTag.data == null)
+                    {
+                        listItem.m_ListTag.itemRenderer = ListTagItem;
+                    }
+                    listItem.m_ListTag.data = itemCfg;
+                    listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+                }
+
                 listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
                 bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
                 listItem.m_imgNew.visible = isNew;
@@ -1003,12 +1093,18 @@ namespace GFGGame
                 longPressGesture.onAction.Add(OnLongPress);
                 _listLongPress.Add(longPressGesture);
             }
+
+            if (!IsTeaPart)
+                listItem.m_itemType.selectedIndex = 0;
+            else
+                listItem.m_itemType.selectedIndex = 1;
+
             listItem.m_btnAni.visible = false;
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_ScoreType.url = "ui://CommonGame/kp_sx_" + scoreType;
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_imgNeed.visible = _fightCfg.needItemId == id || _fightCfg.needSuitId == id;
+            listItem.m_imgNeed.visible = _fightCfg != null && (_fightCfg.needItemId == id || _fightCfg.needSuitId == id);
             UI_PartsListItem.ProxyEnd();
         }
         private void ListParts2Item(int index, GObject item)
@@ -1155,8 +1251,11 @@ namespace GFGGame
 
         private void UpdateScore()
         {
-            _ui.m_txtScore.text = "" + FightDataManager.Instance.GetScore(InstanceZonesDataManager.roleData).ToString();
+            if (!IsTeaPart)
+                _ui.m_txtScore.text = "" + FightDataManager.Instance.GetScore(InstanceZonesDataManager.roleData).ToString();
             // GuideController.TryGuideDressUpFightViewBtnNext(_ui.m_btnNext);
+            else
+                _ui.m_txtMatch.text = "" + LeagueDataManager.Instance.GetTeaPartyMatchedValue(InstanceZonesDataManager.roleData);
         }
 
         private void OnClickBtnSearch()

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

@@ -133,8 +133,8 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSearch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSearch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         protected override void OnShown()
@@ -190,8 +190,8 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSearch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSearch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
@@ -639,7 +639,7 @@ namespace GFGGame
                 OnTouchPad();
             }
         }
-        private void UpdateSerch(EventContext context)
+        private void UpdateSearch(EventContext context)
         {
             if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
             {
@@ -663,7 +663,6 @@ namespace GFGGame
         }
         private void UpdateSearchList()
         {
-
             if (_rarityIndex == SORT_BY_HIGH_RARITY)
             {
                 _currentList3 = DressUpMenuItemDataManager.SortItemListByHighRarity(_currentList3);
@@ -673,7 +672,7 @@ namespace GFGGame
                 _currentList3 = DressUpMenuItemDataManager.SortItemListByLowRarity(_currentList3);
             }
             _currentMenuType = 0;
-            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count; ;
+            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count;
         }
         private void ListType1Item(int index, GObject item)
         {

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

@@ -145,7 +145,7 @@ namespace GFGGame
             _ui.m_btn2.m_txtConsume.text = string.Format("{0}", selectCfg2.needPower);
 
             bool isPass0 = selectCfg0.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg0.storyLvId);
-            bool isPass1 = selectCfg1.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.storyLvId);
+            bool isPass1 = selectCfg1.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.storyLvId); 
             bool isPass2 = selectCfg2.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg2.storyLvId);
             _ui.m_btn0.m_c1.selectedIndex = isPass0 ? 1 : 0;
             _ui.m_btn1.m_c1.selectedIndex = isPass1 ? 1 : 0;
@@ -187,7 +187,10 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
             int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
-            ViewManager.Show<DressUpFightView>(curLevelId, new object[] { typeof(FieldView).FullName, this.viewData }, true);
+            DressUpFightType dressUpFightType = new DressUpFightType();
+            dressUpFightType.levelID = curLevelId;
+            dressUpFightType.teaPartID = 0;
+            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(FieldView).FullName, this.viewData }, true);
             InstanceZonesDataManager.currentLevelCfgId = curLevelId;
         }
         private void OnBtnTaskClick()

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -0,0 +1,153 @@
+using System.Collections;
+using System.Collections.Generic;
+using FairyGUI;
+using UI.FieldGuide;
+using UnityEngine;
+
+namespace GFGGame
+{
+    /// <summary>
+    /// 词牌图鉴界面
+    /// </summary>
+    public class CardGuideView: BaseWindow
+    {
+        private UI_CardGuideUI _ui;
+        private List<int> _cardList;
+
+        public override void Dispose()
+        {
+            if(_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_CardGuideUI.PACKAGE_NAME;
+            _ui = UI_CardGuideUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
+
+            _cardList = new List<int>();
+            _ui.m_listCard.itemRenderer = RenderCardListItem;
+            _ui.m_listCard.onClickItem.Add(OnClickListCardItem);
+            _ui.m_listRole.onClickItem.Add(OnClickRoleListItem);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_listRole.selectedIndex = 0;
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.CARD_FILTER, UpdateCardList);
+            EventAgent.AddEventListener(ConstMessage.CARD_INFO, UpdateCardList);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.CARD_FILTER, UpdateCardList);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, UpdateCardList);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateCardList);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateCardList();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _ui.m_listRole.selectedIndex = 0;
+            _ui.m_listRole.scrollPane.ScrollTop();
+        }
+
+        private void RenderCardListItem(int index, GObject obj)
+        {
+            CardData data = CardDataManager.GetCardDataById(_cardList[index]);
+            UI_ListCardGuideItem listItem = UI_ListCardGuideItem.Proxy(obj);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cardList[index]);
+
+            // Have
+            if (data != null)
+            {
+                listItem.m_unlockMask.visible = false;
+                listItem.m_comCard.m_loaCard.url = ResPathUtil.GetCardIconPath(data.resources[data.resIndex]);
+                int starLevelDodge = data.star / 5;
+                for (int i = 0; i < 4; i++)
+                {
+                    UI_CardGuideComDodgeStar dodgeStar = UI_CardGuideComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
+                    dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                    UI_CardGuideComDodgeStar.ProxyEnd();
+                }
+                listItem.target.data = data;
+            }
+            else
+            {
+                listItem.m_comCard.m_loaCard.url = ResPathUtil.GetCardIconPath(itemCfg.res);
+                listItem.m_unlockMask.visible = true;
+                listItem.target.data = null;
+            }
+
+            RarityIconController.UpdateRarityIcon(listItem.m_loaRarity, itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            listItem.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (itemCfg.mainScore));
+            listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            listItem.m_txtName.text = itemCfg.name;
+
+            UI_ListCardGuideItem.ProxyEnd();
+        }
+
+        private void OnClickListCardItem(EventContext context)
+        {
+            object data = (context.data as GObject).data;
+            int index = _ui.m_listCard.GetChildIndex(context.data as GObject);
+            if(data == null)
+            {
+                object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(CardGuideView).Name);
+                object[] sourceDatas = new object[] { _cardList[index], goBackDatas, 1 };
+                GoodsItemTipsController.ShowItemTips(_cardList[index], sourceDatas, false);
+            }
+            else
+            {
+                ViewManager.Show<CardFosterView>(new object[] { _cardList[index], typeof(CardGuideView).FullName}, new object[] { typeof(CardGuideView).FullName, _ui.m_listRole.selectedIndex });
+                Hide();
+            }   
+        }
+
+        private void OnClickRoleListItem(EventContext eventContext)
+        {
+            UpdateCardList();
+            _ui.m_listCard.scrollPane.ScrollTop();
+        }
+
+        private void UpdateCardList()
+        {
+            UpdateCardStatusView();
+            _cardList = CardDataManager.GetAllCardIdListByRoleType(_ui.m_listRole.selectedIndex);
+            _ui.m_listCard.numItems = _cardList.Count;
+        }
+
+        private void UpdateCardStatusView()
+        {
+            CardDataManager.GetTotalProgress(out int haveCount, out int totalCount, _ui.m_listRole.selectedIndex);
+            _ui.m_progress.target.max = totalCount;
+            _ui.m_progress.target.value = haveCount;
+            _ui.m_progress.m_title1.SetVar("value", haveCount.ToString()).SetVar("max", totalCount.ToString()).FlushVars();
+            _ui.m_progress.m_rate.SetVar("rate", FieldGuideView.ProgressCalculate(haveCount, totalCount).ToString()).FlushVars();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(CardGuideView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs.meta

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