From cb34322f99a59e62ad5e732d3e547169b52c5d14 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 5 Jul 2023 15:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/maincity/maincity_manager.lua | 2 ++ lua/app/ui/main_city/component/main_comp.lua | 9 +++++++++ lua/app/ui/main_city/main_city_ui.lua | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/lua/app/module/maincity/maincity_manager.lua b/lua/app/module/maincity/maincity_manager.lua index 09b004e2..ed638df8 100644 --- a/lua/app/module/maincity/maincity_manager.lua +++ b/lua/app/module/maincity/maincity_manager.lua @@ -65,6 +65,8 @@ function MaincityManager:getModuleEntrancePos(moduleKey) return mainUI:getMallIconPos() elseif moduleKey == ModuleManager.MODULE_KEY.DAILY_CHALLENGE then return mainUI:getDailyChallengeIconPos() + elseif moduleKey == ModuleManager.MODULE_KEY.ARENA then + return mainUI:getArenaIconPos() elseif moduleKey == ModuleManager.MODULE_KEY.FUND or moduleKey == ModuleManager.MODULE_KEY.IDLE_DROP or moduleKey == ModuleManager.MODULE_KEY.SEVEN_DAY then diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 3aa679ef..ffa9ce55 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -371,6 +371,15 @@ function MainComp:getDailyChallengeIconPos() end end +function MainComp:getLeftOrRightEntrancePos(module) + if self.leftEntrance[module] then + return self.leftEntrance[module]:getPosition() + end + if self.rightEntrance[module] then + return self.rightEntrance[module]:getPosition() + end +end + function MainComp:refreshArenaBounty() if self.arenaComp then self.arenaComp:refreshBounty() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 157522ed..cc1057e8 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -1126,6 +1126,14 @@ function MainCityUI:getDailyChallengeIconPos() return self.subComps[GConst.MainCityConst.BOTTOM_PAGE.MAIN]:getDailyChallengeIconPos() end +function MainCityUI:getLeftOrRightEntrancePos(module) + return self.subComps[GConst.MainCityConst.BOTTOM_PAGE.MAIN]:getLeftOrRightEntrancePos(module) +end + +function MainCityUI:getArenaIconPos() + return self:getLeftOrRightEntrancePos(GConst.MainCityConst.MAIN_MODULE.ARENA) +end + function MainCityUI:getSideBarActIconPos(moduleKey) for name, cell in pairs(self.leftBarList) do if moduleKey == cell:getModuleKey() then