From e347d0199ee7f736285ffac8ea035561768244ca Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Mon, 10 Nov 2025 19:03:50 +0800 Subject: [PATCH] 1 --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../GeneralPanel/View/GeneralBigPopup_WishJulingDraw.lua | 4 ++-- .../~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua | 9 +++++++-- .../~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua | 7 ++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index fadea200f2..486d452eb0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -462,6 +462,7 @@ PanelType = { FightPointPass = { 14, 3, 16 }, -- 新关卡 SoulCrystal = { 14, 16 }, -- 魂晶 Recruit = { 16, 19, 20 }, -- 聚灵神戒(群英征募) + RecruitJuling = { 16, 132 }, -- 法宝巨灵 TenRecruit = { 87, 16 }, -- 十连召唤(群英征募) ElementDrawCard = { 14, 74, 20 }, -- 元素神戒(元素招募) SecretBox = { 16, 22, 21 }, -- 妖魂魔戒(秘盒开启) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishJulingDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishJulingDraw.lua index 49f4ba1eab..e18fbb6b86 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishJulingDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishJulingDraw.lua @@ -150,10 +150,10 @@ function this:SetUpHero() else go:SetActive(false) end - LogError("i===================" .. i) + --LogError("i===================" .. i) if i > 1 then self.wishListObj[i]:SetActive(false) - LogError("false false") + --LogError("false false") end Util.AddLongPressClick(go, function() UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, 5) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua index 4236a709e1..3806b19436 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua @@ -108,14 +108,19 @@ function WishEquipBuyOnePanel:OnOpen(...) self.bg.gameObject:SetActive(true) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) + --this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) local args = { ... } this.drop = args[1] this.recruitType = args[2] recType = args[3] --LogError("sssssssssssssssssssss:" .. tostring(this.drop) .. "/" .. tostring(this.recruitType)) --self.singleConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting, "LotteryType", - --TableRecruitType.Youqing, "PerCount", 1) + --TableRecruitType.Youqing, "PerCount", 1) + if this.recruitType == 185 then + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RecruitJuling }) + else + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) + end self.singleConfig = ConfigManager.GetConfigData(ConfigName.LotterySetting, this.recruitType) --获取免费次数 --local currLottery = ConfigManager.GetConfigData(ConfigName.LotterySetting, RecruitType.FriendSingle) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua index 11b06e47f7..3ca54e8b3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua @@ -137,12 +137,17 @@ end --界面打开时调用(用于子类重写) function WishEquipBuyTenPanel:OnOpen(...) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) + -- this.itemIcon1.sprite=this.spLoader:LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop = args[1] this.recruitType = args[2] --LogError("ssssssssssssssssssss" .. tostring(this.recruitType)) + if this.recruitType == 186 then + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RecruitJuling }) + else + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) + end recType = args[3] local d d = RecruitManager.GetExpendData(this.recruitType)