From 443a1570061366e9578dc4e6593f550384128d9a Mon Sep 17 00:00:00 2001 From: JieLing Date: Tue, 22 Sep 2020 18:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A0=B4=E9=98=B5=E8=AF=9B=E4=BB=99?= =?UTF-8?q?=E3=80=91=E7=82=B9=E9=87=91=E8=BE=BE=E4=BA=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E7=82=B9=E9=87=91=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B9=BE=E5=9D=A4?= =?UTF-8?q?=E5=AE=9D=E7=9B=92=E5=BF=AB=E9=80=9F=E5=88=87=E6=8D=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/DynamicActivity/DynamicActivityPanel.lua | 12 ++++++++++++ .../Modules/DynamicActivity/PoZhenZhuXianPage.lua | 2 ++ .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 3 ++- .../~Lua/Modules/Task/TaskManager.lua | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 0d57914816..daacb5945f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -75,9 +75,21 @@ end --添加事件监听(用于子类重写) function DynamicActivityPanel:AddListener() + for i = 1, #this.PageList do + if this.PageList[i] and this.PageList[i].AddListener then + this.PageList[i]:AddListener() + end + end + end --移除事件监听(用于子类重写) function DynamicActivityPanel:RemoveListener() + for i = 1, #this.PageList do + if this.PageList[i] and this.PageList[i].RemoveListener then + this.PageList[i]:RemoveListener() + end + end + end --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua index 14599e08a6..2807f01954 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua @@ -32,10 +32,12 @@ end --添加事件监听(用于子类重写) function PoZhenZhuXianPage:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh) end --移除事件监听(用于子类重写) function PoZhenZhuXianPage:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh) end local sortingOrder = 0 --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 55aad0a067..e83a813085 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -74,6 +74,8 @@ function QianKunBox:BindEvent() ActivityDetail.new(self.detail,2,self.effect) end) Util.AddClick(self.btnStore,function() + self:storeShow()--商店 + self.effect:SetActive(false) self.shop:SetActive(true) self.btnBack:SetActive(false) @@ -103,7 +105,6 @@ function QianKunBox:OnShow(sortingOrder) self:refreshBtnShow()--刷新按钮显示 self:contentShow()--五个魂印头像 - self:storeShow()--商店 self:timeCountDown()--时间 end diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index dfc75ce024..7726259712 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -136,6 +136,8 @@ function this.SetTypeTaskState(type, Id, state, progress, takeTimes,heroId) end this.SetDirty() Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged) + Game.GlobalEvent:DispatchEvent(GameEvent.DynamicTask.OnMissionChange) + end function this.SetMissionIdState(type, Id, state)