diff --git a/Assets/Editor/FrameAnimation/FrameAnimationEditorServices.cs b/Assets/Editor/FrameAnimation/FrameAnimationEditorServices.cs index 53ca236e8..d9434ca82 100644 --- a/Assets/Editor/FrameAnimation/FrameAnimationEditorServices.cs +++ b/Assets/Editor/FrameAnimation/FrameAnimationEditorServices.cs @@ -122,7 +122,7 @@ namespace AibisDream.FrameAnimation.Editor { if (clip == null || !clip.IsImported) { - return "Manual"; + return clip != null && clip.HasStandaloneImportSource ? "Standalone Source" : "Manual"; } var sourceId = clip.ImportInfo?.ImportSourceId; if (sourceNames != null && !string.IsNullOrEmpty(sourceId) && @@ -232,7 +232,7 @@ namespace AibisDream.FrameAnimation.Editor if (clip.IsImported || AssetDatabase.IsSubAsset(clip) || string.IsNullOrEmpty(AssetDatabase.GetAssetPath(clip))) { - error = "只能添加独立 .asset 形式的 Manual Clip。"; + error = "只能添加独立 .asset 形式、且不由 Graph ImportSource 管理的 Clip。"; return false; } if (graph.Clips.Contains(clip)) diff --git a/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs b/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs index e9244f119..6c328f3cf 100644 --- a/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs +++ b/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs @@ -68,6 +68,7 @@ namespace AibisDream.FrameAnimation.Editor private SerializedObject clipSerializedObject; private FrameClip frameListClip; private ReorderableList frameList; + private bool frameListEditable; private readonly FrameAnimationPreviewCoordinator previewCoordinator = new FrameAnimationPreviewCoordinator(); private readonly List previewTimelineSliders = new List(); private readonly List