战力不一致问题处理
parent
d7880d1c9b
commit
6a27a0bd38
|
@ -766,25 +766,25 @@ public class CombatLogic {
|
|||
return passiveskillEffect;
|
||||
}
|
||||
List<Integer> passiveTeamskillEffect = new ArrayList<>();
|
||||
for(TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos){
|
||||
for(TeamPosHeroInfo teamPosHeroInfo :teamPosHeroInfos){
|
||||
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
|
||||
if (hero == null && teamId != TeamEnum.EXPEDITION_TEAM.getTeamId()){
|
||||
continue;
|
||||
if (hero == null){
|
||||
//大闹天宫
|
||||
if (teamId==TeamEnum.EXPEDITION_TEAM.getTeamId()){
|
||||
if (user.getExpeditionManager().getHeroMap().containsKey(teamPosHeroInfo.getHeroId())){
|
||||
hero = user.getExpeditionManager().getHeroMap().get(teamPosHeroInfo.getHeroId());
|
||||
}else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
// 大脑天宫
|
||||
if (!user.getExpeditionManager().getHeroMap().containsKey(teamPosHeroInfo.getHeroId())){
|
||||
continue;
|
||||
}
|
||||
hero = user.getExpeditionManager().getHeroMap().get(teamPosHeroInfo.getHeroId());
|
||||
if (hero == null) {
|
||||
continue;
|
||||
}
|
||||
if (hero == null) {
|
||||
continue;
|
||||
}
|
||||
List<Integer> heroSkillListTmp = HeroLogic.getInstance().getHeroSkillList(user, hero);
|
||||
for (Integer skill : heroSkillListTmp) {
|
||||
SPassiveSkillLogicConfig config = SPassiveSkillLogicConfig.getConfig(skill);
|
||||
if(config!=null && config.getEffectiveRange()==3 && PassiveskillCalEnum.contains(config.getType())){
|
||||
if(config!=null &&config.getEffectiveRange()==3 && PassiveskillCalEnum.contains(config.getType())){
|
||||
passiveTeamskillEffect.add(config.getId());
|
||||
}
|
||||
}
|
||||
|
@ -826,9 +826,6 @@ public class CombatLogic {
|
|||
continue;
|
||||
}
|
||||
Hero hero = user.getHeroManager().getHero(key.getHeroId());
|
||||
if (hero == null){
|
||||
continue;
|
||||
}
|
||||
heroFind.add(hero);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue