diff options
Diffstat (limited to 'Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs')
| -rw-r--r-- | Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs b/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs index 8bad9869..51a8194f 100644 --- a/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs @@ -115,13 +115,16 @@ namespace ActionTool GUI_Detail(ref y);
GUI_ActionSettings(ref y);
GUI_Properties(ref y);
+ GUI_TimeRelatedBg(ref y, 4);
+ y += 5;
GUI_Parameters(ref y);
GUI_Toggle(ref y);
GUI_Curves(ref y);
GUI_Curve(ref y);
- GUI_PlaybackTime(ref y);
- y += 5;
+ y += 12;
GUI_Setting(ref y);
+ y += 5;
+ GUI_PlaybackTime(ref y);
GUI_TimeLineView(ref y);
}
@@ -147,7 +150,7 @@ namespace ActionTool x += 20;
GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.animationData != null;
- GUI_Toolbar_NewHurtBox(ref x, ref y);
+ //GUI_Toolbar_NewHurtBox(ref x, ref y);
GUI_Toolbar_NewHitBox(ref x, ref y);
GUI_Toolbar_NewThrowBox(ref x, ref y);
GUI_Toolbar_NewBlockBox(ref x, ref y);
@@ -284,7 +287,7 @@ namespace ActionTool AnimationData animData = ActionManager.animationData;
ActionInfoEditor.ShowContent("AnimationData Info",
"Events: " + (animData.animationEvents == null ? 0 : animData.animationEvents.Count) + "\n" +
- "HurtBoxes: " + (animData.hurtBoxes == null ? 0 : animData.hurtBoxes.Count) + "\n" +
+ // "HurtBoxes: " + (animData.hurtBoxes == null ? 0 : animData.hurtBoxes.Count) + "\n" +
"HitBoxes: " + (animData.hitBoxes == null ? 0 : animData.hitBoxes.Count) + "\n" +
"ThrowBoxes: " + (animData.throwBoxes == null ? 0 : animData.throwBoxes.Count) + "\n" +
"BlockBoxes: " + (animData.blockBoxes == null ? 0 : animData.blockBoxes.Count) + "\n" +
@@ -400,6 +403,12 @@ namespace ActionTool y += 15;
}
+ void GUI_TimeRelatedBg(ref float y, int lineCount)
+ {
+ Rect bgRect = new Rect(3, y + 3, position.width - 6, 15 * lineCount + 6);
+ EditorGUI.DrawRect(bgRect, new Color32(65, 65, 65, 255));
+ }
+
void GUI_ActionSettings(ref float y)
{
AnimationData animData = ActionManager.animationData;
@@ -640,8 +649,8 @@ namespace ActionTool float y = m_GridY + (ActionManager.MaxEventsPerFrame + 1 + (hasRM ? 1:0)) * kFrameHeight;
if (animData == null)
return;
- DrawBoxList(animData.hurtBoxes, ref y, Color.green);
- DrawBoxList(animData.hitBoxes, ref y, Color.red);
+ //DrawBoxList(animData.hurtBoxes, ref y, Color.green);
+ DrawBoxList(animData.hitBoxes, ref y, Color.red);
DrawBoxList(animData.throwBoxes, ref y, Color.blue);
DrawBoxList(animData.blockBoxes, ref y, Color.yellow);
DrawBoxList(animData.defendBoxes, ref y, Color.magenta);
@@ -771,16 +780,16 @@ namespace ActionTool ui.DrawVerticalLineFast(x+1, y, y +height, lineColor);
}
- void GUI_Toolbar_NewHurtBox(ref float x, ref float y)
- {
- x += kToolbarControlMargin;
- Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHurtBox, "New hurt box")))
- {
- ActionManager.NewHurtBox();
- }
- x += kToolbarControlSize;
- }
+ //void GUI_Toolbar_NewHurtBox(ref float x, ref float y)
+ //{
+ // x += kToolbarControlMargin;
+ // Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
+ // if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHurtBox, "New hurt box")))
+ // {
+ // ActionManager.NewHurtBox();
+ // }
+ // x += kToolbarControlSize;
+ //}
void GUI_Toolbar_NewHitBox(ref float x, ref float y)
{
@@ -797,7 +806,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewThrowBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewThrowBox, "New throw box")))
{
ActionManager.NewHitBox();
}
@@ -808,7 +817,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewDefendBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewDefendBox, "New guard box")))
{
ActionManager.NewHitBox();
}
@@ -819,7 +828,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewBlockBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewBlockBox, "New block box")))
{
ActionManager.NewHitBox();
}
|