优化场景卸载逻辑
This commit is contained in:
何冠峰
2024-12-27 11:53:55 +08:00
parent 069e29ac07
commit 8944ec0e02
7 changed files with 59 additions and 116 deletions
@@ -58,6 +58,9 @@ namespace YooAsset
var loaderDic = _resManager._loaderDic;
var providerDic = _resManager._providerDic;
// 清空所有场景句柄
_resManager._sceneHandles.Clear();
// 释放所有资源句柄
foreach (var provider in providerDic.Values)
{
@@ -79,7 +82,6 @@ namespace YooAsset
// 清空数据
providerDic.Clear();
loaderDic.Clear();
_resManager.ClearSceneHandle();
// 注意:调用底层接口释放所有资源
Resources.UnloadUnusedAssets();
@@ -12,7 +12,7 @@ namespace YooAsset
{
None,
CheckError,
PrepareDone,
WaitDone,
UnLoadScene,
Done,
}
@@ -61,10 +61,10 @@ namespace YooAsset
return;
}
_steps = ESteps.PrepareDone;
_steps = ESteps.WaitDone;
}
if (_steps == ESteps.PrepareDone)
if (_steps == ESteps.WaitDone)
{
if (_provider.IsDone == false)
return;
@@ -93,14 +93,19 @@ namespace YooAsset
if (_asyncOp == null)
{
_asyncOp = SceneManager.UnloadSceneAsync(_provider.SceneObject);
_provider.ResourceMgr.UnloadSubScene(_provider.SceneName);
if (_asyncOp == null)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Unload scene failed, see the console logs !";
return;
}
}
Progress = _asyncOp.progress;
if (_asyncOp.isDone == false)
return;
_provider.ResourceMgr.TryUnloadUnusedAsset(_provider.MainAssetInfo);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}