Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-10-01 00:06:49 +08:00
commit a4b73c33b2
3 changed files with 18237 additions and 18234 deletions

File diff suppressed because it is too large Load Diff

View File

@ -236,7 +236,7 @@ function this:InitComponent()
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld")
this.btnWaiDi:SetActive(false)
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer4/btnCompoundHero")
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
this.operateIcon = {
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),

View File

@ -364,14 +364,17 @@ function this.SetInfoShow(go,data,rankType,Value0)
goldExper:GetComponent("Text").text = Language[12382]
end
elseif rankType == RANK_TYPE.ARENA_RANK then
-- if data.personInfo.score and data.personInfo.score > 0 then
arenaScore:SetActive(true)
local str = ""
if Value0 then
Value0:GetComponent("Text").text = "<size=40%>"..data.personInfo.name .."</size>"
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.personInfo.score
else
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.score
Value0:GetComponent("Text").text = "<size=40%>"..data.userName .."</size>"
end
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
str = Language[12241] .. data.rankInfo.param1--data.param1
else
str = ""
end
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
-- end
end
end