diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index b72d9b5e3e..c7d5e5cfc4 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -388,6 +388,7 @@ GameEvent = { }, Privilege={ OnPrivilegeUpdate = "Privilege.OnPrivilegeUpdate", + OnPrivilegeUpdate = "Privilege.OnPrivilegeZeroUpdate", }, Battle = { OnTimeScaleChanged = "Battle.OnTimeScaleChanged" diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index abb722aa81..ffc60a038b 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -94,12 +94,14 @@ end --添加事件监听(用于子类重写) function JumpServerHightLadderPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) + Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) end --移除事件监听(用于子类重写) function JumpServerHightLadderPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) + Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) end @@ -234,9 +236,9 @@ function this.ShowSingleData(go,data,i) JumpServerManager.StarFightHightLadder(data.personInfo,0,function(msg) if msg then PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM, 1)--更新特权 + this.OnShowPanel() end this.RefreshBuyNum() - this.OnShowPanel() end) end) end) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index 6a05dd9a20..d7517278eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -140,7 +140,8 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack) -- LogGreen("skipFight "..skipFight.." msg.err "..msg.err) if skipFight == 0 then--挑战 if msg.err== -2 then - this.BattleHightLadderData(msg) + -- this.BattleHightLadderData(msg)--后端没给数据 前端自己请求 + JumpServerManager.GetWorldArenaInfoRequest() PopupTipPanel.ShowTip("无法挑战,目标玩家排名出现变化,已重新匹配对手!") if callBack then callBack() @@ -148,7 +149,8 @@ function this.StarFightHightLadder(personInfo,skipFight,callBack) return end if msg.err== -3 then - this.BattleHightLadderData(msg) + -- this.BattleHightLadderData(msg)--后端没给数据 前端自己请求 + JumpServerManager.GetWorldArenaInfoRequest() PopupTipPanel.ShowTip("无法挑战,玩家排名出现变化,已重新匹配对手!") if callBack then callBack() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index d065a0af54..7b3d309478 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -22,6 +22,7 @@ function PrivilegeManager.InitPrivilegeData(data) end table.insert(this._PrivilegeTypeList[config.PrivilegeType], config) end + Game.GlobalEvent:DispatchEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate) end --刷新从后端接收的到的特权表