【跨服天梯】国内提交+1

dev_chengFeng
zhangqiang 2021-07-14 22:12:40 +08:00
parent 6a3c48e0b8
commit c3a456af52
3 changed files with 10 additions and 4 deletions

View File

@ -388,7 +388,7 @@ GameEvent = {
}, },
Privilege={ Privilege={
OnPrivilegeUpdate = "Privilege.OnPrivilegeUpdate", OnPrivilegeUpdate = "Privilege.OnPrivilegeUpdate",
OnPrivilegeUpdate = "Privilege.OnPrivilegeZeroUpdate", OnPrivilegeZeroUpdate = "Privilege.OnPrivilegeZeroUpdate",
}, },
Battle = { Battle = {
OnTimeScaleChanged = "Battle.OnTimeScaleChanged" OnTimeScaleChanged = "Battle.OnTimeScaleChanged"

View File

@ -95,6 +95,7 @@ end
function JumpServerHightLadderPanel:AddListener() function JumpServerHightLadderPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel)
Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum)
Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeUpdate, this.RefreshBuyNum)
-- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum)
end end
@ -102,6 +103,7 @@ end
function JumpServerHightLadderPanel:RemoveListener() function JumpServerHightLadderPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel) Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel, this.OnShowPanel)
Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum) Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, this.RefreshBuyNum)
Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeUpdate, this.RefreshBuyNum)
-- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum) -- Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderNum, this.RefreshBuyNum)
end end
@ -171,9 +173,13 @@ function this.OnShowPanel()
this.canPlayerTipText:GetComponent("Text").text = "本服千战逐胜台前"..JoinRank.."名可以参加" this.canPlayerTipText:GetComponent("Text").text = "本服千战逐胜台前"..JoinRank.."名可以参加"
else else
this.canPlayerTipText.transform.localPosition = Vector3.New(1.3,11.85, 0) 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+" local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank 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) this.mySortText:SetActive(true)
end end
else else

View File

@ -951,8 +951,8 @@ end
--跨服天梯 --跨服天梯
function this.GetWorldArenaInfoIndication(buffer) function this.GetWorldArenaInfoIndication(buffer)
local data = buffer:DataByte() local data = buffer:DataByte()
local msg = WorldProto_pb.GetWorldArenaInfoIndication() -- local msg = WorldProto_pb.GetWorldArenaInfoIndication()
msg:ParseFromString(data) -- msg:ParseFromString(data)
-- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime) -- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime)
LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%") LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%")
-- JumpServerManager.IndicationHightLadderData(msg) -- JumpServerManager.IndicationHightLadderData(msg)