Merge branch 'master_test_gn' into master_test_gn_xxp
commit
34c0d4bd69
|
@ -684,6 +684,15 @@ public class ArenaLogic {
|
||||||
CrossArenaManager crossArenaManager = null;
|
CrossArenaManager crossArenaManager = null;
|
||||||
if (csPlayer.getServerId() != GameApplication.serverId){
|
if (csPlayer.getServerId() != GameApplication.serverId){
|
||||||
crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
|
crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
|
||||||
|
if(crossArenaManager.getTotalForceByTeam().containsKey(myteamId)){
|
||||||
|
deforce = crossArenaManager.getTotalForceByTeam().get(myteamId);
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
User defUser = UserManager.getUserNotCache(challengeUid);
|
||||||
|
if (defUser == null){
|
||||||
|
throw new ErrorCodeException(ErrorCode.USE_NOT_EXIT);
|
||||||
|
}
|
||||||
|
deforce = HeroLogic.getInstance().calTeamTotalForce(defUser, myteamId, false);
|
||||||
}
|
}
|
||||||
deffightTeamInfo = FightUtil.makeCrossPersonData(csPlayer, myteamId, null, crossArenaManager);
|
deffightTeamInfo = FightUtil.makeCrossPersonData(csPlayer, myteamId, null, crossArenaManager);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue