diff options
Diffstat (limited to 'Assets/ActionTool/Editor/ActionManager.cs')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionManager.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs index 4fe3138b..7becca02 100644 --- a/Assets/ActionTool/Editor/ActionManager.cs +++ b/Assets/ActionTool/Editor/ActionManager.cs @@ -25,6 +25,7 @@ namespace ActionTool public static ActionEditor AnimationWindow;
public static ActionPreviewEditor PreviewWindow;
public static ActionEventEditor EventEditWindow;
+ public static ActionColliderFrameEditor ColliderFrameWindow;
public static ActionColliderEditor ColliderWindow;
public static ActionToolSettings Settings;
@@ -170,7 +171,7 @@ namespace ActionTool OnSelectColliderFrame(null);
OnSelectBox(null);
if (EventEditWindow) EventEditWindow.Close();
- if (ColliderWindow) ColliderWindow.Close();
+ if (ColliderFrameWindow) ColliderFrameWindow.Close();
}
public static bool HasSelectObj()
@@ -352,9 +353,18 @@ namespace ActionTool }
}
+ public static void EditCollider()
+ {
+ if (s_CurColliderData == null)
+ return;
+ ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
+ }
+
public static void OnSelectBox(ColliderData collider)
{
s_CurColliderData = collider;
+ if (ColliderWindow != null)
+ ColliderWindow.Repaint();
}
public static void AddNewBoxFrame(object param)
@@ -396,7 +406,7 @@ namespace ActionTool if (frame != null)
{
- ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
+ ColliderFrameWindow = EditorWindow.GetWindow<ActionColliderFrameEditor>(true);
ActionData action = ActionManager.actionData;
float normaltime = frame.frame / action.totalFrame;
|