|
|
@@ -169,8 +169,8 @@ end
|
|
|
-- 活动剩余时间
|
|
|
local function getActLeftTime(dateCfg)
|
|
|
--local finishTime = transBeiJingTime(dateCfg)
|
|
|
- --local now = os.time()
|
|
|
- return dateCfg > now and dateCfg - now or 0
|
|
|
+ local now = os.time()
|
|
|
+ return now > dateCfg and dateCfg - now or 0
|
|
|
end
|
|
|
|
|
|
-- 任务周期
|
|
|
@@ -609,8 +609,8 @@ end
|
|
|
|
|
|
-------------------------------------------- msg -------------------------------------------------------
|
|
|
-- 封装基础信息
|
|
|
-function fontBaseNet(net, human, actStartTime, lvdefine)
|
|
|
- net.leftTime = getActLeftTime(actStartTime)
|
|
|
+function fontBaseNet(net, human, actEndTime, lvdefine)
|
|
|
+ net.leftTime = getActLeftTime(actEndTime)
|
|
|
net.lv = getLv(human)
|
|
|
net.jifen = getJifen(human)
|
|
|
net.maxJifen = lvdefine.needJifen
|
|
|
@@ -656,7 +656,7 @@ function sendTaskQuery(human, mainType)
|
|
|
msgRet.endTime = actEndTime
|
|
|
msgRet.startTime = actStartTime
|
|
|
msgRet.leftTime = actEndTime - os.time()
|
|
|
- fontBaseNet(msgRet.data, human, actStartTime, lvdefine)
|
|
|
+ fontBaseNet(msgRet.data, human, actEndTime, lvdefine)
|
|
|
msgRet.data.hasTaskRed = isTaskRed(human) and 1 or 0
|
|
|
msgRet.mainType = mainType
|
|
|
msgRet.taskLeftTime = leftTime
|