From 6d9077d2982d605caa9fd38841a531f58a177c28 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Wed, 20 Jul 2022 14:41:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.lua | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 74372086e2..9d69b0fe8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -115,7 +115,7 @@ function DailyRechargePanel:OnOpen(actType) self.data = {} if self.actType == ActivityTypeDef.DailyRecharge then self.data.title = "r_mrcz_biaoti_zh" - self.data.tip = "每档限领1次" + self.data.tip = "免费领取1次" self.data.tip2 = "免费领取1次" else self.data.title = "r_yunmenghaoli" @@ -143,20 +143,25 @@ function DailyRechargePanel:OnShow() self.title.sprite = self.spLoader:LoadSprite(self.data.title) self.title:SetNativeSize() self.titleText.text = self.data.tip - local freshTime = self.actInfo.endTime - GetTimeStamp() - local update = function() - self.dealTipText.text = Language[10023]..TimeToFelaxible(freshTime) - end - update() - self.localTimer = Timer.New(function () - freshTime = freshTime - 1 - update() - if freshTime <= 0 then - self.parent:ClosePanel() + if self.actType==93 then + local freshTime = self.actInfo.endTime - GetTimeStamp() + local update = function() + self.dealTipText.text = Language[10023]..TimeToFelaxible(freshTime) end - end, 1, -1, true) - self.localTimer:Start() - -- self.dealTipText.text = self.data.tip2 + update() + self.localTimer = Timer.New(function () + freshTime = freshTime - 1 + update() + if freshTime <= 0 then + self:ClosePanel() + end + end, 1, -1, true) + self.localTimer:Start() + -- self.dealTipText.text = self.data.tip2 + else + self.dealTipText.gameObject:SetActive(false) + end + if not self.actInfo then