diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 44ebcc624..8e9fc44ad 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1732,6 +1732,14 @@ public class TimeUtils { return (Integer.MAX_VALUE - nowInt()) / Math.pow(10, 9); } + /** + * 返回Integer最大值-now()之后变成小于一的小数; + * + * @return + */ + public static long getNanoTime() { + return Long.MAX_VALUE - System.nanoTime(); + } /** * 返回两个事件中间过了几个hour时 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossRank.java index eb11b2187..7ad2e2ae1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossRank.java @@ -20,12 +20,13 @@ public class CrossRank extends AbstractRank { @Override public long[] getDataByScore(Double score) { - return new long[]{score.intValue()}; + return new long[]{score.longValue()}; } @Override public double getScore(double... data) { - return data[0]+ TimeUtils.getDoubleTime(); + String str = (long)data[0] + "." + TimeUtils.getNanoTime(); + return Double.parseDouble(str); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java index 77a2794bd..adad0f52b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildForceRank.java @@ -30,11 +30,6 @@ public class GuildForceRank extends AbstractRank { @Override public double getScore(double... data) { -// Double zSetScore = RedisUtil.getInstence().getZSetScore(redisKey, "", Integer.toString((int) data[0])); -// if (zSetScore <= 0) { -// return 1800; -// } -// return zSetScore; return data[0]; }