导表

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

@@ -70,7 +70,29 @@ namespace GFGGame
             HistoryDatas = null;
             TextureDic.Clear();
         }
-
+        /// <summary>
+        /// 是否结算中
+        /// </summary>
+        /// <returns></returns>
+        public bool IsArenaClearing
+        {
+            get
+            {
+                long curTime = TimeHelper.ServerNow();
+                long startTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.clearingStartWeekDay, GlobalCfgArray.globalCfg.clearingStartTime);
+                long endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.clearingEndWeekDay, GlobalCfgArray.globalCfg.clearingEndTime);
+                if (GlobalCfgArray.globalCfg.clearingEndWeekDay >= GlobalCfgArray.globalCfg.clearingStartWeekDay)
+                {
+                    //结算时间开始到结束未跨周(例：本周六开始，本周日结束)
+                    return curTime >= startTime && curTime <= endTime;
+                }
+                else
+                {
+                    //结算时间开始到结束跨周(例：本周六开始，下周一结束)
+                    return curTime <= endTime || curTime >= startTime;
+                }
+            }
+        }
         /// <summary>
         /// 试图更新最高段位、排行数据
         /// </summary>
@@ -90,6 +112,7 @@ namespace GFGGame
         {
             return arenaTarget.RobotDressupList[index];
         }
+
         /// <summary>
         /// 获取推荐卡牌
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -69,20 +69,11 @@ namespace GFGGame
             ArenaViewManager.Instance.UpdateDanIcon(com.m_loaDanIcon, ArenaDataManager.Instance.Grade);
 
             int[][] rewards = { };
-            ArenaRankCfg rankCfg = ArenaRankCfgArray.Instance.GetCfg(ArenaDataManager.Instance.Grade);
-            List<ArenaRewardCfg> rewardCfgs = ArenaRewardCfgArray.Instance.GetCfgsBygradeName(rankCfg.gradeName);
+            List<ArenaRewardCfg> rewardCfgs = ArenaRewardCfgArray.Instance.GetCfgsBygrade(ArenaDataManager.Instance.Grade);
             for (int i = 0; i < rewardCfgs.Count; i++)
             {
                 ArenaRewardCfg rewardCfg = rewardCfgs[i];
-                int endRank = rewardCfg.rankInGrade == 0 ? rankCfg.num * rewardCfg.rangeInGrade / 10000 : rewardCfg.rankInGrade;
-                int startRank = 0;
-                if (i > 0)
-                {
-                    ArenaRewardCfg nextRewardCfg = rewardCfgs[i + 1];
-                    startRank = nextRewardCfg.rankInGrade == 0 ? rankCfg.num * nextRewardCfg.rangeInGrade / 10000 : nextRewardCfg.rankInGrade;
-                }
-
-                if (ArenaDataManager.Instance.Rank > startRank && ArenaDataManager.Instance.Rank <= endRank)
+                if (ArenaDataManager.Instance.Rank >= rewardCfg.minRank && ArenaDataManager.Instance.Rank <= rewardCfg.maxRank)
                 {
                     rewards = rewardCfg.bonusWeeklyArr;
                     break;

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -157,6 +157,11 @@ namespace GFGGame
         }
         private void OnBtnAddFightCountClick()
         {
+            if (ArenaDataManager.Instance.IsArenaClearing)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("结算中......");
+                return;
+            }
             if (RoleDataManager.ArenaBuyFightTimes == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("今日次数购买已达上限");
@@ -172,6 +177,11 @@ namespace GFGGame
         }
         private async void OnBtnRefreshClick()
         {
+            if (ArenaDataManager.Instance.IsArenaClearing)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("结算中......");
+                return;
+            }
             bool result = await ArenaSproxy.ReqRefreshArenaTargets();
             if (result)
             {
@@ -180,6 +190,11 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
+            if (ArenaDataManager.Instance.IsArenaClearing)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("结算中......");
+                return;
+            }
             ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList, null }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
         }
 
@@ -261,7 +276,7 @@ namespace GFGGame
             _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
             string openTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.openTime));
             string endTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.endTime));
-            _ui.m_txtTime.text = string.Format("{0}/{1}", openTime, endTime);
+            _ui.m_txtTime.text = string.Format("赛季时间：{0}/{1}", openTime, endTime);
             _ui.m_txtName.text = RoleDataManager.roleName;
             _ui.m_txtRank.text = string.Format("段位排名：{0}", _dataManager.Rank);
             _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).gradeName;