From 03dc5fd16f647ccfd099e313ab9a25b4e492bd52 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 14 Jan 2021 14:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E6=B4=BB=E5=8A=A8=E3=80=91?= =?UTF-8?q?=E5=9C=A8=E6=AF=8F=E5=91=A8=E6=B4=BB=E5=8A=A8=E8=A6=81=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=9B=E8=A1=8C=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E9=A2=84=E8=A7=88=E6=88=96=E6=8A=BD=E5=8D=A1=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E7=BB=93=E6=9D=9F=E5=90=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8F=98=E9=BB=91=E6=8A=A5=E9=94=99=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua | 2 +- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 3 ++- .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 1 + .../~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua | 1 + .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 1 + .../~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua | 2 ++ .../~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua | 2 ++ 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index f0f7fcae6e..521601b9e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -274,7 +274,7 @@ end -- 打开,重新打开时回调 function DynamicActivityPanel:OnShow() local activiytId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) - if not activiytId and activiytId <= 0 then + if not activiytId or activiytId <= 0 then self:ClosePanel() end this.btnBack:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index a71033679a..820fda95c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -97,6 +97,8 @@ function LingShouBaoGe:BindEvent() end function LingShouBaoGe:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder this.gameObject:SetActive(true) @@ -105,7 +107,6 @@ function LingShouBaoGe:OnShow(_sortingOrder,_parent) end function LingShouBaoGe:Refresh() - LogYellow("shuaxing !!!!!!!!!!!!!!") ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LingShouBaoGe) activityId = ActData.activityId LSrewardData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index fe5f45a6b2..4466da519d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -99,6 +99,7 @@ function QianKunBox:OnShow(sortingOrder,_parent) Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer) orginLayer = sortingOrder activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) + if not activityId or activityId <= 0 then return end local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId) singleRecruit = array[1] tenRecruit = array[2] diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index a3713d891a..92680e4f97 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -74,6 +74,7 @@ function ShengYiTianJiang:OnShow(_sortingOrder,_parent) end function ShengYiTianJiang:OnShowData() local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ShenYiTianJiang) + if not activityId or activityId <= 0 then return end local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,activityId) rechargeConfigId = activityConfig.CanBuyRechargeId[1] allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,rechargeConfigId) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 4b69a2d084..92e7a2ee35 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -299,6 +299,7 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent) end activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + if not activityId or activityId <= 0 then return end LogBlue("限时招募 activityId:"..activityId) Util.GetGameObject(self.gameObject,activityType[activityId].bg):SetActive(true) Util.GetGameObject(self.gameObject,activityType[activityId].bg.."/Image (3)"):GetComponent("Image").sprite = Util.LoadSprite(activityType[activityId].title) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index dd8b4a963f..bbfcc6b47f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -83,6 +83,8 @@ function XiangYaoDuoBao:BindEvent() end function XiangYaoDuoBao:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder this.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index 26e5a782a0..5e306e49e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -124,6 +124,8 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function XinJiangLaiXi:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinJiangLaiXi) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder XinJiangLaiXi:Refresh()