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

Merge pull request #85 from Vorik-S/main

Browse Source 
加载热更新程序集的崩溃bug修正
This commit is contained in:
ALEXTANG
2024-07-11 12:23:12 +08:00
committed by GitHub
parent dc7ab7fd64 e53ceb0095
commit fd82ddf427
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonBehaviour.cs
View File

@@ -35,9 +35,12 @@ namespace GameBase
} }
protected virtual void OnDestroy() protected virtual void OnDestroy()
{
if (this == _instance)
{ {
Release(); Release();
} }
}
/// <summary> /// <summary>
/// 判断对象是否有效 /// 判断对象是否有效
@@ -96,7 +99,7 @@ namespace GameBase
} }
} }
if(_instance == null) if (_instance == null)
{ {
Log.Error($"Can't create SingletonBehaviour<{typeof(T)}>"); Log.Error($"Can't create SingletonBehaviour<{typeof(T)}>");
} }

2
UnityProject/Assets/GameScripts/HotFix/GameLogic/GameApp_RegisterSystem.cs
View File

@@ -3,7 +3,7 @@ using GameLogic;
using TEngine; using TEngine;
using UnityEngine; using UnityEngine;
public partial class GameApp public partial class GameApp : Singleton<GameApp>
{ {
private List<ILogicSys> _listLogicMgr; private List<ILogicSys> _listLogicMgr;

12
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>();
@@ -78,7 +85,8 @@ namespace GameMain
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;
@@ -235,7 +243,7 @@ namespace GameMain
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;
} }