茶话会接入部分协议

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

@@ -30,10 +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 TeaPartyId = 0; //茶会期数 --未开启则期数为0
         public int TeaPartyStatus = 0; // 0未开启 1集结中 2已集结
         public RoleTeapartyInfoProto RoleTeapartyInfoProto = new RoleTeapartyInfoProto(); // 玩家本期茶话会参与信息
         public List<RoleContainerProto> RoleContainerList = new List<RoleContainerProto>(); // 茶会每个扮演角色坑位信息
+        public long TeaPartyCloseTime = 0; // 茶话会结束时间
         public int ChooseTeaPartId = 0; // 选择的茶话会类型
 
 
@@ -267,7 +268,7 @@ namespace GFGGame
         {
             int matchedValue = 0;
 
-            var teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
+            var teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(TeaPartyId);
             string[] tags = teapartyRoleCfg[ChooseTeaPartId - 1].tagArr;
 
             for (int i = 0; i < roleData.itemList.Count; i++)

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

@@ -855,12 +855,14 @@ namespace GFGGame
         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;
+                    LeagueDataManager.Instance.TeaPartyCloseTime = response.TeaPartyCloseTime;
                     return true;
                 }
             }
@@ -868,10 +870,10 @@ namespace GFGGame
         }
 
         //更换角色坑位以及搭配
-        public static async ETTask<bool> ChangeTeapartyDressup(int TeapartyRoleId,List<int> equipIds)
+        public static async ETTask<bool> ChangeTeapartyDressup(long TeapartyRoleId,List<int> equipIds)
         {
             S2C_ChangeTeapartyDressup response = null;
-            response = (S2C_ChangeTeapartyDressup)await MessageHelper.SendToServer(new C2S_ChangeTeapartyDressup() { RoleId = RoleDataManager.roleId });
+            response = (S2C_ChangeTeapartyDressup)await MessageHelper.SendToServer(new C2S_ChangeTeapartyDressup() { RoleId = TeapartyRoleId, EquipIds  = equipIds });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -883,5 +885,26 @@ namespace GFGGame
             return false;
         }
 
+        //会长点击挑战,开启挑战
+        public static async ETTask<bool> TeapartyStartChallenge(long roleId)
+        {
+            S2C_TeapartyStartChallenge response = null;
+            ET.Log.Debug("打印测试-----ccccccccccccccccc------------");
+
+            response = (S2C_TeapartyStartChallenge)await MessageHelper.SendToServer(new C2S_TeapartyStartChallenge() { RoleId = roleId });
+            if (response != null)
+            {
+                ET.Log.Debug("打印测试-----ttttttttttttttt---------response.Error---" + response.Error);
+
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ET.Log.Debug("打印测试-----ttttttttttttttt------------");
+                    LeagueDataManager.Instance.RoleContainerList = response.RoleContainerList;
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }

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

@@ -104,7 +104,8 @@ namespace GFGGame
             _ui.m_btnAutoPlay.onClick.Add(OnClickBtnAutoPlay);
             _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
             _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
-
+            _ui.m_btnSubmission.onClick.Add(OnClickBtnSubmission);
+            
             _ui.m_compNeed.target.onClick.Add(OnClickComNeed);
             _ui.m_compNeed.m_listTag.itemRenderer = RenderListTagItem;
 
@@ -280,6 +281,24 @@ namespace GFGGame
 
         }
 
+        //茶话会提交搭配
+        private void OnClickBtnSubmission()
+        {
+            ChangeTeapartyDressup();
+        }
+
+        private async void ChangeTeapartyDressup()
+        {
+            DressUpData dressUpData = MyDressUpHelper.dressUpObj.DressUpDataClone();
+            ET.Log.Debug("打印测试-------服装数据----------" + dressUpData.itemList);
+            bool result = await LeagueSproxy.ChangeTeapartyDressup(RoleDataManager.roleId, dressUpData.itemList);
+            if (result)
+            {
+                this.Hide();
+
+            }
+        }
+
         private void OnClickBtnBack()
         {
             AlertUI.Show("是否确定退出？")

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

@@ -11,7 +11,6 @@ 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()
         {
@@ -42,7 +41,7 @@ namespace GFGGame
 
             _ui.m_ListTeaParty.itemRenderer = ListTeaPartyItemRender;
 
-            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
+            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId); 
         }
 
         private void ListTeaPartyItemRender(int index, GObject obj)
@@ -54,9 +53,10 @@ namespace GFGGame
             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();
+            var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
+            itemObj.m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
+            itemObj.m_txtNumber.text = roleContainerList[index].PerNum.ToString();
+            itemObj.m_txtMaxName.text = roleContainerList[index].MaxScoreRoleName;
             UI_comTeaPartyItem.ProxyEnd();
         }
 
@@ -68,33 +68,30 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(1);//LeagueDataManager.Instance.TeaPartyId
+            var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(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;
+            GetRoleContainerInfos();
         }
+
         private void UpDataOverTime()
         {
-            //_ui.m_txtOverTime.text = "挑战剩余时间：" + TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-           
+            ET.Log.Debug("打印测试-------挑战剩余时间----11------" + TimeInfo.Instance.ServerNow());
+            ET.Log.Debug("打印测试------挑战剩余时间-----22------" + LeagueDataManager.Instance.TeaPartyCloseTime);
+            _ui.m_txtOverTime.text = "挑战剩余时间：" + TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), LeagueDataManager.Instance.TeaPartyCloseTime);
         }
 
-
         private async void GetRoleContainerInfos()
         {
             bool result = await LeagueSproxy.GetRoleContainerInfos();
             if (result)
             {
-                roleContainerList = LeagueDataManager.Instance.RoleContainerList;
                 _ui.m_ListTeaParty.numItems = 6;
+                UpDataOverTime();
             }
         }
 
@@ -115,10 +112,17 @@ namespace GFGGame
 
         private void OnBtnChallengeClick()
         {
-            string stroyStartID = "50001";
-            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,true }, null, true);
+            TeapartyStartChallenge();
+        }
 
-            //ViewManager.Show<LeagueTeaPartyOverView>();
+        private async void TeapartyStartChallenge()
+        {
+            bool result = await LeagueSproxy.TeapartyStartChallenge(RoleDataManager.roleId);
+            if (result)
+            {
+                string stroyStartID = "50001";
+                ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
+            }
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)

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

@@ -79,7 +79,6 @@ namespace GFGGame
             isfullScreen = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneStoryDialog"));
-
         }
 
         protected override void OnInit()
@@ -637,6 +636,7 @@ namespace GFGGame
 
         private void UpdateRoleObj()
         {
+            ET.Log.Debug("打印测试-------asdfsdfsdaf----------");
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
             //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaParty);
         }