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 ae3908995..3c31da58e 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 @@ -4,6 +4,7 @@ import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.DeathPathLogic; import org.springframework.data.redis.core.ZSetOperations; import rpc.protocols.CommonProto; import rpc.protocols.PlayerInfoProto; @@ -62,4 +63,13 @@ public class DeathPathEveryGuildRank extends CrossGuildForceRank { .setParam2(getParam2(zSetScore)).build(); allUserResponse.setMyRankInfo(towerRankInfo); } + + @Override + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + if (DeathPathLogic.getInstance().getGroupId() > 0){ + return super.getCrossRank(uid,rkey,page,rankEndLine); + }else { + return getRank(uid,rkey,page,rankEndLine); + } + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java index aaaba5ad2..0b1813719 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryPersonRank.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.logic.family.DeathPathLogic; +import rpc.protocols.PlayerInfoProto; /** * @author lvxinran @@ -27,4 +29,13 @@ public class DeathPathEveryPersonRank extends AbstractRank { public void addRank(int uid,String rkey,double... data){ RedisUtil.getInstence().incrementZsetScore(redisKey,rkey,String.valueOf(uid), Double.valueOf(getScore(data)).intValue()); } + + @Override + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + if (DeathPathLogic.getInstance().getGroupId() > 0){ + return super.getCrossRank(uid,rkey,page,rankEndLine); + }else { + return super.getRank(uid,rkey,page,rankEndLine); + } + } } 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 132488821..eb4856034 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 @@ -114,4 +114,13 @@ public class DeathPathTotalGuildRank extends CrossGuildForceRank{ public void addRank(int uid, String rkey, double... data) { RedisUtil.getInstence().incrementZsetScore(redisKey,rkey,String.valueOf(uid), getScore(data)); } + + @Override + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + if (DeathPathLogic.getInstance().getGroupId() > 0){ + return super.getCrossRank(uid,rkey,page,rankEndLine); + }else { + return super.getRank(uid,rkey,page,rankEndLine); + } + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java index 88fc4d33a..4dd18c538 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalPersonRank.java @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.rank.rankImpl; import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.logic.family.DeathPathLogic; +import rpc.protocols.PlayerInfoProto; /** * @author lvxinran @@ -27,4 +29,13 @@ public class DeathPathTotalPersonRank extends AbstractRank { public void addRank(int uid, String rkey, double... data) { RedisUtil.getInstence().incrementZsetScore(redisKey,rkey,String.valueOf(uid), getScore(data)); } + + @Override + public PlayerInfoProto.RankResponse getCrossRank(int uid, String rkey, int page, int rankEndLine) throws Exception { + if (DeathPathLogic.getInstance().getGroupId() > 0){ + return super.getCrossRank(uid,rkey,page,rankEndLine); + }else { + return super.getRank(uid,rkey,page,rankEndLine); + } + } }