puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-05-26 18:08:08 +08:00
commit 2a9933eba3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/ui/activity/seven_day/seven_day_ui.lua
View File

@ -144,7 +144,7 @@ function SevenDayUI:refreshStepInfo()
local count = DataManager.SevenDayData:getCollectedCount() local count = DataManager.SevenDayData:getCollectedCount()
local totalCount = DataManager.SevenDayData:getTotalCount() local totalCount = DataManager.SevenDayData:getTotalCount()
self.sevenDayDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, count, totalCount)) 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 end
function SevenDayUI:refreshScrollRect() function SevenDayUI:refreshScrollRect()

4
lua/app/userdata/activity/seven_day/seven_day_data.lua
View File

@ -32,6 +32,7 @@ function SevenDayData:init(data)
self.actDay = (today - self.openTs) // 86400 + 1 self.actDay = (today - self.openTs) // 86400 + 1
self:calCollectTaskCount() self:calCollectTaskCount()
self:calCollectStepCount()
self:initTaskListener() self:initTaskListener()
DataManager:registerCrossDayFunc("SevenDayData", function() DataManager:registerCrossDayFunc("SevenDayData", function()
@ -87,6 +88,7 @@ function SevenDayData:refreshClaimed(data)
for id, b in pairs(data) do for id, b in pairs(data) do
self.stepRewards[id] = b self.stepRewards[id] = b
end end
self:calCollectStepCount()
end end
function SevenDayData:opened() function SevenDayData:opened()
@ -145,7 +147,9 @@ function SevenDayData:calCollectTaskCount()
self.collectTaskCount = self.collectTaskCount + 1 self.collectTaskCount = self.collectTaskCount + 1
end end
end end
end
function SevenDayData:calCollectStepCount()
self.collectStepCount = 0 self.collectStepCount = 0
for id, info in ipairs(self:getSevenDayRewardCfg()) do for id, info in ipairs(self:getSevenDayRewardCfg()) do
if self:getStepCollected(id) then if self:getStepCollected(id) then