From 2d3304e7bdd7afdc5ca66cdb8576b9b035ba7dc9 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 4 Nov 2022 17:18:11 +0800 Subject: [PATCH] =?UTF-8?q?gm=E4=BF=AE=E6=94=B9=E5=99=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/functions.lua | 16 +++++++++++++--- .../~Lua/Modules/Operating/GMChangePanel.lua | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 352e6dc2f6..d416a50af2 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2766,11 +2766,21 @@ function CheckGMIsOpen(type,value) local name=ConfigManager.GetConfigData(ConfigName.MainLevelConfig,value).Name or "" return FightPointPassManager.IsFightPointPass(value),string.format(Language[10295], GetLanguageStrById(name)) elseif type==3 then - return true + local config=ConfigManager.GetConfigData(ConfigName.GMInfo,value) + local isBuy=true + for i = 1, #config.Items do + local master=ConfigManager.GetConfigData(ConfigName.GMMaster,config.Items[i]) + local buy=OperatingManager.IsBuyGift(master.PackID) + if buy==false then + isBuy=false + end + end + return isBuy,config.Name.."全部兑换解锁" elseif type==4 then - return VipManager.GetChargedNum()>=value + return VipManager.GetChargedNum()>=value,"累充"..value.."元解锁" elseif type==5 then - return OperatingManager.IsBuyGift(value) + local recharge=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,value) + return OperatingManager.IsBuyGift(value),"购买"..recharge.Name.."解锁" end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index 6cc16e7760..153d5a7c3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -64,7 +64,7 @@ function GMChangePanel:BindEvent() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,1342) end) Util.AddClick(this.btn_up, function() - UIManager.OpenPanel(UIName.ActivityMainPanel,40,11) + UIManager.OpenPanel(UIName.GMShuaChongTeQuan) end) end