update operation logic
This commit is contained in:
@@ -71,17 +71,19 @@ namespace YooAsset
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 等待异步实例化结束
|
||||
/// </summary>
|
||||
public override void WaitForAsyncComplete()
|
||||
internal override void InternalWaitForAsyncComplete()
|
||||
{
|
||||
if (_steps == ESteps.Clone)
|
||||
while (true)
|
||||
{
|
||||
_handle.WaitForAsyncComplete();
|
||||
InternalOnUpdate();
|
||||
DebugCheckWaitForAsyncComplete();
|
||||
// 等待句柄完成
|
||||
if (_handle != null)
|
||||
_handle.WaitForAsyncComplete();
|
||||
|
||||
if (ExecuteWhileDone())
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,8 +33,8 @@ namespace YooAsset
|
||||
if (_steps == ESteps.AbortDownload)
|
||||
{
|
||||
// 注意:终止所有下载任务
|
||||
var loaderList = _resManager._loaderList;
|
||||
foreach (var loader in loaderList)
|
||||
var loaderDic = _resManager._loaderDic;
|
||||
foreach (var loader in loaderDic.Values)
|
||||
{
|
||||
loader.AbortDownloadOperation();
|
||||
}
|
||||
@@ -55,7 +55,6 @@ namespace YooAsset
|
||||
|
||||
if (_steps == ESteps.UnloadAll)
|
||||
{
|
||||
var loaderList = _resManager._loaderList;
|
||||
var loaderDic = _resManager._loaderDic;
|
||||
var providerDic = _resManager._providerDic;
|
||||
|
||||
@@ -68,18 +67,17 @@ namespace YooAsset
|
||||
// 强制销毁资源提供者
|
||||
foreach (var provider in providerDic.Values)
|
||||
{
|
||||
provider.Destroy();
|
||||
provider.DestroyProvider();
|
||||
}
|
||||
|
||||
// 强制销毁文件加载器
|
||||
foreach (var loader in loaderList)
|
||||
foreach (var loader in loaderDic.Values)
|
||||
{
|
||||
loader.Destroy();
|
||||
loader.DestroyLoader();
|
||||
}
|
||||
|
||||
// 清空数据
|
||||
providerDic.Clear();
|
||||
loaderList.Clear();
|
||||
loaderDic.Clear();
|
||||
_resManager.ClearSceneHandle();
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@ namespace YooAsset
|
||||
|
||||
private ESteps _steps = ESteps.None;
|
||||
private readonly string _error;
|
||||
private readonly ProviderBase _provider;
|
||||
private readonly ProviderOperation _provider;
|
||||
private AsyncOperation _asyncOp;
|
||||
|
||||
internal UnloadSceneOperation(string error)
|
||||
{
|
||||
_error = error;
|
||||
}
|
||||
internal UnloadSceneOperation(ProviderBase provider)
|
||||
internal UnloadSceneOperation(ProviderOperation provider)
|
||||
{
|
||||
_error = null;
|
||||
_provider = provider;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace YooAsset
|
||||
{
|
||||
@@ -29,27 +31,32 @@ namespace YooAsset
|
||||
|
||||
if (_steps == ESteps.UnloadUnused)
|
||||
{
|
||||
var loaderList = _resManager._loaderList;
|
||||
var loaderDic = _resManager._loaderDic;
|
||||
var removeList = new List<LoadBundleFileOperation>(loaderDic.Count);
|
||||
|
||||
for (int i = loaderList.Count - 1; i >= 0; i--)
|
||||
// 注意:优先销毁资源提供者
|
||||
foreach (var loader in loaderDic.Values)
|
||||
{
|
||||
BundleFileLoader loader = loaderList[i];
|
||||
loader.TryDestroyProviders();
|
||||
}
|
||||
|
||||
for (int i = loaderList.Count - 1; i >= 0; i--)
|
||||
// 获取销毁列表
|
||||
foreach (var loader in loaderDic.Values)
|
||||
{
|
||||
BundleFileLoader loader = loaderList[i];
|
||||
if (loader.CanDestroy())
|
||||
if (loader.CanDestroyLoader())
|
||||
{
|
||||
string bundleName = loader.MainBundleInfo.Bundle.BundleName;
|
||||
loader.Destroy();
|
||||
loaderList.RemoveAt(i);
|
||||
loaderDic.Remove(bundleName);
|
||||
removeList.Add(loader);
|
||||
}
|
||||
}
|
||||
|
||||
// 销毁文件加载器
|
||||
foreach (var loader in removeList)
|
||||
{
|
||||
string bundleName = loader.BundleFileInfo.Bundle.BundleName;
|
||||
loader.DestroyLoader();
|
||||
_resManager._loaderDic.Remove(bundleName);
|
||||
}
|
||||
|
||||
// 注意:调用底层接口释放所有资源
|
||||
Resources.UnloadUnusedAssets();
|
||||
|
||||
@@ -57,10 +64,16 @@ namespace YooAsset
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
}
|
||||
public override void WaitForAsyncComplete()
|
||||
internal override void InternalWaitForAsyncComplete()
|
||||
{
|
||||
InternalOnUpdate();
|
||||
DebugCheckWaitForAsyncComplete();
|
||||
while (true)
|
||||
{
|
||||
if (ExecuteWhileDone())
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user