From 1cc497b2fdfd8b0c9cadeca02fc0b18807fce66b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 26 Aug 2020 20:30:52 +0800 Subject: [PATCH 1/2] qinglong commit --- .../Mission/MissionDailyPanel_QingLongSecretTreasure.lua | 8 ++++---- .../Mission/MissionDailyPanel_SecretTreasureTrail.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index de6306829c..9ffe4808f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -64,10 +64,10 @@ function this:AddListener() end function this:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess) - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess) - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose) - Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction) + Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh) end this.Closefunction = function() Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 9f5b2a2719..6bf3839056 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -71,10 +71,10 @@ function this:AddListener() end function this:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess) - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh) - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClosen) - Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh,curType) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh, this.RefreshTime) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClosen,this.CloseFunction) + Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh,curType) end function this.RefreshTime() From 1482d308cbdfea770a0a87bda6eb94671f9b7674 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 26 Aug 2020 20:37:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 385b900a98..5c8db0887d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -278,9 +278,9 @@ function this.SetData(root, data, ldata) elseif _point ~= 0 and not FightPointPassManager.IsFightPointPass(_point) then PopupTipPanel.ShowTip(string.format(Language[12220], mainLevelConfig[_point].Name)) return - elseif PlayerManager.curMapId ~= 0 and FightPointPassManager.IsFightPointPass(PlayerManager.curMapId)==false then - PopupTipPanel.ShowTip(string.format(Language[10341],mainLevelConfig[_point].Name)) - return + -- elseif PlayerManager.curMapId ~= 0 and FightPointPassManager.IsFightPointPass(PlayerManager.curMapId)==false then + -- PopupTipPanel.ShowTip(string.format(Language[10341],mainLevelConfig[_point].Name)) + -- return end if not isOpen then