From 3673a84edfc245c937741956e4686edc0c03accf Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <3046463818@qq.com> Date: Tue, 20 Jul 2021 10:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B0=E4=B9=B1=E7=82=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua | 5 +++++ .../~Lua/Modules/Recruit/RecruitMainPanel.lua | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua index 654e4f869a..aa622ce047 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua @@ -12,6 +12,7 @@ function ElementDrawCardPanelNew:InitComponent() self.spLoader = SpriteLoader.New() self.getCardPanel = Util.GetGameObject(self.transform, "getCardPanel") + self.getCardPanel.gameObject:SetActive(false) self.buyOneBtn = Util.GetGameObject(self.getCardPanel,"content2/btn1") self.titleImageText = Util.GetGameObject(self.getCardPanel,"content1/titleImage/Text"):GetComponent("Text") self.Image1 = Util.GetGameObject(self.getCardPanel,"content1/Image/Image1"):GetComponent("Image") @@ -63,6 +64,8 @@ function ElementDrawCardPanelNew:BindEvent() Util.AddClick(self.btnBack, function () self.getCardPanel:SetActive(false) + self.parent.mask.gameObject:SetActive(false) + self.parent.AddTrigger() self.effect:SetActive(false) SoundManager.PlayMusic(SoundConfig.BGM_Main) RecruitManager.recruitSubIndex = 0 @@ -100,6 +103,8 @@ function ElementDrawCardPanelNew:BtnAction(index) self.parent.btnBack.gameObject:SetActive(false) self.parent.tabbox.gameObject:SetActive(false) self.getCardPanel.gameObject:SetActive(true) + self.parent.RemoveTrigger() + self.parent.mask.gameObject:SetActive(true) self.effect:SetActive(true) self.Image2Text.text = string.format("%s神将碎片",PropertyType[index]) SetTextVerTial(self.Image2Text,Vector3.New(134.88,-5.9,0),"MiddleLeft") diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index 549e7b9e48..d4b5b64b02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -56,8 +56,18 @@ function RecruitMainPanel:InitComponent() --LogGreen("this.pos0:"..tostring(this.pos0)) --this.pos4 = Vector3.New(this.off * (4 - 1) + 4 * this.itemWidth,0,0) self.lastPage,self.curPage,self.nextPage = 0,0,0 + this.AddTrigger() +end - this.trigger = Util.GetEventTriggerListener(self.gameObject) --触摸事件 +function this.RemoveTrigger() + this.trigger = Util.GetEventTriggerListener(this.gameObject) --触摸事件 + this.trigger.onBeginDrag = this.trigger.onBeginDrag - this.OnBeginDrag + this.trigger.onDrag = this.trigger.onDrag - this.OnDrag + this.trigger.onEndDrag = this.trigger.onEndDrag - this.OnEndDrag +end + +function this.AddTrigger() + this.trigger = Util.GetEventTriggerListener(this.gameObject) --触摸事件 this.trigger.onBeginDrag = this.trigger.onBeginDrag + this.OnBeginDrag this.trigger.onDrag = this.trigger.onDrag + this.OnDrag this.trigger.onEndDrag = this.trigger.onEndDrag + this.OnEndDrag