pengtaihao
/
YooAsset
mirror of https://github.com/tuyoogame/YooAsset
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update operation system

pull/392/head
何冠峰 2024-10-17 10:51:17 +08:00
parent c0df366676
commit d980b55997
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs
View File

@ -19,7 +19,6 @@ namespace YooAsset
private readonly DefaultBuildinFileSystem _fileSystem; private readonly DefaultBuildinFileSystem _fileSystem;
private readonly PackageBundle _bundle; private readonly PackageBundle _bundle;
private AssetBundleCreateRequest _createRequest; private AssetBundleCreateRequest _createRequest;
private bool _isWaitForAsyncComplete = false;
private ESteps _steps = ESteps.None; private ESteps _steps = ESteps.None;
@ -53,7 +52,7 @@ namespace YooAsset
} }
} }
if (_isWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
if (_bundle.Encrypted) if (_bundle.Encrypted)
{ {
@ -85,7 +84,7 @@ namespace YooAsset
{ {
if (_createRequest != null) if (_createRequest != null)
{ {
if (_isWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
// 强制挂起主线程（注意：该操作会很耗时） // 强制挂起主线程（注意：该操作会很耗时）
YooLogger.Warning("Suspend the main thread to load unity bundle."); YooLogger.Warning("Suspend the main thread to load unity bundle.");
@ -124,8 +123,6 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
_isWaitForAsyncComplete = true;
while (true) while (true)
{ {
if (ExecuteWhileDone()) if (ExecuteWhileDone())

7
Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs
View File

@ -19,7 +19,6 @@ namespace YooAsset
protected readonly PackageBundle _bundle; protected readonly PackageBundle _bundle;
protected FSDownloadFileOperation _downloadFileOp; protected FSDownloadFileOperation _downloadFileOp;
protected AssetBundleCreateRequest _createRequest; protected AssetBundleCreateRequest _createRequest;
protected bool _isWaitForAsyncComplete = false;
protected ESteps _steps = ESteps.None; protected ESteps _steps = ESteps.None;
@ -90,7 +89,7 @@ namespace YooAsset
} }
} }
if (_isWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
if (_bundle.Encrypted) if (_bundle.Encrypted)
{ {
@ -122,7 +121,7 @@ namespace YooAsset
{ {
if (_createRequest != null) if (_createRequest != null)
{ {
if (_isWaitForAsyncComplete) if (IsWaitForAsyncComplete)
{ {
// 强制挂起主线程（注意：该操作会很耗时） // 强制挂起主线程（注意：该操作会很耗时）
YooLogger.Warning("Suspend the main thread to load unity bundle."); YooLogger.Warning("Suspend the main thread to load unity bundle.");
@ -197,8 +196,6 @@ namespace YooAsset
} }
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
_isWaitForAsyncComplete = true;
while (true) while (true)
{ {
if (_downloadFileOp != null) if (_downloadFileOp != null)

6
Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs
View File

@ -12,6 +12,11 @@ namespace YooAsset
private string _packageName = null; private string _packageName = null;
private int _whileFrame = 1000; private int _whileFrame = 1000;
/// <summary>
/// 等待异步执行完成
/// </summary>
internal bool IsWaitForAsyncComplete = false;
/// <summary> /// <summary>
/// 是否已经完成 /// 是否已经完成
/// </summary> /// </summary>
@ -168,6 +173,7 @@ namespace YooAsset
if (IsDone) if (IsDone)
return; return;
IsWaitForAsyncComplete = true;
InternalWaitForAsyncComplete(); InternalWaitForAsyncComplete();
} }

3
Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs
View File

@ -70,7 +70,6 @@ namespace YooAsset
protected ESteps _steps = ESteps.None; protected ESteps _steps = ESteps.None;
protected LoadBundleFileOperation LoadBundleFileOp { private set; get; } protected LoadBundleFileOperation LoadBundleFileOp { private set; get; }
protected LoadDependBundleFileOperation LoadDependBundleFileOp { private set; get; } protected LoadDependBundleFileOperation LoadDependBundleFileOp { private set; get; }
protected bool IsWaitForAsyncComplete { private set; get; } = false;
private readonly List<HandleBase> _handles = new List<HandleBase>(); private readonly List<HandleBase> _handles = new List<HandleBase>();
@ -93,8 +92,6 @@ namespace YooAsset
internal override void InternalWaitForAsyncComplete() internal override void InternalWaitForAsyncComplete()
{ {
IsWaitForAsyncComplete = true;
while (true) while (true)
{ {
if (LoadDependBundleFileOp != null) if (LoadDependBundleFileOp != null)