Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)

back_recharge
zhangshanxue 2020-05-22 05:53:33 +08:00
parent 094d64f8ad
commit dc7bb1a89a
2 changed files with 8 additions and 2 deletions

View File

@ -152,7 +152,7 @@ public class EndConfirmExpeditionBattleRequestHandler extends BaseHandler<Expedi
Expedition.EndExpeditionBattleResponse.Builder response = Expedition.EndExpeditionBattleResponse.newBuilder();
response.setResult(resultCode);
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.EXPEDITION_END_BATTLE_RESONSE_VALUE, response.build(), true);
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.EndConfirmExpeditionBattleResponse_VALUE, response.build(), true);
} else {
throw new ErrorCodeException("节点战斗成功");

View File

@ -928,7 +928,13 @@ public class ExpeditionLogic {
List<CommonProto.FightUnitInfo> heroFightInfos = new ArrayList<>();
List<TeamPosHeroInfo> 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;
}