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

dev_chengFeng
jiaoyangna 2021-08-12 11:41:37 +08:00
commit 4fe156364d
2 changed files with 8 additions and 3 deletions

View File

@ -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)

View File

@ -190,15 +190,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