From 2694f5ad5706bac201ae79ca17066f8b313a2df6 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 6 Jun 2023 17:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=8A=A5=E9=94=99=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 --- .../~Lua/Modules/Recharge/View/EveryDayGiftNew.lua | 3 +++ .../~Lua/Modules/Recharge/View/RechargeViewNew.lua | 3 +++ .../~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua | 4 ++-- .../~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index db1f326eeb..631bc22c07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -224,6 +224,9 @@ function EveryDayGiftNew:SetGrowGift() --如果有当前声望数据,就显示,没有就显示上一档位 -- local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] local data=growData[DynamicActivityManager.Index] + if data==nil then + return + end self:RefreshReward(data) Util.AddOnceClick(self.btnLeft,function () diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 7730ecb7b2..310ae6b050 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -106,6 +106,9 @@ function RechargeViewNew:SetGrowGift() --如果有当前声望数据,就显示,没有就显示上一档位 --local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] local data=growData[DynamicActivityManager.Index] + if data==nil then + return + end self:RefreshReward(data) Util.AddOnceClick(self.btnLeft,function () diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua index ab61b7b124..d45961aeac 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua @@ -22,7 +22,7 @@ function WishEquipBuyOnePanel:InitComponent() self.bg = Util.GetGameObject(self.gameObject, "effect") -- self.dibiao = Util.GetGameObject(self.bg, "dibiao") -- self.dibiao.gameObject:SetActive(false) - this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) + this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) screenAdapte(self.bg) this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton") this.content=Util.GetGameObject(self.gameObject, "content") @@ -106,7 +106,7 @@ function WishEquipBuyOnePanel:OnOpen(...) self.bg.gameObject:SetActive(true) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) local args = { ... } this.drop=args[1] this.recruitType=args[2] diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua index c918f70302..b6214c92f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua @@ -22,7 +22,7 @@ function WishEquipBuyTenPanel:InitComponent() orginLayer = 0 self.bg = Util.GetGameObject(self.gameObject, "effect") screenAdapte(self.bg) - this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) + this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit}) this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton") this.openTenAgainButton=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton") this.costImage=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton/Image") @@ -133,7 +133,7 @@ end --界面打开时调用(用于子类重写) function WishEquipBuyTenPanel:OnOpen(...) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit}) -- this.itemIcon1.sprite=this.spLoader:LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop=args[1]