From 14d50731a8a8ad82dc57ce93e4ae2dfb417ed6ee Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 2 Aug 2021 17:35:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=81=E7=BB=9D=E9=98=B5=E3=80=91?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=20=20=E7=BD=97=E6=B5=AE?= =?UTF-8?q?=E4=BA=89=E9=94=8B=20=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/JumpServer/JumpServerHightLadderPanel.prefab | 6 +++--- .../~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua | 8 ++++---- .../~Lua/Modules/Net/IndicationManager.lua | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab index 5a89a253f6..9458d9050d 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 4f4886f21b..17e8923c41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index e50d514644..94c7960d4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -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