From ab482ab3df64d97c3df9921f6d645d914368bf08 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 30 Jul 2021 11:45:46 +0800
Subject: +misc

---
 Assets/ActionTool/Editor/ActionPreviewEditor.cs | 65 +++++++++++++++++++++----
 1 file changed, 55 insertions(+), 10 deletions(-)

(limited to 'Assets/ActionTool/Editor/ActionPreviewEditor.cs')

diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index ecec6dde..8b13b70a 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -28,8 +28,12 @@ namespace ActionTool
         Texture m_UITextureEnd;
         Texture m_UITexturePrevious;
         Texture m_UITextureStart;
+
         Texture m_UITextureNewHurtBox;
         Texture m_UITextureNewHitBox;
+        Texture m_UITextureNewThrowBox;
+        Texture m_UITextureNewBlockBox;
+        Texture m_UITextureNewDefendBox;
 
         GUIStyle m_StyleBold;
 
@@ -59,7 +63,9 @@ namespace ActionTool
             m_UITextureStart = (Texture)Resources.Load("button_control_start");
             m_UITextureNewHurtBox = (Texture)Resources.Load("hurtbox");
             m_UITextureNewHitBox = (Texture)Resources.Load("hitbox");
-
+            m_UITextureNewThrowBox = (Texture)Resources.Load("throwbox");
+            m_UITextureNewBlockBox = (Texture)Resources.Load("blockbox");
+            m_UITextureNewDefendBox = (Texture)Resources.Load("defendbox");
         }
 
         void Update()
@@ -107,8 +113,11 @@ namespace ActionTool
             GUI.enabled = ActionManager.animationData != null;
             GUI_Toolbar_NewHurtBox(ref x, ref y);
             GUI_Toolbar_NewHitBox(ref x, ref y);
-            GUI_Toolbar_Detail(ref x, ref y);
-            GUI_Toolbar_Delete(ref x, ref y);
+            GUI_Toolbar_NewThrowBox(ref x, ref y);
+            GUI_Toolbar_NewBlockBox(ref x, ref y);
+            GUI_Toolbar_NewDefendBox(ref x, ref y);
+            //GUI_Toolbar_Detail(ref x, ref y);
+            //GUI_Toolbar_Delete(ref x, ref y);
             GUI.enabled = true;
 
             GUI_DrawSeperateLine(x + 10 + kToolbarControlMargin, 0, kToolbarHeight);
@@ -322,7 +331,10 @@ namespace ActionTool
                 return;
             DrawBoxList(animData.hurtBoxes, ref y, Color.green);
             DrawBoxList(animData.hitBoxes, ref y, Color.red);
-			GenericMenu_BoxFrame();
+            DrawBoxList(animData.throwBoxes, ref y, Color.blue);
+            DrawBoxList(animData.blockBoxes, ref y, Color.yellow);
+            DrawBoxList(animData.defendBoxes, ref y, Color.magenta);
+            GenericMenu_BoxFrame();
         }
 
         void DrawBoxList(List<ColliderData> boxes, ref float y, Color c)
@@ -352,7 +364,7 @@ namespace ActionTool
 			GUI.color = c;
 			if (select)
             {
-                ActionManager.OnSelectBox(box);
+                ActionManager.OnSelectBox(box, index);
 
                 //float length = action.totalFrame * kFrameWidth;
                 //ui.DrawHorizontalLineFast(y, kTimeLineViewXOffset, kTimeLineViewXOffset + length, c * 0.7f);
@@ -377,12 +389,12 @@ namespace ActionTool
                     bool frameSelect = GUI.Toggle(frameRect, frameSelected, "",styles.keyFrameButton);
                     if(!frameSelected && frameSelect)
                     {
-						ActionManager.OnSelectBox(box);
-						ActionManager.OnSelectColliderFrame(frame);
+						//ActionManager.OnSelectBox(box, i);
+						ActionManager.OnSelectColliderFrame(frame, box);
 					}
 					else if(frameSelect && !frameSelect)
                     {
-                        ActionManager.OnSelectColliderFrame(null);
+                        ActionManager.OnSelectColliderFrame(null, null);
                     }
                     if(prevIndex != -1)
                     {
@@ -429,8 +441,8 @@ namespace ActionTool
                 BoxParam param = new BoxParam();
                 param.collider = box;
                 param.frame = frame;
-                if(ActionManager.colliderData != box)
-                    ActionManager.OnSelectBox(box);
+                //if(ActionManager.colliderData != box)
+                //    ActionManager.OnSelectBox(box, index);
 				GenericMenu _newFrameMenu = new GenericMenu();
 				_newFrameMenu.AddItem(new GUIContent("New Frame"), false, ActionManager.AddNewBoxFrame, param);
 				_newFrameMenu.AddItem(new GUIContent("Delete"), false, ActionManager.DeleteBoxFrame, param);
@@ -473,6 +485,39 @@ namespace ActionTool
             x += kToolbarControlSize;
         }
 
+        void GUI_Toolbar_NewThrowBox(ref float x, ref float y)
+        {
+            x += kToolbarControlMargin;
+            Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
+            if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewThrowBox, "New hit box")))
+            {
+                ActionManager.NewHitBox();
+            }
+            x += kToolbarControlSize;
+        }
+
+        void GUI_Toolbar_NewDefendBox(ref float x, ref float y)
+        {
+            x += kToolbarControlMargin;
+            Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
+            if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewDefendBox, "New hit box")))
+            {
+                ActionManager.NewHitBox();
+            }
+            x += kToolbarControlSize;
+        }
+
+        void GUI_Toolbar_NewBlockBox(ref float x, ref float y)
+        {
+            x += kToolbarControlMargin;
+            Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
+            if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewBlockBox, "New hit box")))
+            {
+                ActionManager.NewHitBox();
+            }
+            x += kToolbarControlSize;
+        }
+
         void GUI_Toolbar_Detail(ref float x, ref float y)
         {
             x += kToolbarControlMargin + 20;
-- 
cgit v1.1-26-g67d0