yoo2.2,9

yoo2.2,9

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/AssetBundleResult.cs

@@ -0,0 +1,73 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace YooAsset
+{
+    internal class AssetBundleResult : BundleResult
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        private readonly Stream _managedStream;
+
+        public AssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle, Stream managedStream)
+        {
+            _fileSystem = fileSystem;
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+            _managedStream = managedStream;
+        }
+
+        public override void UnloadBundleFile()
+        {
+            if (_assetBundle != null)
+            {
+                _assetBundle.Unload(true);
+            }
+
+            if (_managedStream != null)
+            {
+                _managedStream.Close();
+                _managedStream.Dispose();
+            }
+        }
+        public override string GetBundleFilePath()
+        {
+            return _fileSystem.GetBundleFilePath(_packageBundle);
+        }
+        public override byte[] ReadBundleFileData()
+        {
+            return _fileSystem.ReadBundleFileData(_packageBundle);
+        }
+        public override string ReadBundleFileText()
+        {
+            return _fileSystem.ReadBundleFileText(_packageBundle);
+        }
+
+        public override FSLoadAssetOperation LoadAssetAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAssetOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadAllAssetsOperation LoadAllAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadAllAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSubAssetsOperation LoadSubAssetsAsync(AssetInfo assetInfo)
+        {
+            var operation = new AssetBundleLoadSubAssetsOperation(_packageBundle, _assetBundle, assetInfo);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+        public override FSLoadSceneOperation LoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad)
+        {
+            var operation = new AssetBundleLoadSceneOperation(assetInfo, loadParams, suspendLoad);
+            OperationSystem.StartOperation(_fileSystem.PackageName, operation);
+            return operation;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/AssetBundleResult.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e310d20cf53709541bc66d1483afe627
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs

@@ -0,0 +1,121 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class AssetBundleLoadAllAssetsOperation : FSLoadAllAssetsOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckBundle,
+            LoadAsset,
+            CheckResult,
+            Done,
+        }
+
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        private readonly AssetInfo _assetInfo;
+        private AssetBundleRequest _request;
+        private ESteps _steps = ESteps.None;
+
+        public AssetBundleLoadAllAssetsOperation(PackageBundle packageBundle, AssetBundle assetBundle, AssetInfo assetInfo)
+        {
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+            _assetInfo = assetInfo;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CheckBundle;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CheckBundle)
+            {
+                if (_assetBundle == null)
+                {
+                    _steps = ESteps.Done;
+                    Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
+                    Status = EOperationStatus.Failed;
+                    return;
+                }
+
+                _steps = ESteps.LoadAsset;
+            }
+
+            if (_steps == ESteps.LoadAsset)
+            {
+                if (IsWaitForAsyncComplete)
+                {
+                    if (_assetInfo.AssetType == null)
+                        Result = _assetBundle.LoadAllAssets();
+                    else
+                        Result = _assetBundle.LoadAllAssets(_assetInfo.AssetType);
+                }
+                else
+                {
+                    if (_assetInfo.AssetType == null)
+                        _request = _assetBundle.LoadAllAssetsAsync();
+                    else
+                        _request = _assetBundle.LoadAllAssetsAsync(_assetInfo.AssetType);
+                }
+
+                _steps = ESteps.CheckResult;
+            }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (_request != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                    {
+                        // 强制挂起主线程（注意：该操作会很耗时）
+                        YooLogger.Warning("Suspend the main thread to load unity asset.");
+                        Result = _request.allAssets;
+                    }
+                    else
+                    {
+                        Progress = _request.progress;
+                        if (_request.isDone == false)
+                            return;
+                        Result = _request.allAssets;
+                    }
+                }
+
+                if (Result == null)
+                {
+                    string error;
+                    if (_assetInfo.AssetType == null)
+                        error = $"Failed to load all assets : {_assetInfo.AssetPath} AssetType : null AssetBundle : {_packageBundle.BundleName}";
+                    else
+                        error = $"Failed to load all assets : {_assetInfo.AssetPath} AssetType : {_assetInfo.AssetType} AssetBundle : {_packageBundle.BundleName}";
+                    YooLogger.Error(error);
+
+                    _steps = ESteps.Done;
+                    Error = error;
+                    Status = EOperationStatus.Failed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAllAssetsOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs

@@ -0,0 +1,121 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class AssetBundleLoadAssetOperation : FSLoadAssetOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckBundle,
+            LoadAsset,
+            CheckResult,
+            Done,
+        }
+
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        private readonly AssetInfo _assetInfo;
+        private AssetBundleRequest _request;
+        private ESteps _steps = ESteps.None;
+
+        public AssetBundleLoadAssetOperation(PackageBundle packageBundle, AssetBundle assetBundle, AssetInfo assetInfo)
+        {
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+            _assetInfo = assetInfo;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CheckBundle;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CheckBundle)
+            {
+                if (_assetBundle == null)
+                {
+                    _steps = ESteps.Done;
+                    Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
+                    Status = EOperationStatus.Failed;
+                    return;
+                }
+
+                _steps = ESteps.LoadAsset;
+            }
+
+            if (_steps == ESteps.LoadAsset)
+            {
+                if (IsWaitForAsyncComplete)
+                {
+                    if (_assetInfo.AssetType == null)
+                        Result = _assetBundle.LoadAsset(_assetInfo.AssetPath);
+                    else
+                        Result = _assetBundle.LoadAsset(_assetInfo.AssetPath, _assetInfo.AssetType);
+                }
+                else
+                {
+                    if (_assetInfo.AssetType == null)
+                        _request = _assetBundle.LoadAssetAsync(_assetInfo.AssetPath);
+                    else
+                        _request = _assetBundle.LoadAssetAsync(_assetInfo.AssetPath, _assetInfo.AssetType);
+                }
+
+                _steps = ESteps.CheckResult;
+            }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (_request != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                    {
+                        // 强制挂起主线程（注意：该操作会很耗时）
+                        YooLogger.Warning("Suspend the main thread to load unity asset.");
+                        Result = _request.asset;
+                    }
+                    else
+                    {
+                        Progress = _request.progress;
+                        if (_request.isDone == false)
+                            return;
+                        Result = _request.asset;
+                    }
+                }
+
+                if (Result == null)
+                {
+                    string error;
+                    if (_assetInfo.AssetType == null)
+                        error = $"Failed to load asset : {_assetInfo.AssetPath} AssetType : null AssetBundle : {_packageBundle.BundleName}";
+                    else
+                        error = $"Failed to load asset : {_assetInfo.AssetPath} AssetType : {_assetInfo.AssetType} AssetBundle : {_packageBundle.BundleName}";
+                    YooLogger.Error(error);
+
+                    _steps = ESteps.Done;
+                    Error = error;
+                    Status = EOperationStatus.Failed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadAssetOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs

@@ -0,0 +1,117 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace YooAsset
+{
+    internal class AssetBundleLoadSceneOperation : FSLoadSceneOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            LoadScene,
+            CheckResult,
+            Done,
+        }
+
+        private readonly AssetInfo _assetInfo;
+        private readonly LoadSceneParameters _loadParams;
+        private bool _suspendLoad;
+        private AsyncOperation _asyncOperation;
+        private ESteps _steps = ESteps.None;
+
+        public AssetBundleLoadSceneOperation(AssetInfo assetInfo, LoadSceneParameters loadParams, bool suspendLoad)
+        {
+            _assetInfo = assetInfo;
+            _loadParams = loadParams;
+            _suspendLoad = suspendLoad;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.LoadScene;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.LoadScene)
+            {
+                if (IsWaitForAsyncComplete)
+                {
+                    // 注意：场景同步加载方法不会立即加载场景，而是在下一帧加载。
+                    Result = SceneManager.LoadScene(_assetInfo.AssetPath, _loadParams);
+                    _steps = ESteps.CheckResult;
+                }
+                else
+                {
+                    // 注意：如果场景不存在异步加载方法返回NULL
+                    // 注意：即使是异步加载也要在当帧获取到场景对象
+                    _asyncOperation = SceneManager.LoadSceneAsync(_assetInfo.AssetPath, _loadParams);
+                    if (_asyncOperation != null)
+                    {
+                        _asyncOperation.allowSceneActivation = !_suspendLoad;
+                        _asyncOperation.priority = 100;
+                        Result = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
+                        _steps = ESteps.CheckResult;
+                    }
+                    else
+                    {
+                        string error = $"Failed to load scene : {_assetInfo.AssetPath}";
+                        YooLogger.Error(error);
+                        _steps = ESteps.Done;
+                        Error = error;
+                        Status = EOperationStatus.Failed;
+                    }
+                }
+            }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (_asyncOperation != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                    {
+                        //注意：场景加载无法强制异步转同步
+                        YooLogger.Error("The scene is loading asyn !");
+                    }
+                    else
+                    {
+                        // 注意：在业务层中途可以取消挂起
+                        if (_asyncOperation.allowSceneActivation == false)
+                        {
+                            if (_suspendLoad == false)
+                                _asyncOperation.allowSceneActivation = true;
+                        }
+
+                        Progress = _asyncOperation.progress;
+                        if (_asyncOperation.isDone == false)
+                            return;
+                    }
+                }
+
+                if (Result.IsValid())
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    string error = $"The loaded scene is invalid : {_assetInfo.AssetPath}";
+                    YooLogger.Error(error);
+                    _steps = ESteps.Done;
+                    Error = error;
+                    Status = EOperationStatus.Failed;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            //TODO 场景加载不支持异步转同步，为了支持同步加载方法需要实现该方法！
+            InternalOnUpdate();
+        }
+        public override void UnSuspendLoad()
+        {
+            _suspendLoad = false;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs.meta

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

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs

@@ -0,0 +1,121 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class AssetBundleLoadSubAssetsOperation : FSLoadSubAssetsOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckBundle,
+            LoadAsset,
+            CheckResult,
+            Done,
+        }
+
+        private readonly PackageBundle _packageBundle;
+        private readonly AssetBundle _assetBundle;
+        private readonly AssetInfo _assetInfo;
+        private AssetBundleRequest _request;
+        private ESteps _steps = ESteps.None;
+
+        public AssetBundleLoadSubAssetsOperation(PackageBundle packageBundle, AssetBundle assetBundle, AssetInfo assetInfo)
+        {
+            _packageBundle = packageBundle;
+            _assetBundle = assetBundle;
+            _assetInfo = assetInfo;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.CheckBundle;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CheckBundle)
+            {
+                if (_assetBundle == null)
+                {
+                    _steps = ESteps.Done;
+                    Error = $"The bundle {_packageBundle.BundleName} has been destroyed due to unity engine bugs !";
+                    Status = EOperationStatus.Failed;
+                    return;
+                }
+
+                _steps = ESteps.LoadAsset;
+            }
+
+            if (_steps == ESteps.LoadAsset)
+            {
+                if (IsWaitForAsyncComplete)
+                {
+                    if (_assetInfo.AssetType == null)
+                        Result = _assetBundle.LoadAssetWithSubAssets(_assetInfo.AssetPath);
+                    else
+                        Result = _assetBundle.LoadAssetWithSubAssets(_assetInfo.AssetPath, _assetInfo.AssetType);
+                }
+                else
+                {
+                    if (_assetInfo.AssetType == null)
+                        _request = _assetBundle.LoadAssetWithSubAssetsAsync(_assetInfo.AssetPath);
+                    else
+                        _request = _assetBundle.LoadAssetWithSubAssetsAsync(_assetInfo.AssetPath, _assetInfo.AssetType);
+                }
+
+                _steps = ESteps.CheckResult;
+            }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (_request != null)
+                {
+                    if (IsWaitForAsyncComplete)
+                    {
+                        // 强制挂起主线程（注意：该操作会很耗时）
+                        YooLogger.Warning("Suspend the main thread to load unity asset.");
+                        Result = _request.allAssets;
+                    }
+                    else
+                    {
+                        Progress = _request.progress;
+                        if (_request.isDone == false)
+                            return;
+                        Result = _request.allAssets;
+                    }
+                }
+
+                if (Result == null)
+                {
+                    string error;
+                    if (_assetInfo.AssetType == null)
+                        error = $"Failed to load sub assets : {_assetInfo.AssetPath} AssetType : null AssetBundle : {_packageBundle.BundleName}";
+                    else
+                        error = $"Failed to load sub assets : {_assetInfo.AssetPath} AssetType : {_assetInfo.AssetType} AssetBundle : {_packageBundle.BundleName}";
+                    YooLogger.Error(error);
+
+                    _steps = ESteps.Done;
+                    Error = error;
+                    Status = EOperationStatus.Failed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSubAssetsOperation.cs.meta

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