diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 6971b439..cff97614 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -70,6 +70,10 @@ function MainCityUI:onLoadRootComplete() end, 1) end +function MainCityUI:onReshow() + self:checkMainPop() +end + function MainCityUI:onSetUIOrder() if self.subComps then for index, comp in pairs(self.subComps) do @@ -120,9 +124,11 @@ function MainCityUI:_bind() end end) - -- self:bind(DataManager.BagData.ItemData, "dirty", function(binder, value) - -- UIManager:refreshCurrencyBarTxt() - -- end) + self:bind(DataManager.BagData.ItemData, "dirty", function(binder, value) + if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN and self.subComps[self.selectedIndex] then + self.subComps[self.selectedIndex]:refreshStageFormaion() + end + end) -- self:addEventListener(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE_VIT, function(params) @@ -259,50 +265,7 @@ function MainCityUI:refreshRoleInfo() end) end -function MainCityUI:checkFuncOpen() - -- if not self.lvUpHide then - -- return - -- end - -- for k,v in pairs(ModuleManager.MODULE_KEY) do - -- if not DataManager.PlayerData:isShowFuncOpen(v) and ModuleManager:getIsOpen(v, true) then - -- local params = {} - -- params.funcType = v - -- params.callback = function () - -- self:checkFuncOpen() - -- end - -- ModuleManager.MaincityManager:showFuncOpenUI(params) - -- return - -- end - -- end -end - function MainCityUI:checkMainPop() - -- local topUI = UIManager:getTopUIObj() - -- if topUI:getUIIndex() ~= self:getUIIndex() then - -- return - -- end - - -- -- 功能解锁(todo 把所有的找出来,免得每次关闭界面都要走一遍) - -- for k,v in pairs(ModuleManager.MODULE_KEY) do - -- if ModuleManager:showPop(v) and (not DataManager.PlayerData:isShowFuncOpen(v)) and ModuleManager:getIsOpen(v, true) then - -- local params = {} - -- params.funcType = v - -- ModuleManager.MaincityManager:showFuncOpenUI(params) - -- return - -- end - -- end - - -- -- 章节解锁 - -- if ModuleManager.StageManager:showChapterUnlockUI() then - -- return - -- end - -- -- 活动弹窗 - -- if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then - -- if ModuleManager.ActivityPopManager:checkActivityPop() then - -- return - -- end - -- end - -- 引导 if self:checkTutorial() then return @@ -311,20 +274,6 @@ end -- 检查引导 function MainCityUI:checkTutorial() - -- -- 检查抽卡引导 - -- if not DataManager.TutorialData:getIsFuncTutorialFinished(DataManager.TutorialData.SUMMON_ID) then - -- self.showSummon = 4 - -- ModuleManager.TutorialManager:checkFuncTutorial(DataManager.TutorialData.SUMMON_ID) - -- return - -- end - - -- if not DataManager.TutorialData:getIsFuncTutorialFinished(DataManager.TutorialData.FIGHT_FAIL_ID) then - -- if DataManager.PlayerData:getStageFailCount() == 1 then -- 首次章节战败 - -- ModuleManager.TutorialManager:checkFuncTutorial(DataManager.TutorialData.FIGHT_FAIL_ID) - -- return - -- end - -- end - if DataManager.ChapterData:getMaxChapterId() == 1 then if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.PASS_ONE_CHAPTER) then return