From ce8751bbee98aca76f244c42d51e61b28b24d3d4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 22 Jul 2021 14:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92=20?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua | 4 ++-- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua | 3 ++- .../~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index 810a77a905..7a350206f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -133,7 +133,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) local itemId=0 local itemNum=0 local d - local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType) + local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen if upConfig then local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) if wish then @@ -143,6 +143,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) isLimitUpHero=true end else + isLimitUpHero = false this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) d = RecruitManager.GetExpendData(this.recruitType) end @@ -178,7 +179,6 @@ function QianKunBoxBuyOnePanel:OnOpen(...) end --界面关闭时调用(用于子类重写) function QianKunBoxBuyOnePanel:OnClose() - end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index 2b559505dc..48a0f3bbc2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -143,7 +143,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) local itemId=0 local itemNum=0 local d - local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType) + local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen if upConfig then local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) if wish then @@ -157,6 +157,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) d = RecruitManager.GetExpendDataByCostItem(wish.CostItemMul,2,num) end else + isLimitUpHero = false d = RecruitManager.GetExpendData(this.recruitType) if this.UpView then SubUIManager.Close(this.UpView) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 8639a7bd02..578963a1d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -287,10 +287,10 @@ function TimeLimitUpHero:Recruit(actId,type,itemId) PrivilegeManager.RefreshPrivilegeUsedTimes(self.yaojingMaxTimeId,recrutType)--记录妖晶抽卡次数 end if type == 1 then - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc) + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,RecruitType.PrayerSingle,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc) else --UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,type,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen}) - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc) + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,RecruitType.PrayerTen,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc) end -- if msg.drop.Hero[1] then -- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2)