From a2d5ecd93a3d641addb27f737c0463e5ea47edfc Mon Sep 17 00:00:00 2001
From: lvxinran <lvxinran1997@163.com>
Date: Thu, 4 Jul 2019 15:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=82=BC=E6=8E=89=E5=87=BA=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ljsd/jieling/handler/map/MapLogic.java    | 23 ++++++++++---------
 .../map/behavior/FourtyTwoBehavior.java       |  2 +-
 2 files changed, 13 insertions(+), 12 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 7e2ce9267..169e94bad 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
@@ -805,24 +805,25 @@ public class MapLogic {
         User user = UserManager.getUser(uid);
         MapManager mapManager = user.getMapManager();
         SChallengeConfig challengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
-        if(challengeConfig.getType()==2){
-//            int time = (int)((System.currentTimeMillis()-mapManager.getStartExporeTime())/1000);
-//            mapManager.setCurrTowerTime(time);
-//            if(mapManager.getEveryTowerTime()!=null&&mapManager.getEveryTowerTime().get(mapManager.getTower())!=null){
-//                mapManager.setTowerTimeByTower(mapManager.getTower(),time);
-//            }
-            if(mapManager.getTower()>=1){
-                mapManager.setMapIntoFlag(1);
-            }
 
-
-        }
         MapInfoProto.MapOutResponse.Builder builder = MapInfoProto.MapOutResponse.newBuilder();
         if(outType == 0||mapManager.getTower()-1==STrialConfig.getHighestTower()){
             if(mapManager.getTowerUnusedBuffer()!=null){
                 mapManager.setTowerUnusedBuffer(null);
             };
             LOGGER.info("退出地图");
+            if(challengeConfig.getType()==2){
+//            int time = (int)((System.currentTimeMillis()-mapManager.getStartExporeTime())/1000);
+//            mapManager.setCurrTowerTime(time);
+//            if(mapManager.getEveryTowerTime()!=null&&mapManager.getEveryTowerTime().get(mapManager.getTower())!=null){
+//                mapManager.setTowerTimeByTower(mapManager.getTower(),time);
+//            }
+                if(mapManager.getTower()>=1){
+                    mapManager.setMapIntoFlag(1);
+                }
+
+
+            }
             mapManager.setEssenceValue(0);
             boolean result = onlyLevelMap(user, true);
             if (!result) {
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java
index f3e91743b..1159dcf10 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java
@@ -39,7 +39,7 @@ public class FourtyTwoBehavior extends BaseBehavior{
         mapManager.setCurrTowerTime(time);
         LOGGER.info("上层使用时间{}",time);
         mapManager.setStartExporeTime(0);
-        mapManager.setMapIntoFlag(1);
+        mapManager.setMapIntoFlag(2);
         user.getUserMissionManager().onGameEvent(user, GameEvent.COPY_TOWER_LEVEL,mapManager.getTower());
         MapLogic.getInstance().initTrialMap(mapManager, user);
         return true;