Update ProcedureLoadAssembly.cs

This commit is contained in:
ALEXTANG
2023-07-05 15:20:18 +08:00
parent 7a1d593195
commit b07ef836a9

View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
#if ENABLE_HYBRIDCLR #if ENABLE_HYBRIDCLR
using HybridCLR; using HybridCLR;
#endif #endif
@@ -115,6 +116,10 @@ namespace GameMain
private void AllAssemblyLoadComplete() private void AllAssemblyLoadComplete()
{ {
#if UNITY_EDITOR
m_MainLogicAssembly = AppDomain.CurrentDomain.GetAssemblies().
First(assembly => $"{assembly.GetName().Name}.dll" == SettingsUtils.HybridCLRCustomGlobalSettings.LogicMainDllName);
#endif
if (m_MainLogicAssembly == null) if (m_MainLogicAssembly == null)
{ {
Log.Fatal($"Main logic assembly missing."); Log.Fatal($"Main logic assembly missing.");
@@ -202,6 +207,7 @@ namespace GameMain
{ {
m_LoadAssemblyComplete = m_LoadAssemblyWait && 0 == m_LoadAssetCount; m_LoadAssemblyComplete = m_LoadAssemblyWait && 0 == m_LoadAssetCount;
} }
assetOperationHandle.Dispose();
} }
/// <summary> /// <summary>