From 69da7e98caa7184b5654fd1535e69dc5da007936 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 11 Jul 2019 11:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=82=BC=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- .../ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java | 5 +++-- .../src/main/java/com/ljsd/jieling/util/TowerRankUtil.java | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 12432c323..b668ca54d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2451,7 +2451,7 @@ public class MapLogic { // return; // } User user = UserManager.getUser(session.getUid()); - Set> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.TOWER_RANK, "", 1, 100); + Set> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.TOWER_RANK, "", 0, 99); Iterator> iterator = zsetreverseRangeWithScores.iterator(); MapInfoProto.TowerRankResponse.Builder response = MapInfoProto.TowerRankResponse.newBuilder(); if(!iterator.hasNext()){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java index 85295dce2..6a19a9e4b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java @@ -11,6 +11,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.protocols.MapInfoProto; import com.ljsd.jieling.util.TimeUtils; +import com.ljsd.jieling.util.TowerRankUtil; import org.springframework.stereotype.Component; @Component @@ -41,9 +42,9 @@ public class FourtyTwoBehavior extends BaseBehavior { if(mapManager.getTower()>mapManager.getHighestTower()){ mapManager.setHighestTower(mapManager.getTower()); Double zSetScore = RedisUtil.getInstence().getZSetScore(RedisKey.TOWER_RANK, "", String.valueOf(user.getId())); - if(mapManager.getTower()*3601+3600-(int)(time/1000)>zSetScore){ + if(TowerRankUtil.getRankNumber(mapManager.getTower(),(int)time/1000)>zSetScore){ String key = RedisKey.getKey(RedisKey.TOWER_RANK,"",false); - RedisUtil.getInstence().zsetAddOne(key,String.valueOf(user.getId()),mapManager.getTower()*3601+3600-(int)(time/1000)); + RedisUtil.getInstence().zsetAddOne(key,String.valueOf(user.getId()),TowerRankUtil.getRankNumber(mapManager.getTower(),(int)time/1000)); } } user.getUserMissionManager().onGameEvent(user, GameEvent.COPY_TOWER_LEVEL, mapManager.getTower()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/TowerRankUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/TowerRankUtil.java index e7330a04e..af6ee2f43 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/TowerRankUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/TowerRankUtil.java @@ -8,4 +8,9 @@ public class TowerRankUtil { array[1] =3600-data%3601; return array; } + public static int getRankNumber(int tower,int time){ + + return time>3600?tower*3601:tower*3601+3600-time; + + } }