From f1538020a5c52574c9d59fcf0b41b6a134eb1aaf Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Wed, 15 Apr 2026 12:26:47 +0800 Subject: [PATCH] 1 --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 5 +++-- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5e552a932e..cc93157b68 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1332,7 +1332,7 @@ JumpType = { firstRecharge = 30001, ZhiZunJiangShi = 30002, SurpriseBox = 40001, --惊喜礼盒 - + fabaojuling = 40090, --法宝聚灵招募 linglongShangShi = 20005, linglongBaojing = 10067, @@ -1587,6 +1587,7 @@ ActivityTypeDef = { godsWayTowerTreasure_two = 115, --多队塔二队秘宝 godsWayTowerTreasure_three = 116, --多队塔三队秘宝 wishHero = 117, --英雄心愿抽卡 + fabaojulingzhaomu = 156, --法宝巨灵招募 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { @@ -1855,7 +1856,7 @@ FUNCTION_OPEN_TYPE = { Train = 150, --特训 TrainBuild = 151, --特训建筑 Mingge = 152, --命格 - + Fabaojulingxinyuan = 156, --法宝巨灵招募 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index a4dcfaa624..f54131bac4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -21,7 +21,7 @@ local titleBg={ --神将 [3]={bg="LZS63", titleImg = "r_richang_banner_3_zi_zh", name="龙息副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, --法宝 - [4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh",name="意念副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)}, + [4]={bg="LZH22", titleImg = "r_richang_banner_2_zi_zh",name="羁绊副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)}, --魂印 [5]={bg="r_richang_banner_1_zh", titleImg = "r_richang_banner_1_zi_zh", name="界神技副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)}, } @@ -63,7 +63,7 @@ local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, [3] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, - --[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN }, + [4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = "羁绊副本",type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN }, --[5] = { default = "r_richang_anniu_hunyin_01_zh", select = "r_richang_anniu_hunyin_zh",lock = "r_richang_anniu_hunyin_zh", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT } } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6bf836ae6e..d1249ee23b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1282,6 +1282,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.CourtesyDressPanel) elseif id == 36 then UIManager.OpenPanel(UIName.ActivityMainPanel,id) + elseif id == FUNCTION_OPEN_TYPE.Fabaojulingxinyuan then + UIManager.OpenPanel(UIName.RecruitMainPanel, TableRecruitType.Fabaojulingzhaomu) elseif id == FUNCTION_OPEN_TYPE.EXPERT then -- UIManager.OpenPanel(UIName.ExpertPanel) UIManager.OpenPanel(UIName.ActivityMainPanel,id) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3f4fc8fa5f..ac24194d8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -166,6 +166,9 @@ local jumpDic = { this.isOpen = false end end, + [JumpType.fabaojuling] = function(data) --在线奖励 + UIManager.OpenPanel(UIName.RecruitMainPanel, TableRecruitType.Fabaojulingzhaomu) + end, [JumpType.HeroChallenge] = function(data)--精英副本 local jumpCarbonId = CarbonManager.NeedLockId(data[2],3,math.floor(data[2]/10)) local openPanle