diff options
Diffstat (limited to 'Assets/ActionTool')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionColliderFrameEditor.cs | 29 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/ActionData.cs | 8 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/ActionEditor.cs | 2 |
3 files changed, 33 insertions, 6 deletions
diff --git a/Assets/ActionTool/Editor/ActionColliderFrameEditor.cs b/Assets/ActionTool/Editor/ActionColliderFrameEditor.cs index 4f716be3..91b6d0c3 100644 --- a/Assets/ActionTool/Editor/ActionColliderFrameEditor.cs +++ b/Assets/ActionTool/Editor/ActionColliderFrameEditor.cs @@ -14,7 +14,7 @@ namespace ActionTool private void OnEnable()
{
titleContent = new GUIContent("Collider Frame Editor");
- maxSize = new Vector2(300, 150);
+ maxSize = new Vector2(300, 180);
minSize = maxSize;
if(!sceneView)
@@ -62,6 +62,33 @@ namespace ActionTool GUILayout.Space(10);
+ GUILayout.BeginHorizontal();
+
+ if(GUILayout.Button("Left abit"))
+ {
+ ActionData action = ActionManager.actionData;
+ float normaltime = frame.frame / action.totalFrame;
+ action.curAnimTimeNormal = normaltime - 0.01f;
+ }
+
+ if (GUILayout.Button("Right abit"))
+ {
+ ActionData action = ActionManager.actionData;
+ float normaltime = frame.frame / action.totalFrame;
+ action.curAnimTimeNormal = normaltime + 0.01f;
+ }
+
+ if (GUILayout.Button("Current"))
+ {
+ ActionData action = ActionManager.actionData;
+ float normaltime = frame.frame / action.totalFrame;
+ action.curAnimTimeNormal = normaltime;
+ }
+
+ GUILayout.EndHorizontal();
+
+ GUILayout.Space(10);
+
Color prevColor = GUI.backgroundColor;
GUI.backgroundColor = Color.red;
if (GUILayout.Button("Delete"))
diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs index 799b2244..6116442c 100644 --- a/Assets/ActionTool/Editor/ActionData.cs +++ b/Assets/ActionTool/Editor/ActionData.cs @@ -174,14 +174,14 @@ namespace ActionTool if(m_RootMotion)
{
#if true
- m_Animator.transform.position = m_RootMotion.GetRootMotion(normalizeTime);
-#else
+ m_Animator.transform.position = m_RootMotion.GetRootMotion(normalizeTime);
+#else
Vector3 dis = m_RootMotion.GetRootMotionDistance(m_PrevNormalTime, normalizeTime);
m_Animator.transform.position += dis;
m_PrevNormalTime = normalizeTime;
#endif
- }
- }
+ }
+ }
public int GetCurrentFrame()
{
diff --git a/Assets/ActionTool/Editor/ActionEditor.cs b/Assets/ActionTool/Editor/ActionEditor.cs index d7ba4f54..072d40cc 100644 --- a/Assets/ActionTool/Editor/ActionEditor.cs +++ b/Assets/ActionTool/Editor/ActionEditor.cs @@ -9,7 +9,7 @@ namespace ActionTool public class ActionEditor : EditorWindow
{
- [MenuItem("Custom/ActionTool/Open")]
+ [MenuItem("Erika/ActionTool/Open")]
static void OpenTools()
{
ActionManager.AnimationWindow = GetWindow<ActionEditor>();
|