From 025583762d71a0b695f6b056c734fe611d1d9228 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 12 Aug 2021 11:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua | 4 ++++ .../~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 17e8923c41..d2e460c21a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -302,11 +302,14 @@ function this.SetScrollPre(root,data,curRankType) local hurt=Util.GetGameObject(root,"Hurt"):GetComponent("Text") this.SetRankingNum(root,data.rankInfo.rank,false) + LogGreen("data.serverName:"..tostring(data.serverName)) if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then + LogGreen("data.guildName:"..tostring(data.guildName)) name.text=(data.serverName and data.serverName ~= "") 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 + LogGreen("data.guildName:"..tostring(data.userName)) name.text=(data.serverName and data.serverName ~= "") and data.serverName.." "..string.format("%s",data.userName) or string.format("%s",data.userName) @@ -318,6 +321,7 @@ end function this.SetMyRank(data,curRankType) local guildData = MyGuildManager.GetMyGuildInfo() this.SetRankingNum(this.mRRank,data.rank,true) + LogYellow("data.serverName:"..tostring(data.serverName)) if curRankType==RANK_TYPE.GUILD_DEATHPOS_GUILD then this.mRName.text=(data.serverName and data.serverName ~= "") and data.serverName.." "..string.format(Language[11027],guildData.name,data.param2) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua index 8b9dacd52b..a554197631 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua @@ -189,15 +189,16 @@ function this.RefreshGuildInfo() for key, value in pairs(data) do if i==value.pathId then local guild=Util.GetGameObject(preList[i],"Guild") - local serverName=Util.GetGameObject(preList[i],"serverName/Text"):GetComponent("Text") + local serverDi = Util.GetGameObject(preList[i],"serverName") + local serverName=Util.GetGameObject(serverDi,"Text"):GetComponent("Text") local guildImage=guild:GetComponent("Image") local guildName=Util.GetGameObject(preList[i],"Guild/mask/GuildName"):GetComponent("Text") - Util.GetGameObject(preList[i],"serverName"):SetActive(false) guild:SetActive(true) if value.serverName and value.serverName ~= "" then serverName.text = value.serverName + serverDi:SetActive(true) else - Util.GetGameObject(preList[i],"serverName"):SetActive(false) + serverDi:SetActive(false) serverName.text = "" end guildName.text=value.guildName