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,9 +1288,11 @@ 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());
} }
List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId());
if(teamPosForPokenInfos!=null){
// 异妖 // 异妖
crossInfo.getPokemons().clear(); crossInfo.getPokemons().clear();
List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId());
for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) { for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) {
Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId()); Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId());
if (pokemon == null) { if (pokemon == null) {
@ -1298,6 +1300,8 @@ public class MapLogic {
} }
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) {