From dc7bb1a89a29e86fe6eb732b3b1f5ff963836815 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 22 May 2020 05:53:33 +0800 Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1006213=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=96=B0=E6=88=98=E6=96=97=E7=89=88=E6=9C=AC=E3=80=91=E5=A4=A7?= =?UTF-8?q?=E9=97=B9=E5=A4=A9=E5=AE=AB=EF=BC=88=E7=8C=8E=E5=A6=96=E4=B9=8B?= =?UTF-8?q?=E8=B7=AF=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EndConfirmExpeditionBattleRequestHandler.java | 2 +- .../ljsd/jieling/logic/expedition/ExpeditionLogic.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java index 7088a5bc3..c74d184c1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndConfirmExpeditionBattleRequestHandler.java @@ -152,7 +152,7 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler heroFightInfos = new ArrayList<>(); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { - Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); + Hero hero; + + if(teamId==GlobalsDef.EXPEDITION_TEAM&&user.getExpeditionManager().getHeroMap().containsKey(teamPosHeroInfo.getHeroId())){ + hero =user.getExpeditionManager().getHeroMap().get(teamPosHeroInfo.getHeroId()); + }else { + hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); + } if (hero == null) { continue; }