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

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

Browse Source
This commit is contained in:
chenxi 2023-05-31 17:58:17 +08:00
commit 4abd807b5f
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/app/ui/main_city/main_city_ui.lua
View File

@ -139,9 +139,11 @@ function MainCityUI:_addListeners()
end end
return return
end end
self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born", false, false, function() self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born1", false, false, function()
self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born2", false, false, function()
self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnim("idle", false, false) self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnim("idle", false, false)
end) end)
end)
self:refreshBottom(GConst.MainCityConst.BOTTOM_PAGE.SHOP, true) self:refreshBottom(GConst.MainCityConst.BOTTOM_PAGE.SHOP, true)
if self.subComps and self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then if self.subComps and self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:switchPage(page) self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:switchPage(page)
@ -261,9 +263,11 @@ function MainCityUI:initBottomUI()
BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[i]]) BIReport:postHomeBtnCilck(BIReport.CLICK_BTN_TYPE[MainCityUI.CLICK_BTN_TYPE[i]])
end end
self.bottomBtnSpines[i]:playAnimComplete("born", false, false, function() self.bottomBtnSpines[i]:playAnimComplete("born1", false, false, function()
self.bottomBtnSpines[i]:playAnimComplete("born2", false, false, function()
self.bottomBtnSpines[i]:playAnim("idle", false, false) self.bottomBtnSpines[i]:playAnim("idle", false, false)
end) end)
end)
self:refreshBottom(i, true) self:refreshBottom(i, true)
end) end)
table.insert(self.bottomBtnCells, cellCom) table.insert(self.bottomBtnCells, cellCom)

8
lua/app/userdata/daily_challenge/daily_challenge_data.lua
View File

@ -33,14 +33,6 @@ function DailyChallengeData:onGetedTaskReward(idx)
end end
function DailyChallengeData:clear() function DailyChallengeData:clear()
self.maxWave = nil
self.fixedChapterId = nil
self.chapterDailyId = nil
self.tasks = nil
self.buffIds = nil
self.totalFightCount = nil
self.todayFightCount = nil
self.initDay = nil
end end
function DailyChallengeData:isOpen() function DailyChallengeData:isOpen()