diff --git a/Editor/Event/EventMonitorWindow.cs b/Editor/Event/EventMonitorWindow.cs index df6f016..697eb88 100644 --- a/Editor/Event/EventMonitorWindow.cs +++ b/Editor/Event/EventMonitorWindow.cs @@ -9,7 +9,7 @@ namespace AlicizaX.Editor { internal sealed class EventMonitorWindow : EditorWindow { - private const string MenuPath = "Tools/AlicizaX/Event/事件监视器"; + private const string MenuPath = "AlicizaX/Event 监视器"; private const double RepaintIntervalSeconds = 0.25d; private const float DefaultLeftPanelWidth = 360f; private const float MinLeftPanelWidth = 260f; diff --git a/Editor/Localization/LocalizationSettingsProvider.cs b/Editor/Localization/LocalizationSettingsProvider.cs index bf4c21b..0a9fa3a 100644 --- a/Editor/Localization/LocalizationSettingsProvider.cs +++ b/Editor/Localization/LocalizationSettingsProvider.cs @@ -12,7 +12,7 @@ namespace AlicizaX.Localization.Editor internal sealed class LocalizationSettingsProvider : EditorWindow { private const string WindowTitle = "Localization Settings"; - private const string MenuPath = "Tools/AlicizaX/Localization/Open Localization Settings"; + private const string MenuPath = "AlicizaX/Localization/Open Localization Settings"; private SerializedObject _serializedObject; private SerializedProperty _languageTypes; diff --git a/Editor/Localization/LocalizationTableWindow/Scriptable/GameLocaizationTableEditor.cs b/Editor/Localization/LocalizationTableWindow/Scriptable/GameLocaizationTableEditor.cs index e32298f..c2116d8 100644 --- a/Editor/Localization/LocalizationTableWindow/Scriptable/GameLocaizationTableEditor.cs +++ b/Editor/Localization/LocalizationTableWindow/Scriptable/GameLocaizationTableEditor.cs @@ -89,7 +89,7 @@ namespace AlicizaX.Localization.Editor EditorGUILayout.EndHorizontal(); } - [MenuItem("Tools/AlicizaX/Localization/Open Localization Editor")] + [MenuItem("AlicizaX/Localization/Open Localization Editor")] private static void OpenLocalizationEditor() { EditorWindow window = EditorWindow.GetWindow(false, "Localization Editor", true); @@ -99,11 +99,11 @@ namespace AlicizaX.Localization.Editor public static void OpenSettings() { - EditorApplication.ExecuteMenuItem("Tools/AlicizaX/Localization/Open Localization Settings"); + EditorApplication.ExecuteMenuItem("AlicizaX/Localization/Open Localization Settings"); } - [MenuItem("Tools/AlicizaX/Localization/Create Localization Table")] + [MenuItem("AlicizaX/Localization/Create Localization Table")] private static void CreateLocalizationTable() { string selectedFolderPath = "Assets"; diff --git a/Editor/Misc/EventScriptingDefineSymbols.cs b/Editor/Misc/EventScriptingDefineSymbols.cs deleted file mode 100644 index 13ceab0..0000000 --- a/Editor/Misc/EventScriptingDefineSymbols.cs +++ /dev/null @@ -1,46 +0,0 @@ -using AlicizaX.Editor; -using UnityEditor; -using UnityEngine; - -namespace AlicizaX.Editor -{ - internal static class EventScriptingDefineSymbols - { - private const string MenuPath = "Tools/AlicizaX/Event/Event Strict Check"; - private const string DefineSymbol = "Event_StrictCheck"; - - [MenuItem(MenuPath)] - private static void ToggleStrictCheck() - { - bool enabled = IsEnabled(); - SetEnabled(!enabled); - } - - [MenuItem(MenuPath, true)] - private static bool ToggleStrictCheckValidate() - { - Menu.SetChecked(MenuPath, IsEnabled()); - return true; - } - - private static bool IsEnabled() - { - return ScriptingDefineSymbols.HasScriptingDefineSymbol(EditorUserBuildSettings.selectedBuildTargetGroup, DefineSymbol); - } - - private static void SetEnabled(bool enabled) - { - var targetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; - if (enabled) - { - ScriptingDefineSymbols.AddScriptingDefineSymbol(targetGroup, DefineSymbol); - } - else - { - ScriptingDefineSymbols.RemoveScriptingDefineSymbol(targetGroup, DefineSymbol); - } - - Debug.Log($"[EventKit] Strict Check {(enabled ? "Enabled" : "Disabled")}"); - } - } -} diff --git a/Editor/Misc/EventScriptingDefineSymbols.cs.meta b/Editor/Misc/EventScriptingDefineSymbols.cs.meta deleted file mode 100644 index 1ed3286..0000000 --- a/Editor/Misc/EventScriptingDefineSymbols.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a0f666b24d9c41c4a355f9a9a643928b -timeCreated: 1756782190 \ No newline at end of file diff --git a/Editor/Misc/LogScriptingDefineSymbols.cs b/Editor/Misc/LogScriptingDefineSymbols.cs index 57f5687..e2b7906 100644 --- a/Editor/Misc/LogScriptingDefineSymbols.cs +++ b/Editor/Misc/LogScriptingDefineSymbols.cs @@ -40,7 +40,7 @@ namespace AlicizaX.Editor /// /// 禁用所有日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Disable All Logs", false, 30)] + [MenuItem("AlicizaX/Scripting Define Symbols/Disable All Logs", false, 30)] public static void DisableAllLogs() { ScriptingDefineSymbols.RemoveScriptingDefineSymbol(EnableLogScriptingDefineSymbol); @@ -59,7 +59,7 @@ namespace AlicizaX.Editor /// /// 开启所有日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable All Logs", false, 31)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable All Logs", false, 31)] public static void EnableAllLogs() { DisableAllLogs(); @@ -69,7 +69,7 @@ namespace AlicizaX.Editor /// /// 开启调试及以上级别的日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable Debug And Above Logs", false, 32)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable Debug And Above Logs", false, 32)] public static void EnableDebugAndAboveLogs() { SetAboveLogScriptingDefineSymbol(EnableDebugAndAboveLogScriptingDefineSymbol); @@ -78,7 +78,7 @@ namespace AlicizaX.Editor /// /// 开启信息及以上级别的日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable Info And Above Logs", false, 33)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable Info And Above Logs", false, 33)] public static void EnableInfoAndAboveLogs() { SetAboveLogScriptingDefineSymbol(EnableInfoAndAboveLogScriptingDefineSymbol); @@ -87,7 +87,7 @@ namespace AlicizaX.Editor /// /// 开启警告及以上级别的日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable Warning And Above Logs", false, 34)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable Warning And Above Logs", false, 34)] public static void EnableWarningAndAboveLogs() { SetAboveLogScriptingDefineSymbol(EnableWarningAndAboveLogScriptingDefineSymbol); @@ -96,7 +96,7 @@ namespace AlicizaX.Editor /// /// 开启错误及以上级别的日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable Error And Above Logs", false, 35)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable Error And Above Logs", false, 35)] public static void EnableErrorAndAboveLogs() { SetAboveLogScriptingDefineSymbol(EnableErrorAndAboveLogScriptingDefineSymbol); @@ -105,7 +105,7 @@ namespace AlicizaX.Editor /// /// 开启严重错误及以上级别的日志脚本宏定义。 /// - [MenuItem("Tools/AlicizaX/Scripting Define Symbols/Enable Fatal And Above Logs", false, 36)] + [MenuItem("AlicizaX/Scripting Define Symbols/Enable Fatal And Above Logs", false, 36)] public static void EnableFatalAndAboveLogs() { SetAboveLogScriptingDefineSymbol(EnableFatalAndAboveLogScriptingDefineSymbol); diff --git a/Editor/Misc/OpenFolder.cs b/Editor/Misc/OpenFolder.cs index 22ba4a9..7d83719 100644 --- a/Editor/Misc/OpenFolder.cs +++ b/Editor/Misc/OpenFolder.cs @@ -13,7 +13,7 @@ namespace AlicizaX.Editor /// /// 打开 Data Path 文件夹。 /// - [MenuItem("Tools/AlicizaX/Open Folder/Data Path", false, 10)] + [MenuItem("AlicizaX/Open Folder/Data Path", false, 10)] public static void OpenFolderDataPath() { Execute(Application.dataPath); @@ -22,7 +22,7 @@ namespace AlicizaX.Editor /// /// 打开 Persistent Data Path 文件夹。 /// - [MenuItem("Tools/AlicizaX/Open Folder/Persistent Data Path", false, 11)] + [MenuItem("AlicizaX/Open Folder/Persistent Data Path", false, 11)] public static void OpenFolderPersistentDataPath() { Execute(Application.persistentDataPath); @@ -31,7 +31,7 @@ namespace AlicizaX.Editor /// /// 打开 Streaming Assets Path 文件夹。 /// - [MenuItem("Tools/AlicizaX/Open Folder/Streaming Assets Path", false, 12)] + [MenuItem("AlicizaX/Open Folder/Streaming Assets Path", false, 12)] public static void OpenFolderStreamingAssetsPath() { Execute(Application.streamingAssetsPath); @@ -40,7 +40,7 @@ namespace AlicizaX.Editor /// /// 打开 Temporary Cache Path 文件夹。 /// - [MenuItem("Tools/AlicizaX/Open Folder/Temporary Cache Path", false, 13)] + [MenuItem("AlicizaX/Open Folder/Temporary Cache Path", false, 13)] public static void OpenFolderTemporaryCachePath() { Execute(Application.temporaryCachePath); @@ -51,7 +51,7 @@ namespace AlicizaX.Editor /// /// 打开 Console Log Path 文件夹。 /// - [MenuItem("Tools/AlicizaX/Open Folder/Console Log Path", false, 14)] + [MenuItem("AlicizaX/Open Folder/Console Log Path", false, 14)] public static void OpenFolderConsoleLogPath() { Execute(System.IO.Path.GetDirectoryName(Application.consoleLogPath)); diff --git a/Editor/UI/GenerateWindow/UISettingEditorWindow.cs b/Editor/UI/GenerateWindow/UISettingEditorWindow.cs index 49a13aa..2b330e2 100644 --- a/Editor/UI/GenerateWindow/UISettingEditorWindow.cs +++ b/Editor/UI/GenerateWindow/UISettingEditorWindow.cs @@ -16,7 +16,7 @@ namespace AlicizaX.UI.Editor private static List cacheFilterType; - [MenuItem("Tools/AlicizaX/UISetting Window")] + [MenuItem("AlicizaX/UISetting Window")] private static void OpenWindow() { var window = GetWindow("UI Setting"); diff --git a/Runtime/ABase/Event/EventContainer.cs b/Runtime/ABase/Event/EventContainer.cs index d8dc94f..b5deba7 100644 --- a/Runtime/ABase/Event/EventContainer.cs +++ b/Runtime/ABase/Event/EventContainer.cs @@ -26,9 +26,6 @@ namespace AlicizaX #if UNITY_EDITOR private static int _publishDepth; -#endif - -#if Event_StrictCheck private static System.Collections.Generic.HashSet> _activeHandlers; #endif @@ -48,11 +45,8 @@ namespace AlicizaX _freeSlots[i] = i; } -#if Event_StrictCheck - _activeHandlers = new System.Collections.Generic.HashSet>(); -#endif - #if UNITY_EDITOR + _activeHandlers = new System.Collections.Generic.HashSet>(); EventDebugRegistry.RegisterContainer(GetDebugSubscriberCount, GetDebugCapacity, GetDebugSubscribers); #endif } @@ -62,12 +56,9 @@ namespace AlicizaX { #if UNITY_EDITOR ThrowIfMutatingDuringPublish("subscribe"); -#endif - -#if Event_StrictCheck if (_activeHandlers.Contains(callback)) { - UnityEngine.Debug.LogWarning($"重复订阅事件处理程序: {callback.Method.Name}"); + Log.Warning($"重复订阅事件处理程序: {callback.Method.Name}"); return default; } @@ -141,7 +132,7 @@ namespace AlicizaX _activeIndices[currentActiveIndex] = lastHandlerIndex; _activeSlots[lastHandlerIndex] = currentActiveIndex; -#if Event_StrictCheck +#if UNITY_EDITOR _activeHandlers.Remove(_callbacks[handlerIndex]); #endif @@ -267,9 +258,6 @@ namespace AlicizaX #if UNITY_EDITOR EventDebugRegistry.RecordClear(_activeCount, _callbacks.Length); -#endif - -#if Event_StrictCheck _activeHandlers.Clear(); #endif }