yoo2.2,9
This commit is contained in:
Alex-Rachel
2025-01-25 13:46:17 +08:00
parent 634a392a1f
commit 6166fd24c6
584 changed files with 15684 additions and 11714 deletions

View File

@@ -12,35 +12,29 @@ namespace YooAsset
{
None,
CheckError,
PrepareDone,
WaitDone,
UnLoadScene,
Checking,
Done,
}
private ESteps _steps = ESteps.None;
private readonly string _error;
private readonly ProviderBase _provider;
private AsyncOperation _asyncOp;
private readonly ProviderOperation _provider;
private AsyncOperation _asyncOp = null;
internal UnloadSceneOperation(string error)
{
_error = error;
}
internal UnloadSceneOperation(ProviderBase provider)
internal UnloadSceneOperation(ProviderOperation provider)
{
_error = null;
_provider = provider;
// 注意:卸载场景前必须先解除挂起操作
if (provider is DatabaseSceneProvider)
if (provider is SceneProvider)
{
var temp = provider as DatabaseSceneProvider;
temp.UnSuspendLoad();
}
else if (provider is BundledSceneProvider)
{
var temp = provider as BundledSceneProvider;
var temp = provider as SceneProvider;
temp.UnSuspendLoad();
}
else
@@ -67,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;
@@ -96,17 +90,22 @@ namespace YooAsset
if (_steps == ESteps.UnLoadScene)
{
_asyncOp = SceneManager.UnloadSceneAsync(_provider.SceneObject);
_provider.ResourceMgr.UnloadSubScene(_provider.SceneName);
_steps = ESteps.Checking;
}
if (_asyncOp == null)
{
_asyncOp = SceneManager.UnloadSceneAsync(_provider.SceneObject);
if (_asyncOp == null)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "Unload scene failed, see the console logs !";
return;
}
}
if (_steps == ESteps.Checking)
{
Progress = _asyncOp.progress;
if (_asyncOp.isDone == false)
return;
_provider.ResourceMgr.TryUnloadUnusedAsset(_provider.MainAssetInfo);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}