From 28efc91bc91af1e4d91dee7383c27df6bba9c43a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 17 Dec 2019 00:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=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 | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 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 50bf992cd..e8f93af2e 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 @@ -200,7 +200,6 @@ public class MapLogic { mapEnterResponse.setCurXY(mapManager.getCurXY()); } - if(type ==4){ mapEnterResponse.setCurXY(mapManager.getCurXY()); List teamPosForHero = user.getTeamPosManager().getTeamPosForHero().get(teamId); @@ -212,7 +211,7 @@ public class MapLogic { EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo(); if(endlessMapInfo.getSeason()!=endlessSeason){ //切换赛季清除信息 - resetEndlessInfo(); + clearEndlessItem(user); TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless); StoreLogic.initOnsStoereWithTime(user,SEndlessMapConfig.sEndlessMapConfigMap.get(endlessMapId).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime()); mapManager.updateEndlessSeason(endlessSeason); @@ -1124,10 +1123,6 @@ public class MapLogic { onlyLevelMap(user, false); } if(user.getMapManager().getCurMapId()!=0&&SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()).getType()==4){ - if(endlessSeason==0){ - onlyLevelMap(user,false); - user.getMapManager().setEndlessMapInfo(new EndlessMapInfo()); - } if(user.getMapManager().getEndlessMapInfo().getSeason()!=endlessSeason){ onlyLevelMap(user,false); user.getMapManager().setEndlessMapInfo(new EndlessMapInfo()); @@ -3261,8 +3256,7 @@ public class MapLogic { */ public void resetEndlessInfo() throws Exception { Map onlineUserMap = OnlineUserManager.sessionMap; - SEndlessMapConfig config = SEndlessMapConfig.sEndlessMapConfigMap.get(MapLogic.getEndlessMapId()); - int[] mapItem = config.getMapItem(); + for(Map.Entry entry:onlineUserMap.entrySet()){ User user = UserManager.getUser(entry.getValue().getUid()); MapManager mapManager = user.getMapManager(); @@ -3271,23 +3265,28 @@ public class MapLogic { MessageUtil.sendIndicationMessage(entry.getValue(),1,MessageTypeProto.MessageType.MAP_OUT_INDICATION_VALUE,null,true); resetMapInfo(user,false); } - ItemManager itemManager = user.getItemManager(); - int [][] costItem = new int[mapItem.length][2]; - for(int i = 0 ; i