From 57433529aa2b3d9df9b80162beed77270090b02e Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 30 Jul 2021 18:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/crossService/CrossServiceLogic.java | 3 ++- .../com/ljsd/jieling/logic/family/CrossDeathPathLogic.java | 2 +- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 3108ec84d..f39a8e423 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -146,7 +146,8 @@ public class CrossServiceLogic { arenaOfPlayerManager.setSkin(player.getUserSkin()); arenaOfPlayerManager.setUserMount(player.getUserMount()); arenaOfPlayerManager.setMaxFore(player.getMaxForce()); - arenaOfPlayerManager.setServerName(CrossServiceLogic.getInstance().findServerName(GameApplication.serverId)); + String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(GameApplication.serverId); + arenaOfPlayerManager.setServerName(serverName); return arenaOfPlayerManager; } private ArenaOfHeroManager buildArenaOfHeroManager(User user){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java index ccabba4f3..d43be7945 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java @@ -153,7 +153,7 @@ public class CrossDeathPathLogic { public String getServerNameByDeathPath(int serverId){ String name = getServerName(serverId); - return Utils.getIntByString(name); + return "S"+Utils.getIntByString(name); } /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index c3ee31c7f..3b19af6a3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -682,7 +682,8 @@ public class PlayerLogic { for(Map.Entry entry:query.getPokemons().entrySet()){ teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(entry.getValue(), entry.getKey())); } - Integer integer = query.getHeroManager().getTotalForceByTeam().get(teamId); + LOGGER.info("=====================跨服获取阵容:{}",teamId); + Integer integer = query.getHeroManager().getTotalForceByTeam().getOrDefault(teamId,0); teamOneTeamInfo.setTotalForce(integer); for(Map.Entry entry:query.getSeals().entrySet()){ PurpleMansionSeal value = entry.getValue();