fix
parent
d1efc48e47
commit
5633e399e9
|
|
@ -1540,17 +1540,7 @@ public class MapLogic {
|
|||
}
|
||||
int teamId = mapManager.getTeamId();
|
||||
List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||
<<<<<<< HEAD
|
||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
|
||||
=======
|
||||
for (TeamPosHeroInfo teamPosHeroInfo : team) {
|
||||
Map<Integer, Integer> heroAttr = mapManager.getHeroAllAttributeMap().get(teamPosHeroInfo.getHeroId());
|
||||
if(heroAttr!=null) {
|
||||
mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition() + 1]);
|
||||
}
|
||||
}
|
||||
if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
|
||||
>>>>>>> abd7ebd8754c1471b2b50e9478087bae40f0ad8f
|
||||
mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
|
||||
Set<String> cacheRemove = new HashSet<>();
|
||||
for (int i = 0 ; i <team.size();i++) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue