From adb364a79f5dd69de08f72072cc2261131314e53 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 2 Sep 2021 13:01:49 +0800 Subject: +override rootmotion --- Assets/ActionTool/Editor/ActionData.cs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'Assets/ActionTool/Editor/ActionData.cs') diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs index 5e519c3e..82eedee3 100644 --- a/Assets/ActionTool/Editor/ActionData.cs +++ b/Assets/ActionTool/Editor/ActionData.cs @@ -214,17 +214,30 @@ namespace ActionTool m_Animator.Update(0); m_Animator.speed = 0; - if(applyRootMotion && m_RootMotion) + if(applyRootMotion) { + var animData = ActionManager.animationData; + bool overrideRM = animData != null && animData.overrideRootMotion != null; + + if(!overrideRM && m_RootMotion) + { #if true - // Action Tool这里需要转换一下root motion的轴 - m_Animator.transform.position = RootMotionUtility.ExchangeXZ(m_RootMotion.GetRootMotion(normalizeTime)); + // Action Tool这里需要转换一下root motion的轴 + m_Animator.transform.position = RootMotionUtility.ExchangeXZ(m_RootMotion.GetRootMotion(normalizeTime)); #else Vector3 dis = m_RootMotion.GetRootMotionDistance(m_PrevNormalTime, normalizeTime); m_Animator.transform.position += RootMotionUtility.ExchangeXZ(dis); m_PrevNormalTime = normalizeTime; #endif - } + } + else if(overrideRM) + { + if(!ActionRootMotionEditor.IsRecord) + { + + } + } + } } public int GetCurrentFrame() -- cgit v1.1-26-g67d0