From aad7541dbd0317e0729b899351771eaba811aa19 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sun, 24 Apr 2022 21:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=91=E6=88=98=E5=89=AF=E6=9C=AC=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua | 2 +- .../Popup/View/GeneralPopup_BuyShanHeSheJiTuGetRewardTimes.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 907e84c7a7..982a4dd41f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -223,7 +223,7 @@ function CarbonsPanel:TipShow(_go,_value) self.timeList[_value.id].Text = "剩余时间:" self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - 300 elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL then--无尽副本\森罗幻境 - time:SetActive(true) + time:SetActive(false) self.timeList[_value.id] = {} self.timeList[_value.id].TextObj = timeText self.timeList[_value.id].Text = "剩余时间:" diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyShanHeSheJiTuGetRewardTimes.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyShanHeSheJiTuGetRewardTimes.lua index 5746c3fb0a..bc517fb0bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyShanHeSheJiTuGetRewardTimes.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyShanHeSheJiTuGetRewardTimes.lua @@ -63,6 +63,7 @@ function this:RemoveListener() end function this:OnShow(_parent,...) + parent=_parent local _args = {...} -- 计算可获得的数量 local starNum = FightLevelManager.GetAllChapterStars()