Merge branch 'master_test' into master_test_gn
commit
eb11dd82d1
|
@ -27,10 +27,6 @@ public class CarDealyGuildRank extends AbstractRank{
|
|||
|
||||
@Override
|
||||
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();
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -22,15 +22,6 @@ public class DeathPathEveryGuildRank extends AbstractRank {
|
|||
|
||||
protected void getOptional(int index, ZSetOperations.TypedTuple<String> 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);
|
||||
}
|
||||
|
||||
|
|
|
@ -40,10 +40,6 @@ public class DeathPathTotalGuildRank extends AbstractRank{
|
|||
}
|
||||
|
||||
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()));
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue