feat #639

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs

@@ -6,6 +6,7 @@ namespace YooAsset
         protected enum ESteps
         {
             None,
+            CheckExist,
             DownloadFile,
             LoadAssetBundle,
             CheckResult,
@@ -14,6 +15,7 @@ namespace YooAsset
 
         private readonly DefaultEditorFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
+        protected FSDownloadFileOperation _downloadFileOp;
         private int _asyncSimulateFrame;
         private ESteps _steps = ESteps.None;
 
@@ -24,19 +26,57 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.DownloadFile;
+            _steps = ESteps.CheckExist;
+            _asyncSimulateFrame = _fileSystem.GetAsyncSimulateFrame();
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckExist)
+            {
+                if (_fileSystem.Exists(_bundle))
+                {
+                    DownloadProgress = 1f;
+                    DownloadedBytes = _bundle.FileSize;
+                    _steps = ESteps.LoadAssetBundle;
+                }
+                else
+                {
+                    _steps = ESteps.DownloadFile;
+                }
+            }
+
             if (_steps == ESteps.DownloadFile)
             {
-                _asyncSimulateFrame = _fileSystem.GetAsyncSimulateFrame();
-                DownloadProgress = 1f;
-                DownloadedBytes = _bundle.FileSize;
-                _steps = ESteps.LoadAssetBundle;
+                if (_downloadFileOp == null)
+                {
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
+                    _downloadFileOp.StartOperation();
+                    AddChildOperation(_downloadFileOp);
+                }
+
+                if (IsWaitForAsyncComplete)
+                    _downloadFileOp.WaitForAsyncComplete();
+
+                _downloadFileOp.UpdateOperation();
+                DownloadProgress = _downloadFileOp.DownloadProgress;
+                DownloadedBytes = _downloadFileOp.DownloadedBytes;
+                if (_downloadFileOp.IsDone == false)
+                    return;
+
+                if (_downloadFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadAssetBundle;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _downloadFileOp.Error;
+                }
             }
 
             if (_steps == ESteps.LoadAssetBundle)

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/DownloadVirutalBundleOperation.cs

@@ -0,0 +1,156 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class DownloadVirtualBundleOperation : FSDownloadFileOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckExists,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        // 下载参数
+        protected readonly DefaultEditorFileSystem _fileSystem;
+        protected readonly DownloadFileOptions _options;
+        protected UnityVirtualBundleRequestOperation _unityDownloadFileOp;
+
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+
+        internal DownloadVirtualBundleOperation(DefaultEditorFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle)
+        {
+            _fileSystem = fileSystem;
+            _options = options;
+            _failedTryAgain = options.FailedTryAgain;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CheckExists;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 检测文件是否存在
+            if (_steps == ESteps.CheckExists)
+            {
+                if (_fileSystem.Exists(Bundle))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                if (_options.IsValid() == false)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Download file options is invalid !";
+                    Debug.Log(Error);
+                    return;
+                }
+
+                string url = GetRequestURL();
+                int speed = _fileSystem.VirtualDownloadSpeed;
+                _unityDownloadFileOp = new UnityVirtualBundleRequestOperation(Bundle, speed, url);
+                _unityDownloadFileOp.StartOperation();
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                if (IsWaitForAsyncComplete)
+                    _unityDownloadFileOp.WaitForAsyncComplete();
+
+                // 因为并发数量限制，下载器可能被挂起！
+                if (_unityDownloadFileOp.Status == EOperationStatus.None)
+                    return;
+
+                _unityDownloadFileOp.UpdateOperation();
+                Progress = _unityDownloadFileOp.Progress;
+                DownloadedBytes = _unityDownloadFileOp.DownloadedBytes;
+                DownloadProgress = _unityDownloadFileOp.DownloadProgress;
+                if (_unityDownloadFileOp.IsDone == false)
+                    return;
+
+                if (_unityDownloadFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _fileSystem.RecordDownloadFile(Bundle.BundleName);
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    if (IsWaitForAsyncComplete == false && _failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityDownloadFileOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityDownloadFileOp.Error;
+                        YooLogger.Error(Error);
+                    }
+                }
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    _tryAgainTimer = 0f;
+                    _failedTryAgain--;
+                    Progress = 0f;
+                    DownloadProgress = 0f;
+                    DownloadedBytes = 0;
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        protected string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/DownloadVirutalBundleOperation.cs.meta

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