diff options
Diffstat (limited to 'Assets/ActionTool/Editor/ActionPreviewEditor.cs')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionPreviewEditor.cs | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs index d236770e..8e620d54 100644 --- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs @@ -52,7 +52,6 @@ namespace ActionTool m_UITextureNewHurtBox = (Texture)Resources.Load("hurtbox");
m_UITextureNewHitBox = (Texture)Resources.Load("hitbox");
- styles = ActionEditorStyles.Get();
}
void Update()
@@ -67,7 +66,9 @@ namespace ActionTool private void OnGUI()
{
- if (ActionManager.CurrentAnimationName == null || ActionManager.CurrentAnimationName == "")
+ styles = ActionEditorStyles.Get();
+
+ if (ActionManager.CurrentAnimationName == null || ActionManager.CurrentAnimationName == "")
{
EditorGUILayout.HelpBox("选择动画", MessageType.Warning);
return;
@@ -338,12 +339,17 @@ namespace ActionTool void DrawBox(int index, ColliderData box, float y, Color c)
{
ActionData action = ActionManager.actionData;
- Color prevColor = GUI.color;
- GUI.color = c;
- Rect rect = new Rect(kTimeLineViewXOffset - 18, y - 1, 17, kFrameHeight);
+
+ Color prevColor = GUI.backgroundColor;
+ GUI.backgroundColor = c;
+ Rect rect = new Rect(kTimeLineViewXOffset - 17, y - 1, 17, kFrameHeight);
bool selected = ActionManager.colliderData == box;
- bool select = GUI.Toggle(rect, selected, index.ToString(), styles.boxToggle);
- if (select)
+ bool select = GUI.Toggle(rect, selected, index.ToString(), styles.boxToggle);
+ GUI.backgroundColor = prevColor;
+
+ prevColor = GUI.color;
+ GUI.color = c;
+ if (select)
{
ActionManager.OnSelectBox(box);
@@ -403,7 +409,8 @@ namespace ActionTool GUI.color = prevColor;
}
- void DrawBoxFrameMenuItem()
+ GenericMenu _newFrameMenu;
+ void DrawBoxFrameMenuItem()
{
Event e = Event.current;
if (e.button != 1 || !e.isMouse || e.type != EventType.MouseDown)
@@ -427,16 +434,16 @@ namespace ActionTool param.frame = frame;
if(ActionManager.colliderData != box)
ActionManager.OnSelectBox(box);
- GenericMenu menu = new GenericMenu();
- menu.AddItem(new GUIContent("New Frame"), false, ActionManager.AddNewBoxFrame, param);
- menu.AddItem(new GUIContent("Delete"), false, ActionManager.DeleteBoxFrame, param);
- menu.ShowAsContext();
+ _newFrameMenu = new GenericMenu();
+ _newFrameMenu.AddItem(new GUIContent("New Frame"), false, ActionManager.AddNewBoxFrame, param);
+ _newFrameMenu.AddItem(new GUIContent("Delete"), false, ActionManager.DeleteBoxFrame, param);
+ _newFrameMenu.ShowAsContext();
}
else
{
Debug.LogError("[ActionTool] 错误的点击");
}
- }
+ }
void GUI_DrawSeperateLine(float x, float y, float height)
{
|