update operation system

异步操作增加执行优先级

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs

@@ -7,24 +7,26 @@ namespace YooAsset
 	internal sealed class BundledAllAssetsProvider : ProviderBase
 	{
 		private AssetBundleRequest _cacheRequest;
-		
-		public BundledAllAssetsProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+
+		public BundledAllAssetsProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
 		{
 			DebugBeginRecording();
-
+		}
+		internal override void InternalOnUpdate()
+		{
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -39,17 +41,15 @@ namespace YooAsset
 
 				if (DependBundles.IsSucceed() == false)
 				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
+					string error = DependBundles.GetLastError();
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
@@ -59,11 +59,11 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (IsWaitForAsyncComplete || IsForceDestroyComplete)
 				{
@@ -79,11 +79,11 @@ namespace YooAsset
 					else
 						_cacheRequest = OwnerBundle.CacheBundle.LoadAllAssetsAsync(MainAssetInfo.AssetType);
 				}
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				if (_cacheRequest != null)
 				{
@@ -102,16 +102,20 @@ namespace YooAsset
 					}
 				}
 
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AllAssetObjects == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+						error = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					else
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 		}
 	}

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs

@@ -8,23 +8,25 @@ namespace YooAsset
 	{
 		private AssetBundleRequest _cacheRequest;
 
-		public BundledAssetProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public BundledAssetProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
 		{
 			DebugBeginRecording();
-
+		}
+		internal override void InternalOnUpdate()
+		{
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -39,17 +41,15 @@ namespace YooAsset
 
 				if (DependBundles.IsSucceed() == false)
 				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
+					string error = DependBundles.GetLastError();
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
@@ -59,11 +59,11 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (IsWaitForAsyncComplete || IsForceDestroyComplete)
 				{
@@ -79,11 +79,11 @@ namespace YooAsset
 					else
 						_cacheRequest = OwnerBundle.CacheBundle.LoadAssetAsync(MainAssetInfo.AssetPath, MainAssetInfo.AssetType);
 				}
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				if (_cacheRequest != null)
 				{
@@ -102,16 +102,20 @@ namespace YooAsset
 					}
 				}
 
-				Status = AssetObject == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AssetObject == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+						error = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					else
-						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 		}
 	}

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs

@@ -3,23 +3,25 @@ namespace YooAsset
 {
 	internal class BundledRawFileProvider : ProviderBase
 	{
-		public BundledRawFileProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public BundledRawFileProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
 		{
 			DebugBeginRecording();
-
+		}
+		internal override void InternalOnUpdate()
+		{
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -31,21 +33,19 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 2. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				RawFilePath = OwnerBundle.FileLoadPath;
-				Status = EStatus.Succeed;
-				InvokeCompletion();
+				InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 			}
 		}
 	}

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs

@@ -12,26 +12,28 @@ namespace YooAsset
 		private readonly bool _suspendLoad;
 		private AsyncOperation _asyncOperation;
 
-		public BundledSceneProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad) : base(manager, providerGUID, providerPriority, assetInfo)
+		public BundledSceneProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad) : base(manager, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			SceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
 			_suspendLoad = suspendLoad;
 		}
-		public override void Update()
+		internal override void InternalOnStart()
 		{
 			DebugBeginRecording();
-
+		}
+		internal override void InternalOnUpdate()
+		{
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (DependBundles.IsDone() == false)
 					return;
@@ -40,57 +42,57 @@ namespace YooAsset
 
 				if (DependBundles.IsSucceed() == false)
 				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
+					string error = DependBundles.GetLastError();
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载场景
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				// 注意：如果场景不存在则返回NULL
 				_asyncOperation = SceneManager.LoadSceneAsync(MainAssetInfo.AssetPath, SceneMode);
 				if (_asyncOperation != null)
 				{
 					_asyncOperation.allowSceneActivation = !_suspendLoad;
-					_asyncOperation.priority = (int)ProviderPriority;
+					_asyncOperation.priority = 100;
 					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
-					Status = EStatus.Checking;
+					_steps = ESteps.Checking;
 				}
 				else
 				{
-					Status = EStatus.Failed;
-					LastError = $"Failed to load scene : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Failed to load scene : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 				}
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				Progress = _asyncOperation.progress;
 				if (_asyncOperation.isDone)
 				{
-					Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
-					if (Status == EStatus.Failed)
+					if (SceneObject.IsValid())
 					{
-						LastError = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
-						YooLogger.Error(LastError);
+						InvokeCompletion(string.Empty, EOperationStatus.Succeed);
+					}
+					else
+					{
+						string error = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
+						YooLogger.Error(error);
+						InvokeCompletion(error, EOperationStatus.Failed);
 					}
-					InvokeCompletion();
 				}
 			}
 		}

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs

@@ -8,23 +8,25 @@ namespace YooAsset
 	{
 		private AssetBundleRequest _cacheRequest;
 
-		public BundledSubAssetsProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public BundledSubAssetsProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
 		{
 			DebugBeginRecording();
-
+		}
+		internal override void InternalOnUpdate()
+		{
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -39,17 +41,15 @@ namespace YooAsset
 
 				if (DependBundles.IsSucceed() == false)
 				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
+					string error = DependBundles.GetLastError();
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
@@ -59,11 +59,11 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (IsWaitForAsyncComplete || IsForceDestroyComplete)
 				{
@@ -79,11 +79,11 @@ namespace YooAsset
 					else
 						_cacheRequest = OwnerBundle.CacheBundle.LoadAssetWithSubAssetsAsync(MainAssetInfo.AssetPath, MainAssetInfo.AssetType);
 				}
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				if (_cacheRequest != null)
 				{
@@ -102,16 +102,20 @@ namespace YooAsset
 					}
 				}
 
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AllAssetObjects == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+						error = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					else
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 		}
 	}

Assets/YooAsset/Runtime/ResourceManager/Provider/CompletedProvider.cs

@@ -3,19 +3,22 @@ namespace YooAsset
 {
 	internal sealed class CompletedProvider : ProviderBase
 	{
-		public CompletedProvider(AssetInfo assetInfo) : base(null, string.Empty, 0, assetInfo)
+		public CompletedProvider(AssetInfo assetInfo) : base(null, string.Empty, assetInfo)
 		{
 		}
-		public override void Update()
+
+		internal override void InternalOnStart()
 		{
 		}
+		internal override void InternalOnUpdate()
+		{
+		}
+
 		public void SetCompleted(string error)
 		{
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.Failed;
-				LastError = error;
-				InvokeCompletion();
+				InvokeCompletion(error, EOperationStatus.Failed);
 			}
 		}
 	}

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs

@@ -6,29 +6,32 @@ namespace YooAsset
 {
 	internal sealed class DatabaseAllAssetsProvider : ProviderBase
 	{
-		public DatabaseAllAssetsProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public DatabaseAllAssetsProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
+		{
+			DebugBeginRecording();
+		}
+		internal override void InternalOnUpdate()
 		{
 #if UNITY_EDITOR
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
 				// 检测资源文件是否存在
 				string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
 				if (string.IsNullOrEmpty(guid))
 				{
-					Status = EStatus.Failed;
-					LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Not found asset : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
@@ -36,7 +39,7 @@ namespace YooAsset
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -48,17 +51,16 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (MainAssetInfo.AssetType == null)
 				{
@@ -82,22 +84,26 @@ namespace YooAsset
 					}
 					AllAssetObjects = result.ToArray();
 				}
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AllAssetObjects == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null";
+						error = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null";
 					else
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 #endif
 		}

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs

@@ -6,29 +6,32 @@ namespace YooAsset
 {
 	internal sealed class DatabaseAssetProvider : ProviderBase
 	{
-		public DatabaseAssetProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public DatabaseAssetProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
+		{
+			DebugBeginRecording();
+		}
+		internal override void InternalOnUpdate()
 		{
 #if UNITY_EDITOR
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
 				// 检测资源文件是否存在
 				string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
 				if (string.IsNullOrEmpty(guid))
 				{
-					Status = EStatus.Failed;
-					LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Not found asset : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
@@ -36,7 +39,7 @@ namespace YooAsset
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -48,38 +51,41 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (MainAssetInfo.AssetType == null)
 					AssetObject = UnityEditor.AssetDatabase.LoadMainAssetAtPath(MainAssetInfo.AssetPath);
 				else
 					AssetObject = UnityEditor.AssetDatabase.LoadAssetAtPath(MainAssetInfo.AssetPath, MainAssetInfo.AssetType);
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
-				Status = AssetObject == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AssetObject == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : null";
+						error = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : null";
 					else
-						LastError = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 #endif
 		}

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs

@@ -3,29 +3,32 @@ namespace YooAsset
 {
 	internal class DatabaseRawFileProvider : ProviderBase
 	{
-		public DatabaseRawFileProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public DatabaseRawFileProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
+		{
+			DebugBeginRecording();
+		}
+		internal override void InternalOnUpdate()
 		{
 #if UNITY_EDITOR
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
 				// 检测资源文件是否存在
 				string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
 				if (string.IsNullOrEmpty(guid))
 				{
-					Status = EStatus.Failed;
-					LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Not found asset : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
@@ -33,7 +36,7 @@ namespace YooAsset
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -45,21 +48,19 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 2. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				RawFilePath = MainAssetInfo.AssetPath;
-				Status = EStatus.Succeed;
-				InvokeCompletion();
+				InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 			}
 #endif
 		}

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs

@@ -12,25 +12,29 @@ namespace YooAsset
 		private readonly bool _suspendLoad;
 		private AsyncOperation _asyncOperation;
 
-		public DatabaseSceneProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad) : base(manager, providerGUID, providerPriority, assetInfo)
+		public DatabaseSceneProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad) : base(manager, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			SceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
 			_suspendLoad = suspendLoad;
 		}
-		public override void Update()
+		internal override void InternalOnStart()
+		{
+			DebugBeginRecording();
+		}
+		internal override void InternalOnUpdate()
 		{
 #if UNITY_EDITOR
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -42,17 +46,16 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
 				loadSceneParameters.loadSceneMode = SceneMode;
@@ -60,32 +63,34 @@ namespace YooAsset
 				if (_asyncOperation != null)
 				{
 					_asyncOperation.allowSceneActivation = !_suspendLoad;
-					_asyncOperation.priority = (int)ProviderPriority;
+					_asyncOperation.priority = 100;
 					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
-					Status = EStatus.Checking;
+					_steps = ESteps.Checking;
 				}
 				else
 				{
-					Status = EStatus.Failed;
-					LastError = $"Failed to load scene : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Failed to load scene : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 				}
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
 				Progress = _asyncOperation.progress;
 				if (_asyncOperation.isDone)
 				{
-					Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
-					if (Status == EStatus.Failed)
+					if (SceneObject.IsValid())
 					{
-						LastError = $"The loaded scene is invalid : {MainAssetInfo.AssetPath}";
-						YooLogger.Error(LastError);
+						InvokeCompletion(string.Empty, EOperationStatus.Succeed);
+					}
+					else
+					{
+						string error = $"The loaded scene is invalid : {MainAssetInfo.AssetPath}";
+						YooLogger.Error(error);
+						InvokeCompletion(error, EOperationStatus.Failed);
 					}
-					InvokeCompletion();
 				}
 			}
 #endif

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs

@@ -6,29 +6,32 @@ namespace YooAsset
 {
 	internal sealed class DatabaseSubAssetsProvider : ProviderBase
 	{
-		public DatabaseSubAssetsProvider(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo) : base(manager, providerGUID, providerPriority, assetInfo)
+		public DatabaseSubAssetsProvider(ResourceManager manager, string providerGUID, AssetInfo assetInfo) : base(manager, providerGUID, assetInfo)
 		{
 		}
-		public override void Update()
+		internal override void InternalOnStart()
+		{
+			DebugBeginRecording();
+		}
+		internal override void InternalOnUpdate()
 		{
 #if UNITY_EDITOR
 			if (IsDone)
 				return;
 
-			if (Status == EStatus.None)
+			if (_steps == ESteps.None)
 			{
 				// 检测资源文件是否存在
 				string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
 				if (string.IsNullOrEmpty(guid))
 				{
-					Status = EStatus.Failed;
-					LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
+					string error = $"Not found asset : {MainAssetInfo.AssetPath}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.CheckBundle;
+				_steps = ESteps.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
@@ -36,7 +39,7 @@ namespace YooAsset
 			}
 
 			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
+			if (_steps == ESteps.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
 				{
@@ -48,17 +51,16 @@ namespace YooAsset
 
 				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
+					string error = OwnerBundle.LastError;
+					InvokeCompletion(error, EOperationStatus.Failed);
 					return;
 				}
 
-				Status = EStatus.Loading;
+				_steps = ESteps.Loading;
 			}
 
 			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
+			if (_steps == ESteps.Loading)
 			{
 				if (MainAssetInfo.AssetType == null)
 				{
@@ -75,22 +77,26 @@ namespace YooAsset
 					}
 					AllAssetObjects = result.ToArray();
 				}
-				Status = EStatus.Checking;
+				_steps = ESteps.Checking;
 			}
 
 			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
+			if (_steps == ESteps.Checking)
 			{
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
+				if (AllAssetObjects == null)
 				{
+					string error;
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null";
+						error = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null";
 					else
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
-					YooLogger.Error(LastError);
+						error = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
+					YooLogger.Error(error);
+					InvokeCompletion(error, EOperationStatus.Failed);
+				}
+				else
+				{
+					InvokeCompletion(string.Empty, EOperationStatus.Succeed);
 				}
-				InvokeCompletion();
 			}
 #endif
 		}

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs

@@ -6,16 +6,15 @@ using System;
 
 namespace YooAsset
 {
-	internal abstract class ProviderBase : IComparable<ProviderBase>
+	internal abstract class ProviderBase : AsyncOperationBase
 	{
-		public enum EStatus
+		protected enum ESteps
 		{
 			None = 0,
 			CheckBundle,
 			Loading,
 			Checking,
-			Succeed,
-			Failed,
+			Done,
 		}
 
 		/// <summary>
@@ -23,11 +22,6 @@ namespace YooAsset
 		/// </summary>
 		public string ProviderGUID { private set; get; }
 
-		/// <summary>
-		/// 资源加载的优先级
-		/// </summary>
-		public uint ProviderPriority { private set; get; }
-
 		/// <summary>
 		/// 所属资源系统
 		/// </summary>
@@ -63,22 +57,6 @@ namespace YooAsset
 		/// </summary>
 		public string RawFilePath { protected set; get; }
 
-
-		/// <summary>
-		/// 当前的加载状态
-		/// </summary>
-		public EStatus Status { protected set; get; } = EStatus.None;
-
-		/// <summary>
-		/// 最近的错误信息
-		/// </summary>
-		public string LastError { protected set; get; } = string.Empty;
-
-		/// <summary>
-		/// 加载进度
-		/// </summary>
-		public float Progress { protected set; get; } = 0f;
-
 		/// <summary>
 		/// 引用计数
 		/// </summary>
@@ -89,18 +67,8 @@ namespace YooAsset
 		/// </summary>
 		public bool IsDestroyed { private set; get; } = false;
 
-		/// <summary>
-		/// 是否完毕（成功或失败）
-		/// </summary>
-		public bool IsDone
-		{
-			get
-			{
-				return Status == EStatus.Succeed || Status == EStatus.Failed;
-			}
-		}
-
 
+		protected ESteps _steps = ESteps.None;
 		protected BundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundles DependBundles { private set; get; }
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
@@ -108,11 +76,10 @@ namespace YooAsset
 		private readonly List<HandleBase> _handles = new List<HandleBase>();
 
 
-		public ProviderBase(ResourceManager manager, string providerGUID, uint providerPriority, AssetInfo assetInfo)
+		public ProviderBase(ResourceManager manager, string providerGUID, AssetInfo assetInfo)
 		{
 			ResourceMgr = manager;
 			ProviderGUID = providerGUID;
-			ProviderPriority = providerPriority;
 			MainAssetInfo = assetInfo;
 
 			// 创建资源包加载器
@@ -128,11 +95,6 @@ namespace YooAsset
 			}
 		}
 
-		/// <summary>
-		/// 轮询更新方法
-		/// </summary>
-		public abstract void Update();
-
 		/// <summary>
 		/// 销毁资源提供者
 		/// </summary>
@@ -140,6 +102,13 @@ namespace YooAsset
 		{
 			IsDestroyed = true;
 
+			// 检测是否为正常销毁
+			if (IsDone == false)
+			{
+				Error = "User abort !";
+				Status = EOperationStatus.Failed;
+			}
+
 			// 释放资源包加载器
 			if (OwnerBundle != null)
 			{
@@ -159,7 +128,7 @@ namespace YooAsset
 		public bool CanDestroy()
 		{
 			// 注意：在进行资源加载过程时不可以销毁
-			if (Status == EStatus.Loading || Status == EStatus.Checking)
+			if (_steps == ESteps.Loading || _steps == ESteps.Checking)
 				return false;
 
 			return RefCount <= 0;
@@ -226,7 +195,7 @@ namespace YooAsset
 			IsWaitForAsyncComplete = true;
 
 			// 注意：主动轮询更新完成同步加载
-			Update();
+			InternalOnUpdate();
 
 			// 验证结果
 			if (IsDone == false)
@@ -244,7 +213,7 @@ namespace YooAsset
 
 			// 注意：主动轮询更新完成同步加载
 			// 说明：如果资源包未准备完毕也可以放心销毁。
-			Update();
+			InternalOnUpdate();
 		}
 
 		/// <summary>
@@ -255,44 +224,21 @@ namespace YooAsset
 			if (OwnerBundle.IsDestroyed)
 				throw new System.Exception("Should never get here !");
 
-			Status = EStatus.Failed;
-			LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
-			YooLogger.Error(LastError);
-			InvokeCompletion();
+			string error = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
+			YooLogger.Error(error);
+			InvokeCompletion(Error, EOperationStatus.Failed);
 		}
 
 		/// <summary>
-		/// 异步操作任务
+		/// 结束流程
 		/// </summary>
-		public Task Task
-		{
-			get
-			{
-				if (_taskCompletionSource == null)
-				{
-					_taskCompletionSource = new TaskCompletionSource<object>();
-					if (IsDone)
-						_taskCompletionSource.SetResult(null);
-				}
-				return _taskCompletionSource.Task;
-			}
-		}
-
-		#region 排序接口实现
-		public int CompareTo(ProviderBase other)
-		{
-			return other.ProviderPriority.CompareTo(this.ProviderPriority);
-		}
-		#endregion
-
-		#region 异步编程相关
-		private TaskCompletionSource<object> _taskCompletionSource;
-		protected void InvokeCompletion()
+		protected void InvokeCompletion(string error, EOperationStatus status)
 		{
 			DebugEndRecording();
 
-			// 进度百分百完成
-			Progress = 1f;
+			_steps = ESteps.Done;
+			Error = error;
+			Status = status;
 
 			// 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
 			// 注意：回调方法如果发生异常，会阻断列表里的后续回调方法！
@@ -304,11 +250,7 @@ namespace YooAsset
 					hande.InvokeCallback();
 				}
 			}
-
-			if (_taskCompletionSource != null)
-				_taskCompletionSource.TrySetResult(null);
 		}
-		#endregion
 
 		#region 调试信息相关
 		/// <summary>