From 280d6d2c072d3f4721920225c7a2bec6ebcad72f Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 17:33:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/seven_day/seven_day_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index 4a670af0..82ca5263 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -144,7 +144,7 @@ function SevenDayUI:refreshStepInfo() local count = DataManager.SevenDayData:getCollectedCount() local totalCount = DataManager.SevenDayData:getTotalCount() self.sevenDayDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, count, totalCount)) - self.sevenDaySliderComp.value = count / totalCount + self.sevenDaySliderComp.value = count / DataManager.SevenDayData:getStepNum(#self.stepObjs) end function SevenDayUI:refreshScrollRect() From 33781e32def11f1e20395f03d3943b08e5034a81 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 26 May 2023 17:38:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=83=E5=A4=A9=E4=B9=90=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E8=AF=A5=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/activity/seven_day/seven_day_data.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/app/userdata/activity/seven_day/seven_day_data.lua b/lua/app/userdata/activity/seven_day/seven_day_data.lua index 724a1408..f4f3da05 100644 --- a/lua/app/userdata/activity/seven_day/seven_day_data.lua +++ b/lua/app/userdata/activity/seven_day/seven_day_data.lua @@ -32,6 +32,7 @@ function SevenDayData:init(data) self.actDay = (today - self.openTs) // 86400 + 1 self:calCollectTaskCount() + self:calCollectStepCount() self:initTaskListener() DataManager:registerCrossDayFunc("SevenDayData", function() @@ -87,6 +88,7 @@ function SevenDayData:refreshClaimed(data) for id, b in pairs(data) do self.stepRewards[id] = b end + self:calCollectStepCount() end function SevenDayData:opened() @@ -145,7 +147,9 @@ function SevenDayData:calCollectTaskCount() self.collectTaskCount = self.collectTaskCount + 1 end end +end +function SevenDayData:calCollectStepCount() self.collectStepCount = 0 for id, info in ipairs(self:getSevenDayRewardCfg()) do if self:getStepCollected(id) then