diff --git a/Assets/Editor/AIBIS.meta b/Assets/Editor/AIBIS.meta
new file mode 100644
index 000000000..907771bfa
--- /dev/null
+++ b/Assets/Editor/AIBIS.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 638cd3fa1c2470d42aceb69214c01786
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Editor/AIBIS/AibisEditorMenus.cs b/Assets/Editor/AIBIS/AibisEditorMenus.cs
deleted file mode 100644
index 8e40480cf..000000000
--- a/Assets/Editor/AIBIS/AibisEditorMenus.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace AibisDream.Editor
-{
- ///
- /// 项目自研编辑器菜单路径常量。新工具统一挂 下扁平条目。
- /// Create 路径见运行时 。
- ///
- public static class AibisEditorMenus
- {
- public const string Root = AibisAssetMenus.Root;
-
- public const string AnimationClipGenerator = Root + "/动画片段生成器";
- public const string JsonEditor = Root + "/JSON 编辑器";
- public const string NameCollector = Root + "/名称收集器";
- public const string ChapterGraphEditor = Root + "/章节 Graph 编辑器";
- public const string FrameAnimationGraphEditor = Root + "/帧动画 Graph 编辑器";
- public const string FrameClipEditor = Root + "/帧动画 Clip 编辑器";
- public const string YarnLocalizationValidator = Root + "/Yarn 本地化校验";
-
- public const string GameObjectRoot = "GameObject/" + Root;
- public const string BlockPuzzleShape = GameObjectRoot + "/方块拼图 Shape";
-
- public static class Create
- {
- public const string NarrativeTalkScene = AibisAssetMenus.NarrativeTalkScene;
- public const string FrameAnimationGraph = AibisAssetMenus.FrameAnimationGraph;
- public const string FrameClip = AibisAssetMenus.FrameClip;
- public const string BubbleStyle = AibisAssetMenus.BubbleStyle;
- public const string FixCheckRule = AibisAssetMenus.FixCheckRule;
- public const string FixCheckData = AibisAssetMenus.FixCheckData;
- public const string FixWhackMoleData = AibisAssetMenus.FixWhackMoleData;
- public const string HuoShanEmotionWave = AibisAssetMenus.HuoShanEmotionWave;
- public const string HuoShanWaveform = AibisAssetMenus.HuoShanWaveform;
- public const string BlockPuzzleValidator = AibisAssetMenus.BlockPuzzleValidator;
- public const string MemoryPunchTapeCatalog = AibisAssetMenus.MemoryPunchTapeCatalog;
- }
- }
-}
diff --git a/Assets/Editor/ChapterGraph/ChapterGraphEditorWindow.cs b/Assets/Editor/ChapterGraph/ChapterGraphEditorWindow.cs
index faac5e2c3..098c7da8d 100644
--- a/Assets/Editor/ChapterGraph/ChapterGraphEditorWindow.cs
+++ b/Assets/Editor/ChapterGraph/ChapterGraphEditorWindow.cs
@@ -2,7 +2,6 @@
using System.IO;
using System.Linq;
using AibisDream;
-using AibisDream.Editor;
using UnityEditor;
using UnityEditor.UIElements;
using UnityEngine;
diff --git a/Assets/Editor/FrameAnimation/AibisDream.FrameAnimation.Editor.asmdef b/Assets/Editor/FrameAnimation/AibisDream.FrameAnimation.Editor.asmdef
index 8a5bae64f..66c17e7dd 100644
--- a/Assets/Editor/FrameAnimation/AibisDream.FrameAnimation.Editor.asmdef
+++ b/Assets/Editor/FrameAnimation/AibisDream.FrameAnimation.Editor.asmdef
@@ -3,6 +3,7 @@
"rootNamespace": "AibisDream.FrameAnimation.Editor",
"references": [
"AibisDream.FrameAnimation.Runtime",
+ "AibisDream.Menus",
"Unity.2D.Sprite.Editor"
],
"includePlatforms": [
diff --git a/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs b/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs
index 56c0295b7..1a21517d3 100644
--- a/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs
+++ b/Assets/Editor/FrameAnimation/FrameAnimationGraphEditorWindow.cs
@@ -3,7 +3,6 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using AibisDream.Editor;
using UnityEditor;
using UnityEditor.Callbacks;
using UnityEditor.UIElements;
diff --git a/Assets/Editor/FrameAnimation/FrameClipEditorWindow.cs b/Assets/Editor/FrameAnimation/FrameClipEditorWindow.cs
index 4a8aca16e..1ea066a22 100644
--- a/Assets/Editor/FrameAnimation/FrameClipEditorWindow.cs
+++ b/Assets/Editor/FrameAnimation/FrameClipEditorWindow.cs
@@ -1,6 +1,5 @@
using System;
using System.Linq;
-using AibisDream.Editor;
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
diff --git a/Assets/Editor/HandlerNameCollector/HandlerNameCollectorWindow.cs b/Assets/Editor/HandlerNameCollector/HandlerNameCollectorWindow.cs
index 8ba0c7e65..66177aebc 100644
--- a/Assets/Editor/HandlerNameCollector/HandlerNameCollectorWindow.cs
+++ b/Assets/Editor/HandlerNameCollector/HandlerNameCollectorWindow.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using AibisDream.Editor;
using UnityEditor;
using UnityEditor.SceneManagement;
using UnityEngine;
diff --git a/Assets/Editor/MenuItem/BlockPuzzleMenuItemCreator.cs b/Assets/Editor/MenuItem/BlockPuzzleMenuItemCreator.cs
index c31d85c5f..a5510caae 100644
--- a/Assets/Editor/MenuItem/BlockPuzzleMenuItemCreator.cs
+++ b/Assets/Editor/MenuItem/BlockPuzzleMenuItemCreator.cs
@@ -1,5 +1,4 @@
-using AibisDream.Editor;
-using UnityEditor;
+using UnityEditor;
using UnityEngine;
namespace AibisDream.SystemEditor
diff --git a/Assets/Editor/Window/AnimationClipGenerator.cs b/Assets/Editor/Window/AnimationClipGenerator.cs
index d9a227f7d..1294c8a9e 100644
--- a/Assets/Editor/Window/AnimationClipGenerator.cs
+++ b/Assets/Editor/Window/AnimationClipGenerator.cs
@@ -1,5 +1,4 @@
using System.IO;
-using AibisDream.Editor;
using UnityEditor;
using UnityEngine;
diff --git a/Assets/Editor/Window/JsonEditWindow.cs b/Assets/Editor/Window/JsonEditWindow.cs
index a13c95abf..c59d89b9f 100644
--- a/Assets/Editor/Window/JsonEditWindow.cs
+++ b/Assets/Editor/Window/JsonEditWindow.cs
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using AibisDream.Editor;
using AibisDream.Utility;
using Newtonsoft.Json.Linq;
using UnityEditor;
diff --git a/Assets/Editor/YarnLocalizationValidation/YarnL10nValidationWindow.cs b/Assets/Editor/YarnLocalizationValidation/YarnL10nValidationWindow.cs
index 6497e90c8..511e55357 100644
--- a/Assets/Editor/YarnLocalizationValidation/YarnL10nValidationWindow.cs
+++ b/Assets/Editor/YarnLocalizationValidation/YarnL10nValidationWindow.cs
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using AibisDream.Editor;
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
diff --git a/Assets/Scripts/AibisDream.Menus.meta b/Assets/Scripts/AibisDream.Menus.meta
new file mode 100644
index 000000000..4de0bafdc
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6422dcc8dba87cd41a6b24ae4de41c7c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AssetRefs/AibisAssetMenus.cs b/Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs
similarity index 89%
rename from Assets/Scripts/AssetRefs/AibisAssetMenus.cs
rename to Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs
index 6044f7506..8e291fec3 100644
--- a/Assets/Scripts/AssetRefs/AibisAssetMenus.cs
+++ b/Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs
@@ -1,7 +1,7 @@
namespace AibisDream
{
///
- /// Create 菜单路径（运行时 ScriptableObject 注册用，须与 Editor/AIBIS/AibisEditorMenus.Create 保持一致）。
+ /// Create 菜单路径（ScriptableObject 注册用，须与 保持一致）。
///
public static class AibisAssetMenus
{
diff --git a/Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs.meta b/Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs.meta
new file mode 100644
index 000000000..1a813b22b
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus/AibisAssetMenus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d3ccbcbc29bb8b34bb5be6236d6ab461
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef b/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef
new file mode 100644
index 000000000..b5b72e4af
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef
@@ -0,0 +1,14 @@
+{
+ "name": "AibisDream.Menus",
+ "rootNamespace": "AibisDream",
+ "references": [],
+ "includePlatforms": [],
+ "excludePlatforms": [],
+ "allowUnsafeCode": false,
+ "overrideReferences": false,
+ "precompiledReferences": [],
+ "autoReferenced": true,
+ "defineConstraints": [],
+ "versionDefines": [],
+ "noEngineReferences": false
+}
diff --git a/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef.meta b/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef.meta
new file mode 100644
index 000000000..1bb6a4dca
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus/AibisDream.Menus.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1c0cbee178998b44e892fc91023ef470
+AssemblyDefinitionImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs b/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs
new file mode 100644
index 000000000..dfe3eb777
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs
@@ -0,0 +1,21 @@
+namespace AibisDream
+{
+ ///
+ /// 项目自研编辑器菜单路径常量。新工具统一挂 下扁平条目。
+ ///
+ public static class AibisEditorMenus
+ {
+ public const string Root = AibisAssetMenus.Root;
+
+ public const string AnimationClipGenerator = Root + "/动画片段生成器";
+ public const string JsonEditor = Root + "/JSON 编辑器";
+ public const string NameCollector = Root + "/名称收集器";
+ public const string ChapterGraphEditor = Root + "/章节 Graph 编辑器";
+ public const string FrameAnimationGraphEditor = Root + "/帧动画 Graph 编辑器";
+ public const string FrameClipEditor = Root + "/帧动画 Clip 编辑器";
+ public const string YarnLocalizationValidator = Root + "/Yarn 本地化校验";
+
+ public const string GameObjectRoot = "GameObject/" + Root;
+ public const string BlockPuzzleShape = GameObjectRoot + "/方块拼图 Shape";
+ }
+}
diff --git a/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs.meta b/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs.meta
new file mode 100644
index 000000000..7519b6d1d
--- /dev/null
+++ b/Assets/Scripts/AibisDream.Menus/AibisEditorMenus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 79b55c46887d94a4a8a27c7587d6d2dd
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/FrameAnimation/Runtime/AibisDream.FrameAnimation.Runtime.asmdef b/Assets/Scripts/FrameAnimation/Runtime/AibisDream.FrameAnimation.Runtime.asmdef
index d10496d8f..9eb7faa68 100644
--- a/Assets/Scripts/FrameAnimation/Runtime/AibisDream.FrameAnimation.Runtime.asmdef
+++ b/Assets/Scripts/FrameAnimation/Runtime/AibisDream.FrameAnimation.Runtime.asmdef
@@ -2,7 +2,8 @@
"name": "AibisDream.FrameAnimation.Runtime",
"rootNamespace": "AibisDream.FrameAnimation",
"references": [
- "UnityEngine.UI"
+ "UnityEngine.UI",
+ "AibisDream.Menus"
],
"includePlatforms": [],
"excludePlatforms": [],
diff --git a/Assets/Scripts/FrameAnimation/Runtime/FrameAnimationGraph.cs b/Assets/Scripts/FrameAnimation/Runtime/FrameAnimationGraph.cs
index 141e9e398..87023bf31 100644
--- a/Assets/Scripts/FrameAnimation/Runtime/FrameAnimationGraph.cs
+++ b/Assets/Scripts/FrameAnimation/Runtime/FrameAnimationGraph.cs
@@ -3,7 +3,7 @@ using UnityEngine;
namespace AibisDream.FrameAnimation
{
- [CreateAssetMenu(fileName = "FrameAnimationGraph", menuName = "AIBIS/角色动画/帧动画 Graph")]
+ [CreateAssetMenu(fileName = "FrameAnimationGraph", menuName = AibisAssetMenus.FrameAnimationGraph)]
public sealed class FrameAnimationGraph : ScriptableObject
{
[SerializeField] private string id = string.Empty;
diff --git a/Assets/Scripts/FrameAnimation/Runtime/FrameClip.cs b/Assets/Scripts/FrameAnimation/Runtime/FrameClip.cs
index f16bda40a..da7add352 100644
--- a/Assets/Scripts/FrameAnimation/Runtime/FrameClip.cs
+++ b/Assets/Scripts/FrameAnimation/Runtime/FrameClip.cs
@@ -3,7 +3,7 @@ using UnityEngine;
namespace AibisDream.FrameAnimation
{
- [CreateAssetMenu(fileName = "FrameClip", menuName = "AIBIS/角色动画/帧动画 Clip")]
+ [CreateAssetMenu(fileName = "FrameClip", menuName = AibisAssetMenus.FrameClip)]
public sealed class FrameClip : ScriptableObject
{
[SerializeField] private string id = string.Empty;