From 9ceee66bf53b1fed9cd522bd288c4a1734c5d96e Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 9 Jul 2021 19:42:40 +0800 Subject: *mic --- Assets/ActionTool/Editor/ActionManager.cs | 38 +++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'Assets/ActionTool/Editor/ActionManager.cs') diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs index 08fc8383..29384821 100644 --- a/Assets/ActionTool/Editor/ActionManager.cs +++ b/Assets/ActionTool/Editor/ActionManager.cs @@ -53,8 +53,22 @@ namespace ActionTool private static RootMotionData s_RootMotion; - private static AnimationData s_AnimationData; - public static AnimationData animationData { get { return s_AnimationData; } } + private static AnimationData m_AnimationData; + public static AnimationData animationData + { + get + { + return m_AnimationData; + } + set + { + m_AnimationData = value; + if (gizmos) + { + gizmos.SetAnimationData(value); + } + } + } private static ColliderData s_CurColliderData; public static ColliderData colliderData { get { return s_CurColliderData; } } @@ -120,7 +134,7 @@ namespace ActionTool s_CurActionData.Initialize(s_Animator, clip, s_RootMotion); string animationDataPath = s_AnimationDataFolder + unitName + "/" + animation + ".asset"; - s_AnimationData = AssetDatabase.LoadAssetAtPath(animationDataPath); + animationData = AssetDatabase.LoadAssetAtPath(animationDataPath); } public static bool HasSelectObj() @@ -256,48 +270,48 @@ namespace ActionTool animData.animationPath = animpath; AssetDatabase.CreateAsset(animData, animationDataPath); AssetDatabase.Refresh(); - s_AnimationData = animData; + animationData = animData; } public static void SaveAnimationData() { - if (s_AnimationData == null) + if (animationData == null) { Debug.LogError("[ActionTool] 没有animation data数据"); return; } - EditorUtility.SetDirty(s_AnimationData); + EditorUtility.SetDirty(animationData); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } public static void NewHurtBox() { - if (s_AnimationData == null) + if (animationData == null) { Debug.LogError("[ActionTool] 没有animation data数据"); return; } ColliderData box = new ColliderData(ColliderBox.EColliderType.HurtBox, ColliderBox.Pivot.MiddleBottom); - s_AnimationData.AddBox(s_AnimationData.hurtBoxes, box); + animationData.AddBox(animationData.hurtBoxes, box); } public static void NewHitBox() { - if (s_AnimationData == null) + if (animationData == null) { Debug.LogError("[ActionTool] 没有animation data数据"); return; } ColliderData box = new ColliderData(ColliderBox.EColliderType.HitBox, ColliderBox.Pivot.MiddleCenter); - s_AnimationData.AddBox(s_AnimationData.hitBoxes, box); + animationData.AddBox(animationData.hitBoxes, box); } public static void DeleteCurBox() { - if(s_AnimationData != null && s_CurColliderData != null) + if(animationData != null && s_CurColliderData != null) { - s_AnimationData.DeleteBox(s_CurColliderData); + animationData.DeleteBox(s_CurColliderData); s_CurColliderData = null; } } -- cgit v1.1-26-g67d0