From fc5bf86887e8c22de855db594fd00207e962ff53 Mon Sep 17 00:00:00 2001 From: walon Date: Sun, 23 Oct 2022 17:46:09 +0800 Subject: [PATCH] =?UTF-8?q?[new]=20=E6=96=B0=E5=A2=9E=20hotUpdateDllCompil?= =?UTF-8?q?eOutputRootDir=E5=92=8CstrippedAOTDllOutputRootDir=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/Settings/HybridCLRSettingProvider.cs | 6 ++++++ Editor/Settings/HybridCLRSettings.cs | 6 ++++++ Editor/SettingsUtil.cs | 6 +++--- package.json | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Editor/Settings/HybridCLRSettingProvider.cs b/Editor/Settings/HybridCLRSettingProvider.cs index ab0a594..0df4d1c 100644 --- a/Editor/Settings/HybridCLRSettingProvider.cs +++ b/Editor/Settings/HybridCLRSettingProvider.cs @@ -15,6 +15,8 @@ namespace HybridCLR.Editor private SerializedProperty _hotUpdateAssemblyDefinitions; private SerializedProperty _hotUpdateAssemblies; private SerializedProperty _preserveHotUpdateAssemblies; + private SerializedProperty _hotUpdateDllCompileOutputRootDir; + private SerializedProperty _strippedAOTDllOutputRootDir; private SerializedProperty _patchAOTAssemblies; private SerializedProperty _collectAssetReferenceTypes; private SerializedProperty _outputLinkFile; @@ -35,6 +37,8 @@ namespace HybridCLR.Editor _hotUpdateAssemblyDefinitions = _serializedObject.FindProperty("hotUpdateAssemblyDefinitions"); _hotUpdateAssemblies = _serializedObject.FindProperty("hotUpdateAssemblies"); _preserveHotUpdateAssemblies = _serializedObject.FindProperty("preserveHotUpdateAssemblies"); + _hotUpdateDllCompileOutputRootDir = _serializedObject.FindProperty("hotUpdateDllCompileOutputRootDir"); + _strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir"); _patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies"); _collectAssetReferenceTypes = _serializedObject.FindProperty("collectAssetReferenceTypes"); _outputLinkFile = _serializedObject.FindProperty("outputLinkFile"); @@ -109,6 +113,8 @@ namespace HybridCLR.Editor EditorGUILayout.PropertyField(_hotUpdateAssemblyDefinitions); EditorGUILayout.PropertyField(_hotUpdateAssemblies); EditorGUILayout.PropertyField(_preserveHotUpdateAssemblies); + EditorGUILayout.PropertyField(_hotUpdateDllCompileOutputRootDir); + EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir); EditorGUILayout.PropertyField(_patchAOTAssemblies); EditorGUILayout.PropertyField(_collectAssetReferenceTypes); EditorGUILayout.PropertyField(_outputLinkFile); diff --git a/Editor/Settings/HybridCLRSettings.cs b/Editor/Settings/HybridCLRSettings.cs index f5af0e3..a3d6ffe 100644 --- a/Editor/Settings/HybridCLRSettings.cs +++ b/Editor/Settings/HybridCLRSettings.cs @@ -23,6 +23,12 @@ namespace HybridCLR.Editor [Header("预留的热更新dlls")] public string[] preserveHotUpdateAssemblies; + [Header("热更新dll编译输出根目录")] + public string hotUpdateDllCompileOutputRootDir = "HybridCLRData/HotUpdateDlls"; + + [Header("裁减后AOT dll输出根目录")] + public string strippedAOTDllOutputRootDir = "HybridCLRData/AssembliesPostIl2CppStrip"; + [Header("补充元数据AOT dlls")] public string[] patchAOTAssemblies; diff --git a/Editor/SettingsUtil.cs b/Editor/SettingsUtil.cs index 38c18fd..8265175 100644 --- a/Editor/SettingsUtil.cs +++ b/Editor/SettingsUtil.cs @@ -27,12 +27,12 @@ namespace HybridCLR.Editor public static string Dataunity3dBinFile { get; } = "data.unity3d"; - public static string HotUpdateDllsRootOutputDir => $"{HybridCLRDataDir}/HotUpdateDlls"; + public static string HotUpdateDllsRootOutputDir => HybridCLRSettings.Instance.hotUpdateDllCompileOutputRootDir; + + public static string AssembliesPostIl2CppStripDir => HybridCLRSettings.Instance.strippedAOTDllOutputRootDir; public static string HybridCLRDataDir => $"{ProjectDir}/HybridCLRData"; - public static string AssembliesPostIl2CppStripDir => $"{HybridCLRDataDir}/AssembliesPostIl2CppStrip"; - public static string LocalUnityDataDir => $"{HybridCLRDataDir}/LocalIl2CppData-{Application.platform}"; public static string LocalIl2CppDir => $"{LocalUnityDataDir}/il2cpp"; diff --git a/package.json b/package.json index 5915c67..256817b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.focus-creative-games.hybridclr_unity", - "version": "0.7.4", + "version": "0.8.0", "displayName": "HybridCLR", "description": "Unity package for HybridCLR. It includes editor and runtime scripts and assets for HybridCLR", "category": "Runtime",