搭配赛补充提交

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

@@ -416,6 +416,32 @@ namespace GFGGame
         {
             ViewManager.Show<MatchingCompetitionRuleTipsView>();
         }
+        public async void OnClickBtnView()
+        {
+            if (MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason > 0)
+            {
+                if (MatchingCompetitionDataManager.Instance.MatchingState == 1)
+                {
+                    ViewManager.Show<MatchingCompetitionGatheringView>();
+                }
+                else
+                {
+                    bool result = await MatchingCompetitionSproxy.ReqGetOnePlayers();
+                    if (result)
+                    {
+                        ViewManager.Show<MatchingCompetitionUpLoadView>();
+                    }
+                    else
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("暂无玩家数据!");
+                    }
+                }
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("搭配赛未开启!");
+            }
+        }
     }
 
     class MatchingOneDataManager : SingletonBase<MatchingOneDataManager>

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

@@ -7,11 +7,13 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class M2C_NoticeMatchingStateHandler : AMHandler<S2C_UpJudgingRoundWorksToppingStatus>
+    public class M2C_NoticeMatchingStateHandler : AMHandler<S2C_PushJudgingRoundInfo>
     {
-        protected override async ETTask Run(Session session, S2C_UpJudgingRoundWorksToppingStatus message)
+        protected override async ETTask Run(Session session, S2C_PushJudgingRoundInfo message)
         {
-
+            MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = message.JudgingRoundOpenId;
+            MatchingCompetitionDataManager.Instance.MatchingEndTimes = message.PhaseEndTime;
+            MatchingCompetitionDataManager.Instance.MatchingState = message.PhaseType;
             await ETTask.CompletedTask;
         }
     }
@@ -26,7 +28,7 @@ namespace GFGGame
             S2C_GetJudgingRoundInfo response = (S2C_GetJudgingRoundInfo)await MessageHelper.SendToServer(new C2S_GetJudgingRoundInfo { });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = response.JudgingRoundOpenId;
-            MatchingCompetitionDataManager.Instance.MatchingState = Mathf.Max(response.PhaseType - 1);
+            MatchingCompetitionDataManager.Instance.MatchingState = response.PhaseType;
             MatchingCompetitionDataManager.Instance.MatchingEndTimes = response.PhaseEndTime;
             MatchingCompetitionDataManager.Instance.myWorks = response.MyWorks;
             if(response.MyWorks != null)

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

@@ -55,9 +55,10 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
-            _ui.m_c1.selectedIndex = 0;
-            SuitID = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].ShowSuit;
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_c1.selectedIndex = 1;
+            JudgingRoundOpenCfg judgingCfg = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1];
+            SuitID = judgingCfg.ShowSuit;
+            _ui.m_titleText.text = judgingCfg.Name;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(SuitID);
             _ui.m_suitName.text = suitCfg.name;
             UpdateView();
@@ -104,6 +105,8 @@ namespace GFGGame
             if (endTime < curTime + 1)
             {
                 Timers.inst.Remove(UpdateTime);
+                //PromptController.Instance.ShowFloatTextPrompt("投稿时间已到!");
+                //ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
                 return;
             }
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);

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

@@ -40,7 +40,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
             UpdateHead();
         }

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

@@ -57,7 +57,7 @@ namespace GFGGame
         {
             UI_MatchingCompetitionRewardItem item = UI_MatchingCompetitionRewardItem.Proxy(obj);
             JudgingRoundRewardCfg judginRewardCfg = JudgingRoundRewardCfgArray.Instance.dataArray[index];
-            item.m_rankIndex.text = (index + 1).ToString();
+            item.m_rankIndex.text = judginRewardCfg.desc;
             if (item.m_rewardList.data == null)
             {
                 item.m_rewardList.itemRenderer = SpecialRewardRender;

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

@@ -41,7 +41,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             _ui.m_BtnBack.touchable = true;
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             //isRefresh = (bool)this.viewData;
             UpdateView();
             UpdatePlayer();

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

@@ -53,7 +53,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             _ui.m_c1.selectedIndex = MatchingCompetitionDataManager.Instance.MatchingState;
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             isCountTime = false;
             UpdateView();
             UpdateHead();
@@ -146,6 +146,26 @@ namespace GFGGame
         {
             _ui.m_countTime.fillAmount = 0;
             _ui.m_countTime.visible = false;
+            long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime + 1)
+            {
+                if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
+                    ViewManager.GoBackFrom(typeof(MatchingCompetitionUpLoadView).FullName);
+                }
+                return;
+            }
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            {
+                _ui.m_timeText.text = "评选剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+            else
+            {
+                _ui.m_timeText.text = "结算剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
         }
         private void UpdateHead()
         {
@@ -160,10 +180,23 @@ namespace GFGGame
             if (endTime < curTime + 1)
             {
                 Timers.inst.Remove(UpdateTime);
+                if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("评选时间已到!");
+                    ViewManager.GoBackFrom(typeof(MatchingCompetitionUpLoadView).FullName);
+                }
                 return;
             }
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            _ui.m_timeText.text = "评选剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            if (MatchingCompetitionDataManager.Instance.MatchingState == 2)
+            {
+                _ui.m_timeText.text = "评选剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+            else
+            {
+                _ui.m_timeText.text = "结算剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+                
         }
         private void UpdateCountTime(object param = null)
         {

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

@@ -41,7 +41,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             _seasonIndex = (int)this.viewData;
             UpdateView();
         }

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

@@ -41,7 +41,7 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
-            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason].Name;
+            _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
         }