Merge branch 'master_test_gn_arena' into master_test_gn
commit
6957ef336f
|
@ -298,7 +298,7 @@ public abstract class AbstractRank implements IRank {
|
||||||
allUserResponse.setMyRankInfo(towerRankInfo);
|
allUserResponse.setMyRankInfo(towerRankInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void getCrossMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){
|
public void getCrossMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){
|
||||||
int myRank= RedisUtil.getInstence().getZSetreverseRank(getCrossRedisKey(),rkey,Integer.toString(user.getId()),false).intValue();
|
int myRank= RedisUtil.getInstence().getZSetreverseRank(getCrossRedisKey(),rkey,Integer.toString(user.getId()),false).intValue();
|
||||||
Double zSetScore = RedisUtil.getInstence().getZSetScore(getCrossRedisKey(), rkey, Integer.toString(user.getId()),false);
|
Double zSetScore = RedisUtil.getInstence().getZSetScore(getCrossRedisKey(), rkey, Integer.toString(user.getId()),false);
|
||||||
CommonProto.RankInfo towerRankInfo = CommonProto.RankInfo.newBuilder()
|
CommonProto.RankInfo towerRankInfo = CommonProto.RankInfo.newBuilder()
|
||||||
|
|
|
@ -87,4 +87,20 @@ public class CrossGuildForceRank extends GuildForceRank {
|
||||||
builder = getCrossOneUserRank(query,mapEntry.getName(),everyRankInfo);
|
builder = getCrossOneUserRank(query,mapEntry.getName(),everyRankInfo);
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void getCrossMyInfo(User user,String rkey,PlayerInfoProto.RankResponse.Builder allUserResponse){
|
||||||
|
int guildId = user.getPlayerInfoManager().getGuildId();
|
||||||
|
if (guildId == 0){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
int myRank= RedisUtil.getInstence().getZSetreverseRank(getCrossRedisKey(),rkey,Integer.toString(guildId),false).intValue();
|
||||||
|
Double zSetScore = RedisUtil.getInstence().getZSetScore(getCrossRedisKey(), rkey, Integer.toString(guildId),false);
|
||||||
|
CommonProto.RankInfo towerRankInfo = CommonProto.RankInfo.newBuilder()
|
||||||
|
.setRank(myRank)
|
||||||
|
.setParam1(getParam1(zSetScore))
|
||||||
|
.setParam2(getParam2(zSetScore)).build();
|
||||||
|
allUserResponse.setMyRankInfo(towerRankInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue