diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java index e74118c23..490181735 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.logic.ridingSward; import com.google.gson.reflect.TypeToken; +import com.ljsd.GameApplication; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; @@ -231,8 +232,16 @@ public class RidingSwardLogic{ if (startTime == 0 || endTime == 0) { // 初始化活动数据 SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(proto.getActivityId()); - startTime = (int) (TimeUtils.stringToTimeLong(activity.getStartTime(), "yyyyMMdd HHmmss")/1000); - endTime = (int) (TimeUtils.stringToTimeLong(activity.getEndtime(), "yyyyMMdd HHmmss")/1000); + if(activity.getTime()==ActivityType.OPEN_TYPE_SERVER){ + String openTime = GameApplication.serverConfig.getOpenTime(); + long timeStamp2 = TimeUtils.stringToTimeLong2(openTime); + startTime = (int)(timeStamp2/1000)+Integer.parseInt(activity.getStartTime()); + endTime = (int)(timeStamp2/1000)+Integer.parseInt(activity.getEndtime()); + } + if(activity.getTime()==ActivityType.OPEN_TYPE_TIME){ + startTime = (int) (TimeUtils.stringToTimeLong(activity.getStartTime(), "yyyyMMdd HHmmss")/1000); + endTime = (int) (TimeUtils.stringToTimeLong(activity.getEndtime(), "yyyyMMdd HHmmss")/1000); + } // 定时器启动 getInstance().createExecuteScript(); }