搭配赛补充

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionSelectView.cs

@@ -14,6 +14,7 @@ namespace GFGGame
         private UI_MatchingCompetitionSelectUI _ui;
         private int _seasonIndex = 0;
         private bool isRefresh = false;
+        private JudgingRoundOpenCfg judgingCfg;
         private GameObject _sceneObjectLeft;
         private GameObject _sceneObjectRight;
         public override void Dispose()
@@ -57,8 +58,9 @@ namespace GFGGame
             _ui.m_BtnBack.touchable = true;
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             //isRefresh = (bool)this.viewData;       
+            judgingCfg = JudgingRoundOpenCfgArray.Instance.GetCfg(MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason);
             UpdateView();
-            //UpdateDressLeft();
+            UpdateDressLeft();
             ViewManager.Hide<ModalStatusView>();
         }
 
@@ -234,7 +236,7 @@ namespace GFGGame
         {
             _ui.m_selectText1.alpha = 0;
             _ui.m_selectText2.alpha = 0;
-            _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
+            _ui.m_timeText.text = string.Format("剩余次数：{0}",Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
         }
         private void OnClickBtnBack()
         {
@@ -243,7 +245,7 @@ namespace GFGGame
         }
         private async void OnClickBtnSelect1()
         {
-            if(MatchingCompetitionDataManager.Instance.MatchingRemainingTimes<=0)
+            if((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes)<=0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足");
                 return;
@@ -257,7 +259,7 @@ namespace GFGGame
                 _ui.m_select1.m_numText.visible = true;
                 _ui.m_select2.m_numText.visible = true;
                 _ui.m_select1.m_numText.text = string.Format("心动值{0}", MatchingLeftDataManager.Instance.LeftRoleInfo.JudgingInfo.Score.ToString());
-                _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
+                _ui.m_timeText.text = string.Format("剩余次数：{0}", Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
             }
             _ui.m_t0.Play(async () =>
             {
@@ -281,7 +283,7 @@ namespace GFGGame
         }
         private async void OnClickBtnSelect2()
         {
-            if (MatchingCompetitionDataManager.Instance.MatchingRemainingTimes <= 0)
+            if ((judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes) <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("评选次数不足");
                 return;
@@ -295,7 +297,7 @@ namespace GFGGame
                 _ui.m_select1.m_numText.visible = true;
                 _ui.m_select2.m_numText.visible = true;
                 _ui.m_select2.m_numText.text = string.Format("心动值{0}", MatchingRightDataManager.Instance.RightRoleInfo.JudgingInfo.Score.ToString());
-                _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
+                _ui.m_timeText.text = string.Format("剩余次数：{0}", Mathf.Max(0, judgingCfg.FreeTimes - MatchingCompetitionDataManager.Instance.MatchingRemainingTimes));
             }
             _ui.m_t1.Play(async () => 
             {

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionUpLoadView.cs

@@ -86,7 +86,7 @@ namespace GFGGame
         {
             //if (MatchingOneDataManager.Instance.MathingDressDate.actionId != 0)
             {
-                //_ui.m_bg.visible = false;
+                _ui.m_bg.visible = false;
                 _ui.m_playerImage.visible = false;
                 MatchingOneDataManager.Instance.itemGameObjs.Clear();
                 PhotographDataManager.Instance.itemGameObjs.Clear();