diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index aa82f4a0dd..330ac020e2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -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: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index 3d2871371c..22200acf35 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -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 --- 获取刷新剩余时间