From e7d2136f497a9065194d9ba479c8da6c6c20ce9a Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 3 Jan 2022 01:03:59 +0800 Subject: [PATCH] =?UTF-8?q?team=E8=B7=A8=E6=9C=8D=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 5bf78a9c3..29f76a8b1 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 @@ -941,13 +941,14 @@ public class PlayerLogic { } //基本信息从redis中拿 剩下的队伍 属性 数据量大的数据rpc调用 String serverName = CrossDeathPathLogic.getInstance().getServerNameByDeathPath(csPlayer.getServerId()); + GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(csPlayer.getGuildId()); CommonProto.TeamOneInfo.Builder builder = CommonProto.TeamOneInfo.newBuilder() .setHead(csPlayer.getHead()) .setHeadFrame(csPlayer.getHeadFrame()) .setUserTitle(csPlayer.getUserTitle()) .setLevel(csPlayer.getLevel()) .setName(csPlayer.getName()) - .setGuildName("nb guild") //csPlayer.getGuildName() + .setGuildName(Optional.ofNullable(mapEntry).map(GuildCache::getName).orElse("")) //csPlayer.getGuildName() .setPracticeLevel(csPlayer.getPracticeLevel()) .setUid(user.getId()).setCrossTeamScore(csPlayer.getCrossYuxulundaoNewScore()) .setServerName(serverName);