From 60f3397865a1253d85e99ae242757725be098762 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 7 Nov 2022 14:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=8D=E5=86=B2=E6=A6=9C=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenServerCompeteRankActivity.java | 2 +- .../java/com/ljsd/jieling/util/ToolsUtil.java | 48 +++++++++++-------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java index 67e5337ef..9ea43de3b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/OpenServerCompeteRankActivity.java @@ -91,7 +91,7 @@ public class OpenServerCompeteRankActivity extends AbstractActivity { return 0; } long endTime = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),0, 2); - return endTime + info.getCloseTime() * 1000L; + return endTime + info.getCloseTime() * 1000L - TimeUtils.now(); } /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java index d74b3e645..4c20a4387 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java @@ -6,34 +6,40 @@ import util.TimeUtils; public class ToolsUtil { - public static long getTimeLong(long startTimeLong , long endTimeLong,int time,long createUserTime,int type){ + public static long getTimeLong(long startTimeLong, long endTimeLong, int time, long createUserTime, int type){ long baseTime = startTimeLong; if(type == 2){ baseTime = endTimeLong; } long startTime=0; - if(time == ActivityType.OPEN_TYPE_TIME ){ - startTime = baseTime; - }else if(time == ActivityType.OPEN_TYPE_SERVER){ - long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime(); - startTime = serverOpenTime + baseTime*1000; - }else if(time == ActivityType.OPEN_TYPE_ROLE){ - startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000; - }else if(time == ActivityType.OPEN_TYPE_MONTHS){ - if(type == 1){ - if(baseTime ==1){ - //第一个月 - startTime = GameApplication.serverConfig.getCacheOpenTime(); - }else{ - startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime-1); + switch (time){ + case ActivityType.OPEN_TYPE_TIME: + startTime = baseTime; + break; + case ActivityType.OPEN_TYPE_ROLE: + startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000; + break; + case ActivityType.OPEN_TYPE_SERVER: + long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime(); + startTime = serverOpenTime + baseTime*1000; + break; + case ActivityType.OPEN_TYPE_MONTHS: + if(type == 1){ + if(baseTime == 1){//第一个月 + startTime = GameApplication.serverConfig.getCacheOpenTime(); + }else{ + startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime-1); + } } - }else if(type ==2){ - if(baseTime ==1){ - startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime()); - }else{ - startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime); + if(type == 2){ + if(baseTime ==1){ + startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime()); + }else{ + startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime); + } } - } + break; + default:break; } return startTime; }