From 9a61491b9021d9be1a31fc1d12fcb8e9508bf78b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 27 Nov 2021 18:28:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9D=A1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 ++- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f30a93833b..9b3f3ce31c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -480,7 +480,8 @@ PanelType = { WorldArena = { 107,16,23}, --玉虚论道 Compound_equip = { 14, 16,1258 }, --装备合成 YuJianXing = {14,16,1010},--御剑行 - LingMai = {14,16,1273}--御剑行 + LingMai = {14,16,1273},--御剑行 + tiandihonglu = {16,1287,1289} } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index e9e8b5b809..32e14c2e40 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -160,7 +160,11 @@ function QianKunBoxBuyOnePanel:OnOpen(...) end else isLimitUpHero = false - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) + if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].LotteryType == 13 then + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.tiandihonglu }) + else + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) + end d = RecruitManager.GetExpendData(this.recruitType) end