From cc1d26d842d59b516c936381612e8f5ed7181f75 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 30 Jun 2020 20:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=82=BC=E6=B8=B8=E6=88=8F=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9=E3=80=81=E6=88=98?= =?UTF-8?q?=E6=96=97=E5=9B=9E=E5=90=88=E6=95=B0=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/mapType/TowerMap.java | 11 +++++------ .../ljsd/jieling/handler/map/miniGame/ColorGame.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) 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 6747c8b52..3e4e82bb2 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 @@ -212,7 +212,7 @@ public class TowerMap extends AbstractMap { int i = 0; while (cellMap1.size() < sTrialConfig.getGameCount()[0]) { i++; - if (i >= 10000) { + if (i >= 100) { break; } int randomIndex = random.nextInt(scMap1.getGroups().length); @@ -231,14 +231,14 @@ public class TowerMap extends AbstractMap { int i = 0; while (cellMap2.size() < sTrialConfig.getGameCount()[1]) { i++; - if (i >= 10000) { + if (i >= 100) { break; } int randomIndex = random.nextInt(scMap1.getGroups().length); int x = scMap1.getGroups()[randomIndex][0]; int y = scMap1.getGroups()[randomIndex][1]; int xy = CellUtil.xy2Pos(x, y); - MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(sTrialConfig.getGameType()[1][1]); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(sTrialConfig.getGameType()[1][cellMap2.size()+1]); if (mapPointConfig == null) { LOGGER.info("====initTrialMap()====mapPointConfig == null======>{}", scMap1.getEvent()); continue; @@ -359,9 +359,8 @@ public class TowerMap extends AbstractMap { } int groupId = option[0]; int destoryXY = mapManager.getTriggerXY(); - SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()); -// int mostTime = sChallengeConfig.getMostTime(); - PVEFightEvent pveFightEvent = new PVEFightEvent(uid, mapManager.getTeamId(), 1000, "", GameFightType.MapFastFight, groupId, 3); + + PVEFightEvent pveFightEvent = new PVEFightEvent(uid, mapManager.getTeamId(), 10, "", GameFightType.MapFastFight, groupId, 3); FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent); int[] checkResult = fightResult.getCheckResult(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/ColorGame.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/ColorGame.java index 0ddb4fa6e..b6a39d766 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/ColorGame.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/ColorGame.java @@ -31,7 +31,7 @@ public abstract class ColorGame implements MapGame { if(configs==null||configs.isEmpty()){ return new ArrayList<>(); } - List collect = configs.stream().filter(config -> config.getUnlockLv() > level).collect(Collectors.toList()); + List collect = configs.stream().filter(config -> config.getUnlockLv() < level).collect(Collectors.toList()); return collect; } }