From dc363d25c4b9582f9872cf4784b64d16bc20f1a1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 14 Jul 2021 15:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1009412=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E8=B6=85=E5=80=BC=E5=9F=BA=E9=87=91=E3=80=91=E8=B6=85=E5=80=BC?= =?UTF-8?q?=E5=9F=BA=E9=87=91=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9e1366ff27c4a0ace7476391a02817e9465cde88) --- .../~Lua/Modules/Main/MainPanel.lua | 17 +++++++++++++++-- .../~Lua/Modules/Operating/UppperMonthCard.lua | 9 +++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index b5319a47f9..440c628811 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1379,7 +1379,11 @@ function this.RefreshGiftBtnShow() local showTab = activityTabs[k].go.gameObject.activeSelf local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) if actInfo and actInfo.value > 0 then - showTab = true + showTab = true + elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + showTab = true + else + showTab = false end this.RefreshLayer(showTab,k,v) break @@ -1408,6 +1412,15 @@ function this.RefreshActivityBtn(context) activityTabs[k].img.sprite = this.spLoader:LoadSprite(tempConfig.Icon[1]) end showTab = context.status == 1 + elseif v.ActiveType == 78 then + local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) + if actInfo and actInfo.value > 0 then + showTab = true + elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + showTab = true + else + showTab = false + end else showTab = context.status == 1 end @@ -1479,7 +1492,7 @@ function this.RefreshActivityShow() elseif v.FunType and v.FunType == 41 then showTab = DailyRechargeManager.GetDailyRechargeExist() elseif v.ActiveType == 78 then - showTab = ActivityGiftManager.GetActivityValueInfo(v.ActiveType, activityId) ~= 0 + showTab = ActivityGiftManager.GetActivityValueInfo(v.ActiveType, activityId) > 0 or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) else showTab = true end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 997bec34a8..6d07b6fbb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -86,7 +86,7 @@ function UpperMonthCard:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) end) Util.AddOnceClick(self.btnBuy, function() - if self.actInfo.value == 1 then + if self.actInfo.value < 2 then PayManager.Pay(self.baseType, function(id) self:RechargeSuccessFunc(id) end) @@ -95,6 +95,11 @@ function UpperMonthCard:BindEvent() UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1) end) end + if self.actType == 78 then + CheckRedPointStatus(RedPointType.jijin128) + else + CheckRedPointStatus(RedPointType.jijin328) + end end) end @@ -195,7 +200,7 @@ end --- 根据是否购买了显示信息 function UpperMonthCard:SetBuyState() - if self.actInfo.value == 1 then + if self.actInfo.value < 2 then self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[0].bg) self.textBuy.text = MoneyUtil.GetMoneyUnitNameWithMoney(chargeConfig[self.baseType].Price) self.btnBuyRed.gameObject:SetActive(false)