From e39df9d30b7236d50deb2fe5c71962f719234b16 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 30 Jul 2021 19:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=B7=A5=E4=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java | 4 +++- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- .../java/com/ljsd/jieling/logic/rank/CrossRankManager.java | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java index 047a60e01..3c564cfd3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/gm/ArenaOfPlayerManager.java @@ -25,12 +25,13 @@ public class ArenaOfPlayerManager { private int maxFore; - public ArenaOfPlayerManager(int uId, int level, String name, int head, int headFrame, String guildName, int userTitle, int userMount, int practiceLevel, int serverId, String serverName,int gender,int skin) { + public ArenaOfPlayerManager(int uId, int level, String name, int head, int headFrame, int guildId, String guildName, int userTitle, int userMount, int practiceLevel, int serverId, String serverName, int gender, int skin, int maxFore) { this.uId = uId; this.level = level; this.name = name; this.head = head; this.headFrame = headFrame; + this.guildId = guildId; this.guildName = guildName; this.userTitle = userTitle; this.userMount = userMount; @@ -39,6 +40,7 @@ public class ArenaOfPlayerManager { this.serverName = serverName; this.gender = gender; this.skin = skin; + this.maxFore = maxFore; } public ArenaOfPlayerManager() { 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 3b19af6a3..b9d4101c3 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 @@ -656,7 +656,7 @@ public class PlayerLogic { } //获取跨服玩家信息 - public PlayerInfoProto.GetPlayerOneTeamInfoResponse getCrossOneTeamInfo( int id,int teamId) throws Exception { + public PlayerInfoProto.GetPlayerOneTeamInfoResponse getCrossOneTeamInfo(int id,int teamId) throws Exception { ArenaOfUser query = CrossServiceLogic.getInstance().query(id); if(query==null){ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java index be855a18f..3796716ab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java @@ -62,10 +62,16 @@ public class CrossRankManager { if(crossGroup != -1){ AbstractRank rank = RankContext.getRankEnum(type); String key = RedisUtil.getInstence().getKey(rank.getCrossRedisKey(),"",false); + Map cacheMap = RedisUtil.getInstence().getMapValues(RedisKey.FAMILY_INFO, "", Integer.class, GuildCache.class); Set> range = RedisUtil.getInstence().getZsetreverseRangeWithScores(rank.getRedisKey(), "", 0, 100, true); for (ZSetOperations.TypedTuple tuple : range) { if (tuple.getValue().length() == 8){ rank.crossUserCache(Integer.parseInt(tuple.getValue())); + }else { + GuildCache cache = cacheMap.get(Integer.valueOf(tuple.getValue())); + if (cache != null){ + rank.crossUserCache(cache.getLeaderUId()); + } } RedisUtil.getInstence().zsetAddOne(key,tuple.getValue(),tuple.getScore()); }