打工相关代码修改

script/module/absAct/HeroGrowUp.lua

@@ -42,6 +42,7 @@ DAY_TIME_SEC = 1 * 86400
 WEEK_TIME_SEC = 7 * 86400
 ACT_TIME_SEC1 = 28 * 86400
 ACT_TIME_SEC2 = 14 * 86400
+local SERVER_TIME_ZONE = 8  -- 服务器所在区服时区 北京东八区
 
 -- 任务分类
 MAINTYPE_DAY = 1 		-- 每日
@@ -140,23 +141,28 @@ function initAfterHot()
 	end
 end
 
--- 本期活动开始时间
+-- 本期活动开始时间 --@warning actID不存在
 function getActStartTime()
     --local id = AbsActLogic.getIDByActID(human, DG_ABS_ACT_ID)
+	 --[[if absActConfig.actId and absActConfig.actId ~= 0 then
+        return absActConfig.startDate,absActConfig.endDate,absActConfig.actId
+    end]]
 
     local absActConfig = AbsActExcel.absActivity[DG_ABS_ACT_ID]
-    if absActConfig.actId and absActConfig.actId ~= 0 then
-        return absActConfig.realStartTime,absActConfig.realEndTime,absActConfig.actId
-    end
+	assert(#absActConfig.turns ~= 0,"invalid config error")
+	return absActConfig.startDate,absActConfig.endDate,absActConfig.turns[1] -- @error 目前默认第一期
+	
+end
+
+local function transBeiJingTime(d)
+	return os.time(d) - SERVER_TIME_ZONE * 3600
 end
 
 -- 活动剩余时间
-function getActLeftTime()
-    local absActConfig = AbsActExcel.absActivity[DG_ABS_ACT_ID]
-    if absActConfig.actId then
-        return absActConfig.realEndTime - os.time()
-    end
-    return 0
+function getActLeftTime(dateCfg)
+	local finishTime = transBeiJingTime(dateCfg)
+	local now = os.time()
+    return finishTime > now and finishTime - now or 0
 end
 
 -- 任务周期
@@ -181,10 +187,10 @@ function getTaskStartTime(actStartTime, mainType)
 end
 
 -- 获取任务剩余时间
-function getTaskLeftTime(actStartTime, mainType)
+function getTaskLeftTime(actFinishTime, mainType)
 	local time = getTaskTime(mainType)
 	if not time then return end
-	local actLeftTime = getActLeftTime(actStartTime)
+	local actLeftTime = getActLeftTime(actFinishTime)
 	return actLeftTime % time
 end