diff --git a/Editor/HybridCLR/BuildDLLCommand.cs b/Editor/HybridCLR/BuildDLLCommand.cs deleted file mode 100644 index ca37415..0000000 --- a/Editor/HybridCLR/BuildDLLCommand.cs +++ /dev/null @@ -1,110 +0,0 @@ -#if ENABLE_HYBRIDCLR -using HybridCLR.Editor; -using HybridCLR.Editor.Commands; -#endif -using AlicizaX.Editor; -using UnityEditor; -using UnityEngine; - -[InitializeOnLoad] -public static class BuildDLLCommand -{ - private const string EnableHybridClrScriptingDefineSymbol = "ENABLE_HYBRIDCLR"; - public const string AssemblyTextAssetPath = "Bundles/DLL"; - - static BuildDLLCommand() - { - } - - /// - /// 禁用HybridCLR宏定义。 - /// - [MenuItem("HybridCLR/Tools/Define Symbols/Disable HybridCLR", false, 30)] - public static void Disable() - { - ScriptingDefineSymbols.RemoveScriptingDefineSymbol(EnableHybridClrScriptingDefineSymbol); - HybridCLR.Editor.SettingsUtil.Enable = false; - } - - /// - /// 开启HybridCLR宏定义。 - /// - [MenuItem("HybridCLR/Tools/Define Symbols/Enable HybridCLR", false, 31)] - public static void Enable() - { - ScriptingDefineSymbols.RemoveScriptingDefineSymbol(EnableHybridClrScriptingDefineSymbol); - ScriptingDefineSymbols.AddScriptingDefineSymbol(EnableHybridClrScriptingDefineSymbol); - HybridCLR.Editor.SettingsUtil.Enable = true; - } - -#if ENABLE_HYBRIDCLR - [MenuItem("HybridCLR/Tools/Build/BuildAssets And CopyTo AssemblyTextAssetPath")] - public static void BuildAndCopyDlls() - { - BuildTarget target = EditorUserBuildSettings.activeBuildTarget; - CompileDllCommand.CompileDll(target); - CopyAOTHotUpdateDlls(target); - } -#endif - - public static void GenerateHybridCLRSome() - { - PrebuildCommand.GenerateAll(); - } - - public static void BuildAndCopyDlls(BuildTarget target) - { -#if ENABLE_HYBRIDCLR - CompileDllCommand.CompileDll(target); - CopyAOTHotUpdateDlls(target); -#endif - } - - public static void CopyAOTHotUpdateDlls(BuildTarget target) - { - CopyAOTAssembliesToAssetPath(); - CopyHotUpdateAssembliesToAssetPath(); - AssetDatabase.Refresh(); - } - - public static void CopyAOTAssembliesToAssetPath() - { -#if ENABLE_HYBRIDCLR - var target = EditorUserBuildSettings.activeBuildTarget; - string aotAssembliesSrcDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(target); - string aotAssembliesDstDir = Application.dataPath + "/" + AssemblyTextAssetPath; - - foreach (var dll in SettingsUtil.AOTAssemblyNames) - { - string srcDllPath = $"{aotAssembliesSrcDir}/{dll}"; - if (!System.IO.File.Exists(srcDllPath)) - { - Debug.LogError( - $"ab中添加AOT补充元数据dll:{srcDllPath} 时发生错误,文件不存在。裁剪后的AOT dll在BuildPlayer时才能生成,因此需要你先构建一次游戏App后再打包。"); - continue; - } - - string dllBytesPath = $"{aotAssembliesDstDir}/{dll}.bytes"; - System.IO.File.Copy(srcDllPath, dllBytesPath, true); - Debug.Log($"[CopyAOTAssembliesToStreamingAssets] copy AOT dll {srcDllPath} -> {dllBytesPath}"); - } -#endif - } - - public static void CopyHotUpdateAssembliesToAssetPath() - { -#if ENABLE_HYBRIDCLR - var target = EditorUserBuildSettings.activeBuildTarget; - - string hotfixDllSrcDir = SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target); - string hotfixAssembliesDstDir = Application.dataPath + "/" + AssemblyTextAssetPath; - foreach (var dll in SettingsUtil.HotUpdateAssemblyFilesExcludePreserved) - { - string dllPath = $"{hotfixDllSrcDir}/{dll}"; - string dllBytesPath = $"{hotfixAssembliesDstDir}/{dll}.bytes"; - System.IO.File.Copy(dllPath, dllBytesPath, true); - Debug.Log($"[CopyHotUpdateAssembliesToStreamingAssets] copy hotfix dll {dllPath} -> {dllBytesPath}"); - } -#endif - } -} diff --git a/Editor/HybridCLR/BuildDLLCommand.cs.meta b/Editor/HybridCLR/BuildDLLCommand.cs.meta deleted file mode 100644 index 5a82fd4..0000000 --- a/Editor/HybridCLR/BuildDLLCommand.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0761954ba63648b8b73f8ebb736bb9eb -timeCreated: 1737524294 \ No newline at end of file diff --git a/Editor/HybridCLR/SynAssemblysContent.cs b/Editor/HybridCLR/BuilderGenerate.cs similarity index 92% rename from Editor/HybridCLR/SynAssemblysContent.cs rename to Editor/HybridCLR/BuilderGenerate.cs index ba70370..527cc19 100644 --- a/Editor/HybridCLR/SynAssemblysContent.cs +++ b/Editor/HybridCLR/BuilderGenerate.cs @@ -10,7 +10,6 @@ namespace AlicizaX.Editor { AssemblyLoadData assemblyLoadData = new AssemblyLoadData(); assemblyLoadData.HotUpdateAssemblies = HybridCLR.Editor.SettingsUtil.HotUpdateAssemblyFilesIncludePreserved; - assemblyLoadData.AOTMetaAssemblies = HybridCLR.Editor.SettingsUtil.AOTAssemblyNames; File.WriteAllText("Assets/Resources/AssemblyLoadData.bytes", Utility.Json.ToJson(assemblyLoadData)); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); diff --git a/Editor/HybridCLR/SynAssemblysContent.cs.meta b/Editor/HybridCLR/BuilderGenerate.cs.meta similarity index 100% rename from Editor/HybridCLR/SynAssemblysContent.cs.meta rename to Editor/HybridCLR/BuilderGenerate.cs.meta diff --git a/Runtime/Constant/AssemblyLoadData.cs b/Runtime/Constant/AssemblyLoadData.cs index 589afa8..1b820b6 100644 --- a/Runtime/Constant/AssemblyLoadData.cs +++ b/Runtime/Constant/AssemblyLoadData.cs @@ -38,9 +38,6 @@ public class AssemblyLoadData private static AssemblyLoadData _instance; - public List HotUpdateAssemblies = new List() { "GameLib.dll", "GameProto.dll", "GameBase.dll", "GameLogic.dll" }; - - public List AOTMetaAssemblies = new List() { "mscorlib.dll", "System.dll", "System.Core.dll" }; }