diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index fd542e6d1..f9a71bfa0 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1621,6 +1621,23 @@ public class TimeUtils { // 结果 return nowTime - startTime >= weekTime; } + + /** + * 距离第一时间第几周 + * 指定时间距离指定时间周末为一周 + * @param before + * @param after + * @return + */ + public static long AfterTimeByWeek(long before, long after) { + // 开始时间 + long startTime = getCurWeekdayByTime(1, 0, before); + // 当前时间 + long nowTime = getCurWeekdayByTime(1, 0, after); + // 结果 + return ((nowTime - startTime)/WEEK)+1; + } + /** * @return */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java index 5eee6ca24..3a9498722 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java @@ -49,24 +49,18 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler> suiteMap; public static Map config; @@ -52,5 +54,7 @@ public class SEquipSuiteConfig implements BaseConfig { return suiteValue; } - + public int[][] getSuiteSkill() { + return suiteSkill; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SMServerArenaSetting.java b/tablemanager/src/main/java/config/SMServerArenaSetting.java index 72705738c..d0f8ea940 100644 --- a/tablemanager/src/main/java/config/SMServerArenaSetting.java +++ b/tablemanager/src/main/java/config/SMServerArenaSetting.java @@ -46,6 +46,10 @@ public class SMServerArenaSetting implements BaseConfig { private int[] privId; private int treasureOpen; + + private int[] scoreRange; + + private int basicScore; @Override public void init() throws Exception { @@ -132,4 +136,12 @@ public class SMServerArenaSetting implements BaseConfig { public int getTreasureOpen() { return treasureOpen; } + + public int[] getScoreRange() { + return scoreRange; + } + + public int getBasicScore() { + return basicScore; + } } \ No newline at end of file