From ed6e825266bbb89bf51e53df981b5c597e2f3650 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 30 Mar 2021 21:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=99=90=E6=97=B6=E6=8A=A2?= =?UTF-8?q?=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/ExpertPanel.lua | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 721de3654f..90c85b40ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -46,7 +46,7 @@ local Expert = require("Modules/Expert/Expert") -- local HeHeHe = require("Modules/Expert/HeroStarFeedPage") local Expert_UpLv = require("Modules/Expert/Expert_UpLv") local ContinuityRechargePage = require("Modules/Operating/ContinuityRechargePage") --积天豪礼 -local GiftBuy = require("Modules/Expert/GiftBuy") --限时抢购 +--local GiftBuy = require("Modules/Expert/GiftBuy") --限时抢购 local diffMonsterBuyData = {}--异妖直购数据 local rechargeCommodityConfig @@ -83,7 +83,7 @@ function ExpertPanel:InitComponent() -- this.heroStarGift = HeHeHe:New(self, Util.GetGameObject(self.transform, "downLayout/GrowShitGiftPage")) this.upLvRewardGrid = Expert_UpLv.new(self, Util.GetGameObject(self.transform, "downLayout/UpLvRewardGrid")) this.continuityRechargePage = ContinuityRechargePage.new(self, Util.GetGameObject(self.transform, "downLayout/ContinuityRecharge")) - this.giftBuy = GiftBuy.new(self, Util.GetGameObject(self.transform, "downLayout/GiftBuy")) + --this.giftBuy = GiftBuy.new(self, Util.GetGameObject(self.transform, "downLayout/GiftBuy")) --this.luckyTurnTablePanel = Util.GetGameObject(this.gameObject, "downLayout/LuckyTurnTablePanel") this.CourtesyDressPanel = Util.GetGameObject(this.gameObject, "downLayout/CourtesyDressPanel") @@ -93,7 +93,7 @@ function ExpertPanel:InitComponent() this.diffMonsterBuyPanel = Util.GetGameObject(this.gameObject, "downLayout/DiffMonsterBuy") this.exChangePanel = Util.GetGameObject(this.gameObject, "downLayout/exChangeGrid") this.expertRewardGridPanel = Util.GetGameObject(this.gameObject, "downLayout/expertRewardGrid") - this.giftBuyPanel = Util.GetGameObject(this.gameObject, "downLayout/GiftBuy") + --this.giftBuyPanel = Util.GetGameObject(this.gameObject, "downLayout/GiftBuy") self.luckyCatAnimator = Util.GetGameObject(self.transform, "downLayout/LuckyCatPanel"):GetComponent("Animator") self.effext1 = Util.GetGameObject(self.transform, "downLayout/patFaceGrid/UI_effect_PatFacePanel_obg1_normal_particle") self.effext2 = Util.GetGameObject(self.transform, "downLayout/DiffMonsterBuy/UI_effect_PatFacePanel_obg2_normal_particle") @@ -238,7 +238,7 @@ function ExpertPanel:OnSortingOrderChange() -- this.heroStarGift:OnSortingOrderChange(self.sortingOrder) this.upLvRewardGrid:OnSortingOrderChange(self.sortingOrder) this.continuityRechargePage:OnSortingOrderChange(self.sortingOrder) - this.giftBuy:OnSortingOrderChange(self.sortingOrder) + --this.giftBuy:OnSortingOrderChange(self.sortingOrder) this.exChange:OnSortingOrderChange(self.sortingOrder) Util.AddParticleSortLayer( self.effext1, self.sortingOrder - cursortingOrder) Util.AddParticleSortLayer( self.effext2, self.sortingOrder - cursortingOrder) @@ -268,7 +268,7 @@ function ExpertPanel:ActivityRewardShow(index,isPlayLuckCat) -- this.heroStarGift.gameObject:SetActive(index == ExperType.StarGrowGift) this.upLvRewardGrid.gameObject:SetActive(index == ExperType.UpLv) this.continuityRechargePage.gameObject:SetActive(false) - this.giftBuy.gameObject:SetActive(index == ExperType.GiftBuy) + --this.giftBuy.gameObject:SetActive(index == ExperType.GiftBuy) -- if index ~= ExperType.StarGrowGift then -- this.heroStarGift:OnClose() -- end @@ -338,10 +338,10 @@ function ExpertPanel:ActivityRewardShow(index,isPlayLuckCat) self:ShowActivityData(index) this.continuityRechargePage:OnShow(self.sortingOrder) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) - elseif index == ExperType.GiftBuy then - self:ShowActivityData(index) - this.giftBuy:OnShow(self.sortingOrder) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) + -- elseif index == ExperType.GiftBuy then + -- self:ShowActivityData(index) + -- this.giftBuy:OnShow(self.sortingOrder) + -- this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) else --达人 this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) @@ -461,7 +461,7 @@ function ExpertPanel:RefreshActivityShow() tabBtns[22]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SecretBoxExper)) tabBtns[23]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpLvAct)) tabBtns[24]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ContinuityRecharge)) - tabBtns[25]:SetActive(OperatingManager.IsGiftBuyActive()) + tabBtns[25]:SetActive(false) tabBtns[26]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ExpeditionExper)) tabBtns[27]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.slhjExper)) end @@ -478,7 +478,7 @@ function ExpertPanel:OnClose() --this.luckyTurn.OnClose() this.exChange.OnClose() -- this.heroStarGift:OnClose() - this.giftBuy.OnClose() + --this.giftBuy.OnClose() this.upLvRewardGrid:OnClose() defaultIndex = activeIndext this.isPlayingLackCatAni = false @@ -519,7 +519,7 @@ function ExpertPanel:OnDestroy() -- this.heroStarGift:OnDestroy() this.upLvRewardGrid:OnDestroy() this.exChange.OnDestroy() - this.giftBuy.OnDestroy() + --this.giftBuy.OnDestroy() this.continuityRechargePage.OnDestroy() SubUIManager.Close(this.UpView) end @@ -664,15 +664,15 @@ function ExpertPanel:SetOpenActiveBtn() -- defaultIndex = ExperType.StarGrowGift -- end -- end - --限时礼包 - if OperatingManager.IsGiftBuyActive() then - tabBtns[ExperType.GiftBuy]:SetActive(true) - if defaultIndex == 0 or defaultIndex > ExperType.GiftBuy then - defaultIndex = ExperType.GiftBuy - end - else - tabBtns[ExperType.GiftBuy]:SetActive(false) - end + -- --限时礼包 + -- if OperatingManager.IsGiftBuyActive() then + -- tabBtns[ExperType.GiftBuy]:SetActive(true) + -- if defaultIndex == 0 or defaultIndex > ExperType.GiftBuy then + -- defaultIndex = ExperType.GiftBuy + -- end + -- else + -- tabBtns[ExperType.GiftBuy]:SetActive(false) + -- end return defaultIndex end @@ -699,10 +699,10 @@ function ExpertPanel:RechargeSuccessFunc(id) --异妖直购 this.diffMonsterBuy.OnShow() end - if curRechargeCommConfig.ShowType == 20 then - --限购礼包 - this.giftBuy.OnShow() - end + -- if curRechargeCommConfig.ShowType == 20 then + -- --限购礼包 + -- this.giftBuy.OnShow() + -- end end --招财猫其实动画特效播放(单击招财猫才播放) function ExpertPanel:LuckyCatAnimatorPlay(isPlayLuckCat)