summaryrefslogtreecommitdiff
path: root/Assets/ActionTool/Editor
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/ActionTool/Editor')
-rw-r--r--Assets/ActionTool/Editor/ActionData.cs5
-rw-r--r--Assets/ActionTool/Editor/ActionManager.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs
index 85b0cc6e..03dc6b86 100644
--- a/Assets/ActionTool/Editor/ActionData.cs
+++ b/Assets/ActionTool/Editor/ActionData.cs
@@ -204,10 +204,11 @@ namespace ActionTool
if(applyRootMotion && m_RootMotion)
{
#if true
- m_Animator.transform.position = 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 += dis;
+ m_Animator.transform.position += RootMotionUtility.ExchangeXZ(dis);
m_PrevNormalTime = normalizeTime;
#endif
}
diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs
index 2d45630e..52311140 100644
--- a/Assets/ActionTool/Editor/ActionManager.cs
+++ b/Assets/ActionTool/Editor/ActionManager.cs
@@ -63,7 +63,7 @@ namespace ActionTool
public static Vector3 s_InitPosition = Vector3.zero;
- public static Quaternion s_InitRotation = Quaternion.identity;
+ public static Quaternion s_InitRotation = Quaternion.Euler(0,90,0);
private static RootMotionData s_RootMotion;