Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
dbebfeddf7
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue