跨服参数判空

back_recharge
xuexinpeng 2021-10-26 10:23:17 +08:00
parent 08d19e5edd
commit ae732cb0fa
1 changed files with 9 additions and 4 deletions

View File

@ -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<TeamPosHeroInfo> 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<com.ljsd.jieling.thrift.idl.TeamPosHeroInfo> 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<PurpleMansionSeal> 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());