From 441480aed091892f81921e047a471de5452530c2 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 21 Feb 2020 17:55:36 +0800 Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1005747=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=20=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9=20=E6=AD=BB=E4=BA=A1=E7=8C=8E=E5=A6=96?= =?UTF-8?q?=E5=B8=88=E6=9C=AA=E4=B8=8B=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/EndExpeditionBattleRequest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 22be5995c..9e60ec1f2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -132,6 +132,8 @@ public class EndExpeditionBattleRequest extends BaseHandler()); //节点血量更新 nodeInfo.getSnapFightInfo().getHeroAttribute().forEach((s, familyHeroInfo) -> @@ -158,16 +160,25 @@ public class EndExpeditionBattleRequest extends BaseHandler teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); - for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { + + Iterator iterator = teamPosHeroInfos.iterator(); + while (iterator.hasNext()){ + TeamPosHeroInfo teamPosHeroInfo = iterator.next(); Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); if (hero == null) { continue; } Map 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)) {//最后一层直接更新 领取宝箱时候校验