Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-08-02 17:48:34 +08:00
commit bd85be16d2
3 changed files with 8 additions and 8 deletions

View File

@ -4050,9 +4050,9 @@ RectTransform:
m_Father: {fileID: 7783183355034074848}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 437.5, y: 844.9001}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -102.5, y: -115.099915}
m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7197382918888777827

View File

@ -304,8 +304,8 @@ function this.SetScrollPre(root,data,curRankType)
this.SetRankingNum(root,data.rankInfo.rank,false)
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11052],data.guildName,data.rankInfo.param2)
or string.format(Language[11052],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数
and data.serverName.." "..string.format(Language[11027],data.guildName,data.rankInfo.param2)
or string.format(Language[11027],data.guildName,data.rankInfo.param2) --公会名称(人数) param2 挑战人数
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
name.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format("%s",data.userName)
@ -320,8 +320,8 @@ function this.SetMyRank(data,curRankType)
this.SetRankingNum(this.mRRank,data.rank,true)
if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then
this.mRName.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..string.format(Language[11052],guildData.name,data.param2)
or string.format(Language[11052],guildData.name,data.param2) --param2 人数
and data.serverName.." "..string.format(Language[11027],guildData.name,data.param2)
or string.format(Language[11027],guildData.name,data.param2) --param2 人数
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
this.mRName.text=(data.serverName and data.serverName ~= "")
and data.serverName.." "..PlayerManager.nickName

View File

@ -982,7 +982,7 @@ function this.GetWorldArenaInfoIndication(buffer)
-- local msg = WorldProto_pb.GetWorldArenaInfoIndication()
-- msg:ParseFromString(data)
-- LogPink("%%%%%%%%%%%msg.arenaInfo: "..#msg.arenaInfo.arenaEnemys.." msg.stage: "..msg.stage.." msg.endTime: "..msg.endTime)
LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%")
-- LogPink("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%")
-- JumpServerManager.IndicationHightLadderData(msg)
JumpServerManager.ZeroRefreshPanel()
end