From 8cc94c90510c39dfbe63acde6e037c6eb43c9aee Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Wed, 3 Apr 2024 17:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=B4=BB=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E7=99=BE=E6=8A=BD=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/NewEightActivity.java | 8 +------- .../src/main/java/com/ljsd/jieling/util/ToolsUtil.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java index 3ba12cf13..419b3b6fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewEightActivity.java @@ -27,12 +27,6 @@ public class NewEightActivity extends AbstractActivity { long createTime = user.getPlayerInfoManager().getCreateTime(); SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id); long startTime = ToolsUtil.getTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), createTime, 1, activity.getCycleMinute()); - if (activity.getTime()==1 || activity.getTime() == 6){ - return TimeUtils.getOverTimeCount(startTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1; - } - else if (activity.getTime()==2){ - return TimeUtils.getOverTimeCount(createTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1; - } - return true; + return TimeUtils.getOverTimeCount(startTime, now, 0) >= sActivityRewardConfig.getValues()[0][0] - 1; } } 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 9cef669d9..162ee2d36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java @@ -32,7 +32,7 @@ public class ToolsUtil { case ActivityType.OPEN_TYPE_TIME://绝对时间 resultTime = baseTime; break; - case ActivityType.OPEN_TYPE_ROLE: + case ActivityType.OPEN_TYPE_ROLE://创角时间 resultTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000; break; case ActivityType.OPEN_TYPE_SERVER://开服时间