Merge branch 'master_test' into master_test_gn

back_recharge
lvxinran 2021-04-20 10:26:04 +08:00
commit eb11dd82d1
4 changed files with 3 additions and 36 deletions

View File

@ -27,10 +27,6 @@ public class CarDealyGuildRank extends AbstractRank{
@Override @Override
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true);
if (everyUser == null){
return;
}
String value = data.getValue(); String value = data.getValue();
int guildId = Integer.parseInt(value); int guildId = Integer.parseInt(value);
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);
@ -46,10 +42,6 @@ public class CarDealyGuildRank extends AbstractRank{
CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder() CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder()
.setGuildName(familyName) .setGuildName(familyName)
.setRankInfo(everyRankInfo) .setRankInfo(everyRankInfo)
.setSex(everyUser.getPlayerInfoManager().getSex())
.setUserSkin(everyUser.getPlayerInfoManager().getUserSkin())
.setUserTitle(everyUser.getPlayerInfoManager().getUserTitle())
.setUserMount(everyUser.getPlayerInfoManager().getUserMount())
.build(); .build();
builder.addRanks(everyRank); builder.addRanks(everyRank);
} }

View File

@ -22,15 +22,6 @@ public class DeathPathEveryGuildRank extends AbstractRank {
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) { protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) {
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); 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() CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
.setRank(index) .setRank(index)
.setParam1(getParam1(data.getScore())) .setParam1(getParam1(data.getScore()))
@ -39,11 +30,7 @@ public class DeathPathEveryGuildRank extends AbstractRank {
CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder()
.setUid(guildInfo.getId()) .setUid(guildInfo.getId())
.setGuildName(guildInfo.getName()) .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); builder.addRanks(everyRank);
} }

View File

@ -40,10 +40,6 @@ public class DeathPathTotalGuildRank extends AbstractRank{
} }
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { protected void getOptional(int index, ZSetOperations.TypedTuple<String> 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())); 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); DeathChallengeCount countInfo = RedisUtil.getInstence().get(RedisKey.DEATH_PATH_TOTAL_CHALLENGE_COUNT, String.valueOf(guildInfo.getId()), DeathChallengeCount.class);
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
@ -54,11 +50,7 @@ public class DeathPathTotalGuildRank extends AbstractRank{
CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder()
.setUid(guildInfo.getId()) .setUid(guildInfo.getId())
.setGuildName(guildInfo.getName()) .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); builder.addRanks(everyRank);
} }

View File

@ -46,11 +46,7 @@ public class GuildSheJiScoreRank extends AbstractRank {
.setUid(user.getId()) .setUid(user.getId())
.setLevel(user.getPlayerInfoManager().getLevel()) .setLevel(user.getPlayerInfoManager().getLevel())
.setGuildName(guildInfo.getName()) .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); builder.addRanks(everyRank);
} }