From 26b68caaae2804c701c6655f096feb2c5e826ba5 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 13 Sep 2021 12:00:32 +0800 Subject: *fxclear --- Assets/Scripts/Unit/TimelineEventProxy.cs | 38 ++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'Assets/Scripts/Unit/TimelineEventProxy.cs') diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 3310f6cd..6d4650fc 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -87,10 +87,16 @@ public partial class TimelineEventProxy private AnimationData m_PrevAnimationData; - public TimelineEventProxy(Transform root, UnitController owner = null) - { - m_Root = root; - this.owner = owner; + public TimelineEventProxy( UnitController owner) + { + this.owner = owner; + m_Root = owner.transform; + m_PrevAnimationData = null; + } + + public TimelineEventProxy(Transform root) + { + m_Root = root; m_PrevAnimationData = null; } @@ -173,13 +179,29 @@ public partial class TimelineEventProxy onClear.gameObject.name = prefab.name + "(Clone)"; if(owner != null) { - Quaternion rot = owner.transform.rotation * Quaternion.Euler(effect.rotation); - Debug.Log(effect.rotation); - onClear.Initialize(new PlayEffectInfo(path, EffectPlayTypes.Oneshot, m_Root, effect.position, effect.rotation, effect.scale, 0, false)); + PlayEffectInfo info = new PlayEffectInfo(); + info.path = path; + info.playEffectType = EffectPlayTypes.Oneshot; + info.rootTr = m_Root; + info.posOffset = effect.position; + info.rot = effect.rotation; + info.scale = effect.scale; + info.bAttached = true; + + onClear.Initialize(info); } else { - onClear.Initialize(new PlayEffectInfo(path, EffectPlayTypes.Oneshot, m_Root, effect.position, effect.rotation, effect.scale, 0, false)); + PlayEffectInfo info = new PlayEffectInfo(); + info.path = path; + info.playEffectType = EffectPlayTypes.Oneshot; + info.rootTr = m_Root; + info.posOffset = effect.position; + info.rot = effect.rotation; + info.scale = effect.scale; + info.bAttached = true; + + onClear.Initialize(info); } #if UNITY_EDITOR if (isInEditMode && registerParticleSystem != null) -- cgit v1.1-26-g67d0