From 9c3f1cb5ebb0db7d3c49e653d0af4e5484245338 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 3 Jun 2021 15:52:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=B0=E5=8F=B7]=3D=3D=3D=3D=E6=8C=82?= =?UTF-8?q?=E6=9C=BA=E7=95=8C=E9=9D=A2=E7=89=B9=E6=95=88=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=A7=B0=E5=8F=B7=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/Map/MapCtrl.prefab | 2 +- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 2 +- Assets/ManagedResources/~Lua/View/PlayerLiveView.lua | 3 +++ Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua | 5 +++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/MapCtrl.prefab b/Assets/ManagedResources/Prefabs/Map/MapCtrl.prefab index e4ae58fe64..c36f772634 100644 --- a/Assets/ManagedResources/Prefabs/Map/MapCtrl.prefab +++ b/Assets/ManagedResources/Prefabs/Map/MapCtrl.prefab @@ -4815,7 +4815,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 33 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 631ba32fe6..611e406721 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1044,7 +1044,7 @@ JumpType = { NPCPosType={ maincity=1, - + onHook = 2, } diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 1081686ffc..31814e9f01 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -835,7 +835,7 @@ function this.RefreshLittleMap() if this.liveNode then this.liveNode:OnClose() end - this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,1) + this.liveNode = PlayerLiveView:New(this.btnMap.transform,1,nil,orginLayer) this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale3,Vector3.New(0,-40,0)) if FightPointPassManager.GetRoleDirection()==1 then this.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT) diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 77c9596580..ccafc64e95 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -166,6 +166,7 @@ function PlayerLiveView:OnShowLive() local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale) local y=curArtResourcesConfig.Position[2]+curPlayerRole.Height if isRide then + LogError("name height=="..self.nameHeight) y=y+3+self.nameHeight end local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],y,0) @@ -174,6 +175,8 @@ function PlayerLiveView:OnShowLive() local effect=0 if self.posType==NPCPosType.maincity then effect=self.transform.localScale.x + elseif self.posType==NPCPosType.onHook then + effect=50 else effect=self.leader.transform.localScale.x end diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index b9003b3c8a..de2824b7a0 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -159,7 +159,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data) npc = NameManager.roleSex == ROLE_SEX.BOY and npc1 or npc2 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 = PlayerLiveView:New(self.roleRoot,1,nil,sortingorder,NPCPosType.onHook) self.playerLiveView:RemoveTitleCanvas() self.nameDi.gameObject:SetActive(false) --如果修行开启设置修行标识 @@ -176,7 +176,8 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data) sex = data.sex, ride = data.userMount, designation = data.userTitle, - }) + },sortingorder,NPCPosType.onHook) + self.playerLiveView:SetNameHeight(1.5) self.playerLiveView:RemoveTitleCanvas() if data.userMount == 0 then self.nameDi.transform.localPosition = namePos[1].pos