diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index c7d5e5cfc4..c8873cdecc 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -388,7 +388,7 @@ GameEvent = { }, Privilege={ OnPrivilegeUpdate = "Privilege.OnPrivilegeUpdate", - OnPrivilegeUpdate = "Privilege.OnPrivilegeZeroUpdate", + OnPrivilegeZeroUpdate = "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 ffc60a038b..14e576dce3 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -95,6 +95,7 @@ end function JumpServerHightLadderPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) + Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeUpdate, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) end @@ -102,6 +103,7 @@ end function JumpServerHightLadderPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) + Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeUpdate, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) end @@ -171,9 +173,13 @@ function this.OnShowPanel() this.canPlayerTipText:GetComponent("Text").text = "本服千战逐胜台前"..JoinRank.."名可以参加" else this.canPlayerTipText.transform.localPosition = Vector3.New(1.3,11.85, 0) - this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励" local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+" this.mySortText:GetComponent("Text").text = "我的排名:".. myRank + if JumpServerManager.GetHightLadderDataMyRank() <= 1000 then + this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励" + else + this.canPlayerTipText:GetComponent("Text").text = "无法获得奖励" + end this.mySortText:SetActive(true) end else diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index c019370b71..1156d52f1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -951,8 +951,8 @@ end --跨服天梯 function this.GetWorldArenaInfoIndication(buffer) local data = buffer:DataByte() - local msg = WorldProto_pb.GetWorldArenaInfoIndication() - msg:ParseFromString(data) + -- local msg = WorldProto_pb.GetWorldArenaInfoIndication() + -- msg:ParseFromString(data) -- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime) LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%") -- JumpServerManager.IndicationHightLadderData(msg)