From 6687d0425ff21219c470dab97300bc912c9ea104 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 25 Aug 2020 12:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 99e8c07889..b1d5c37f4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -63,7 +63,7 @@ function LeiJiChongZhiPage:SetTime() self.timer:Stop() self.timer = nil end - local timeDown = endtime - GetTimeStamp() + local timeDown = endtime this.time.text = Language[10028]..TimeToDHMS(timeDown) self.timer = Timer.New(function() timeDown = timeDown - 1 @@ -81,7 +81,12 @@ end function LeiJiChongZhiPage:OnShowData() allData =OperatingManager.InitLeiJiChongZhiData(curtype) if allData then - endtime = ActivityGiftManager.GetTaskEndTime(curtype) + if curtype == ActivityTypeDef.AccumulativeRechargeExper then + endtime = CalculateSecondsNowTo_N_OClock(5) + else + endtime = ActivityGiftManager.GetTaskEndTime(curtype) - GetTimeStamp() + end + this.SortData(allData) this.ScrollView:SetData(allData, function (index, go) this.SingleDataShow(go, allData[index])