diff options
Diffstat (limited to 'Assets/ActionTool/Editor/ActionManager.cs')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionManager.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs index 29384821..89e04c80 100644 --- a/Assets/ActionTool/Editor/ActionManager.cs +++ b/Assets/ActionTool/Editor/ActionManager.cs @@ -293,7 +293,7 @@ namespace ActionTool return;
}
ColliderData box = new ColliderData(ColliderBox.EColliderType.HurtBox, ColliderBox.Pivot.MiddleBottom);
- animationData.AddBox(animationData.hurtBoxes, box);
+ animationData.AddBox(ref animationData.hurtBoxes, box);
}
public static void NewHitBox()
@@ -304,7 +304,7 @@ namespace ActionTool return;
}
ColliderData box = new ColliderData(ColliderBox.EColliderType.HitBox, ColliderBox.Pivot.MiddleCenter);
- animationData.AddBox(animationData.hitBoxes, box);
+ animationData.AddBox(ref animationData.hitBoxes, box);
}
public static void DeleteCurBox()
@@ -356,11 +356,12 @@ namespace ActionTool public static void OnSelectColliderFrame(ColliderData.ColliderFrame frame)
{
s_CurEditColliderFrame = frame;
- ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
- if(frame != null)
+ if (frame != null)
{
- ActionData action = ActionManager.actionData;
+ ColliderWindow = EditorWindow.GetWindow<ActionColliderEditor>(true);
+
+ ActionData action = ActionManager.actionData;
float normaltime = frame.frame / action.totalFrame;
action.curAnimTimeNormal = normaltime;
}
|