update resource manager

UnloadAllAssetsAsync新增UnloadAllAssetsOptions参数
2025-02-11 17:32:31 +08:00
parent ce023cedb8
commit fb06f2aa11
5 changed files with 149 additions and 52 deletions
@@ -3,38 +3,88 @@ using UnityEngine;

 namespace YooAsset
 {
+    public sealed class UnloadAllAssetsOptions
+    {
+        /// <summary>
+        /// 释放所有资源句柄，防止卸载过程中触发完成回调！
+        /// </summary>
+        public bool ReleaseAllHandles = true;
+
+        /// <summary>
+        /// 卸载过程中锁定加载操作，防止新的任务请求！
+        /// </summary>
+        public bool LockLoadOperation = true;
+    }
+
    public sealed class UnloadAllAssetsOperation : AsyncOperationBase
    {
        private enum ESteps
        {
            None,
+            CheckOptions,
+            ReleaseAll,
            AbortDownload,
            CheckLoading,
-            UnloadAll,
+            DestroyAll,
            Done,
        }

        private readonly ResourceManager _resManager;
+        private readonly UnloadAllAssetsOptions _options;
        private ESteps _steps = ESteps.None;

-        internal UnloadAllAssetsOperation(ResourceManager resourceManager)
+        internal UnloadAllAssetsOperation(ResourceManager resourceManager, UnloadAllAssetsOptions options)
        {
            _resManager = resourceManager;
+            _options = options;
        }
        internal override void InternalOnStart()
        {
-            _steps = ESteps.AbortDownload;
+            _steps = ESteps.CheckOptions;
        }
        internal override void InternalOnUpdate()
        {
            if (_steps == ESteps.None || _steps == ESteps.Done)
                return;

+            if (_steps == ESteps.CheckOptions)
+            {
+                if (_options == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"{nameof(UnloadAllAssetsOptions)} is null.";
+                    return;
+                }
+
+                // 设置锁定状态
+                if (_options.LockLoadOperation)
+                    _resManager.LockLoadOperation = true;
+
+                _steps = ESteps.ReleaseAll;
+            }
+
+            if (_steps == ESteps.ReleaseAll)
+            {
+                // 清空所有场景句柄
+                _resManager.SceneHandles.Clear();
+
+                // 释放所有资源句柄
+                if (_options.ReleaseAllHandles)
+                {
+                    foreach (var provider in _resManager.ProviderDic.Values)
+                    {
+                        provider.ReleaseAllHandles();
+                    }
+                }
+
+                _steps = ESteps.AbortDownload;
+            }
+
            if (_steps == ESteps.AbortDownload)
            {
                // 注意：终止所有下载任务
-                var loaderDic = _resManager._loaderDic;
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                {
                    loader.AbortDownloadOperation();
                }
@@ -44,44 +94,32 @@ namespace YooAsset
            if (_steps == ESteps.CheckLoading)
            {
                // 注意：等待所有任务完成
-                var providerDic = _resManager._providerDic;
-                foreach (var provider in providerDic.Values)
+                foreach (var provider in _resManager.ProviderDic.Values)
                {
                    if (provider.IsDone == false)
                        return;
                }
-                _steps = ESteps.UnloadAll;
+                _steps = ESteps.DestroyAll;
            }

-            if (_steps == ESteps.UnloadAll)
+            if (_steps == ESteps.DestroyAll)
            {
-                var loaderDic = _resManager._loaderDic;
-                var providerDic = _resManager._providerDic;
-
-                // 清空所有场景句柄
-                _resManager._sceneHandles.Clear();
-
-                // 释放所有资源句柄
-                foreach (var provider in providerDic.Values)
-                {
-                    provider.ReleaseAllHandles();
-                }
-
                // 强制销毁资源提供者
-                foreach (var provider in providerDic.Values)
+                foreach (var provider in _resManager.ProviderDic.Values)
                {
                    provider.DestroyProvider();
                }

                // 强制销毁文件加载器
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                {
                    loader.DestroyLoader();
                }

                // 清空数据
-                providerDic.Clear();
-                loaderDic.Clear();
+                _resManager.ProviderDic.Clear();
+                _resManager.LoaderDic.Clear();
+                _resManager.LockLoadOperation = false;

                // 注意：调用底层接口释放所有资源
                Resources.UnloadUnusedAssets();
@@ -31,17 +31,16 @@ namespace YooAsset

            if (_steps == ESteps.UnloadUnused)
            {
-                var loaderDic = _resManager._loaderDic;
-                var removeList = new List<LoadBundleFileOperation>(loaderDic.Count);
+                var removeList = new List<LoadBundleFileOperation>(_resManager.LoaderDic.Count);

                // 注意：优先销毁资源提供者
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                {
                    loader.TryDestroyProviders();
                }

                // 获取销毁列表
-                foreach (var loader in loaderDic.Values)
+                foreach (var loader in _resManager.LoaderDic.Values)
                {
                    if (loader.CanDestroyLoader())
                    {
@@ -54,7 +53,7 @@ namespace YooAsset
                {
                    string bundleName = loader.LoadBundleInfo.Bundle.BundleName;
                    loader.DestroyLoader();
-                    _resManager._loaderDic.Remove(bundleName);
+                    _resManager.LoaderDic.Remove(bundleName);
                }

                // 注意：调用底层接口释放所有资源