From 5e568b203b4fc8abbaf63cd3d964b8110c520251 Mon Sep 17 00:00:00 2001
From: Alex-Rachel <574809918@qq.com>
Date: Sat, 8 Mar 2025 21:03:18 +0800
Subject: [PATCH] HybridCLR BuildDLLCommond

---
 .../TEngine/Editor/HybridCLR/BuildDLLCommand.cs   |  6 +++---
 .../Assets/TEngine/Editor/TEngine.Editor.asmdef   |  4 +---
 .../TEngine/Runtime/Module/Settings/Settings.cs   | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/UnityProject/Assets/TEngine/Editor/HybridCLR/BuildDLLCommand.cs b/UnityProject/Assets/TEngine/Editor/HybridCLR/BuildDLLCommand.cs
index 27449118..7b6c33f0 100644
--- a/UnityProject/Assets/TEngine/Editor/HybridCLR/BuildDLLCommand.cs
+++ b/UnityProject/Assets/TEngine/Editor/HybridCLR/BuildDLLCommand.cs
@@ -63,9 +63,9 @@ public static class BuildDLLCommand
 #if ENABLE_HYBRIDCLR
         var target = EditorUserBuildSettings.activeBuildTarget;
         string aotAssembliesSrcDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(target);
-        string aotAssembliesDstDir = Application.dataPath +"/"+ SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath;
+        string aotAssembliesDstDir = Application.dataPath +"/"+ TEngine.Settings.UpdateSetting.AssemblyTextAssetPath;
 
-        foreach (var dll in SettingsUtils.HybridCLRCustomGlobalSettings.AOTMetaAssemblies)
+        foreach (var dll in TEngine.Settings.UpdateSetting.AOTMetaAssemblies)
         {
             string srcDllPath = $"{aotAssembliesSrcDir}/{dll}";
             if (!System.IO.File.Exists(srcDllPath))
@@ -86,7 +86,7 @@ public static class BuildDLLCommand
         var target = EditorUserBuildSettings.activeBuildTarget;
 
         string hotfixDllSrcDir = SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target);
-        string hotfixAssembliesDstDir = Application.dataPath +"/"+ SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath;
+        string hotfixAssembliesDstDir = Application.dataPath +"/"+ TEngine.Settings.UpdateSetting.AssemblyTextAssetPath;
         foreach (var dll in SettingsUtil.HotUpdateAssemblyFilesExcludePreserved)
         {
             string dllPath = $"{hotfixDllSrcDir}/{dll}";
diff --git a/UnityProject/Assets/TEngine/Editor/TEngine.Editor.asmdef b/UnityProject/Assets/TEngine/Editor/TEngine.Editor.asmdef
index cccb2f28..97a57cae 100644
--- a/UnityProject/Assets/TEngine/Editor/TEngine.Editor.asmdef
+++ b/UnityProject/Assets/TEngine/Editor/TEngine.Editor.asmdef
@@ -5,10 +5,8 @@
         "GUID:24c092aee38482f4e80715eaa8148782",
         "GUID:e34a5702dd353724aa315fb8011f08c3",
         "GUID:4d1926c9df5b052469a1c63448b7609a",
-        "GUID:2373f786d14518f44b0f475db77ba4de",
         "GUID:6e76b07590314a543b982daed6af2509",
-        "GUID:478a2357cc57436488a56e564b08d223",
-        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+        "GUID:2373f786d14518f44b0f475db77ba4de"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs b/UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs
index 03d7bd15..4e575938 100644
--- a/UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs
@@ -19,7 +19,6 @@ namespace TEngine
                         return _instance;
                     }
                 }
-
                 return _instance;
             }
         }
@@ -34,6 +33,18 @@ namespace TEngine
 
         public static ProcedureSetting ProcedureSetting => Instance.procedureSetting;
 
-        public static UpdateSetting UpdateSetting => Instance.updateSetting;
+        public static UpdateSetting UpdateSetting
+        {
+            get
+            {
+#if UNITY_EDITOR
+                if (Instance == null)
+                {
+                    return UnityEditor.AssetDatabase.LoadAssetAtPath<UpdateSetting>("Assets/TEngine/Settings/UpdateSetting.asset");
+                }
+#endif
+                return Instance.updateSetting;
+            }
+        }
     }
 }
\ No newline at end of file