Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
commit
a7328fdfaf
|
@ -196,7 +196,7 @@ function this.GuildItemAdapter(item, data)
|
|||
-- gName = SubString(gName, 5).."..."
|
||||
--end
|
||||
nameText.text = gName
|
||||
announceText.text = guildData.annouce
|
||||
announceText.text = GetLanguageStrById(guildData.annouce)
|
||||
head.sprite = Util.LoadSprite(GuildManager.GetLogoResName(guildData.icon))
|
||||
local curGuildLevelInfo = ConfigManager.GetConfigData(ConfigName.GuildLevelConfig, guildData.levle)
|
||||
local maxMemNum = curGuildLevelInfo.Num
|
||||
|
|
|
@ -349,7 +349,7 @@ function this.RefreshBaseInfoShow()
|
|||
local masterInfo = MyGuildManager.GetMyGuildMasterInfo()
|
||||
|
||||
this.guildName.text = guildData.name
|
||||
this.guildAnnounce.text = guildData.annouce
|
||||
this.guildAnnounce.text = GetLanguageStrById(guildData.annouce)
|
||||
this.guildLevel.text = curGuildlv..Language[10065]
|
||||
this.guildMaster.text = masterInfo.userName
|
||||
this.guildMember.text = string.format("(%s/%s)", guildData.totalNum, curGuildLevelInfo.Num)
|
||||
|
|
Loading…
Reference in New Issue