diff --git a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua index 4cbe4c2ed8..a3c4048bf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua @@ -85,7 +85,6 @@ local curServerDay--1 3 5 7 10 15 -- local curServerIndex--1 2 3 4 5 6 --界面打开时调用(用于子类重写) function JourneyWithWindPanel:OnOpen(_curDayIndex) - allBtnsConFigData = ActivityGiftManager.GetJourneyWithWindAllDayConFigData() curServerDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - PlayerManager.userCreateTime)/86400) local curDay = 1 @@ -471,12 +470,14 @@ function this.ShowDayDataGiftBag() end end --活动到期自动关闭 -function this.AutoClose() - if this.timer then - this.timer:Stop() - this.timer = nil +function this.AutoClose(data) + if data.type == ActivityTypeDef.JourneyWithWind and data.status == 0 then + if this.timer then + this.timer:Stop() + this.timer = nil + end + this:ClosePanel() end - self:ClosePanel() end --界面关闭时调用(用于子类重写)