diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 6bed8198f..dad8633be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -735,9 +735,10 @@ public class MissionLoigc { break; case FINISH_MISSING_ROOM: if(missionSubType[0] == 0){ - cumulationData.finishMissionTimes.values().stream().collect(Collectors.summarizingInt(x->x)); + count = (int)(cumulationData.finishMissionTimes.values().stream().collect(Collectors.summarizingInt(x->x)).getSum()); + }else{ + count = cumulationData.finishMissionTimes.get(missionSubType[0]); } - count = cumulationData.finishMissionTimes.get(missionSubType[0]); break; case REFRESH_MISSING_ROOM: count = cumulationData.refreshMrTimes; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java index 56151edcf..56b0e5b8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java @@ -1,7 +1,9 @@ package com.ljsd.jieling.logic.rank.rankImpl; +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.protocols.CommonProto; import com.ljsd.jieling.protocols.PlayerInfoProto; import org.springframework.data.redis.core.ZSetOperations; @@ -13,36 +15,6 @@ public class CarDealyGuildRank extends AbstractRank{ super(type, redisKey); } - - @Override - protected PlayerInfoProto.RankResponse.Builder getAllUserResponse(Set> zsetreverseRangeWithScores, int start) throws Exception { -// PlayerInfoProto.RankResponse.Builder allUserResponse = super.getAllUserResponse(zsetreverseRangeWithScores, start); -// List ranksBuilderList = allUserResponse.getRanksList(); -// if(ranksBuilderList.size()<2){ -// return allUserResponse; -// } -// List builders = new ArrayList<>(ranksBuilderList); -// Collections.sort(builders,(o1, o2) -> { -// if(o1.getRankInfo().getParam1()==o2.getRankInfo().getParam1()){ -// if(o1.getForce()>o2.getForce() &&o1.getRankInfo().getRank()>o2.getRankInfo().getRank()){ -// CommonProto.UserRank rankInfo1 = o1 ; -// o1 = o2; -// o2 = rankInfo1; -// } -// } -// return o1.getRankInfo().getRank()-o2.getRankInfo().getRank(); -// }); -// List buildersCopy = new ArrayList<>(ranksBuilderList.size()); -// for(CommonProto.UserRank userRank : builders){ -// buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(start).build()).build()); -// start++; -// } -// PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder(); -// response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy); -// return response; - return super.getAllUserResponse(zsetreverseRangeWithScores,start); - } - @Override public int[] getDataByScore(Double score) { return new int[]{(int) (score.longValue()/1000),(int) (score.longValue()%1000)}; @@ -72,4 +44,17 @@ public class CarDealyGuildRank extends AbstractRank{ .build(); builder.addRanks(everyRank); } + + + @Override + protected void getMyInfo(User user, String rkey, PlayerInfoProto.RankResponse.Builder allUserResponse) { + int guildId = user.getPlayerInfoManager().getGuildId(); + int myRank= RedisUtil.getInstence().getZSetreverseRank(redisKey,rkey,Integer.toString(guildId)).intValue(); + Double zSetScore = RedisUtil.getInstence().getZSetScore(redisKey, rkey, Integer.toString(guildId)); + CommonProto.RankInfo towerRankInfo = CommonProto.RankInfo.newBuilder() + .setRank(myRank) + .setParam1(getParam1(zSetScore)) + .setParam2(getParam2(zSetScore)).build(); + allUserResponse.setMyRankInfo(towerRankInfo); + } }