Update AssetSystem

Assets/YooAsset/Runtime/AssetSystem/Operations/AssetOperationHandle.cs

@@ -76,5 +76,13 @@ namespace YooAsset
 				return;
 			_provider.WaitForAsyncComplete();
 		}
+
+		/// <summary>
+		/// 释放资源句柄
+		/// </summary>
+		public void Release()
+		{
+			this.ReleaseInternal();
+		}
 	}
 }

Assets/YooAsset/Runtime/AssetSystem/Operations/OperationHandleBase.cs

@@ -70,7 +70,7 @@ namespace YooAsset
 		/// <summary>
 		/// 释放句柄
 		/// </summary>
-		public void Release()
+		internal void ReleaseInternal()
 		{
 			if (IsValid == false)
 				return;

Assets/YooAsset/Runtime/AssetSystem/Operations/SceneOperationHandle.cs

@@ -1,8 +1,114 @@
-
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
 namespace YooAsset
 {
 	public class SceneOperationHandle : OperationHandleBase
 	{
+		/// <summary>
+		/// 场景卸载异步操作类
+		/// </summary>
+		public class UnloadSceneOperation : AsyncOperationBase
+		{
+			private enum EFlag
+			{
+				Normal,
+				Error,
+				Skip,
+			}
+			private enum ESteps
+			{
+				None,
+				UnLoad,
+				Checking,
+				Done,
+			}
+
+			private readonly EFlag _flag;
+			private ESteps _steps = ESteps.None;
+			private Scene _scene;
+			private AsyncOperation _asyncOp;
+
+			/// <summary>
+			/// 场景卸载进度
+			/// </summary>
+			public float Progress
+			{
+				get
+				{
+					if (_asyncOp == null)
+						return 0;
+					return _asyncOp.progress;
+				}
+			}
+
+			internal UnloadSceneOperation()
+			{
+				_flag = EFlag.Skip;
+			}
+			internal UnloadSceneOperation(string error)
+			{
+				_flag = EFlag.Error;
+				Error = error;
+			}
+			internal UnloadSceneOperation(Scene scene)
+			{
+				_flag = EFlag.Normal;
+				_scene = scene;
+			}
+			internal override void Start()
+			{
+				if (_flag == EFlag.Normal)
+				{
+					_steps = ESteps.UnLoad;
+				}
+				else if (_flag == EFlag.Skip)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else if (_flag == EFlag.Error)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+				}
+				else
+				{
+					throw new System.NotImplementedException(_flag.ToString());
+				}
+			}
+			internal override void Update()
+			{
+				if (_steps == ESteps.None || _steps == ESteps.Done)
+					return;
+
+				if (_steps == ESteps.UnLoad)
+				{
+					if (_scene.IsValid() && _scene.isLoaded)
+					{
+						_asyncOp = SceneManager.UnloadSceneAsync(_scene);
+						_steps = ESteps.Checking;
+					}
+					else
+					{
+						Error = "Scene is invalid or is not loaded.";
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+					}
+				}
+
+				if (_steps == ESteps.Checking)
+				{
+					if (_asyncOp.isDone == false)
+						return;
+
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+
+
 		private System.Action<SceneOperationHandle> _callback;
 
 		internal SceneOperationHandle(AssetProviderBase provider) : base(provider)
@@ -41,13 +147,13 @@ namespace YooAsset
 		/// <summary>
 		/// 场景对象
 		/// </summary>
-		public UnityEngine.SceneManagement.Scene Scene
+		public Scene SceneObject
 		{
 			get
 			{
 				if (IsValid == false)
-					return new UnityEngine.SceneManagement.Scene();
-				return _provider.Scene;
+					return new Scene();
+				return _provider.SceneObject;
 			}
 		}
 
@@ -59,15 +165,79 @@ namespace YooAsset
 			if (IsValid == false)
 				return false;
 
-			if (Scene.IsValid() && Scene.isLoaded)
+			if (SceneObject.IsValid() && SceneObject.isLoaded)
 			{
-				return UnityEngine.SceneManagement.SceneManager.SetActiveScene(Scene);
+				return SceneManager.SetActiveScene(SceneObject);
 			}
 			else
 			{
-				YooLogger.Warning($"Scene is invalid or not loaded : {Scene.name}");
+				YooLogger.Warning($"Scene is invalid or not loaded : {SceneObject.name}");
 				return false;
 			}
 		}
+
+		/// <summary>
+		/// 异步卸载场景
+		/// </summary>
+		public UnloadSceneOperation UnloadAsync()
+		{
+			if (IsValid == false)
+			{
+				string error = $"{nameof(SceneOperationHandle)} is invalid.";
+				var operation = new UnloadSceneOperation(error);
+				OperationSystem.ProcessOperaiton(operation);
+				return operation;
+			}
+
+			AssetProviderBase provider = _provider;
+
+			// 释放场景句柄
+			ReleaseInternal();
+
+			// 卸载未被使用的资源（包括场景）
+			AssetSystem.UnloadUnusedAssets();
+
+			// 返回场景卸载异步操作类
+			if (provider.IsDestroyed == false)
+			{
+				YooLogger.Warning($"Scene can not unload. The provider not destroyed : {provider.AssetPath}");
+				var operation = new UnloadSceneOperation();
+				OperationSystem.ProcessOperaiton(operation);
+				return operation;
+			}
+			else
+			{
+				if (IsAdditiveScene(provider))
+				{
+					var operation = new UnloadSceneOperation(provider.SceneObject);
+					OperationSystem.ProcessOperaiton(operation);
+					return operation;
+				}
+				else
+				{
+					var operation = new UnloadSceneOperation();
+					OperationSystem.ProcessOperaiton(operation);
+					return operation;
+				}
+			}
+		}
+
+		private bool IsAdditiveScene(AssetProviderBase provider)
+		{
+			if (provider is DatabaseSceneProvider)
+			{
+				var temp = provider as DatabaseSceneProvider;
+				return temp.SceneMode == LoadSceneMode.Additive;
+			}
+			else if (provider is BundledSceneProvider)
+			{
+				var temp = provider as BundledSceneProvider;
+				return temp.SceneMode == LoadSceneMode.Additive;
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
 	}
 }

Assets/YooAsset/Runtime/AssetSystem/Operations/SubAssetsOperationHandle.cs

@@ -0,0 +1,92 @@
+
+namespace YooAsset
+{
+	public class SubAssetsOperationHandle : OperationHandleBase
+	{
+		private System.Action<SubAssetsOperationHandle> _callback;
+
+		internal SubAssetsOperationHandle(AssetProviderBase provider) : base(provider)
+		{
+		}
+		internal override void InvokeCallback()
+		{
+			if (IsValid)
+			{
+				_callback?.Invoke(this);
+			}
+		}
+
+		/// <summary>
+		/// 完成委托
+		/// </summary>
+		public event System.Action<SubAssetsOperationHandle> Completed
+		{
+			add
+			{
+				if (IsValid == false)
+					throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
+				if (_provider.IsDone)
+					value.Invoke(this);
+				else
+					_callback += value;
+			}
+			remove
+			{
+				if (IsValid == false)
+					throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
+				_callback -= value;
+			}
+		}
+
+		/// <summary>
+		/// 子资源对象集合
+		/// </summary>
+		public UnityEngine.Object[] AllAssetObjects
+		{
+			get
+			{
+				if (IsValid == false)
+					return null;
+				return _provider.AllAssets;
+			}
+		}
+
+		/// <summary>
+		/// 获取子资源对象
+		/// </summary>
+		/// <typeparam name="TObject">子资源对象类型</typeparam>
+		/// <param name="assetName">子资源对象名称</param>
+		public TObject GetSubAssetObject<TObject>(string assetName) where TObject : UnityEngine.Object
+		{
+			if (IsValid == false)
+				return null;
+
+			foreach (var asset in _provider.AllAssets)
+			{
+				if (asset.name == assetName)
+					return asset as TObject;
+			}
+
+			YooLogger.Warning($"Not found sub asset {assetName} in {_provider.AssetPath}");
+			return null;
+		}
+
+		/// <summary>
+		/// 等待异步执行完毕
+		/// </summary>
+		public void WaitForAsyncComplete()
+		{
+			if (IsValid == false)
+				return;
+			_provider.WaitForAsyncComplete();
+		}
+
+		/// <summary>
+		/// 释放资源句柄
+		/// </summary>
+		public void Release()
+		{
+			this.ReleaseInternal();
+		}
+	}
+}

Assets/YooAsset/Runtime/AssetSystem/Operations/SubAssetsOperationHandle.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 76b148be04a698e45a54dd85e64969dd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: