From ef6969c4d98850cd82618c7e22f481a246debebb Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 28 Jul 2023 18:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/tutorial.lua | 25 ++++++++++++++++--- .../ui/main_city/component/dungeon_comp.lua | 13 ++++++++-- lua/app/ui/main_city/component/main_comp.lua | 8 ++++++ lua/app/userdata/tutorial/tutorial_data.lua | 4 +++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 350de8d7..d05e0d87 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -619,6 +619,7 @@ local tutorial = { ["next_id"]=80010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -639,6 +640,7 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -650,6 +652,7 @@ local tutorial = { ["next_id"]=80030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_weapon", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -663,7 +666,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_weapon_open" }, [80040]={ ["next_id"]=80050, @@ -674,6 +678,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -684,6 +689,7 @@ local tutorial = { ["next_id"]=80060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -703,6 +709,7 @@ local tutorial = { ["next_id"]=80070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -717,7 +724,8 @@ local tutorial = { }, [80070]={ ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_2/btn_start", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_weapon_open/btn_start", + ["func_id"]="dungeon_weapon_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -728,6 +736,7 @@ local tutorial = { ["next_id"]=90010, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -748,6 +757,7 @@ local tutorial = { ["delay"]=0.5, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/formation/hero_3", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -759,6 +769,7 @@ local tutorial = { ["next_id"]=90030, ["type"]=2, ["target_name"]="hero_detail_ui(Clone)/common/btns/btn_armor", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -772,7 +783,8 @@ local tutorial = { ["txt_offset"]={ 0, 200 - } + }, + ["func_id"]="dungeon_armor_open" }, [90040]={ ["next_id"]=90050, @@ -783,6 +795,7 @@ local tutorial = { 200 }, ["target_name"]="hero_detail_ui(Clone)/common/btn_close", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -793,6 +806,7 @@ local tutorial = { ["next_id"]=90060, ["type"]=2, ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -812,6 +826,7 @@ local tutorial = { ["next_id"]=90070, ["type"]=2, ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=1, ["arrow_offset"]={ 0, @@ -827,7 +842,8 @@ local tutorial = { [90070]={ ["next_id"]=90080, ["type"]=2, - ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/scroll_cell_3/btn_start", + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/dungeon_comp/scrollrect/viewport/content/dungeon_armor_open/btn_start", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=2, ["arrow_offset"]={ 0, @@ -837,6 +853,7 @@ local tutorial = { [90080]={ ["type"]=2, ["target_name"]="dungeon_armor_main_ui(Clone)/scrollrect/viewport/content/scroll_cell_1/touch_node", + ["func_id"]="dungeon_armor_open", ["arrow_direction"]=4, ["arrow_offset"]={ 20, diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index 74c85f10..bd9de764 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -31,13 +31,22 @@ function DungeonComp:init() self:refreshShow() end -function DungeonComp:refreshShow() +function DungeonComp:refreshShow(targetMuduleKey) if EDITOR_MODE then Logger.logHighlight("更新副本显示."..tostring(Time:getTodaySurplusTime())) end self.openDungeons = DataManager.DungeonData:getOpenDungeons() + local targetIndex + if targetMuduleKey then + for index, dungeon in ipairs(self.openDungeons) do + if dungeon.module == targetMuduleKey then + targetIndex = index + break + end + end + end self.scrollRectComp:clearCells() - self.scrollRectComp:refillCells(#self.openDungeons) + self.scrollRectComp:refillCells(#self.openDungeons, nil, targetIndex) -- 跨天定时器 if self.countdownSid then diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 9c167abc..99e93112 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -87,6 +87,14 @@ function MainComp:refreshModule(selectModule) if DataManager.ArenaData:needShowPopGift() and DataManager.ArenaData:getGiftId() then ModuleManager.ArenaManager:showGiftPopUI() end + elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then + if DataManager.TutorialData:getIsInTutorial() then + local moduleKey = DataManager.TutorialData:getTargetFuncId() + if moduleKey then + local dungeonComp = self.moduleMap[self.curModuleType] + dungeonComp:refreshShow(moduleKey) + end + end end for idx, cell in pairs(self.moduleMap) do diff --git a/lua/app/userdata/tutorial/tutorial_data.lua b/lua/app/userdata/tutorial/tutorial_data.lua index c47a17b1..6415d6e0 100644 --- a/lua/app/userdata/tutorial/tutorial_data.lua +++ b/lua/app/userdata/tutorial/tutorial_data.lua @@ -191,6 +191,10 @@ function TutorialData:getTargetName() return self.tutorialInfo.target_name end +function TutorialData:getTargetFuncId() + return self.tutorialInfo.func_id +end + function TutorialData:getTargetHeroId() return self.tutorialInfo.heroid end