diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java index d135a99eb..a3c5dee56 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/Cell.java @@ -1,5 +1,8 @@ package com.ljsd.jieling.handler.map; +import com.ljsd.jieling.config.MapPointConfig; +import com.ljsd.jieling.util.MonsterUtil; + public class Cell { private int cellId; @@ -18,6 +21,14 @@ public class Cell { this.cellId = cellId; this.pointId = pointId; this.eventId = eventId; + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(pointId); + int[] isShowFightAbility = mapPointConfig.getIsShowFightAbility(); + if(isShowFightAbility !=null&& isShowFightAbility.length>0){ + if(isShowFightAbility[0]!=0){ + int force = MonsterUtil.getMonsterForce(isShowFightAbility); + this.setForce(force); + } + } } public int getCellId() { 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 e97b988b3..2844ee9c0 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 @@ -421,13 +421,7 @@ public class MapLogic { continue; } Cell cellValue = new Cell(xy, mapPointConfig.getInitialEventId(), mapPointConfig.getId()); - int[] isShowFightAbility = mapPointConfig.getIsShowFightAbility(); - if(isShowFightAbility !=null&& isShowFightAbility.length>0){ - if(isShowFightAbility[0]!=0){ - int force = MonsterUtil.getMonsterForce(isShowFightAbility); - cellValue.setForce(force); - } - } + newMap.put(xy, cellValue); } if (user.getPlayerInfoManager().getMapId() == 100) { @@ -1353,7 +1347,7 @@ public class MapLogic { } } else { int[] option = sEventPointConfig.getOption(); - if (option == null) { + if (option == null||option.length<1) { LOGGER.info("option == null sEventPointConfig.getId()=>{}", sEventPointConfig.getId()); MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); return; @@ -1514,6 +1508,8 @@ public class MapLogic { if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){ Cell cell = mapManager.getMapInfo().get(triggerXY); MapPointConfig mapPointConfig = MapPointConfig.getScMapEventMap().get(cell.getPointId()); + Map map= SCMap.sCMap.get(mapManager.getCurMapId()); + if(mapPointConfig.getStyle()==1){ BehaviorUtil.destoryApointXY(user, triggerXY); }