back_recharge
zhangshanxue 2020-07-02 11:30:23 +08:00
commit 9532f3e6a8
2 changed files with 6 additions and 7 deletions

View File

@ -212,7 +212,7 @@ public class TowerMap extends AbstractMap {
int i = 0; int i = 0;
while (cellMap1.size() < sTrialConfig.getGameCount()[0]) { while (cellMap1.size() < sTrialConfig.getGameCount()[0]) {
i++; i++;
if (i >= 10000) { if (i >= 100) {
break; break;
} }
int randomIndex = random.nextInt(scMap1.getGroups().length); int randomIndex = random.nextInt(scMap1.getGroups().length);
@ -231,14 +231,14 @@ public class TowerMap extends AbstractMap {
int i = 0; int i = 0;
while (cellMap2.size() < sTrialConfig.getGameCount()[1]) { while (cellMap2.size() < sTrialConfig.getGameCount()[1]) {
i++; i++;
if (i >= 10000) { if (i >= 100) {
break; break;
} }
int randomIndex = random.nextInt(scMap1.getGroups().length); int randomIndex = random.nextInt(scMap1.getGroups().length);
int x = scMap1.getGroups()[randomIndex][0]; int x = scMap1.getGroups()[randomIndex][0];
int y = scMap1.getGroups()[randomIndex][1]; int y = scMap1.getGroups()[randomIndex][1];
int xy = CellUtil.xy2Pos(x, y); 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) { if (mapPointConfig == null) {
LOGGER.info("====initTrialMap()====mapPointConfig == null======>{}", scMap1.getEvent()); LOGGER.info("====initTrialMap()====mapPointConfig == null======>{}", scMap1.getEvent());
continue; continue;
@ -359,9 +359,8 @@ public class TowerMap extends AbstractMap {
} }
int groupId = option[0]; int groupId = option[0];
int destoryXY = mapManager.getTriggerXY(); int destoryXY = mapManager.getTriggerXY();
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId());
// int mostTime = sChallengeConfig.getMostTime(); PVEFightEvent pveFightEvent = new PVEFightEvent(uid, mapManager.getTeamId(), 10, "", GameFightType.MapFastFight, groupId, 3);
PVEFightEvent pveFightEvent = new PVEFightEvent(uid, mapManager.getTeamId(), 1000, "", GameFightType.MapFastFight, groupId, 3);
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent); FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
int[] checkResult = fightResult.getCheckResult(); int[] checkResult = fightResult.getCheckResult();

View File

@ -31,7 +31,7 @@ public abstract class ColorGame implements MapGame {
if(configs==null||configs.isEmpty()){ if(configs==null||configs.isEmpty()){
return new ArrayList<>(); return new ArrayList<>();
} }
List<STrialGameConfig> collect = configs.stream().filter(config -> config.getUnlockLv() > level).collect(Collectors.toList()); List<STrialGameConfig> collect = configs.stream().filter(config -> config.getUnlockLv() < level).collect(Collectors.toList());
return collect; return collect;
} }
} }