From 64105348b452229951ffbb85a616a6f1f09c6a9f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Wed, 12 Jul 2023 16:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=92=E9=BE=99=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 ------- .../java/com/ljsd/jieling/logic/activity/ActivityType.java | 1 - .../src/main/java/com/ljsd/jieling/util/ToolsUtil.java | 4 ---- 3 files changed, 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 6c5c30cb3..f96ae7b40 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -177,13 +177,6 @@ public class ActivityLogic implements IEventHandler{ if(sGlobalActivity.getType() == ActivityType.DAILY_PREFERENTIAL_GIFT){ continue; } - if(sGlobalActivity.getType() == ActivityType.OPEN_TYPE_LONG &&!openActivityIds.contains(sGlobalActivity.getId())){ - openActivityIds.add(sGlobalActivity.getId()); - LOGGER.info("永久开活动-新青龙秘宝"); - continue; - } - - long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1); long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2); if (now < startTime) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 14b9ffa71..c8f3b33aa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -13,7 +13,6 @@ public interface ActivityType { int OPEN_TYPE_SERVER = 3; // 活动开启类型:开服时间 int OPEN_TYPE_MONTHS = 5 ; // 活动开启类型:开服自然月 - int OPEN_TYPE_LONG = 6; // 活动开启类型:一直开启 int WILL_TAKE = 0; //未领取 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 e07af0bd5..4ccd64fc3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java @@ -39,10 +39,6 @@ public class ToolsUtil { } } break; - case ActivityType.OPEN_TYPE_LONG: - startTime = -1; - break; - default:break; } return startTime; }