Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
b82347e7eb
Binary file not shown.
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 900 KiB |
|
@ -355,6 +355,7 @@ function this.FriendItemAdapter(node, data)
|
||||||
titlePar:SetActive(true)
|
titlePar:SetActive(true)
|
||||||
if not titleList[node] then
|
if not titleList[node] then
|
||||||
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
||||||
|
titleList[node]:RemoveCanvas()
|
||||||
end
|
end
|
||||||
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
||||||
else
|
else
|
||||||
|
@ -526,6 +527,7 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
||||||
titlePar:SetActive(true)
|
titlePar:SetActive(true)
|
||||||
if not titleList[node] then
|
if not titleList[node] then
|
||||||
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
||||||
|
titleList[node]:RemoveCanvas()
|
||||||
end
|
end
|
||||||
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
||||||
else
|
else
|
||||||
|
|
|
@ -160,6 +160,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
|
||||||
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
|
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
|
||||||
self.userId = PlayerManager.uid
|
self.userId = PlayerManager.uid
|
||||||
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil)
|
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil)
|
||||||
|
self.playerLiveView:RemoveTitleCanvas()
|
||||||
self.nameDi.gameObject:SetActive(false)
|
self.nameDi.gameObject:SetActive(false)
|
||||||
--如果修行开启设置修行标识
|
--如果修行开启设置修行标识
|
||||||
if ActTimeCtrlManager.SingleFuncState(108) then
|
if ActTimeCtrlManager.SingleFuncState(108) then
|
||||||
|
@ -176,6 +177,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
|
||||||
ride = data.userMount,
|
ride = data.userMount,
|
||||||
designation = data.userTitle,
|
designation = data.userTitle,
|
||||||
})
|
})
|
||||||
|
self.playerLiveView:RemoveTitleCanvas()
|
||||||
if data.userMount == 0 then
|
if data.userMount == 0 then
|
||||||
self.nameDi.transform.localPosition = namePos[1].pos
|
self.nameDi.transform.localPosition = namePos[1].pos
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue