From 5163eab96387ef9b43e1f7122ae81c55660798d0 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 7 Jul 2021 11:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=A5=E7=BC=88=E4=B9=8B=E6=97=85?= =?UTF-8?q?=E3=80=91=E5=81=9C=E5=9C=A8=E6=B4=BB=E5=8A=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=93=8D=E4=BD=9C=E6=B4=BB=E5=8A=A8=E5=86=85?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E7=B4=A7=E6=80=A5=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JourneyWithWind/JourneyWithWindPanel.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 --界面关闭时调用(用于子类重写)