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

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/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

@@ -141,10 +141,11 @@ namespace GFGGame
             }
             return _cardDicByType[0][cardId];
         }
+
         /// <summary>
         /// 根据男主类型获取词牌列表
         /// </summary>
-        public static List<CardData> GetCardListByRarity(int mainScore)
+        public static List<CardData> GetCardListByRoleType(int mainScore)
         {
             if (_cardDicByType.ContainsKey(mainScore))
             {

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,11 @@ 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 int ChooseTeaPartId = 0; // 选择的茶话会类型
 
 
         public void Clear()
@@ -254,7 +259,39 @@ namespace GFGGame
                 giftBuyDatas.Add(giftBuyData);
             }
             return giftBuyDatas;
+        }
+
+
+        //茶话会匹配度计算
+        public int GetTeaPartyMatchedValue(FightData roleData)
+        {
+            int matchedValue = 0;
+
+            var teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.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;
         }
     }
 }

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;

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/DressUp/UI_ComTagItem.cs.meta

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

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

@@ -9,13 +9,15 @@ namespace UI.League
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GTextField m_txtTeaName;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
-        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         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";
@@ -65,31 +67,35 @@ namespace UI.League
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
             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_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
             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_txtTeaName = 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_TeaPartyOverItem2.Dispose();
-            m_TeaPartyOverItem2 = 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();

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

@@ -10,6 +10,12 @@ namespace UI.League
         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";
@@ -60,12 +66,24 @@ namespace UI.League
             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();

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

@@ -12,13 +12,9 @@ namespace UI.League
         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 GList m_ListTeaParty;
         public UI_TeaPartyItemTips m_teaPartyItemTips;
         public const string URL = "ui://tw70qm9dchwotpk";
         public const string PACKAGE_NAME = "League";
@@ -72,13 +68,9 @@ namespace UI.League
             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_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
             m_teaPartyItemTips = (UI_TeaPartyItemTips)UI_TeaPartyItemTips.Create(comp.GetChild("teaPartyItemTips"));
         }
         public void Dispose(bool disposeTarget = false)
@@ -88,19 +80,9 @@ namespace UI.League
             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_ListTeaParty = 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,10 @@ 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 GLoader m_btnDetail;
         public const string URL = "ui://tw70qm9dchwotpl";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyItem";
@@ -60,18 +60,18 @@ 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_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_btnDetail = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_iconRole;
-        public GTextField m_txtRoleName;
         public const string URL = "ui://tw70qm9dic4otq5";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyOverItem";
@@ -57,12 +56,10 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_iconRole = (GLoader)comp.GetChild("iconRole");
-            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconRole = null;
-            m_txtRoleName = 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/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_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/LeagueSproxy.cs

@@ -818,5 +818,70 @@ 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()
+        {
+            S2C_TeapartyMatchingInfos response = null;
+            response = (S2C_TeapartyMatchingInfos)await MessageHelper.SendToServer(new C2S_GetTeapartyMatchingInfos() { RoleId = RoleDataManager.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()
+        {
+            S2C_GetRoleContainerInfos response = null;
+            response = (S2C_GetRoleContainerInfos)await MessageHelper.SendToServer(new C2S_GetRoleContainerInfos() { RoleId = RoleDataManager.roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.RoleContainerList = response.RoleContainerList;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //更换角色坑位以及搭配
+        public static async ETTask<bool> ChangeTeapartyDressup(int TeapartyRoleId,List<int> equipIds)
+        {
+            S2C_ChangeTeapartyDressup response = null;
+            response = (S2C_ChangeTeapartyDressup)await MessageHelper.SendToServer(new C2S_ChangeTeapartyDressup() { RoleId = RoleDataManager.roleId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    //LeagueDataManager.Instance.Type = response.PerScore;
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }

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

@@ -234,7 +234,7 @@ namespace GFGGame
             _nowIndex = _cardData.index;
             _comFosterBottom = _ui.m_ComFosterBottom;
 
-            _cardList = CardDataManager.GetCardListByRarity(_cardData.pageIndex);
+            _cardList = CardDataManager.GetCardListByRoleType(_cardData.pageIndex);
             if (CardDataManager.isFilter == true)
             {
                 //筛选

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

@@ -112,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/SevenDayLoginView.cs

@@ -62,7 +62,7 @@ namespace GFGGame
             base.OnHide();
             if (GameGlobal.isLogon && RedDotDataManager.Instance.DailySignRed())
             {
-                ViewManager.Show<DailySignView>();
+                ViewManager.Show<DailySignView>(new object[] { 1 });
             }
             _ui.m_list.numItems = 0;
             ViewManager.SetMaskAlpha(0.6f);
@@ -93,7 +93,7 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
 
-            if (cfg.id < ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count && ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
             {
                 bool result = await ActivitySProxy.ReqSevenDayLoginRewards(cfg.id);
                 if (result)

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

@@ -8,6 +8,12 @@ using System.Collections;
 
 namespace GFGGame
 {
+    public class DressUpFightType
+    {
+        public int levelID;
+        public int teaPartID;
+    }
+
     public class DressUpFightView : BaseView
     {
         private UI_DressUpFightUI _ui;
@@ -27,6 +33,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;
@@ -141,6 +148,17 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+
+            var objData = (DressUpFightType)this.viewData;
+            if (objData.teaPartID > 0)
+                IsTeaPart = true;
+
+            _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 +168,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); ;
-
-            _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_btnRecommend.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
 
-            _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;
@@ -215,9 +234,16 @@ namespace GFGGame
             _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);
         }
 
@@ -258,7 +284,10 @@ namespace GFGGame
             AlertUI.Show("是否确定退出？")
             .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
             {
-                if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
+                if(_levelCfg == null){ 
+                    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));
                 }
@@ -571,7 +600,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 +810,7 @@ namespace GFGGame
             // }
 
             //必穿品放在列表最前面
-            if (_fightCfg.needItemId > 0)
+            if (_fightCfg!= null && _fightCfg.needItemId > 0)
             {
                 int index = _currentList3.IndexOf(_fightCfg.needItemId);
                 if (index >= 0)
@@ -791,7 +820,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 +970,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 +991,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 +1042,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 +1070,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 +1228,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/Field/FieldView.cs

@@ -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/League/LeagueTeaPartyOverView.cs

@@ -30,9 +30,11 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-          
+            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300022;
         }
 
         protected override void AddEventListener()
@@ -58,5 +60,10 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
+
+        private void OnBtnRewardClick()
+        {
+            ViewManager.Show<LeagueTeaPartyRewardView>();
+        }
     }
 }

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

@@ -11,6 +11,10 @@ namespace GFGGame
     {
         private UI_LeagueTeaPartyRewardUI _ui;
 
+        private List<GComponent> componentsPerson = new List<GComponent>();
+        private List<GComponent> componentsLeague = new List<GComponent>();
+
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -39,6 +43,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            SetPersonScoreList();
+            SetLeagueScoreList();
         }
         protected override void OnHide()
         {
@@ -54,5 +60,88 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
+
+
+        //角色评选奖励
+        private void SetPersonScoreList()
+        {
+            var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
+            var maxCfg = teapartyRewardRoleCfg[teapartyRewardRoleCfg.Length - 1];
+            var maxCfgID = maxCfg.id;
+            var maxScore = maxCfg.targetScore;
+            var pos = _ui.m_StartIndex.position;
+            var endX = _ui.m_EndIndex.position.x;
+            _ui.m_barPerson.max = maxScore;
+            //循环设置UI
+            foreach (var cfg in teapartyRewardRoleCfg)
+            {
+                var cfgScore = cfg.targetScore;
+                var item = UI_LinessRewardProcessItemBt.Create();
+                var target = item.target;
+                componentsPerson.Add(target);
+                _ui.target.AddChild(target);
+                 //根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
+                var x = pos.x + (endX - pos.x) * cfgScore / maxScore;
+                target.SetPosition(x, pos.y, pos.z);
+                item.m_Score.text = cfgScore.ToString();
+                var cfgBonusArr = cfg.stageRewardArr;
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
+                item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
+                item.m_Num.text = cfgBonusArr[0][1].ToString();
+                //item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                //item.target.data = cfg;
+                //item.target.onClick.Add(OnClickReward);
+            }
+            FreshGetStatus();
+        }
+
+        private void FreshGetStatus()
+        {
+            componentsPerson.ForEach(com =>
+            {
+                //var item = UI_ExpProcessItem.Proxy(com);
+                //var cfg = (Activity7DaysCfg)item.target.data;
+                //var cfgID = cfg.id;
+                //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
+                //item.m_c2.selectedIndex = state ? 1 : 0;
+                //RedDotController.Instance.SetComRedDot(item.target,
+                //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
+                //UI_ExpProcessItem.ProxyEnd();
+            });
+        }
+
+        //雅集评选奖励
+        private void SetLeagueScoreList()
+        {
+            var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(1);  //LeagueDataManager.Instance.TeaPartyId
+            var maxCfg = teapartyRewardLeagueCfgs[teapartyRewardLeagueCfgs.Count - 1];
+            var maxCfgID = maxCfg.id;
+            var maxScore = maxCfg.targetScore;
+            var pos = _ui.m_StartLeagueIndex.position;
+            var endX = _ui.m_EndLeagueIndex.position.x;
+            _ui.m_barPerson.max = maxScore;
+            //循环设置UI
+            foreach (var cfg in teapartyRewardLeagueCfgs)
+            {
+                var cfgScore = cfg.targetScore;
+                var item = UI_LinessRewardProcessItemBt.Create();
+                var target = item.target;
+                componentsLeague.Add(target);
+                _ui.target.AddChild(target);
+                //根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
+                var x = pos.x + (endX - pos.x) * cfgScore / maxScore;
+                target.SetPosition(x, pos.y, pos.z);
+                item.m_Score.text = cfgScore.ToString();
+                var cfgBonusArr = cfg.stageRewardArr;
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
+                item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
+                item.m_Num.text = cfgBonusArr[0][1].ToString();
+                //item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                //item.target.data = cfg;
+                //item.target.onClick.Add(OnClickReward);
+            }
+            FreshGetStatus();
+        }
+
     }
 }

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

@@ -11,7 +11,7 @@ namespace GFGGame
     {
         private UI_LeagueTeaPartyUI _ui;
         private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
-
+        private List<TeapartyRoleCfg> teapartyRoleCfg;
         public override void Dispose()
         {
             if (_ui != null)
@@ -30,31 +30,30 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
             _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300022;
 
-            teaPartyItemList.Add(_ui.m_teaPartyItem1);
-            teaPartyItemList.Add(_ui.m_teaPartyItem2);
-            teaPartyItemList.Add(_ui.m_teaPartyItem3);
-            teaPartyItemList.Add(_ui.m_teaPartyItem4);
-            teaPartyItemList.Add(_ui.m_teaPartyItem5);
-            teaPartyItemList.Add(_ui.m_teaPartyItem6);
+            _ui.m_ListTeaParty.itemRenderer = ListTeaPartyItemRender;
 
-            _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
+            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
+        }
 
-            int index = 0;
-            int teaPartyType = 1;
-            List<TeapartyRoleCfg> teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(teaPartyType);
+        private void ListTeaPartyItemRender(int index, GObject obj)
+        {
+            UI_comTeaPartyItem itemObj = UI_comTeaPartyItem.Proxy(obj);
 
-            foreach (var itemObj in teaPartyItemList) {
-                itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
-                itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
-                itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
-                index += 1;
-            }
+            itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
+            itemObj.m_iconRole.data = index;
+            itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
+            itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
+
+            UI_comTeaPartyItem.ProxyEnd();
         }
 
         protected override void AddEventListener()
@@ -65,7 +64,27 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            GetRoleContainerInfos();
+            var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(1);//LeagueDataManager.Instance.TeaPartyId
+            _ui.m_txtTeaName.text = openCfg.name;
+            _ui.m_teaPartyItemTips.target.visible = false;
+            _ui.m_ListTeaParty.numItems = 6;
         }
+
+        private async void GetRoleContainerInfos()
+        {
+            bool result = await LeagueSproxy.GetRoleContainerInfos();
+            if (result)
+            {
+                var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
+                for (int index = 0; index < roleContainerList.Count; index++){
+                    teaPartyItemList[index].m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
+
+
+                }
+            }
+        }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -108,12 +127,14 @@ namespace GFGGame
             _ui.m_teaPartyItemTips.target.visible = false;
         }
 
-        private void OnBtnIconRoleClick()
+        private void OnBtnIconRoleClick(EventContext context)
         {
-            FieldCfg _curCfg;
-            _curCfg = FieldCfgArray.Instance.dataArray[FieldDataManager.Instance.difficulty];
-            int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
-            ViewManager.Show<DressUpFightView>(curLevelId, new object[] { typeof(LeagueTeaPartyView).FullName, null }, true);
+            GObject obj = context.sender as GObject;
+            LeagueDataManager.Instance.ChooseTeaPartId = (int)obj.data + 1;
+            DressUpFightType dressUpFightType = new DressUpFightType();
+            dressUpFightType.levelID = 0;
+            dressUpFightType.teaPartID = LeagueDataManager.Instance.ChooseTeaPartId;
+            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(LeagueTeaPartyView).FullName, null }, true);
         }
     }
 }

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

@@ -60,6 +60,7 @@ namespace GFGGame
             _ui.m_btnChangeNotice.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
             UpdateView();
             UpdateRedDot();
+            UpdateTeaPartyShowText();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
         }
@@ -116,7 +117,7 @@ namespace GFGGame
         private void OnBtnPartyClick()
         {
             //PromptController.Instance.ShowFloatTextPrompt("活动未开启");
-
+  
             ViewManager.Show<LeagueTeaPartyView>();
         }
         private void OnBtnShopClick()
@@ -191,6 +192,26 @@ namespace GFGGame
                 _ui.m_btnAnswer.m_txtTime.text = "进行中";
             }
         }
+
+        private void UpdateTeaPartyShowText()
+        {
+            // 0未开启 1集结中 2已集结
+            _ui.m_btnParty.m_showText.selectedIndex = 0;
+            string text = "";
+            if (LeagueDataManager.Instance.TeaPartyStatus == 0)
+            {
+                text = "未开启";
+                _ui.m_btnParty.m_showText.selectedIndex = 1;
+            }
+            else if (LeagueDataManager.Instance.TeaPartyStatus == 1)
+            {
+                text = "集结中";
+                _ui.m_btnParty.m_showText.selectedIndex = 1;
+            }
+
+            _ui.m_btnParty.m_txtTime.text = text;
+        }
+
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());

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

@@ -84,7 +84,7 @@ namespace GFGGame
             _scoreType = (int)this.viewData;
             ArenaDataManager dataManager = ArenaDataManager.Instance;
 
-            cardList = CardDataManager.GetCardListByRarity(0);
+            cardList = CardDataManager.GetCardListByRoleType(0);
             //是从竞技场进来的话，去掉已经在其他主题装配的cardList
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {

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

@@ -90,7 +90,10 @@ namespace GFGGame
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
-                ViewManager.Show<DressUpFightView>(_levelID, null, true);
+                DressUpFightType dressUpFightType = new DressUpFightType();
+                dressUpFightType.levelID = _levelID;
+                dressUpFightType.teaPartID = 0;
+                ViewManager.Show<DressUpFightView>(dressUpFightType, null, true);
             }
             else
             {

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

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

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

@@ -222,7 +222,7 @@ namespace GFGGame
                 }
                 else if (RedDotDataManager.Instance.DailySignRed())
                 {
-                    ViewManager.Show<DailySignView>();
+                    ViewManager.Show<DailySignView>(new object[] { 1 });
                 }
 
                 //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);

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

@@ -19,6 +19,9 @@ namespace GFGGame
         private const int BUY_TYPE_0 = 0;
         private const int BUY_TYPE_1 = 1;
 
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -26,6 +29,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             base.Dispose();
         }
 
@@ -41,6 +48,7 @@ namespace GFGGame
             _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_0); });
             _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
             _ui.m_btnBack.onClick.Add(this.Hide);
+            AddEffect();
 
         }
         protected override void AddEventListener()
@@ -94,6 +102,15 @@ namespace GFGGame
         {
             base.OnHide();
         }
+
+        private void AddEffect()
+        {
+            //边框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_LeftTopEffect, "ui_Activity", "Com_window_L_up");
+
+            //边框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

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

@@ -12,6 +12,8 @@ namespace GFGGame
     {
         private UI_StudioFilingRewardUI _ui;
         private List<int> rewardList;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
 
         public override void Dispose()
         {
@@ -20,6 +22,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             base.Dispose();
         }
 
@@ -36,6 +42,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnGet.onClick.Add(OnBtnGetClcik);
             _ui.m_btnBack.onClick.Add(this.Hide);
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -62,6 +69,14 @@ namespace GFGGame
             _ui.m_list.ScrollToView(0);
         }
 
+        private void AddEffect()
+        {
+            //边框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_LeftTopEffect, "ui_Activity", "Com_window_L_up");
+
+            //边框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

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

@@ -8,10 +8,8 @@ namespace GFGGame
 {
     public class StudioPropertyView : StudioBaseView
     {
-        // private GList _listProperty;
-        private GComponent com;
+        //private GList _listProperty;
         private GLoader _bg0;
-        private GLoader _bg1;
         private GLoader _btnChageLine;
         private Controller _croProperty;
         private int _propertySelectIndex = 0;
@@ -28,24 +26,26 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
             // _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
-            com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            //com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
             //AddChildCom(com, false);
             //list.itemRenderer = ListItemRender;
-            _croProperty = com.GetController("c1");
 
-            _bg0 = com.GetChild("bg0").asLoader;
-            _bg1 = com.GetChild("bg1").asLoader;
-            _btnChageLine = com.GetChild("btnChageLine").asLoader;
         }
 
         protected override void OnShown()
         {
-            AddChildCom(com, false);
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            AddChildCom(com);
+            _croProperty = com.GetController("c1");
+
+            _bg0 = com.GetChild("bg0").asLoader;
+            _btnChageLine = com.GetChild("btnChageLine").asLoader;
+
             list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
             _bg0.url = ResPathUtil.GetBgImgPath("bg_fhl");
-            _bg1.url = "ui://Studio/lm_db_chang_2";
+            //_bg1.url = "ui://Studio/lm_db_chang_2";
             _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             
             _propertySelectIndex = this.viewData == null ? 0 : (int)this.viewData;
@@ -75,6 +75,7 @@ namespace GFGGame
 
             
             base.OnShown();
+            com.height = _ui.target.height;
             _ui.m_loaBg.visible = false;
         }
 

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

@@ -102,7 +102,7 @@ namespace GFGGame
         }
         private void OnComProperty()
         {
-            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
+            //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
             ViewManager.Show<StudioPropertyView>(null, new object[] { typeof(StudioView).FullName, this.viewData });

GameClient/Assets/Game/HotUpdate/Views/ViewAnimationFactory.cs

@@ -9,14 +9,33 @@ namespace GFGGame
 
         public static void ZoomInCenter(GComponent gComponent, GTweenCallback callback = null)
         {
-            gComponent.SetScale(0.1f, 0.1f);
-            gComponent.SetPivot(0.5f, 0.5f);
-            gComponent.TweenScale(new Vector2(1, 1), 0.2f).OnComplete(callback);
+            Transition transition = (gComponent as Window).contentPane.GetTransition("openViewAction");
+
+            if (transition != null)
+            {
+                transition.Play(() =>
+                {
+                    callback?.Invoke();
+                });
+            }
+            else
+            {
+                gComponent.visible = false;
+                gComponent.SetScale(0.4f, 0.4f);
+                gComponent.SetPivot(0.5f, 0.5f);
+                gComponent.TweenFade(0, 0).OnComplete(() =>
+                {
+                    gComponent.visible = true;
+                    gComponent.TweenFade(1, 0.3f);
+                    gComponent.TweenScale(new Vector2(1, 1), 0.3f).SetEase(EaseType.BackOut).OnComplete(callback);
+                });
+            }
+
         }
 
         public static void ZoomOutCenter(GComponent gComponent, GTweenCallback callback)
         {
-            gComponent.TweenScale(new Vector2(0.1f, 0.1f), 0.2f).OnComplete(callback);
+            callback?.Invoke();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -8,8 +8,8 @@ using ET;
 namespace GFGGame
 {
     /// <summary>
-    /// ��ͼ������
-    /// ������ͼ����ʾ������
+    /// 视图管理类
+    /// 管理视图的显示、隐藏
     /// </summary>
     public class ViewManager
     {
@@ -53,7 +53,7 @@ namespace GFGGame
             UIConfig.bringWindowToFrontOnClick = false;
 
             _viewDic = new Dictionary<string, IUIView>();
-            //��ʼ����ͼ������
+            //初始化视图层容器
             _bottomLayer = CreateLayer("BottomLayer");
             _topLayer = CreateLayer("TopLayer");
             _topLayer.sortingOrder = ConstSortingOrder.TOP;
@@ -106,12 +106,12 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// ��ʾһ����ͼ
+        /// 显示一个视图
         /// </summary>
-        /// <param name="name">Ҫ��ʾ����ͼ����</param>
-        /// <param name="viewData">Ҫ���ݸ���ͼ�IJ���</param>
-        /// <param name="goBackParams">�Ӹ���ͼ���ص���ͼ��Ϣ</param>
-        /// <param name="hideOthers">�Ƿ�ر�������ͼ</param>
+        /// <param name="viewName">要显示的视图名称</param>
+        /// <param name="viewData">要传递给视图的参数</param>
+        /// <param name="goBackParams">从该视图返回的视图信息</param>
+        /// <param name="hideOthers">是否关闭其他视图</param>
         public static bool Show(string fullViewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
         {
             string name = GetName(fullViewName);

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3!a.png.meta

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

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3.png.meta

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