Merge branch 'master_test_gn' into master_prb_gn
commit
c542ac0f86
|
@ -43,12 +43,13 @@ public class CrossArenaRank extends AbstractRank {
|
||||||
return data[0];
|
return data[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void removeOneRankByPiece(String rkey,String value){
|
public void removeOneRankByPiece(String rkey,String value){
|
||||||
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(redisKey,rkey),value);
|
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(redisKey,rkey),value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
protected void getCrossOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
||||||
if(Integer.parseInt(data.getValue())<1000){
|
if(Integer.parseInt(data.getValue())<1000){
|
||||||
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
||||||
.setRank(index)
|
.setRank(index)
|
||||||
|
@ -93,22 +94,6 @@ public class CrossArenaRank extends AbstractRank {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void getMyInfo(User user, String rkey, PlayerInfoProto.RankResponse.Builder allUserResponse){
|
|
||||||
int myRank= RedisUtil.getInstence().getZSetreverseRank(redisKey,rkey,Integer.toString(user.getId())).intValue();
|
|
||||||
Double zSetScore = RedisUtil.getInstence().getZSetScore(redisKey, rkey, Integer.toString(user.getId()));
|
|
||||||
try {
|
|
||||||
ArenaOfUser query = CrossServiceLogic.getInstance().query(user.getId());
|
|
||||||
CommonProto.RankInfo towerRankInfo = CommonProto.RankInfo.newBuilder()
|
|
||||||
.setRank(myRank)
|
|
||||||
.setParam1(query.getHeroManager().getTotalForce())
|
|
||||||
.setParam2(getParam2(zSetScore)).build();
|
|
||||||
allUserResponse.setMyRankInfo(towerRankInfo);
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception {
|
public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception {
|
||||||
if(rankEndLine==-1){
|
if(rankEndLine==-1){
|
||||||
|
|
Loading…
Reference in New Issue