茶话会修改

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

@@ -1479,7 +1479,7 @@ namespace GFGGame
 
         private void TeaPartyStatuChange()
         {
-            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo)
+            if (IsTeaPart && LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo)
             {
                 AlertUI.Show("管理员已开启茶会，请前往挑战！")
                 .SetLeftButton(false).SetRightButton(true, "确定", (object data) =>

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

@@ -83,6 +83,7 @@ namespace GFGGame
             int myPos = LeagueDataManager.Instance.GetMyPos();
             bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
             _ui.m_btnChallenge.visible = isLeader;
+            _ui.m_btnChallenge.grayed = LeagueDataManager.Instance.TeaPartyStatus != LeagueTeaPartyStatus.YesOpen;
 
             GetTeapartyMatchingInfos();
             GetRoleContainerInfos();
@@ -91,8 +92,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            QuitTeapparty();
             Timers.inst.Remove(UpDataTime);
+            QuitTeapparty();
         }
 
         protected override void RemoveEventListener()
@@ -117,7 +118,7 @@ namespace GFGGame
 
         private void OnBtnChallengeClick()
         {
-            if (LeagueDataManager.Instance.TeaPartyStatus != 1)
+            if (LeagueDataManager.Instance.TeaPartyStatus != LeagueTeaPartyStatus.YesOpen)
                 return;
 
             TeapartyStartChallenge();
@@ -142,7 +143,6 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
 
-
         private void OnBtnDetailClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -193,6 +193,9 @@ namespace GFGGame
         }
         private void UpDataOverTime()
         {
+            string strTimeText = "挑战剩余时间：";
+            if(LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo)
+                strTimeText = "公开剩余时间：";
             _ui.m_txtOverTime.text = "挑战剩余时间：" + TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), LeagueDataManager.Instance.TeaPartyCloseTime);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/WeekGiftView.cs

@@ -74,6 +74,7 @@ namespace GFGGame
             AlertUI.Show("提升VIP等级能领取更高级的礼包，是否继续领取当前等级的VIP礼包?", "(该礼包每周只能领取1次)")
              .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
              {
+                 ViewManager.Hide<WeekGiftView>();
                  bool result = await ShopSProxy.ReqGetVipWeekGiftBag(_vipLv);
                  if (result){ }
              });