From ae732cb0fa6527724da347c230ab06186dc3b7aa Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 26 Oct 2021 10:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=8F=82=E6=95=B0=E5=88=A4?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/fight/FightUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 790d06fb8..6ec987921 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -673,6 +673,7 @@ public class FightUtil { .build(); } + //TODO 规范这个参数 public static CommonProto.FightTeamInfo makeCrossPersonData(CSPlayer csPlayer, int teamId, ArenaRecord arenaRecord, CrossArenaManager crossArenaManager) throws Exception { //CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid); if (csPlayer == null) { @@ -685,8 +686,10 @@ public class FightUtil { User user = UserManager.getUser(csPlayer.getUserId()); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().getOrDefault(teamId, new ArrayList<>()); int addforce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); - arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforce); - arenaRecord.getYxldDefForce().add(addforce); + if(arenaRecord != null){ + arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforce); + arenaRecord.getYxldDefForce().add(addforce); + } for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { Hero hero = user.getHeroManager().getHeroMap().get(teamPosHeroInfo.getHeroId()); if (hero == null) { @@ -722,8 +725,10 @@ public class FightUtil { } List teamPosHeroInfos = crossArenaManager.getTeams().getOrDefault(teamId, new ArrayList<>()); int addforcerpc = crossArenaManager.getTotalForceByTeam().get(teamId); - arenaRecord.getYxldDefForce().add(addforcerpc); - arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc); + if(arenaRecord != null){ + arenaRecord.getYxldDefForce().add(addforcerpc); + arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc); + } //Collection seals = crossArenaManager.getSeals().values(); for (com.ljsd.jieling.thrift.idl.TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { com.ljsd.jieling.thrift.idl.ArenaOfHero hero = crossArenaManager.getHeros().get(teamPosHeroInfo.getHeroId());