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

加载热更新程序集的崩溃bug修正

Browse Source
This commit is contained in:
沈挺
2024-07-09 16:11:41 +08:00
parent dc7ab7fd64
commit 5734d4f995
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
UnityProject/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs
View File

@@ -9,6 +9,7 @@ using UnityEngine;
using TEngine; using TEngine;
using System.Reflection; using System.Reflection;
using YooAsset; using YooAsset;
using Cysharp.Threading.Tasks;
namespace GameMain namespace GameMain
{ {
@@ -38,6 +39,12 @@ namespace GameMain
base.OnEnter(procedureOwner); base.OnEnter(procedureOwner);
Log.Debug("HyBridCLR ProcedureLoadAssembly OnEnter"); Log.Debug("HyBridCLR ProcedureLoadAssembly OnEnter");
m_procedureOwner = procedureOwner; m_procedureOwner = procedureOwner;
LoadAssembly().Forget();
}
private async UniTaskVoid LoadAssembly()
{
m_LoadAssemblyComplete = false; m_LoadAssemblyComplete = false;
m_HotfixAssemblys = new List<Assembly>(); m_HotfixAssemblys = new List<Assembly>();
@@ -55,7 +62,7 @@ namespace GameMain
{ {
m_LoadMetadataAssemblyComplete = true; m_LoadMetadataAssemblyComplete = true;
} }
if (!SettingsUtils.HybridCLRCustomGlobalSettings.Enable || GameModule.Resource.PlayMode == EPlayMode.EditorSimulateMode) if (!SettingsUtils.HybridCLRCustomGlobalSettings.Enable || GameModule.Resource.PlayMode == EPlayMode.EditorSimulateMode)
{ {
m_MainLogicAssembly = GetMainLogicAssembly(); m_MainLogicAssembly = GetMainLogicAssembly();
@@ -75,10 +82,11 @@ namespace GameMain
SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath, SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath,
$"{hotUpdateDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}")); $"{hotUpdateDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}"));
} }
Log.Debug($"LoadAsset: [ {assetLocation} ]"); Log.Debug($"LoadAsset: [ {assetLocation} ]");
m_LoadAssetCount++; m_LoadAssetCount++;
GameModule.Resource.LoadAsset<TextAsset>(assetLocation,LoadAssetSuccess); var result = await GameModule.Resource.LoadAssetAsync<TextAsset>(assetLocation);
LoadAssetSuccess(result);
} }
m_LoadAssemblyWait = true; m_LoadAssemblyWait = true;
@@ -94,7 +102,7 @@ namespace GameMain
m_LoadAssemblyComplete = true; m_LoadAssemblyComplete = true;
} }
} }
protected override void OnUpdate(IFsm<IProcedureManager> procedureOwner, float elapseSeconds, float realElapseSeconds) protected override void OnUpdate(IFsm<IProcedureManager> procedureOwner, float elapseSeconds, float realElapseSeconds)
{ {
base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds);
@@ -108,7 +116,7 @@ namespace GameMain
} }
AllAssemblyLoadComplete(); AllAssemblyLoadComplete();
} }
private void AllAssemblyLoadComplete() private void AllAssemblyLoadComplete()
{ {
ChangeState<ProcedureStartGame>(m_procedureOwner); ChangeState<ProcedureStartGame>(m_procedureOwner);
@@ -231,11 +239,11 @@ namespace GameMain
SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath, SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath,
$"{aotDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}")); $"{aotDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}"));
} }
Log.Debug($"LoadMetadataAsset: [ {assetLocation} ]"); Log.Debug($"LoadMetadataAsset: [ {assetLocation} ]");
m_LoadMetadataAssetCount++; m_LoadMetadataAssetCount++;
GameModule.Resource.LoadAsset<TextAsset>(assetLocation,LoadMetadataAssetSuccess); GameModule.Resource.LoadAsset<TextAsset>(assetLocation, LoadMetadataAssetSuccess);
} }
m_LoadMetadataAssemblyWait = true; m_LoadMetadataAssemblyWait = true;
} }