From 59a2dfa11a24a7c24bc77a6a9a77e0c28dcf2a2f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 20 Apr 2021 10:25:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=B1=BB=E5=9E=8B=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/rank/rankImpl/CarDealyGuildRank.java | 8 -------- .../rank/rankImpl/DeathPathEveryGuildRank.java | 15 +-------------- .../rank/rankImpl/DeathPathTotalGuildRank.java | 10 +--------- .../logic/rank/rankImpl/GuildSheJiScoreRank.java | 6 +----- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java index 206cf0309..ddd65640b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java @@ -27,10 +27,6 @@ public class CarDealyGuildRank extends AbstractRank{ @Override protected void getOptional(int index, ZSetOperations.TypedTuple 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); @@ -46,10 +42,6 @@ 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/DeathPathEveryGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java index d162341f0..949cbff9d 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 @@ -22,15 +22,6 @@ 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())) @@ -39,11 +30,7 @@ public class DeathPathEveryGuildRank extends AbstractRank { CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); 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 3b0890cab..aca685928 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 @@ -40,10 +40,6 @@ public class DeathPathTotalGuildRank extends AbstractRank{ } protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - 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() @@ -54,11 +50,7 @@ public class DeathPathTotalGuildRank extends AbstractRank{ CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); 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 a85d738ea..b4e80dfea 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,11 +46,7 @@ public class GuildSheJiScoreRank extends AbstractRank { .setUid(user.getId()) .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(user.getPlayerInfoManager().getSex()) - .setUserSkin(user.getPlayerInfoManager().getUserSkin()) - .setUserTitle(user.getPlayerInfoManager().getUserTitle()) - .setUserMount(user.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); }