Merge branch 'master' of 60.1.1.230:backend/jieling_server

back_recharge
wangyuan 2020-02-21 18:04:24 +08:00
commit 74213d4c0d
1 changed files with 14 additions and 3 deletions

View File

@ -132,6 +132,8 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
user.getExpeditionManager().getHeroHPWithChange().put(hero.getId(), 0d);
ids.add(hero.getId());
}
//出队伍
user.getTeamPosManager().updateTeamPosByTeamId(1001,new LinkedList<>());
//节点血量更新
nodeInfo.getSnapFightInfo().getHeroAttribute().forEach((s, familyHeroInfo) ->
@ -158,16 +160,25 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
);
// 更新队伍血量
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) {
Iterator<TeamPosHeroInfo> iterator = teamPosHeroInfos.iterator();
while (iterator.hasNext()){
TeamPosHeroInfo teamPosHeroInfo = iterator.next();
Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId());
if (hero == null) {
continue;
}
Map<Integer, Integer> heroAttributeMap = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
user.getExpeditionManager().getHeroHPWithChange().put(teamPosHeroInfo.getHeroId(), (double) remainHp.remove(0) / (double) heroAttributeMap.get(HeroAttributeEnum.CurHP.getPropertyId()));
double remain = remainHp.remove(0);
user.getExpeditionManager().getHeroHPWithChange().put(teamPosHeroInfo.getHeroId(), remain / (double) heroAttributeMap.get(HeroAttributeEnum.CurHP.getPropertyId()));
ids.add(hero.getId());
if(remain==0d){
iterator.remove();
}
}
//出队伍
user.getTeamPosManager().updateTeamPosByTeamId(1001,teamPosHeroInfos);
nodeInfo.setState(ExpeditionLogic.NODESTATE_NOT_GET);
if(!STableManager.getConfig(SExpeditionFloorConfig.class).containsKey(oldlay+1))
{//最后一层直接更新 领取宝箱时候校验