From 423bb145c55424fe95dc1511d600ce000a3932cb Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Fri, 16 Apr 2021 17:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E7=9A=AE=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/player/ActiveUserMountHandler.java | 2 +- .../handler/player/ActiveUserTitleHandler.java | 2 +- .../logic/rank/rankImpl/CarDealyGuildRank.java | 10 +++++++++- .../logic/rank/rankImpl/CarDealyRank.java | 4 ++++ .../rank/rankImpl/DeathPathEveryGuildRank.java | 16 +++++++++++++++- .../rank/rankImpl/DeathPathTotalGuildRank.java | 13 +++++++++++-- .../logic/rank/rankImpl/GuildSheJiScoreRank.java | 6 +++++- 7 files changed, 46 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ActiveUserMountHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ActiveUserMountHandler.java index 2b71cfe5c..315fc7b2a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ActiveUserMountHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/player/ActiveUserMountHandler.java @@ -35,7 +35,7 @@ public class ActiveUserMountHandler extends BaseHandler data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - + User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); + if (everyUser == null){ + return; + } String value = data.getValue(); int guildId = Integer.parseInt(value); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); @@ -42,6 +46,10 @@ public class CarDealyGuildRank extends AbstractRank{ CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder() .setGuildName(familyName) .setRankInfo(everyRankInfo) + .setSex(everyUser.getPlayerInfoManager().getSex()) + .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) + .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) + .setUserMount(everyUser.getPlayerInfoManager().getUserMount()) .build(); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java index 614aa7909..33430d422 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java @@ -34,6 +34,10 @@ public class CarDealyRank extends AbstractRank{ CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder() .setUserName(everyUser.getPlayerInfoManager().getNickName()) .setRankInfo(everyRankInfo) + .setSex(everyUser.getPlayerInfoManager().getSex()) + .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) + .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) + .setUserMount(everyUser.getPlayerInfoManager().getUserMount()) .build(); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java index 2d2827555..d162341f0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.dao.GuilidManager; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; import rpc.protocols.CommonProto; @@ -21,6 +22,15 @@ public class DeathPathEveryGuildRank extends AbstractRank { protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); + User everyUser = null; + try{ + everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); + if (everyUser == null){ + return; + } + }catch(Exception e){ + e.printStackTrace(); + } CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) .setParam1(getParam1(data.getScore())) @@ -29,7 +39,11 @@ public class DeathPathEveryGuildRank extends AbstractRank { CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo); + .setRankInfo(everyRankInfo) + .setSex(everyUser.getPlayerInfoManager().getSex()) + .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) + .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) + .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java index 3e0e56b89..3b0890cab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java @@ -3,6 +3,7 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.dao.GuilidManager; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.family.DeathChallengeCount; @@ -39,7 +40,11 @@ public class DeathPathTotalGuildRank extends AbstractRank{ } protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); + User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); + if (everyUser == null){ + return; + } + GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); DeathChallengeCount countInfo = RedisUtil.getInstence().get(RedisKey.DEATH_PATH_TOTAL_CHALLENGE_COUNT, String.valueOf(guildInfo.getId()), DeathChallengeCount.class); CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) @@ -49,7 +54,11 @@ public class DeathPathTotalGuildRank extends AbstractRank{ CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo); + .setRankInfo(everyRankInfo) + .setSex(everyUser.getPlayerInfoManager().getSex()) + .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) + .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) + .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java index b4e80dfea..a85d738ea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java @@ -46,7 +46,11 @@ public class GuildSheJiScoreRank extends AbstractRank { .setUid(user.getId()) .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo); + .setRankInfo(everyRankInfo) + .setSex(user.getPlayerInfoManager().getSex()) + .setUserSkin(user.getPlayerInfoManager().getUserSkin()) + .setUserTitle(user.getPlayerInfoManager().getUserTitle()) + .setUserMount(user.getPlayerInfoManager().getUserMount()); builder.addRanks(everyRank); }