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

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