Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-04-27 20:26:15 +08:00
commit 923034957e
2 changed files with 7 additions and 5 deletions

View File

@ -5218,7 +5218,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -735,10 +735,12 @@ 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
-- 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()
end
end
--- 获取刷新剩余时间