From 2d669fd354e2d34c2dcee805b77293a9fbcbaf25 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 4 Nov 2021 15:50:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=91=A8=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E5=8C=85ID=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua index 34d276ca84..6912d18887 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua @@ -130,7 +130,7 @@ function WeekCardPage:SetCardShow(index, data) pre.icon2.sprite = sprite pre.icon3.sprite = sprite - local rechargeCfg = _RechargeCommodityConfig[data.id] + local rechargeCfg = _RechargeCommodityConfig[config.RechargeId] if not rechargeCfg then return end @@ -163,7 +163,7 @@ function WeekCardPage:SetCardShow(index, data) pre.red:SetActive(false) Util.SetGray(pre.btn, false) Util.AddOnceClick(pre.btn, function() - PayManager.Pay(data.id, function(id) + PayManager.Pay(config.RechargeId, function(id) -- 前端修改购买状态 data.isBuy = true WeekCardManager.UpdateWeekCardData(data) From 7f3d044ec3e1e93e47b5ed8a20ee8cf3cd2cce2e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 4 Nov 2021 16:10:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=91=A8=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=98=BE=E7=A4=BA=E5=91=A8=E5=8D=A1=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua | 12 +++++++++++- .../~Lua/Modules/Operating/WeekCardManager.lua | 9 +++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index 8d560d09f4..3757112eb0 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -273,7 +273,8 @@ function this.SingleFuncState(id) local qualifiled = this.IsQualifiled(id) local isOpen = this.IsSwitchOpen(id) local isActive = this.FuncTimeJudge(id) - if isOpen and qualifiled and isActive then + local isSpecialActive = this.IsSpecialActive(id) + if isOpen and qualifiled and isActive and isSpecialActive then isOpen = true else isOpen = false @@ -555,4 +556,13 @@ function this.SystemOpenTip(type) return str end +-- 一些功能特殊判断 +function this.IsSpecialActive(id) + if id == FUNCTION_OPEN_TYPE.WEEK_CARD then + return WeekCardManager.IsWeekCardOpen() + end + return true +end + + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua index 727761d9ba..5356a063c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardManager.lua @@ -91,4 +91,13 @@ function this.CheckRedReward() end end return false +end + +-- 根据是否有周卡数据,判断周卡功能是否开启 +function this.IsWeekCardOpen() + local list = this.GetWeekCardDataArray() + if list and #list > 0 then + return true + end + return false end \ No newline at end of file