From 289177dba268cb48fd1fa259ca0217fee40a4e59 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 6 Jan 2021 13:58:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=900106=E6=8A=BD=E5=8D=A1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=99=AE=E9=80=9A=E6=8A=BD=E5=8D=A1=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f) (cherry picked from commit 524e5027735cb3df157a498e3605d554acf6181b) --- .../~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua | 2 +- .../~Lua/Modules/Recruit/SingleRecruitPanel.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 064c477e88..83dd91758a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -26,7 +26,7 @@ function this:BindEvent() return end RecruitManager.RecruitRequest(RecruitType.RecruitBox, function(msg) - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],RecruitType.RecruitBox,1) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],RecruitType.RecruitBox,1,{RecruitType.RecruitBox,RecruitType.RecruitBox}) this.curNum.text=string.format(Language[11637],BagManager.GetItemCountById(94)) parent:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index 0293be3d56..98b8db5414 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -229,7 +229,7 @@ function SingleRecruitPanel:TenOpenPanel() self:UpdataPanelData(_heroTable[index]) else self:ClosePanel() - UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type) + UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type,recruitType) end end end, timeNum2)