From 498bc9a9b5d3202bb96b2dac2ac5da13252a1b96 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 8 Jun 2021 14:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=8D=E4=BC=98=E5=8C=96=EF=BC=8C=E8=80=81=E5=8C=85?= =?UTF-8?q?=E4=B9=9F=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scripts/Utility/Util.cs | 4 ++-- Assets/ManagedResources/~Lua/View/PlayerLiveView.lua | 2 +- Assets/ManagedResources/~Lua/View/PlayerTitle.lua | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/LuaFramework/Scripts/Utility/Util.cs b/Assets/LuaFramework/Scripts/Utility/Util.cs index 9cbb1839ca..788e17df68 100644 --- a/Assets/LuaFramework/Scripts/Utility/Util.cs +++ b/Assets/LuaFramework/Scripts/Utility/Util.cs @@ -901,11 +901,11 @@ namespace GameLogic main.startRotationMultiplier *= scale; } main.startSpeedMultiplier *= scale; - //particle.transform.localScale *= scale; + particle.transform.localScale *= scale; } if (hasParticleObj) { - //go.transform.localScale = new Vector3(scale, scale, scale); + go.transform.localScale = new Vector3(scale, scale, scale); } } diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index ccafc64e95..7536ed8698 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -180,7 +180,7 @@ function PlayerLiveView:OnShowLive() else effect=self.leader.transform.localScale.x end - self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale*effect,self.orginLayer) + self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale * effect,self.orginLayer) end end function PlayerLiveView:SetNameHeight(hei) diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index b7de9207ae..70f79af34d 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -58,12 +58,12 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) if position then self:SetPostion(position) end - if scale then - self:SetScale(scale) - end if effectScale then self:SetEffectScale(effectScale) end + if scale then + self:SetScale(scale) + end if layer then self:SetLayer(layer) end @@ -77,6 +77,7 @@ end function PlayerTitle:SetScale(scale) + self.scale = scale if self.titleLive then self.titleLive.transform.localScale = Vector3.one * scale end @@ -94,7 +95,7 @@ function PlayerTitle:SetEffectScale(effectScale) isScale = true end if isScale then - self.titleLive.transform.localScale = self.titleLive.transform.localScale / effectScale + self.titleLive.transform.localScale = Vector3.one * (self.scale or 1) end end end