From fb82580b37bb837b653fee8659be496f6e4ea33f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 23 Sep 2021 14:33:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=95=86=E5=B8=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=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 | 2 ++ .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a2d12b484f..0d50ce5007 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1298,6 +1298,7 @@ ActivityTypeDef = { FifteenDayGiftNotice = 80,--15日登陆预告 DynamicActShop = 81,--主题活动商店 QiJieTreasure = 83,--七界秘宝 + linglongshangshi = 20005, } --活动结束需要处理面板关闭类型 ActivityTypePanel = { @@ -2429,6 +2430,7 @@ DirectBuyType = { XIANSHISHANGSHI = 22, --限时商市 ZHENQIBAOGE = 23, --珍奇宝阁 XINRENSHANGCHENG = 30, --新人商城 + linglongShagnshi = 40, } --新月卡类型定义 MONTH_CARD_TYPE = { diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 958f3143bc..9d013b37a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -130,7 +130,7 @@ function EveryDayGift:OnShow(_sortingOrder) end end - if self.actType == ActivityTypeDef.DynamicAct_Treasure or self.actType == ActivityTypeDef.DynamicAct_TimeLimitShop then + if self.actType == ActivityTypeDef.DynamicAct_Treasure or self.actType == ActivityTypeDef.DynamicAct_TimeLimitShop or self.actType == ActivityTypeDef.linglongshangshi then self.parent.tabbox.gameObject:SetActive(false) else self.parent.tabbox.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index e5a450df9b..4bdf12e4a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -255,7 +255,7 @@ function GiftPre:SetContent1() if self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.DAILY_GIFT then--每日礼包 self:SetType2() - elseif self.data.DataType == DataType.Direct and (self.data.buyType == DirectBuyType.WEEK_GIFT or self.data.buyType == DirectBuyType.MONTH_GIFT or self.data.buyType == DirectBuyType.XIANSHISHANGSHI or self.data.buyType == DirectBuyType.ZHENQIBAOGE) then--周月礼包 + elseif self.data.DataType == DataType.Direct and (self.data.buyType == DirectBuyType.WEEK_GIFT or self.data.buyType == DirectBuyType.MONTH_GIFT or self.data.buyType == DirectBuyType.XIANSHISHANGSHI or self.data.buyType == DirectBuyType.ZHENQIBAOGE or self.data.buyType == DirectBuyType.linglongShagnshi) then--周月礼包 self.grid:GetComponent("RectTransform").anchoredPosition = offSetX[1].scroll self.upLayout.gameObject:SetActive(false) elseif self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.VIP_GIFT then--特权