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

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

@@ -97,8 +97,6 @@ namespace GFGGame
                         StoryDialogDataManager.Instance.waitBgChange = false;
                     }
                 }
-
-
             }
         }
 

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

@@ -8,13 +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 GList m_ListTeaParty;
+        public GTextField m_txtOverTime;
         public UI_TeaPartyItemTips m_teaPartyItemTips;
         public const string URL = "ui://tw70qm9dchwotpk";
         public const string PACKAGE_NAME = "League";
@@ -64,25 +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_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
+            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_ListTeaParty = null;
+            m_txtOverTime = null;
             m_teaPartyItemTips.Dispose();
             m_teaPartyItemTips = null;
             if(disposeTarget && target != null)

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

@@ -11,6 +11,8 @@ namespace UI.League
         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";
@@ -63,6 +65,8 @@ namespace UI.League
             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)
@@ -71,6 +75,8 @@ namespace UI.League
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;
+            m_txtNumber = null;
+            m_txtMaxName = null;
             m_btnDetail = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,6 +8,8 @@ namespace UI.League
     {
         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";
@@ -56,10 +58,14 @@ namespace UI.League
         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();

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

@@ -13,6 +13,7 @@ namespace UI.Studio
         public GLoader m_loaName;
         public GTextField m_txtName;
         public GLoader m_loaIcon;
+        public GImage m_imgLockBg;
         public GImage m_imgLock;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecf2bf2x";
@@ -68,6 +69,7 @@ namespace UI.Studio
             m_loaName = (GLoader)comp.GetChild("loaName");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_test = comp.GetTransition("test");
         }
@@ -79,6 +81,7 @@ namespace UI.Studio
             m_loaName = null;
             m_txtName = null;
             m_loaIcon = null;
+            m_imgLockBg = null;
             m_imgLock = null;
             m_test = null;
             if(disposeTarget && target != null)

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

@@ -150,6 +150,7 @@ namespace GFGGame
             base.OnShown();
 
             var objData = (DressUpFightType)this.viewData;
+
             if (objData.teaPartID > 0)
                 IsTeaPart = true;
 
@@ -229,7 +230,7 @@ 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);
 

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

@@ -10,7 +10,8 @@ namespace GFGGame
     public class LeagueTeaPartyOverView : BaseWindow
     {
         private UI_LeagueTeaPartyOverUI _ui;
-        private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+        private List<UI_comTeaPartyOverItem> teaPartyOverItemList = new List<UI_comTeaPartyOverItem>();
+        private List<TeapartyRoleCfg> teapartyRoleCfg;
 
         public override void Dispose()
         {
@@ -30,11 +31,20 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("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;
+
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem1);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem2);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem3);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem4);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem5);
+            teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem6);
+
+            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
         }
 
         protected override void AddEventListener()
@@ -45,17 +55,35 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+
+            GetRoleContainerInfos();
+            Timers.inst.Add(2, 1, UpdateTime);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
         }
-        
+
+        private async void GetRoleContainerInfos()
+        {
+            bool result = await LeagueSproxy.GetRoleContainerInfos();
+            if (result)
+            {
+                for (int index = 0; index < teaPartyOverItemList.Count; index++)
+                {
+                    teaPartyOverItemList[index].m_txtRoleName.text = teapartyRoleCfg[index].name;
+                    teaPartyOverItemList[index].m_txtGuildName.text = teapartyRoleCfg[index].name;
+                }
+            }
+        }
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
@@ -65,5 +93,11 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueTeaPartyRewardView>();
         }
+
+        private void UpdateTime(object param)
+        {
+            OnBtnRewardClick();
+            Timers.inst.Remove(UpdateTime);
+        }
     }
 }

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

@@ -61,7 +61,6 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
 
-
         //½ÇÉ«ÆÀÑ¡½±Àø
         private void SetPersonScoreList()
         {
@@ -88,9 +87,9 @@ namespace GFGGame
                 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);
+                item.m_c1.selectedIndex = cfg.id < maxCfgID ? 1 : 0;
+                item.target.data = cfgBonusArr;
+                item.target.onClick.Add(OnClickReward);
             }
             FreshGetStatus();
         }
@@ -99,17 +98,33 @@ namespace GFGGame
         {
             componentsPerson.ForEach(com =>
             {
-                //var item = UI_ExpProcessItem.Proxy(com);
-                //var cfg = (Activity7DaysCfg)item.target.data;
-                //var cfgID = cfg.id;
+                var item = UI_LinessRewardProcessItemBt.Proxy(com);
+                var cfg = (int[][])item.target.data;
+                var cfgID = cfg[0][0];
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
                 //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
-                //item.m_c2.selectedIndex = state ? 1 : 0;
+                //item.m_c1.selectedIndex = state ? 1 : 0;
                 //RedDotController.Instance.SetComRedDot(item.target,
                 //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
-                //UI_ExpProcessItem.ProxyEnd();
+                UI_LinessRewardProcessItemBt.ProxyEnd();
             });
         }
 
+        private async void OnClickReward(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
+            var id = activity7DaysCfg.id;
+            if (!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
+            {
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
+                return;
+            }
+            var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+            if (!result) return;
+            FreshGetStatus();
+        }
+
         //Ñż¯ÆÀÑ¡½±Àø
         private void SetLeagueScoreList()
         {
@@ -136,12 +151,42 @@ namespace GFGGame
                 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);
+                item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                item.target.data = cfgBonusArr;
+                item.target.onClick.Add(OnClickLeagueReward);
             }
-            FreshGetStatus();
+            FreshGetLeagueStatus();
+        }
+
+        private void FreshGetLeagueStatus()
+        {
+            componentsPerson.ForEach(com =>
+            {
+                var item = UI_LinessRewardProcessItemBt.Proxy(com);
+                var cfg = (int[][])item.target.data;
+                var cfgID = cfg[0][0];
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
+                //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
+                //item.m_c1.selectedIndex = state ? 1 : 0;
+                //RedDotController.Instance.SetComRedDot(item.target,
+                //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
+                UI_LinessRewardProcessItemBt.ProxyEnd();
+            });
         }
 
+        private async void OnClickLeagueReward(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
+            var id = activity7DaysCfg.id;
+            if (!ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(id))
+            {
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
+                return;
+            }
+            var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+            if (!result) return;
+            FreshGetStatus();
+        }
     }
 }

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

@@ -11,6 +11,7 @@ namespace GFGGame
     {
         private UI_LeagueTeaPartyUI _ui;
         private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+        private List<RoleContainerProto> roleContainerList = new List<RoleContainerProto>();
         private List<TeapartyRoleCfg> teapartyRoleCfg;
         public override void Dispose()
         {
@@ -30,7 +31,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
@@ -47,12 +48,15 @@ namespace GFGGame
         private void ListTeaPartyItemRender(int index, GObject obj)
         {
             UI_comTeaPartyItem itemObj = UI_comTeaPartyItem.Proxy(obj);
-
+            Vector2 localpos = obj.position;//.LocalToGlobal();
+            itemObj.m_btnDetail.data = localpos;
             itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
             itemObj.m_iconRole.data = index;
             itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
             itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
-
+            //itemObj.m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
+            //itemObj.m_txtNumber.text = roleContainerList[index].PerNum.ToString();
+            //itemObj.m_txtMaxName.text = roleContainerList[index].MaxScoreROleName.ToString();
             UI_comTeaPartyItem.ProxyEnd();
         }
 
@@ -64,24 +68,33 @@ 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;
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            _ui.m_btnChallenge.visible = isLeader;
+
+            UpDataOverTime();
+
+            //GetRoleContainerInfos();
+            roleContainerList = LeagueDataManager.Instance.RoleContainerList;
             _ui.m_ListTeaParty.numItems = 6;
         }
+        private void UpDataOverTime()
+        {
+            //_ui.m_txtOverTime.text = "挑战剩余时间：" + TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+           
+        }
+
 
         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();
-
-
-                }
+                roleContainerList = LeagueDataManager.Instance.RoleContainerList;
+                _ui.m_ListTeaParty.numItems = 6;
             }
         }
 
@@ -102,8 +115,14 @@ namespace GFGGame
 
         private void OnBtnChallengeClick()
         {
-            PromptController.Instance.ShowFloatTextPrompt("开始挑战");
+            string stroyStartID = "50001";
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,true }, null, true);
 
+            //ViewManager.Show<LeagueTeaPartyOverView>();
+        }
+
+        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        {
             ViewManager.Show<LeagueTeaPartyOverView>();
         }
 
@@ -117,11 +136,17 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
 
-        private void OnBtnDetailClick()
+
+        private void OnBtnDetailClick(EventContext context)
         {
+            GObject obj = context.sender as GObject;
+            var pos = (Vector2)obj.data;
+
+            //_ui.m_teaPartyItemTips.m_window.position = pos;
+
             _ui.m_teaPartyItemTips.target.visible = true;
         }
-        
+
         private void OnTeaPartyItemTipsClick()
         {
             _ui.m_teaPartyItemTips.target.visible = false;

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

@@ -50,7 +50,7 @@ namespace GFGGame
                 }
                 //, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, gobackparams, true);
+                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, gobackparams, true);
             }
         }
 

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

@@ -55,7 +55,7 @@ namespace GFGGame
 
         public static void ShowCardStoryDialog(CardStoryCfg cardStoryCfg, CardData cardData)
         {
-            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData }, new object[] { typeof(CardFosterView).FullName, cardData }, true);
+            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData ,false}, new object[] { typeof(CardFosterView).FullName, cardData }, true);
         }
         private static void OnCompleteCardStoryDialog(bool isSkip, object param)
         {
@@ -70,7 +70,7 @@ namespace GFGGame
             InstanceZonesDataManager.currentLevelCfgId = 100001001;
             string stroyStartID = "1";
             // string stroyStartID = MainStoryDataManager.priorId;
-            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog) }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, null, true);
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
@@ -84,7 +84,7 @@ namespace GFGGame
 
             InstanceZonesDataManager.currentLevelCfgId = storyLevelCfg.id;
 
-            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) ,null,false}, null, true);
 
         }
 

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

@@ -37,14 +37,13 @@ namespace GFGGame
         private string _currentWords;
         private string _storyStartID;
         private string lastTextFieldType;   // 上一段文本框的类型
-        TypingFadeEffect _typingEffect;
+        private bool IsTeaParty;    //是否是茶话会里的对话
 
+        TypingFadeEffect _typingEffect;
 
         //屏幕效果中
         private Action<object> _onScreenEffectComplete;
 
-
-
         public override void Dispose()
         {
             base.Dispose();
@@ -80,6 +79,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneStoryDialog"));
+
         }
 
         protected override void OnInit()
@@ -126,6 +126,9 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
+            if ((bool)datas[4]) 
+                IsTeaParty = true;
+
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话
@@ -150,6 +153,10 @@ namespace GFGGame
                 _speedAutoPlay = 1;
                 FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
             }
+
+            if(IsTeaParty)
+                _ui.m_c1.selectedIndex = 2;
+
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
             
         }
@@ -417,6 +424,10 @@ namespace GFGGame
             {
                 roleName = RoleDataManager.roleName;
             }
+            if (roleName == "")
+            {
+                roleName = RoleDataManager.roleName;
+            }
             //回顾
             if (roleName != null)
             {
@@ -490,8 +501,10 @@ namespace GFGGame
                 if (!lastTextFieldType.Equals("name"))
                 {
                     lastTextFieldType = "name";
-                    _ui.m_t0.Play();
-
+                    if(IsTeaParty)
+                        _ui.m_t1.Play();
+                    else
+                        _ui.m_t0.Play();
                 }
             }
             else
@@ -509,7 +522,6 @@ namespace GFGGame
             ShowNextDialog();
         }
 
-
         private void ShowNextDialog()
         {
             if (_wordList != null && _wordList.Length > _wordIndex)
@@ -603,7 +615,6 @@ namespace GFGGame
             _typingEffect.Cancel();
         }
 
-
         private void UpdateBg(string value)
         {
             if (value.Length > 0)
@@ -618,6 +629,16 @@ namespace GFGGame
             {
                 SceneController.UpdateDialogPic(value, _sceneObject);
             }
+            else if (IsTeaParty)
+            {
+                UpdateRoleObj();
+            }
+        }
+
+        private void UpdateRoleObj()
+        {
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+            //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaParty);
         }
 
         private void UpdateMusic(string value)
@@ -725,9 +746,6 @@ namespace GFGGame
             _autoPlay = false;
             _ui.m_btnAutoPlay.selected = false;
             Timers.inst.Remove(ShowNextWords);
-
         }
-
-
     }
 }

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

@@ -80,7 +80,7 @@ namespace GFGGame
             base.OnShown();
             _valueBarController.OnShown();
             // _valueBarController.Controller(1);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
             //add by zyq
             UpdateItem();
@@ -146,6 +146,10 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_star.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(storyLevelCfgs[index].id);
             item.m_imgLock.visible = canFight ? false : true;
+            if (item.m_imgLockBg != null)
+            {
+                item.m_imgLockBg.visible = canFight ? false : true;
+            }
             item.m_txtTitle.text = canFight ? storyLevelCfgs[index].name : content;
             if (canFight) curIndex = index;
             if (item.m_loaIcon.data == null)

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

@@ -33,6 +33,10 @@ namespace GFGGame
             list.ScrollToView(curIndex);
             base.OnShown();
 
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            com.GetChild("Name").asTextField.text = "织物修复";
+            com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            com.height = _ui.target.height;
 
         }
 

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

@@ -33,7 +33,12 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            com.GetChild("Name").asTextField.text = "金属修复";
+            com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+
             base.OnShown();
+            com.height = _ui.target.height;
         }
 
         protected override void OnHide()

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

@@ -9,6 +9,7 @@ namespace GFGGame
     public class StudioPorcelainView : StudioBaseView
     {
         private GComponent _comPorcelain;
+        private string[] porcelainTheme = new string[]{"风","花","雪","月"};
         public override void Dispose()
         {
             base.Dispose();
@@ -30,16 +31,18 @@ namespace GFGGame
         {
             _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
             AddChildCom(_comPorcelain);
-            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this._studioCfg.type, this._studioCfg.subType, this._studioCfg.id);
 
-            _comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
+            //_comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
+            _comPorcelain.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            _comPorcelain.GetChild("loaName").asTextField.text = porcelainTheme[StudioDataManager.Instance.PorcelainTheme-1];
             base.OnShown();
             _comPorcelain.height = _ui.target.height;
 

GameClient/Assets/ResIn/Prefab/SceneStoryDialog.prefab

@@ -29,7 +29,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &893629500977733783
 SpriteRenderer:
@@ -193,6 +193,7 @@ Transform:
   m_Children:
   - {fileID: 8934048990313003902}
   - {fileID: 617406097305830421}
+  - {fileID: 6712570806157986695}
   - {fileID: 838069369391452446}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -279,3 +280,77 @@ SpriteRenderer:
   m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1001 &3047808934040316681
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8934048990737965464}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &6712570806157986695 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 3047808934040316681}
+  m_PrefabAsset: {fileID: 0}

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7dab36fb97997d94bb3e31e835455519
-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_2.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 13d3743513874c547be3c2c8a28534e4
-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: