back_recharge
wangyuan 2019-04-30 09:49:40 +08:00
parent a00a5f4597
commit 3d0e7cebc6
1 changed files with 11 additions and 7 deletions

View File

@ -1288,16 +1288,20 @@ public class MapLogic {
heroForces += HeroLogic.getInstance().calHeoForce(user, hero); heroForces += HeroLogic.getInstance().calHeoForce(user, hero);
crossInfo.getHeroIds().add(hero.getTemplateId()); crossInfo.getHeroIds().add(hero.getTemplateId());
} }
// 异妖
crossInfo.getPokemons().clear();
List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId()); List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId());
for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) { if(teamPosForPokenInfos!=null){
Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId()); // 异妖
if (pokemon == null) { crossInfo.getPokemons().clear();
continue; for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) {
Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId());
if (pokemon == null) {
continue;
}
crossInfo.getPokemons().add(pokemon.getId());
} }
crossInfo.getPokemons().add(pokemon.getId());
} }
crossInfo.setForces(heroForces); crossInfo.setForces(heroForces);
SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId());
if (sChallengeMapConfig.getIfRank() == 1) { if (sChallengeMapConfig.getIfRank() == 1) {