diff options
| author | chai <chaifix@163.com> | 2021-09-13 12:00:32 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-09-13 12:00:32 +0800 |
| commit | 26b68caaae2804c701c6655f096feb2c5e826ba5 (patch) | |
| tree | a293cb335d1e221de1d95d48cbdcdc60e2ac160d /Assets/Scripts/Unit/TimelineEventProxy.cs | |
| parent | c4299d8f353b270018786bfcd1a3344142724559 (diff) | |
*fxclear
Diffstat (limited to 'Assets/Scripts/Unit/TimelineEventProxy.cs')
| -rw-r--r-- | Assets/Scripts/Unit/TimelineEventProxy.cs | 38 |
1 files changed, 30 insertions, 8 deletions
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)
|