Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
a4b73c33b2
File diff suppressed because it is too large
Load Diff
|
@ -236,7 +236,7 @@ function this:InitComponent()
|
||||||
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi")
|
||||||
this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld")
|
this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld")
|
||||||
this.btnWaiDi:SetActive(false)
|
this.btnWaiDi:SetActive(false)
|
||||||
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer4/btnCompoundHero")
|
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
|
||||||
|
|
||||||
this.operateIcon = {
|
this.operateIcon = {
|
||||||
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
|
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
|
||||||
|
|
|
@ -364,14 +364,17 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
goldExper:GetComponent("Text").text = Language[12382]
|
goldExper:GetComponent("Text").text = Language[12382]
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.ARENA_RANK then
|
elseif rankType == RANK_TYPE.ARENA_RANK then
|
||||||
-- if data.personInfo.score and data.personInfo.score > 0 then
|
|
||||||
arenaScore:SetActive(true)
|
arenaScore:SetActive(true)
|
||||||
|
local str = ""
|
||||||
if Value0 then
|
if Value0 then
|
||||||
Value0:GetComponent("Text").text = "<size=40%>"..data.personInfo.name .."</size>"
|
Value0:GetComponent("Text").text = "<size=40%>"..data.userName .."</size>"
|
||||||
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.personInfo.score
|
end
|
||||||
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
|
str = Language[12241] .. data.rankInfo.param1--data.param1
|
||||||
else
|
else
|
||||||
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.score
|
str = ""
|
||||||
end
|
end
|
||||||
|
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
|
||||||
-- end
|
-- end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue