Merge branch 'china/dev-c' into china/dev

dev_chengFeng
gaoxin 2021-04-29 21:28:31 +08:00
commit dbbf02f48d
1 changed files with 10 additions and 7 deletions

View File

@ -734,13 +734,16 @@ function this.CountShopRefreshLeftTime(shopId)
-- return lastTime < 0 and 0 or lastTime -- return lastTime < 0 and 0 or lastTime
--- 按时间长度刷新 --- 按时间长度刷新
elseif shopInfo.RefreshType[1] == 3 then elseif shopInfo.RefreshType[1] == 3 then
local shopData = this.GetShopDataByType(shopType) local shopData = this.GetShopDataByType(shopType)
-- local lastRefreshTime = shopData.lastRefreshTime / 1000 if shopType == 12 then
-- local deltaSeconds = shopInfo.RefreshType[2] * 60 * 60 local lastRefreshTime = shopData.lastRefreshTime / 1000
-- local lastTime = lastRefreshTime + deltaSeconds - GetTimeStamp() local deltaSeconds = shopInfo.RefreshType[2] * 60 * 60
-- return lastTime < 0 and 0 or lastTime local lastTime = lastRefreshTime + deltaSeconds - GetTimeStamp()
-- LogPink("shopData.endTime:"..tostring(shopData.endTime)) return lastTime < 0 and 0 or lastTime
return shopData.endTime/1000 - GetTimeStamp() else
return shopData.endTime/1000 - GetTimeStamp()
end
end end
end end
--- 获取刷新剩余时间 --- 获取刷新剩余时间