From fbafd3f2272d2d01627bac42cb0f20af7da780d9 Mon Sep 17 00:00:00 2001
From: jiahuiwen <1024696487@qq.com>
Date: Mon, 22 Apr 2019 11:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=8C=91=E6=88=98=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
index 9fee6a68b..ee68e8e04 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
@@ -126,7 +126,7 @@ public class MapLogic {
 //                }
 //            }
             SChallengeSetting sChallengeSetting = SChallengeSetting.challengeSetting;
-            if (mapManager.getDayFightCount() > sChallengeSetting.getLimit()) {
+            if (mapManager.getDayFightCount() >= sChallengeSetting.getLimit() + mapManager.getBuyFightCount()) {
                 LOGGER.info("enterMap() uid=>{} max fight count =>{} ", uid, mapManager.getDayFightCount());
                 MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "请购买挑战次数");
                 return;
@@ -1462,7 +1462,6 @@ public class MapLogic {
             MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
             return;
         }
-        mapManager.setDayFightCount(dayFightCount - buyCount < 0 ? 0 : dayFightCount - buyCount);
         MessageUtil.sendMessage(session, 1, messageType.getNumber(), null, true);
     }
 
@@ -1491,7 +1490,7 @@ public class MapLogic {
             return;
         }
         SChallengeSetting sChallengeSetting = SChallengeSetting.challengeSetting;
-        if (mapManager.getDayFightCount() + count > sChallengeSetting.getLimit()) {
+        if (mapManager.getDayFightCount() + count >= sChallengeSetting.getLimit() + mapManager.getBuyFightCount()) {
             LOGGER.info("sweep over max count: {}", (mapManager.getDayFightCount() + count));
             MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), "");
             return;