diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java index 4dc443be6..df78099a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java @@ -77,13 +77,13 @@ public abstract class AbstractMap implements IMap { MapManager mapManager = user.getMapManager(); if (teamId == 0) { LOGGER.info("enterMap() uid=>{} teamId =>{} ", uid, teamId); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } user.getTeamPosManager().setCurTeamPosId(teamId); if (mapManager.getCurMapId() == 0||mapManager.getCurXY()==0) { enterNewMap(user,mapId,teamId,mapEnterResponse); } else if (mapManager.getCurMapId() != mapId) { - throw new ErrorCodeException(ErrorCode.newDefineCode("地图错误,应进入" + mapManager.getCurMapId())); +// throw new ErrorCodeException(ErrorCode.newDefineCode("地图错误,应进入" + mapManager.getCurMapId())); }else{ mapEnterResponse.setCurXY(mapManager.getCurXY()); } @@ -173,12 +173,12 @@ public abstract class AbstractMap implements IMap { Map scMap = SCMap.sCMap.get(mapId); if (scMap == null) { LOGGER.info("enterMap() uid=>{} scMap == null =>{} ", user.getId(), mapId); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } SChallengeConfig sChallengeConfig = STableManager.getConfig(SChallengeConfig.class).get(mapId); if (sChallengeConfig == null) { LOGGER.info("enterMap() uid=>{} sChallengeConfig == null =>{} ", user.getId(), mapId); - throw new ErrorCodeException(ErrorCode.newDefineCode("该地图不存在")); +// throw new ErrorCodeException(ErrorCode.newDefineCode("该地图不存在")); } // 可进入地图条件判断 int[][] openRule = sChallengeConfig.getOpenRule(); @@ -232,12 +232,12 @@ public abstract class AbstractMap implements IMap { MapManager mapManager = user.getMapManager(); if (mapManager.getMapInfo() == null) { LOGGER.info("mapManager.getMapInfo() == null"); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } if (mapManager.getCanMoveTime() > 0) { long leftTime = mapManager.getCanMoveTime() - TimeUtils.now(); if (leftTime > 0) { - throw new ErrorCodeException(ErrorCode.HERO_LIVE_AGAIN,Collections.singletonList((leftTime / 1000)+"")); +// throw new ErrorCodeException(ErrorCode.HERO_LIVE_AGAIN,Collections.singletonList((leftTime / 1000)+"")); } } Cell cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); @@ -245,14 +245,14 @@ public abstract class AbstractMap implements IMap { cell = mapManager.getMapInfo().get(mapManager.getCurXY()); if (cell == null) { LOGGER.info("cell == null xy is wrong =>{} triggerXY=>{}", mapManager.getCurXY(), mapManager.getTriggerXY()); - throw new ErrorCodeException(ErrorCode.newDefineCode("cell == null")); +// throw new ErrorCodeException(ErrorCode.newDefineCode("cell == null")); } } int bigEventId = cell.getEventId(); SEventPointConfig sEventPointConfig = STableManager.getConfig(SEventPointConfig.class).get(bigEventId); if (sEventPointConfig == null) { LOGGER.info("sEventPointConfig == null"); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } String fightReadyKey = RedisKey.getKey(RedisKey.FIGHT_READY, Integer.toString(uid), false); String fightReady = (String) RedisUtil.getInstence().get(fightReadyKey); @@ -269,7 +269,7 @@ public abstract class AbstractMap implements IMap { int[] option = sEventPointConfig.getOption(); if (option == null||option.length<1) { LOGGER.info("option == null sEventPointConfig.getId()=>{}", sEventPointConfig.getId()); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } groupId = monsterGroupChange(option[0]); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java index 5bb28f54c..aad56372d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java @@ -82,9 +82,9 @@ public class TowerMap extends AbstractMap { @Override public void enterMap(int uid, int mapId, int teamId, MapInfoProto.MapEnterResponse.Builder mapEnterResponse) throws Exception { - if(teamId!= GlobalsDef.TRIAL_TEAM){ - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); - } +// if(teamId!= GlobalsDef.TRIAL_TEAM){ +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// } //进图时检测是否需要重置 MapLogic.getInstance().checkTrialReset(UserManager.getUser(uid)); @@ -342,26 +342,26 @@ public class TowerMap extends AbstractMap { MapManager mapManager = user.getMapManager(); if (mapManager.getMapInfo() == null) { LOGGER.info("fastFight mapManager.getMapInfo() == null"); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } Cell cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); if (cell == null) { cell = mapManager.getMapInfo().get(mapManager.getCurXY()); if (cell == null) { LOGGER.info("cell == null xy is wrong =>{} triggerXY=>{}", mapManager.getCurXY(), mapManager.getTriggerXY()); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } } int bigEventId = cell.getEventId(); SEventPointConfig sEventPointConfig = STableManager.getConfig(SEventPointConfig.class).get(bigEventId); if (sEventPointConfig == null) { LOGGER.info("sEventPointConfig == null"); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } int[] option = sEventPointConfig.getOption(); if (option == null) { LOGGER.info("option == null sEventPointConfig.getId()=>{}", sEventPointConfig.getId()); - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } int groupId = option[0]; int destoryXY = mapManager.getTriggerXY(); @@ -374,14 +374,14 @@ public class TowerMap extends AbstractMap { //校验结果码 1:胜利 int resultCode = checkResult[0]; if (resultCode == -1) { - throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION); +// throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION); } mapManager.setLastFightResult(resultCode); //更新血量 TrialInfo trialInfo = mapManager.getTrialInfo(); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId()); if(teamPosHeroInfos==null||teamPosHeroInfos.size()!=1){ - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } TrailHero trailHero = trialInfo.getHeroInfo().get(teamPosHeroInfos.get(0).getHeroId()); @@ -465,7 +465,7 @@ public class TowerMap extends AbstractMap { MapManager mapManager = user.getMapManager(); // LOGGER.info("进入召唤boss"); if(mapManager.getTrialInfo().getEnergy()<100){ - throw new ErrorCodeException(ErrorCode.newDefineCode("精气值不足!!")); +// throw new ErrorCodeException(ErrorCode.newDefineCode("精气值不足!!")); } int currTower = mapManager.getTrialInfo().getFloor(); STrialConfig config = STrialConfig.sTrialConfigMap.get(currTower);