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

dev_chengFeng
jiaoyangna 2021-06-02 20:59:26 +08:00
commit b82347e7eb
3 changed files with 4 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 900 KiB

View File

@ -355,6 +355,7 @@ function this.FriendItemAdapter(node, data)
titlePar:SetActive(true)
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
titleList[node]:RemoveCanvas()
end
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else
@ -526,6 +527,7 @@ function this.ChatItemAdapter(node, data, isShowTime)
titlePar:SetActive(true)
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
titleList[node]:RemoveCanvas()
end
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else

View File

@ -160,6 +160,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
self.userId = PlayerManager.uid
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil)
self.playerLiveView:RemoveTitleCanvas()
self.nameDi.gameObject:SetActive(false)
--如果修行开启设置修行标识
if ActTimeCtrlManager.SingleFuncState(108) then
@ -176,6 +177,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
ride = data.userMount,
designation = data.userTitle,
})
self.playerLiveView:RemoveTitleCanvas()
if data.userMount == 0 then
self.nameDi.transform.localPosition = namePos[1].pos
else