diff --git a/Editor/HTFramework.Editor.asmdef b/Editor/HTFramework.Editor.asmdef new file mode 100644 index 00000000..541aab7d --- /dev/null +++ b/Editor/HTFramework.Editor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "HTFramework.Editor", + "references": [ + "GUID:83f631a6180cc5a41982c9354b6cc704" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Editor/HTFramework.Editor.asmdef.meta b/Editor/HTFramework.Editor.asmdef.meta new file mode 100644 index 00000000..b56cb666 --- /dev/null +++ b/Editor/HTFramework.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b65453a364e1774bb7db0e5a7454a24 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Main/InternalModuleInspector.cs b/Editor/Main/InternalModuleInspector.cs index 69f5e360..dec1224f 100644 --- a/Editor/Main/InternalModuleInspector.cs +++ b/Editor/Main/InternalModuleInspector.cs @@ -12,7 +12,7 @@ namespace HT.Framework /// /// 内置模块 /// 内置模块的助手 - public abstract class InternalModuleInspector : HTFEditor where M : UObject where H : class, IInternalModuleHelper + internal abstract class InternalModuleInspector : HTFEditor where M : UObject where H : class, IInternalModuleHelper { protected H _helper; private InternalModuleBase _module; diff --git a/Editor/Main/MainInspector.cs b/Editor/Main/MainInspector.cs index 1da37972..1467ef48 100644 --- a/Editor/Main/MainInspector.cs +++ b/Editor/Main/MainInspector.cs @@ -1,9 +1,14 @@ using System; using System.Collections.Generic; +using System.Runtime.CompilerServices; using UnityEditor; using UnityEditorInternal; using UnityEngine; +[assembly: InternalsVisibleTo("HTFramework.AI.Editor")] +[assembly: InternalsVisibleTo("HTFramework.ILHotfix.Editor")] +[assembly: InternalsVisibleTo("HTFramework.GC.Editor")] + namespace HT.Framework { [CustomEditor(typeof(Main))] diff --git a/Editor/Utility/AdminLoginWindow/AdminLoginWindow.cs b/Editor/Utility/AdminLoginWindow/AdminLoginWindow.cs index 936a1822..4da7543c 100644 --- a/Editor/Utility/AdminLoginWindow/AdminLoginWindow.cs +++ b/Editor/Utility/AdminLoginWindow/AdminLoginWindow.cs @@ -6,7 +6,7 @@ namespace HT.Framework /// /// 管理员身份登录窗口 /// - internal sealed class AdminLoginWindow : HTFEditorWindow + public sealed class AdminLoginWindow : HTFEditorWindow { public static void OpenWindow(IAdminLoginWindow parent, HTFAction checkAction) { diff --git a/Editor/Utility/AdminLoginWindow/IAdminLoginWindow.cs b/Editor/Utility/AdminLoginWindow/IAdminLoginWindow.cs index e643969d..58ebe24f 100644 --- a/Editor/Utility/AdminLoginWindow/IAdminLoginWindow.cs +++ b/Editor/Utility/AdminLoginWindow/IAdminLoginWindow.cs @@ -3,7 +3,7 @@ /// /// 拥有管理员模式的窗口 /// - internal interface IAdminLoginWindow + public interface IAdminLoginWindow { } diff --git a/Editor/Utility/AdvancedControls/Table/GenericTableWindow.cs b/Editor/Utility/AdvancedControls/Table/GenericTableWindow.cs index 37357e2e..d041a240 100644 --- a/Editor/Utility/AdvancedControls/Table/GenericTableWindow.cs +++ b/Editor/Utility/AdvancedControls/Table/GenericTableWindow.cs @@ -10,7 +10,7 @@ namespace HT.Framework /// /// 通用表格绘制器 /// - internal sealed class GenericTableWindow : HTFEditorWindow + public sealed class GenericTableWindow : HTFEditorWindow { /// /// 打开通用表格绘制器 diff --git a/Editor/Utility/LocalizeWindow/ILocalizeWindow.cs b/Editor/Utility/LocalizeWindow/ILocalizeWindow.cs index 267b0b84..6778868b 100644 --- a/Editor/Utility/LocalizeWindow/ILocalizeWindow.cs +++ b/Editor/Utility/LocalizeWindow/ILocalizeWindow.cs @@ -3,7 +3,7 @@ /// /// 拥有本地化模式的窗口 /// - internal interface ILocalizeWindow + public interface ILocalizeWindow { } diff --git a/Editor/Utility/Setter/SettingItemTransform.cs.meta b/Editor/Utility/Setter/SettingItemTransform.cs.meta index fa6e3667..20c368af 100644 --- a/Editor/Utility/Setter/SettingItemTransform.cs.meta +++ b/Editor/Utility/Setter/SettingItemTransform.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 2800000, guid: 701b9bfeb6deef341a599f8d0f1ec080, type: 3} userData: assetBundleName: assetBundleVariant: diff --git a/Editor/Utility/Toolkit/EditorReflectionToolkit.cs b/Editor/Utility/Toolkit/EditorReflectionToolkit.cs index 76d209f0..044d6f25 100644 --- a/Editor/Utility/Toolkit/EditorReflectionToolkit.cs +++ b/Editor/Utility/Toolkit/EditorReflectionToolkit.cs @@ -7,7 +7,7 @@ namespace HT.Framework /// /// 编辑器反射工具箱 /// - internal static class EditorReflectionToolkit + public static class EditorReflectionToolkit { /// /// 当前的热更新程序集 @@ -16,7 +16,9 @@ internal static class EditorReflectionToolkit /// /// 当前的编辑器程序集 /// - private static HashSet EditorAssemblies = new HashSet() { "Assembly-CSharp-Editor", "UnityEditor" }; + private static HashSet EditorAssemblies = new HashSet() { + "Assembly-CSharp-Editor", "HTFramework.Editor", "HTFramework.AI.Editor", "HTFramework.ILHotfix.Editor", "HTFramework.GC.Editor", + "UnityEditor", "UnityEditorInternal" }; /// /// 从当前程序域的热更新程序集中获取所有类型 diff --git a/Editor/Utility/Toolkit/ExecutableToolkit.cs b/Editor/Utility/Toolkit/ExecutableToolkit.cs index 22251afb..cce991ff 100644 --- a/Editor/Utility/Toolkit/ExecutableToolkit.cs +++ b/Editor/Utility/Toolkit/ExecutableToolkit.cs @@ -7,7 +7,7 @@ namespace HT.Framework /// /// 可执行程序工具箱 /// - internal static class ExecutableToolkit + public static class ExecutableToolkit { /// /// 打开一个可执行程序 diff --git a/Editor/Utility/Toolkit/MonoScriptToolkit.cs b/Editor/Utility/Toolkit/MonoScriptToolkit.cs index b84a3682..04a2db77 100644 --- a/Editor/Utility/Toolkit/MonoScriptToolkit.cs +++ b/Editor/Utility/Toolkit/MonoScriptToolkit.cs @@ -6,7 +6,7 @@ namespace HT.Framework /// /// MonoScript工具箱 /// - internal static class MonoScriptToolkit + public static class MonoScriptToolkit { private static Dictionary _monoScripts = new Dictionary(); diff --git a/Editor/Utility/Toolkit/ScriptableToolkit.cs b/Editor/Utility/Toolkit/ScriptableToolkit.cs index d4722613..33a8dd35 100644 --- a/Editor/Utility/Toolkit/ScriptableToolkit.cs +++ b/Editor/Utility/Toolkit/ScriptableToolkit.cs @@ -7,7 +7,7 @@ namespace HT.Framework /// /// 脚本化工具箱 /// - internal static class ScriptableToolkit + public static class ScriptableToolkit { /// /// 获取一个游戏对象所属的预制体,当为空时,则此对象不是预制体 diff --git a/RunTime/Main/MainPartial.cs b/RunTime/Main/MainPartial.cs index 1fc42dd3..9faddeb6 100644 --- a/RunTime/Main/MainPartial.cs +++ b/RunTime/Main/MainPartial.cs @@ -7,9 +7,12 @@ using UnityEngine; using UObject = UnityEngine.Object; -[assembly: InternalsVisibleTo("Assembly-CSharp-Editor")] +[assembly: InternalsVisibleTo("HTFramework.Editor")] +[assembly: InternalsVisibleTo("HTFramework.AI.Editor")] [assembly: InternalsVisibleTo("HTFramework.AI.RunTime")] +[assembly: InternalsVisibleTo("HTFramework.ILHotfix.Editor")] [assembly: InternalsVisibleTo("HTFramework.ILHotfix.RunTime")] +[assembly: InternalsVisibleTo("HTFramework.GC.Editor")] [assembly: InternalsVisibleTo("HTFramework.GC.RunTime")] namespace HT.Framework