AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

HybridCLR BuildDLLCommond

Browse Source
This commit is contained in:
Alex-Rachel
2025-03-08 21:03:18 +08:00
parent 5bb168a958
commit 5e568b203b
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UnityProject/Assets/TEngine/Editor/HybridCLR/BuildDLLCommand.cs
View File

@@ -63,9 +63,9 @@ public static class BuildDLLCommand
#if ENABLE_HYBRIDCLR #if ENABLE_HYBRIDCLR
var target = EditorUserBuildSettings.activeBuildTarget; var target = EditorUserBuildSettings.activeBuildTarget;
string aotAssembliesSrcDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(target); 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}"; string srcDllPath = $"{aotAssembliesSrcDir}/{dll}";
if (!System.IO.File.Exists(srcDllPath)) if (!System.IO.File.Exists(srcDllPath))
@@ -86,7 +86,7 @@ public static class BuildDLLCommand
var target = EditorUserBuildSettings.activeBuildTarget; var target = EditorUserBuildSettings.activeBuildTarget;
string hotfixDllSrcDir = SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target); 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) foreach (var dll in SettingsUtil.HotUpdateAssemblyFilesExcludePreserved)
{ {
string dllPath = $"{hotfixDllSrcDir}/{dll}"; string dllPath = $"{hotfixDllSrcDir}/{dll}";

4
UnityProject/Assets/TEngine/Editor/TEngine.Editor.asmdef
View File

@@ -5,10 +5,8 @@
"GUID:24c092aee38482f4e80715eaa8148782", "GUID:24c092aee38482f4e80715eaa8148782",
"GUID:e34a5702dd353724aa315fb8011f08c3", "GUID:e34a5702dd353724aa315fb8011f08c3",
"GUID:4d1926c9df5b052469a1c63448b7609a", "GUID:4d1926c9df5b052469a1c63448b7609a",
"GUID:2373f786d14518f44b0f475db77ba4de",
"GUID:6e76b07590314a543b982daed6af2509", "GUID:6e76b07590314a543b982daed6af2509",
"GUID:478a2357cc57436488a56e564b08d223", "GUID:2373f786d14518f44b0f475db77ba4de"
"GUID:6055be8ebefd69e48b49212b09b47b2f"
], ],
"includePlatforms": [ "includePlatforms": [
"Editor" "Editor"

15
UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs
View File

@@ -19,7 +19,6 @@ namespace TEngine
return _instance; return _instance;
} }
} }
return _instance; return _instance;
} }
} }
@@ -34,6 +33,18 @@ namespace TEngine
public static ProcedureSetting ProcedureSetting => Instance.procedureSetting; 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;
}
}
} }
} }