From b9beea2c4598634c6318d88a0f58a13cf454c393 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 4 Sep 2023 17:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fourteen_day/fourteen_day_bounty_ui.lua | 4 ++-- .../fourteen_day/fourteen_day_entrance_ui.lua | 16 ++++++++-------- .../fourteen_day/fourteen_day_exchange_ui.lua | 4 ++-- .../fourteen_day/fourteen_day_gift_ui.lua | 4 ++-- .../fourteen_day/fourteen_day_task_ui.lua | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua index 9aea69b7..7d77a063 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_bounty_ui.lua @@ -86,9 +86,9 @@ function FourteenDayBountyUI:refreshCountdown() self:closeUI() return end - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(time)) + self.txCountdown:setText(Time:formatNumTimeStr(time)) end, 1) - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FourteenDayData:getEndRemainTime())) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) end -- 刷新购买 diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua index 6caea960..4e7004f3 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua @@ -105,16 +105,16 @@ function FourteenDayEntranceUI:onRefresh() self:closeUI() return end - self.txBountyCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txTaskCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txExchangeCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txGiftCountdown:setText(GFunc.getTimeStrWithHMS2(time)) + self.txBountyCountdown:setText(Time:formatNumTimeStr(time)) + self.txTaskCountdown:setText(Time:formatNumTimeStr(time)) + self.txExchangeCountdown:setText(Time:formatNumTimeStr(time)) + self.txGiftCountdown:setText(Time:formatNumTimeStr(time)) end, 1) local time = DataManager.FourteenDayData:getEndRemainTime() - self.txBountyCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txTaskCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txExchangeCountdown:setText(GFunc.getTimeStrWithHMS2(time)) - self.txGiftCountdown:setText(GFunc.getTimeStrWithHMS2(time)) + self.txBountyCountdown:setText(Time:formatNumTimeStr(time)) + self.txTaskCountdown:setText(Time:formatNumTimeStr(time)) + self.txExchangeCountdown:setText(Time:formatNumTimeStr(time)) + self.txGiftCountdown:setText(Time:formatNumTimeStr(time)) self:refreshRedPoint() end diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua index 5b2f9c77..55e90cc6 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_exchange_ui.lua @@ -76,9 +76,9 @@ function FourteenDayExchangeUI:refreshCountdown() self:closeUI() return end - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(time)) + self.txCountdown:setText(Time:formatNumTimeStr(time)) end, 1) - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FourteenDayData:getEndRemainTime())) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) end return FourteenDayExchangeUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua index 6854fe52..5dd13884 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_gift_ui.lua @@ -67,9 +67,9 @@ function FourteenDayGiftUI:refreshCountdown() self:closeUI() return end - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(time)) + self.txCountdown:setText(Time:formatNumTimeStr(time)) end, 1) - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FourteenDayData:getEndRemainTime())) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) end return FourteenDayGiftUI \ No newline at end of file diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua index c9f42293..87fa3e72 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_task_ui.lua @@ -112,9 +112,9 @@ function FourteenDayTaskUI:refreshCountdown() self:unscheduleGlobal(self.countdownSid) end self.countdownSid = self:scheduleGlobal(function() - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FourteenDayData:getEndRemainTime())) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) end, 1) - self.txCountdown:setText(GFunc.getTimeStrWithHMS2(DataManager.FourteenDayData:getEndRemainTime())) + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.FourteenDayData:getEndRemainTime())) end return FourteenDayTaskUI \ No newline at end of file