Update CHANGELOG.md

1. 新增WebGL专属模式WebPlayMode

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.5.2-preview] - 2023-07-18
+
+重新设计了对WebGL平台的支持，新增加了专属模式：WebPlayMode
+
 ## [1.5.1] - 2023-07-12
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -8,39 +8,54 @@ namespace YooAsset.Editor
 {
 	public class BuildBundleInfo
 	{
-		public class InfoWrapper
+		#region 补丁文件的关键信息
-		{
+		/// <summary>
-			/// <summary>
+		/// Unity引擎生成的哈希值（构建内容的哈希值）
-			/// 构建内容的哈希值
+		/// </summary>
-			/// </summary>
+		public string PackageUnityHash { set; get; }
-			public string ContentHash { set; get; }
 
-			/// <summary>
+		/// <summary>
-			/// 文件哈希值
+		/// Unity引擎生成的CRC
-			/// </summary>
+		/// </summary>
-			public string FileHash { set; get; }
+		public uint PackageUnityCRC { set; get; }
 
-			/// <summary>
+		/// <summary>
-			/// 文件哈希值
+		/// 文件哈希值
-			/// </summary>
+		/// </summary>
-			public string FileCRC { set; get; }
+		public string PackageFileHash { set; get; }
 
-			/// <summary>
+		/// <summary>
-			/// 文件哈希值
+		/// 文件哈希值
-			/// </summary>
+		/// </summary>
-			public long FileSize { set; get; }
+		public string PackageFileCRC { set; get; }
 
+		/// <summary>
+		/// 文件哈希值
+		/// </summary>
+		public long PackageFileSize { set; get; }
 
-			/// <summary>
+		/// <summary>
-			/// 构建输出的文件路径
+		/// 构建输出的文件路径
-			/// </summary>
+		/// </summary>
-			public string BuildOutputFilePath { set; get; }
+		public string BuildOutputFilePath { set; get; }
+
+		/// <summary>
+		/// 补丁包的源文件路径
+		/// </summary>
+		public string PackageSourceFilePath { set; get; }
+
+		/// <summary>
+		/// 补丁包的目标文件路径
+		/// </summary>
+		public string PackageDestFilePath { set; get; }
+
+		/// <summary>
+		/// 加密生成文件的路径
+		/// 注意：如果未加密该路径为空
+		/// </summary>
+		public string EncryptedFilePath { set; get; }
+		#endregion
 
-			/// <summary>
-			/// 补丁包输出文件路径
-			/// </summary>
-			public string PackageOutputFilePath { set; get; }
-		}
 
 		/// <summary>
 		/// 资源包名称
@@ -53,22 +68,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
 
-		/// <summary>
-		/// 补丁文件信息
-		/// </summary>
-		public readonly InfoWrapper BundleInfo = new InfoWrapper();
-
 		/// <summary>
 		/// Bundle文件的加载方法
 		/// </summary>
 		public EBundleLoadMethod LoadMethod { set; get; }
 
-		/// <summary>
-		/// 加密生成文件的路径
-		/// 注意：如果未加密该路径为空
-		/// </summary>
-		public string EncryptedFilePath { set; get; }
-
 		/// <summary>
 		/// 是否为原生文件
 		/// </summary>
@@ -208,9 +212,10 @@ namespace YooAsset.Editor
 		{
 			PackageBundle packageBundle = new PackageBundle();
 			packageBundle.BundleName = BundleName;
-			packageBundle.FileHash = BundleInfo.FileHash;
+			packageBundle.FileHash = PackageFileHash;
-			packageBundle.FileCRC = BundleInfo.FileCRC;
+			packageBundle.FileCRC = PackageFileCRC;
-			packageBundle.FileSize = BundleInfo.FileSize;
+			packageBundle.FileSize = PackageFileSize;
+			packageBundle.UnityCRC = PackageUnityCRC;
 			packageBundle.IsRawFile = IsRawFile;
 			packageBundle.LoadMethod = (byte)LoadMethod;
 			packageBundle.Tags = GetBundleTags();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs

@@ -70,7 +70,7 @@ namespace YooAsset.Editor
 			int fileTotalCount = buildMapContext.Collection.Count;
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				EditorTools.CopyFile(bundleInfo.BundleInfo.BuildOutputFilePath, bundleInfo.BundleInfo.PackageOutputFilePath, true);
+				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
 				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
 			}
 			EditorTools.ClearProgressBar();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs

@@ -29,32 +29,35 @@ namespace YooAsset.Editor
 			// 2.更新构建输出的文件路径
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
+				bundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 				if (bundleInfo.IsEncryptedFile)
-					bundleInfo.BundleInfo.BuildOutputFilePath = bundleInfo.EncryptedFilePath;
+					bundleInfo.PackageSourceFilePath = bundleInfo.EncryptedFilePath;
 				else
-					bundleInfo.BundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					bundleInfo.PackageSourceFilePath = bundleInfo.BuildOutputFilePath;
 			}
 
 			// 3.更新文件其它信息
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				string buildOutputFilePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
-				bundleInfo.BundleInfo.ContentHash = GetBundleContentHash(bundleInfo, context);
+				bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
-				bundleInfo.BundleInfo.FileHash = GetBundleFileHash(buildOutputFilePath, buildParametersContext);
+				bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.BundleInfo.FileCRC = GetBundleFileCRC(buildOutputFilePath, buildParametersContext);
+				bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.BundleInfo.FileSize = GetBundleFileSize(buildOutputFilePath, buildParametersContext);
+				bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo.PackageSourceFilePath, buildParametersContext);
 			}
 
 			// 4.更新补丁包输出的文件路径
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
+				string bundleName = bundleInfo.BundleName;
-				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, fileExtension, bundleInfo.BundleInfo.FileHash);
+				string fileHash = bundleInfo.PackageFileHash;
-				bundleInfo.BundleInfo.PackageOutputFilePath = $"{packageOutputDirectory}/{fileName}";
+				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleName);
+				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleName, fileExtension, fileHash);
+				bundleInfo.PackageDestFilePath = $"{packageOutputDirectory}/{fileName}";
 			}
 		}
 
-		private string GetBundleContentHash(BuildBundleInfo bundleInfo, BuildContext context)
+		private string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var parameters = buildParametersContext.Parameters;
@@ -64,7 +67,7 @@ namespace YooAsset.Editor
 
 			if (bundleInfo.IsRawFile)
 			{
-				string filePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				string filePath = bundleInfo.PackageSourceFilePath;
 				return HashUtility.FileMD5(filePath);
 			}
 
@@ -75,7 +78,7 @@ namespace YooAsset.Editor
 				if (hash.isValid)
 					return hash.ToString();
 				else
-					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
 			}
 			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
@@ -84,7 +87,39 @@ namespace YooAsset.Editor
 				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
 					return value.Hash.ToString();
 				else
-					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+		private uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return 0;
+
+			if (bundleInfo.IsRawFile)
+				return 0;
+
+			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				string filePath = bundleInfo.BuildOutputFilePath;
+				if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
+					return crc;
+				else
+					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
+			}
+			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
+					return value.Crc;
+				else
+					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
 			}
 			else
 			{

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -111,7 +111,7 @@ namespace YooAsset
 				if (loader.CanDestroy())
 				{
 					string bundleName = loader.MainBundleInfo.Bundle.BundleName;
-					loader.Destroy(false);
+					loader.Destroy();
 					_loaderList.RemoveAt(i);
 					_loaderDic.Remove(bundleName);
 				}
@@ -123,15 +123,16 @@ namespace YooAsset
 		/// </summary>
 		public void ForceUnloadAllAssets()
 		{
+#if UNITY_WEBGL
+			throw new Exception($"WebGL not support invoke {nameof(ForceUnloadAllAssets)}");
+#else
 			foreach (var provider in _providerList)
 			{
-				provider.WaitForAsyncComplete();
+				provider.DestroySafely();
-				provider.Destroy();
 			}
 			foreach (var loader in _loaderList)
 			{
-				loader.WaitForAsyncComplete();
+				loader.DestroySafely();
-				loader.Destroy(true);
 			}
 
 			_providerList.Clear();
@@ -142,6 +143,7 @@ namespace YooAsset
 
 			// 注意：调用底层接口释放所有资源
 			Resources.UnloadUnusedAssets();
+#endif
 		}
 
 		/// <summary>
@@ -414,7 +416,7 @@ namespace YooAsset
 				return null;
 		}
 
-		#region 调试信息
+#region 调试信息
 		internal List<DebugProviderInfo> GetDebugReportInfos()
 		{
 			List<DebugProviderInfo> result = new List<DebugProviderInfo>(_providerList.Count);
@@ -442,6 +444,6 @@ namespace YooAsset
 			}
 			return result;
 		}
-		#endregion
+#endregion
 	}
 }

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs

@@ -82,7 +82,8 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -112,7 +113,8 @@ namespace YooAsset
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				_unpacker.SendRequest();
 				_steps = ESteps.CheckUnpack;
 			}
 
@@ -262,9 +264,9 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁
 		/// </summary>
-		public override void Destroy(bool forceDestroy)
+		public override void Destroy()
 		{
-			base.Destroy(forceDestroy);
+			base.Destroy();
 
 			if (_stream != null)
 			{

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs

@@ -15,21 +15,14 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None = 0,
-			Download,
+			LoadWebSiteFile,
-			CheckDownload,
+			LoadRemoteFile,
-			LoadCacheFile,
+			CheckLoadFile,
-			CheckLoadCacheFile,
-			LoadWebFile,
-			CheckLoadWebFile,
-			TryLoadWebFile,
 			Done,
 		}
 
 		private ESteps _steps = ESteps.None;
-		private float _tryTimer = 0;
+		private WebDownloader _downloader;
-		private DownloaderBase _downloader;
-		private UnityWebRequest _webRequest;
-		private AssetBundleCreateRequest _createRequest;
 
 
 		public AssetBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
@@ -48,18 +41,13 @@ namespace YooAsset
 			{
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
-					_steps = ESteps.Download;
+					_steps = ESteps.LoadRemoteFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = string.Empty;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-					_steps = ESteps.LoadWebFile;
+					_steps = ESteps.LoadWebSiteFile;
-					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+					FileLoadPath = string.Empty;
-				}
-				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
-				{
-					_steps = ESteps.LoadCacheFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else
 				{
@@ -67,168 +55,49 @@ namespace YooAsset
 				}
 			}
 
-			// 1. 从服务器下载
+			// 1. 跨域获取资源包
-			if (_steps == ESteps.Download)
+			if (_steps == ESteps.LoadRemoteFile)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain) as WebDownloader;
-				_steps = ESteps.CheckDownload;
+				_downloader.SendRequest(true);
+				_steps = ESteps.CheckLoadFile;
 			}
 
-			// 2. 检测服务器下载结果
+			// 2. 从站点获取资源包
-			if (_steps == ESteps.CheckDownload)
+			if (_steps == ESteps.LoadWebSiteFile)
+			{
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
+				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				_downloader = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain) as WebDownloader;
+				_downloader.SendRequest(true);
+				_steps = ESteps.CheckLoadFile;
+			}
+
+			// 3. 检测加载结果
+			if (_steps == ESteps.CheckLoadFile)
 			{
 				DownloadProgress = _downloader.DownloadProgress;
 				DownloadedBytes = _downloader.DownloadedBytes;
 				if (_downloader.IsDone() == false)
 					return;
 
-				if (_downloader.HasError())
+				CacheBundle = _downloader.GetAssetBundle();
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = _downloader.GetLastError();
-				}
-				else
-				{
-					_steps = ESteps.LoadCacheFile;
-					return; //下载完毕等待一帧再去加载！
-				}
-			}
-
-			// 3. 从本地缓存里加载AssetBundle
-			if (_steps == ESteps.LoadCacheFile)
-			{
-#if UNITY_EDITOR
-				// 注意：Unity2017.4编辑器模式下，如果AssetBundle文件不存在会导致编辑器崩溃，这里做了预判。
-				if (System.IO.File.Exists(FileLoadPath) == false)
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"Not found assetBundle file : {FileLoadPath}";
-					YooLogger.Error(LastError);
-					return;
-				}
-#endif
-
-				// 设置下载进度
-				DownloadProgress = 1f;
-				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
-
-				// Load assetBundle file
-				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
-				if (loadMethod == EBundleLoadMethod.Normal)
-				{
-					_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath);
-				}
-				else
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"WebGL not support encrypted bundle file : {MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
-					return;
-				}
-				_steps = ESteps.CheckLoadCacheFile;
-			}
-
-			// 4. 检测AssetBundle加载结果
-			if (_steps == ESteps.CheckLoadCacheFile)
-			{
-				if (_createRequest.isDone == false)
-					return;
-
-				CacheBundle = _createRequest.assetBundle;
 				if (CacheBundle == null)
 				{
 					_steps = ESteps.Done;
 					Status = EStatus.Failed;
-					LastError = $"Failed to load AssetBundle file : {MainBundleInfo.Bundle.BundleName}";
+					LastError = $"AssetBundle file is invalid : {MainBundleInfo.Bundle.BundleName}";
 					YooLogger.Error(LastError);
-
-					// 注意：当缓存文件的校验等级为Low的时候，并不能保证缓存文件的完整性。
-					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
-					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
-					{
-						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-						if (result != EVerifyResult.Succeed)
-						{
-							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID}");
-							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-						}
-					}
 				}
 				else
 				{
 					_steps = ESteps.Done;
 					Status = EStatus.Succeed;
 				}
-			}
 
-			// 5. 从WEB网站获取AssetBundle文件
+				// 注意：释放下载句柄
-			if (_steps == ESteps.LoadWebFile)
+				_downloader.DisposeHandler();
-			{
-				if (CacheSystem.DisableUnityCacheOnWebGL)
-				{
-					_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath);
-				}
-				else
-				{
-					var hash = Hash128.Parse(MainBundleInfo.Bundle.FileHash);
-					_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath, hash);
-				}
-
-				DownloadSystem.SetUnityWebRequest(_webRequest);
-				_webRequest.SendWebRequest();
-				_steps = ESteps.CheckLoadWebFile;
-			}
-
-			// 6. 检测AssetBundle加载结果
-			if (_steps == ESteps.CheckLoadWebFile)
-			{
-				DownloadProgress = _webRequest.downloadProgress;
-				DownloadedBytes = _webRequest.downloadedBytes;
-				if (_webRequest.isDone == false)
-					return;
-
-#if UNITY_2020_1_OR_NEWER
-				if (_webRequest.result != UnityWebRequest.Result.Success)
-#else
-				if (_webRequest.isNetworkError || _webRequest.isHttpError)
-#endif
-				{
-					YooLogger.Warning($"Failed to get asset bundle from web : {FileLoadPath} Error : {_webRequest.error}");
-					_steps = ESteps.TryLoadWebFile;
-					_tryTimer = 0;
-				}
-				else
-				{
-					CacheBundle = DownloadHandlerAssetBundle.GetContent(_webRequest);
-					if (CacheBundle == null)
-					{
-						_steps = ESteps.Done;
-						Status = EStatus.Failed;
-						LastError = $"AssetBundle file is invalid : {MainBundleInfo.Bundle.BundleName}";
-						YooLogger.Error(LastError);
-					}
-					else
-					{
-						_steps = ESteps.Done;
-						Status = EStatus.Succeed;
-					}
-				}
-			}
-
-			// 7. 如果获取失败，重新尝试
-			if (_steps == ESteps.TryLoadWebFile)
-			{
-				_tryTimer += Time.unscaledDeltaTime;
-				if (_tryTimer > 1f)
-				{
-					_webRequest.Dispose();
-					_webRequest = null;
-					_steps = ESteps.LoadWebFile;
-				}
 			}
 		}
 

Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs

@@ -144,6 +144,15 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 销毁资源包（安全模式）
+		/// </summary>
+		public void DestroySafely()
+		{
+			WaitForAsyncComplete();
+			Destroy();
+		}
+
 
 		/// <summary>
 		/// 轮询更新
@@ -153,18 +162,15 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁
 		/// </summary>
-		public virtual void Destroy(bool forceDestroy)
+		public virtual void Destroy()
 		{
 			IsDestroyed = true;
 
 			// Check fatal
-			if (forceDestroy == false)
+			if (RefCount > 0)
-			{
+				throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.Bundle.BundleName}");
-				if (RefCount > 0)
+			if (IsDone() == false)
-					throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.Bundle.BundleName}");
+				throw new Exception($"Bundle file loader is not done : {MainBundleInfo.Bundle.BundleName}");
-				if (IsDone() == false)
-					throw new Exception($"Bundle file loader is not done : {MainBundleInfo.Bundle.BundleName}");
-			}
 
 			if (CacheBundle != null)
 			{

Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs

@@ -64,7 +64,8 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -93,7 +94,8 @@ namespace YooAsset
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				_unpacker.SendRequest();
 				_steps = ESteps.CheckUnpack;
 			}
 

Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs

@@ -47,11 +47,6 @@ namespace YooAsset
 					_steps = ESteps.Website;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
-				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
-				{
-					_steps = ESteps.CheckFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
-				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
@@ -62,7 +57,8 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -91,7 +87,8 @@ namespace YooAsset
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_website = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				_website.SendRequest();
 				_steps = ESteps.CheckWebsite;
 			}
 

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

@@ -123,7 +123,7 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁资源对象
 		/// </summary>
-		public virtual void Destroy()
+		public void Destroy()
 		{
 			IsDestroyed = true;
 
@@ -140,6 +140,22 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 销毁资源对象（安全模式）
+		/// </summary>
+		public void DestroySafely()
+		{
+			if (Status == EStatus.Loading || Status == EStatus.Checking)
+			{
+				WaitForAsyncComplete();
+				Destroy();
+			}
+			else
+			{
+				Destroy();
+			}
+		}
+
 		/// <summary>
 		/// 是否可以销毁
 		/// </summary>

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -93,7 +93,7 @@ namespace YooAsset
 		/// <summary>
 		/// 验证缓存文件（子线程内操作）
 		/// </summary>
-		public static EVerifyResult VerifyingCacheFile(VerifyCacheElement element)
+		public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element)
 		{
 			try
 			{
@@ -125,7 +125,7 @@ namespace YooAsset
 		/// <summary>
 		/// 验证下载文件（子线程内操作）
 		/// </summary>
-		public static EVerifyResult VerifyingTempFile(VerifyTempElement element)
+		public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
 		{
 			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
 		}

Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs

@@ -25,7 +25,7 @@ namespace YooAsset
 		/// <summary>
 		/// 需要验证的元素
 		/// </summary>
-		public readonly List<VerifyCacheElement> VerifyElements = new List<VerifyCacheElement>(5000);
+		public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
 
 		public FindCacheFilesOperation(string packageName)
 		{
@@ -113,7 +113,7 @@ namespace YooAsset
 					string fileRootPath = chidDirectory.FullName;
 					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
 					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheElement element = new VerifyCacheElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
 					VerifyElements.Add(element);
 				}
 
@@ -161,7 +161,7 @@ namespace YooAsset
 					string fileRootPath = chidDirectory.FullName;
 					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}{dataFileExtension}";
 					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheElement element = new VerifyCacheElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
 					VerifyElements.Add(element);
 				}
 

Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs

@@ -8,7 +8,7 @@ namespace YooAsset
 {
 	internal abstract class VerifyCacheFilesOperation : AsyncOperationBase
 	{
-		public static VerifyCacheFilesOperation CreateOperation(List<VerifyCacheElement> elements)
+		public static VerifyCacheFilesOperation CreateOperation(List<VerifyCacheFileElement> elements)
 		{
 #if UNITY_WEBGL
 			var operation = new VerifyCacheFilesWithoutThreadOperation(elements);
@@ -33,8 +33,8 @@ namespace YooAsset
 		}
 
 		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
-		private List<VerifyCacheElement> _waitingList;
+		private List<VerifyCacheFileElement> _waitingList;
-		private List<VerifyCacheElement> _verifyingList;
+		private List<VerifyCacheFileElement> _verifyingList;
 		private int _verifyMaxNum;
 		private int _verifyTotalCount;
 		private float _verifyStartTime;
@@ -42,7 +42,7 @@ namespace YooAsset
 		private int _failedCount;
 		private ESteps _steps = ESteps.None;
 
-		public VerifyCacheFilesWithThreadOperation(List<VerifyCacheElement> elements)
+		public VerifyCacheFilesWithThreadOperation(List<VerifyCacheFileElement> elements)
 		{
 			_waitingList = elements;
 		}
@@ -68,7 +68,7 @@ namespace YooAsset
 				if (_verifyMaxNum < 1)
 					_verifyMaxNum = 1;
 
-				_verifyingList = new List<VerifyCacheElement>(_verifyMaxNum);
+				_verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
 				_steps = ESteps.UpdateVerify;
 			}
 
@@ -114,19 +114,19 @@ namespace YooAsset
 				return 1f;
 			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
 		}
-		private bool BeginVerifyFileWithThread(VerifyCacheElement element)
+		private bool BeginVerifyFileWithThread(VerifyCacheFileElement element)
 		{
 			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
 		}
 		private void VerifyInThread(object obj)
 		{
-			VerifyCacheElement element = (VerifyCacheElement)obj;
+			VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
 			element.Result = CacheSystem.VerifyingCacheFile(element);
 			_syncContext.Post(VerifyCallback, element);
 		}
 		private void VerifyCallback(object obj)
 		{
-			VerifyCacheElement element = (VerifyCacheElement)obj;
+			VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
 			_verifyingList.Remove(element);
 
 			if (element.Result == EVerifyResult.Succeed)
@@ -158,8 +158,8 @@ namespace YooAsset
 			Done,
 		}
 
-		private List<VerifyCacheElement> _waitingList;
+		private List<VerifyCacheFileElement> _waitingList;
-		private List<VerifyCacheElement> _verifyingList;
+		private List<VerifyCacheFileElement> _verifyingList;
 		private int _verifyMaxNum;
 		private int _verifyTotalCount;
 		private float _verifyStartTime;
@@ -167,7 +167,7 @@ namespace YooAsset
 		private int _failedCount;
 		private ESteps _steps = ESteps.None;
 		
-		public VerifyCacheFilesWithoutThreadOperation(List<VerifyCacheElement> elements)
+		public VerifyCacheFilesWithoutThreadOperation(List<VerifyCacheFileElement> elements)
 		{
 			_waitingList = elements;
 		}
@@ -189,7 +189,7 @@ namespace YooAsset
 				_verifyMaxNum = fileCount;
 				_verifyTotalCount = fileCount;
 
-				_verifyingList = new List<VerifyCacheElement>(_verifyMaxNum);
+				_verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
 				_steps = ESteps.UpdateVerify;
 			}
 
@@ -229,7 +229,7 @@ namespace YooAsset
 				return 1f;
 			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
 		}
-		private void BeginVerifyFileWithoutThread(VerifyCacheElement element)
+		private void BeginVerifyFileWithoutThread(VerifyCacheFileElement element)
 		{
 			element.Result = CacheSystem.VerifyingCacheFile(element);
 			if (element.Result == EVerifyResult.Succeed)

Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs

@@ -10,7 +10,7 @@ namespace YooAsset
 	{
 		public EVerifyResult VerifyResult { protected set; get; }
 
-		public static VerifyTempFileOperation CreateOperation(VerifyTempElement element)
+		public static VerifyTempFileOperation CreateOperation(VerifyTempFileElement element)
 		{
 #if UNITY_WEBGL
 			var operation = new VerifyTempFileWithoutThreadOperation(element);
@@ -34,10 +34,10 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly VerifyTempElement _element;
+		private readonly VerifyTempFileElement _element;
 		private ESteps _steps = ESteps.None;
 
-		public VerifyTempFileWithThreadOperation(VerifyTempElement element)
+		public VerifyTempFileWithThreadOperation(VerifyTempFileElement element)
 		{
 			_element = element;
 		}
@@ -79,13 +79,13 @@ namespace YooAsset
 			}
 		}
 
-		private bool BeginVerifyFileWithThread(VerifyTempElement element)
+		private bool BeginVerifyFileWithThread(VerifyTempFileElement element)
 		{
 			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
 		}
 		private void VerifyInThread(object obj)
 		{
-			VerifyTempElement element = (VerifyTempElement)obj;
+			VerifyTempFileElement element = (VerifyTempFileElement)obj;
 			int result = (int)CacheSystem.VerifyingTempFile(element);
 			element.Result = result;
 		}
@@ -103,10 +103,10 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly VerifyTempElement _element;
+		private readonly VerifyTempFileElement _element;
 		private ESteps _steps = ESteps.None;
 
-		public VerifyTempFileWithoutThreadOperation(VerifyTempElement element)
+		public VerifyTempFileWithoutThreadOperation(VerifyTempFileElement element)
 		{
 			_element = element;
 		}

Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs

@@ -5,7 +5,7 @@ namespace YooAsset
 	/// <summary>
 	/// 缓存文件验证元素
 	/// </summary>
-	internal class VerifyCacheElement
+	internal class VerifyCacheFileElement
 	{
 		public string PackageName { private set; get; }
 		public string CacheGUID { private set; get; }
@@ -17,7 +17,7 @@ namespace YooAsset
 		public string DataFileCRC;
 		public long DataFileSize;
 
-		public VerifyCacheElement(string packageName, string cacheGUID, string fileRootPath, string dataFilePath, string infoFilePath)
+		public VerifyCacheFileElement(string packageName, string cacheGUID, string fileRootPath, string dataFilePath, string infoFilePath)
 		{
 			PackageName = packageName;
 			CacheGUID = cacheGUID;
@@ -43,7 +43,7 @@ namespace YooAsset
 	/// <summary>
 	/// 下载文件验证元素
 	/// </summary>
-	internal class VerifyTempElement
+	internal class VerifyTempFileElement
 	{
 		public string TempDataFilePath { private set; get; }
 		public string FileCRC { private set; get; }
@@ -51,7 +51,7 @@ namespace YooAsset
 
 		public int Result = 0; // 注意：原子操作对象
 
-		public VerifyTempElement(string tempDataFilePath, string fileCRC, long fileSize)
+		public VerifyTempFileElement(string tempDataFilePath, string fileCRC, long fileSize)
 		{
 			TempDataFilePath = tempDataFilePath;
 			FileCRC = fileCRC;

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs

@@ -98,34 +98,49 @@ namespace YooAsset
 
 
 		/// <summary>
-		/// 开始下载资源文件
+		/// 创建下载器
-		/// 注意：只有第一次请求的参数才是有效的
+		/// 注意：只有第一次请求的参数才有效
 		/// </summary>
-		public static DownloaderBase BeginDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
+		public static DownloaderBase CreateDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
 		{
 			// 查询存在的下载器
 			if (_downloaderDic.TryGetValue(bundleInfo.Bundle.CachedDataFilePath, out var downloader))
-			{
 				return downloader;
-			}
 
 			// 如果资源已经缓存
 			if (CacheSystem.IsCached(bundleInfo.Bundle.PackageName, bundleInfo.Bundle.CacheGUID))
 			{
-				var tempDownloader = new TempDownloader(bundleInfo);
+				var completedDownloader = new CompletedDownloader(bundleInfo);
-				return tempDownloader;
+				return completedDownloader;
 			}
 
 			// 创建新的下载器	
+			YooLogger.Log($"Beginning to download bundle : {bundleInfo.Bundle.BundleName} URL : {bundleInfo.RemoteMainURL}");
+#if UNITY_WEBGL
+			if (bundleInfo.Bundle.IsRawFile)
 			{
-				YooLogger.Log($"Beginning to download file : {bundleInfo.Bundle.FileName} URL : {bundleInfo.RemoteMainURL}");
 				FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedDataFilePath);
-				bool breakDownload = bundleInfo.Bundle.FileSize >= BreakpointResumeFileSize;
+				DownloaderBase newDownloader = new FileGeneralDownloader(bundleInfo, failedTryAgain, timeout);
-				DownloaderBase newDownloader = new FileDownloader(bundleInfo, breakDownload);
-				newDownloader.SendRequest(failedTryAgain, timeout);
 				_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
 				return newDownloader;
 			}
+			else
+			{
+				WebDownloader newDownloader = new WebDownloader(bundleInfo, failedTryAgain, timeout);
+				_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
+				return newDownloader;
+			}
+#else
+			FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedDataFilePath);
+			bool resumeDownload = bundleInfo.Bundle.FileSize >= BreakpointResumeFileSize;
+			DownloaderBase newDownloader;
+			if (resumeDownload)
+				newDownloader = new FileResumeDownloader(bundleInfo, failedTryAgain, timeout);
+			else
+				newDownloader = new FileGeneralDownloader(bundleInfo, failedTryAgain, timeout);
+			_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
+			return newDownloader;
+#endif
 		}
 
 		/// <summary>
@@ -139,14 +154,14 @@ namespace YooAsset
 			else
 				webRequest = new UnityWebRequest(requestURL, UnityWebRequest.kHttpVerbGET);
 
-			SetUnityWebRequest(webRequest);
+			SetUnityWebRequestParam(webRequest);
 			return webRequest;
 		}
 
 		/// <summary>
 		/// 设置网络请求的自定义参数
 		/// </summary>
-		public static void SetUnityWebRequest(UnityWebRequest webRequest)
+		private static void SetUnityWebRequestParam(UnityWebRequest webRequest)
 		{
 			if (RedirectLimit >= 0)
 				webRequest.redirectLimit = RedirectLimit;

Assets/YooAsset/Runtime/DownloadSystem/Downloader/CompletedDownloader.cs

@@ -0,0 +1,23 @@
+
+namespace YooAsset
+{
+	internal sealed class CompletedDownloader : DownloaderBase
+	{
+		public CompletedDownloader(BundleInfo bundleInfo) : base(bundleInfo, 0, 0)
+		{
+			_downloadProgress = 1f;
+			_downloadedBytes = (ulong)bundleInfo.Bundle.FileSize;
+			_status = EStatus.Succeed;
+		}
+
+		public override void SendRequest(params object[] param)
+		{
+		}
+		public override void Update()
+		{
+		}
+		public override void Abort()
+		{
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs

@@ -1,39 +1,41 @@
-
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
 namespace YooAsset
 {
 	internal abstract class DownloaderBase
 	{
-		protected enum ESteps
+		public enum EStatus
 		{
-			None,
+			None = 0,
-			CheckTempFile,
-			WaitingCheckTempFile,
-			PrepareDownload,
-			CreateResumeDownloader,
-			CreateGeneralDownloader,
-			CheckDownload,
-			VerifyTempFile,
-			WaitingVerifyTempFile,
-			CachingFile,
-			TryAgain,
 			Succeed,
-			Failed,
+			Failed
 		}
 
 		protected readonly BundleInfo _bundleInfo;
-
+		protected readonly int _timeout;
-		protected ESteps _steps = ESteps.None;
-
-		protected int _timeout;
 		protected int _failedTryAgain;
-		protected int _requestCount;
-		protected string _requestURL;
 
+		protected UnityWebRequest _webRequest;
+		protected EStatus _status = EStatus.None;
 		protected string _lastError = string.Empty;
 		protected long _lastCode = 0;
+
+		// 请求次数
+		protected int _requestCount = 0;
+		protected string _requestURL;
+
+		// 下载进度
 		protected float _downloadProgress = 0f;
 		protected ulong _downloadedBytes = 0;
 
+		// 超时相关
+		protected bool _isAbort = false;
+		protected ulong _latestDownloadBytes;
+		protected float _latestDownloadRealtime;
+		protected float _tryAgainTimer;
+
 		/// <summary>
 		/// 是否等待异步结束
 		/// 警告：只能用于解压APP内部资源
@@ -57,41 +59,31 @@ namespace YooAsset
 		}
 
 
-		public DownloaderBase(BundleInfo bundleInfo)
+		public DownloaderBase(BundleInfo bundleInfo, int failedTryAgain, int timeout)
 		{
 			_bundleInfo = bundleInfo;
+			_failedTryAgain = failedTryAgain;
+			_timeout = timeout;
 		}
-		public void SendRequest(int failedTryAgain, int timeout)
+		public abstract void SendRequest(params object[] param);
-		{
-			if (_steps == ESteps.None)
-			{
-				_failedTryAgain = failedTryAgain;
-				_timeout = timeout;
-				_steps = ESteps.CheckTempFile;
-			}
-		}
 		public abstract void Update();
 		public abstract void Abort();
 
 		/// <summary>
-		/// 获取网络请求地址
+		/// 获取下载文件的大小
 		/// </summary>
-		protected string GetRequestURL()
+		/// <returns></returns>
+		public long GetDownloadFileSize()
 		{
-			// 轮流返回请求地址
+			return _bundleInfo.Bundle.FileSize;
-			_requestCount++;
-			if (_requestCount % 2 == 0)
-				return _bundleInfo.RemoteFallbackURL;
-			else
-				return _bundleInfo.RemoteMainURL;
 		}
 
 		/// <summary>
-		/// 获取资源包信息
+		/// 获取下载文件的资源包名
 		/// </summary>
-		public BundleInfo GetBundleInfo()
+		public string GetDownloadBundleName()
 		{
-			return _bundleInfo;
+			return _bundleInfo.Bundle.BundleName;
 		}
 
 		/// <summary>
@@ -99,7 +91,7 @@ namespace YooAsset
 		/// </summary>
 		public bool IsDone()
 		{
-			return _steps == ESteps.Succeed || _steps == ESteps.Failed;
+			return _status == EStatus.Succeed || _status == EStatus.Failed;
 		}
 
 		/// <summary>
@@ -107,7 +99,7 @@ namespace YooAsset
 		/// </summary>
 		public bool HasError()
 		{
-			return _steps == ESteps.Failed;
+			return _status == EStatus.Failed;
 		}
 
 		/// <summary>
@@ -133,5 +125,69 @@ namespace YooAsset
 		{
 			return $"Failed to download : {_requestURL} Error : {_lastError} Code : {_lastCode}";
 		}
+
+
+		/// <summary>
+		/// 获取网络请求地址
+		/// </summary>
+		protected string GetRequestURL()
+		{
+			// 轮流返回请求地址
+			_requestCount++;
+			if (_requestCount % 2 == 0)
+				return _bundleInfo.RemoteFallbackURL;
+			else
+				return _bundleInfo.RemoteMainURL;
+		}
+
+		/// <summary>
+		/// 超时判定方法
+		/// </summary>
+		protected void CheckTimeout()
+		{
+			// 注意：在连续时间段内无新增下载数据及判定为超时
+			if (_isAbort == false)
+			{
+				if (_latestDownloadBytes != DownloadedBytes)
+				{
+					_latestDownloadBytes = DownloadedBytes;
+					_latestDownloadRealtime = Time.realtimeSinceStartup;
+				}
+
+				float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
+				if (offset > _timeout)
+				{
+					YooLogger.Warning($"Web file request timeout : {_requestURL}");
+					_webRequest.Abort();
+					_isAbort = true;
+				}
+			}
+		}
+
+		/// <summary>
+		/// 缓存下载文件
+		/// </summary>
+		protected void CachingFile(string tempFilePath)
+		{
+			string infoFilePath = _bundleInfo.Bundle.CachedInfoFilePath;
+			string dataFilePath = _bundleInfo.Bundle.CachedDataFilePath;
+			string dataFileCRC = _bundleInfo.Bundle.FileCRC;
+			long dataFileSize = _bundleInfo.Bundle.FileSize;
+
+			if (File.Exists(infoFilePath))
+				File.Delete(infoFilePath);
+			if (File.Exists(dataFilePath))
+				File.Delete(dataFilePath);
+
+			FileInfo fileInfo = new FileInfo(tempFilePath);
+			fileInfo.MoveTo(dataFilePath);
+
+			// 写入信息文件记录验证数据
+			CacheFileInfo.WriteInfoToFile(infoFilePath, dataFileCRC, dataFileSize);
+
+			// 记录缓存文件
+			var wrapper = new PackageCache.RecordWrapper(infoFilePath, dataFilePath, dataFileCRC, dataFileSize);
+			CacheSystem.RecordFile(_bundleInfo.Bundle.PackageName, _bundleInfo.Bundle.CacheGUID, wrapper);
+		}
 	}
 }

Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs

@@ -0,0 +1,225 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 普通的下载器
+	/// </summary>
+	internal sealed class FileGeneralDownloader : DownloaderBase
+	{
+		private enum ESteps
+		{
+			None,
+			PrepareDownload,
+			CreateDownloader,
+			CheckDownload,
+			VerifyTempFile,
+			WaitingVerifyTempFile,
+			CachingFile,
+			TryAgain,
+			Done,
+		}
+
+		private readonly string _tempFilePath;
+		private VerifyTempFileOperation _verifyFileOp = null;
+		private ESteps _steps = ESteps.None;
+
+
+		public FileGeneralDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
+		{
+			_tempFilePath = bundleInfo.Bundle.TempDataFilePath;
+		}
+		public override void SendRequest(params object[] param)
+		{
+			if (_steps == ESteps.None)
+			{
+				_steps = ESteps.PrepareDownload;
+			}
+		}
+		public override void Update()
+		{
+			if (_steps == ESteps.None)
+				return;
+			if (IsDone())
+				return;
+
+			// 准备下载
+			if (_steps == ESteps.PrepareDownload)
+			{
+				// 重置变量
+				_downloadProgress = 0f;
+				_downloadedBytes = 0;
+
+				// 重置变量
+				_isAbort = false;
+				_latestDownloadBytes = 0;
+				_latestDownloadRealtime = Time.realtimeSinceStartup;
+				_tryAgainTimer = 0f;
+
+				// 删除临时文件
+				if (File.Exists(_tempFilePath))
+					File.Delete(_tempFilePath);
+
+				// 获取请求地址
+				_requestURL = GetRequestURL();
+				_steps = ESteps.CreateDownloader;
+			}
+
+			// 创建下载器
+			if (_steps == ESteps.CreateDownloader)
+			{
+				_webRequest = DownloadSystem.NewRequest(_requestURL);
+				DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
+				handler.removeFileOnAbort = true;
+				_webRequest.downloadHandler = handler;
+				_webRequest.disposeDownloadHandlerOnDispose = true;
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 检测下载结果
+			if (_steps == ESteps.CheckDownload)
+			{
+				_downloadProgress = _webRequest.downloadProgress;
+				_downloadedBytes = _webRequest.downloadedBytes;
+				if (_webRequest.isDone == false)
+				{
+					CheckTimeout();
+					return;
+				}
+
+				bool hasError = false;
+
+				// 检查网络错误
+#if UNITY_2020_3_OR_NEWER
+				if (_webRequest.result != UnityWebRequest.Result.Success)
+				{
+					hasError = true;
+					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
+				}
+#else
+				if (_webRequest.isNetworkError || _webRequest.isHttpError)
+				{
+					hasError = true;
+					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
+				}
+#endif
+
+				// 如果网络异常
+				if (hasError)
+				{
+					// 下载失败之后删除文件
+					if (File.Exists(_tempFilePath))
+						File.Delete(_tempFilePath);
+
+					_steps = ESteps.TryAgain;
+				}
+				else
+				{
+					_steps = ESteps.VerifyTempFile;
+				}
+
+				// 最终释放下载器
+				DisposeWebRequest();
+			}
+
+			// 验证下载文件
+			if (_steps == ESteps.VerifyTempFile)
+			{
+				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
+				_verifyFileOp = VerifyTempFileOperation.CreateOperation(element);
+				OperationSystem.StartOperation(_verifyFileOp);
+				_steps = ESteps.WaitingVerifyTempFile;
+			}
+
+			// 等待验证完成
+			if (_steps == ESteps.WaitingVerifyTempFile)
+			{
+				if (WaitForAsyncComplete)
+					_verifyFileOp.Update();
+
+				if (_verifyFileOp.IsDone == false)
+					return;
+
+				if (_verifyFileOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.CachingFile;
+				}
+				else
+				{
+					if (File.Exists(_tempFilePath))
+						File.Delete(_tempFilePath);
+
+					_lastError = _verifyFileOp.Error;
+					_steps = ESteps.TryAgain;
+				}
+			}
+
+			// 缓存下载文件
+			if (_steps == ESteps.CachingFile)
+			{
+				try
+				{
+					CachingFile(_tempFilePath);
+					_status = EStatus.Succeed;
+					_steps = ESteps.Done;
+					_lastError = string.Empty;
+					_lastCode = 0;
+				}
+				catch (Exception e)
+				{
+					_lastError = e.Message;
+					_steps = ESteps.TryAgain;
+				}
+			}
+
+			// 重新尝试下载
+			if (_steps == ESteps.TryAgain)
+			{
+				if (_failedTryAgain <= 0)
+				{
+					ReportError();
+					_status = EStatus.Failed;
+					_steps = ESteps.Done;
+					return;
+				}
+
+				_tryAgainTimer += Time.unscaledDeltaTime;
+				if (_tryAgainTimer > 1f)
+				{
+					_failedTryAgain--;
+					_steps = ESteps.PrepareDownload;
+					ReportWarning();
+					YooLogger.Warning($"Try again download : {_requestURL}");
+				}
+			}
+		}
+		public override void Abort()
+		{
+			if (IsDone() == false)
+			{
+				_status = EStatus.Failed;
+				_steps = ESteps.Done;
+				_lastError = "user abort";
+				_lastCode = 0;
+				DisposeWebRequest();
+			}
+		}
+
+		private void DisposeWebRequest()
+		{
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose();
+				_webRequest = null;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs

@@ -7,28 +7,47 @@ using UnityEngine.Networking;
 
 namespace YooAsset
 {
-	internal sealed class FileDownloader : DownloaderBase
+	/// <summary>
+	/// 断点续传下载器
+	/// </summary>
+	internal sealed class FileResumeDownloader : DownloaderBase
 	{
-		private readonly bool _breakResume;
+		private enum ESteps
+		{
+			None,
+			CheckTempFile,
+			WaitingCheckTempFile,
+			PrepareDownload,
+			CreateDownloader,
+			CheckDownload,
+			VerifyTempFile,
+			WaitingVerifyTempFile,
+			CachingFile,
+			TryAgain,
+			Done,
+		}
+
 		private readonly string _tempFilePath;
-		private UnityWebRequest _webRequest = null;
 		private DownloadHandlerFileRange _downloadHandle = null;
 		private VerifyTempFileOperation _checkFileOp = null;
 		private VerifyTempFileOperation _verifyFileOp = null;
+		private ESteps _steps = ESteps.None;
 
 		// 重置变量
-		private bool _isAbort = false;
 		private ulong _fileOriginLength;
-		private ulong _latestDownloadBytes;
-		private float _latestDownloadRealtime;
-		private float _tryAgainTimer;
 
 
-		public FileDownloader(BundleInfo bundleInfo, bool breakResume) : base(bundleInfo)
+		public FileResumeDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
 		{
-			_breakResume = breakResume;
 			_tempFilePath = bundleInfo.Bundle.TempDataFilePath;
 		}
+		public override void SendRequest(params object[] param)
+		{
+			if (_steps == ESteps.None)
+			{
+				_steps = ESteps.CheckTempFile;
+			}
+		}
 		public override void Update()
 		{
 			if (_steps == ESteps.None)
@@ -39,7 +58,7 @@ namespace YooAsset
 			// 检测临时文件
 			if (_steps == ESteps.CheckTempFile)
 			{
-				VerifyTempElement element = new VerifyTempElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
+				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
 				_checkFileOp = VerifyTempFileOperation.CreateOperation(element);
 				OperationSystem.StartOperation(_checkFileOp);
 				_steps = ESteps.WaitingCheckTempFile;
@@ -75,38 +94,21 @@ namespace YooAsset
 				// 重置变量
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
+
+				// 重置变量
 				_isAbort = false;
-				_fileOriginLength = 0;
 				_latestDownloadBytes = 0;
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
 				_tryAgainTimer = 0f;
+				_fileOriginLength = 0;
 
 				// 获取请求地址
 				_requestURL = GetRequestURL();
-
+				_steps = ESteps.CreateDownloader;
-				if (_breakResume)
-					_steps = ESteps.CreateResumeDownloader;
-				else
-					_steps = ESteps.CreateGeneralDownloader;
 			}
 
-			// 创建普通的下载器
+			// 创建下载器
-			if (_steps == ESteps.CreateGeneralDownloader)
+			if (_steps == ESteps.CreateDownloader)
-			{
-				if (File.Exists(_tempFilePath))
-					File.Delete(_tempFilePath);
-
-				_webRequest = DownloadSystem.NewRequest(_requestURL);
-				DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
-				handler.removeFileOnAbort = true;
-				_webRequest.downloadHandler = handler;
-				_webRequest.disposeDownloadHandlerOnDispose = true;
-				_webRequest.SendWebRequest();
-				_steps = ESteps.CheckDownload;
-			}
-
-			// 创建断点续传下载器
-			if (_steps == ESteps.CreateResumeDownloader)
 			{
 				long fileLength = -1;
 				if (File.Exists(_tempFilePath))
@@ -167,24 +169,15 @@ namespace YooAsset
 				// 如果网络异常
 				if (hasError)
 				{
-					if (_breakResume)
+					// 注意：下载断点续传文件发生特殊错误码之后删除文件
+					if (DownloadSystem.ClearFileResponseCodes != null)
 					{
-						// 注意：下载断点续传文件发生特殊错误码之后删除文件
+						if (DownloadSystem.ClearFileResponseCodes.Contains(_webRequest.responseCode))
-						if (DownloadSystem.ClearFileResponseCodes != null)
 						{
-							if (DownloadSystem.ClearFileResponseCodes.Contains(_webRequest.responseCode))
+							if (File.Exists(_tempFilePath))
-							{
+								File.Delete(_tempFilePath);
-								if (File.Exists(_tempFilePath))
-									File.Delete(_tempFilePath);
-							}
 						}
 					}
-					else
-					{
-						// 注意：非断点续传下载失败之后删除文件
-						if (File.Exists(_tempFilePath))
-							File.Delete(_tempFilePath);
-					}
 
 					_steps = ESteps.TryAgain;
 				}
@@ -193,14 +186,14 @@ namespace YooAsset
 					_steps = ESteps.VerifyTempFile;
 				}
 
-				// 释放下载器
+				// 最终释放下载器
 				DisposeWebRequest();
 			}
 
 			// 验证下载文件
 			if (_steps == ESteps.VerifyTempFile)
 			{
-				VerifyTempElement element = new VerifyTempElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
+				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
 				_verifyFileOp = VerifyTempFileOperation.CreateOperation(element);
 				OperationSystem.StartOperation(_verifyFileOp);
 				_steps = ESteps.WaitingVerifyTempFile;
@@ -234,29 +227,11 @@ namespace YooAsset
 			{
 				try
 				{
-					string infoFilePath = _bundleInfo.Bundle.CachedInfoFilePath;
+					CachingFile(_tempFilePath);
-					string dataFilePath = _bundleInfo.Bundle.CachedDataFilePath;
+					_status = EStatus.Succeed;
-					string dataFileCRC = _bundleInfo.Bundle.FileCRC;
+					_steps = ESteps.Done;
-					long dataFileSize = _bundleInfo.Bundle.FileSize;
-
-					if (File.Exists(infoFilePath))
-						File.Delete(infoFilePath);
-					if (File.Exists(dataFilePath))
-						File.Delete(dataFilePath);
-
-					FileInfo fileInfo = new FileInfo(_tempFilePath);
-					fileInfo.MoveTo(dataFilePath);
-
-					// 写入信息文件记录验证数据
-					CacheFileInfo.WriteInfoToFile(infoFilePath, dataFileCRC, dataFileSize);
-
-					// 记录缓存文件
-					var wrapper = new PackageCache.RecordWrapper(infoFilePath, dataFilePath, dataFileCRC, dataFileSize);
-					CacheSystem.RecordFile(_bundleInfo.Bundle.PackageName, _bundleInfo.Bundle.CacheGUID, wrapper);
-
 					_lastError = string.Empty;
 					_lastCode = 0;
-					_steps = ESteps.Succeed;
 				}
 				catch (Exception e)
 				{
@@ -271,7 +246,8 @@ namespace YooAsset
 				if (_failedTryAgain <= 0)
 				{
 					ReportError();
-					_steps = ESteps.Failed;
+					_status = EStatus.Failed;
+					_steps = ESteps.Done;
 					return;
 				}
 
@@ -289,33 +265,14 @@ namespace YooAsset
 		{
 			if (IsDone() == false)
 			{
-				_steps = ESteps.Failed;
+				_status = EStatus.Failed;
+				_steps = ESteps.Done;
 				_lastError = "user abort";
 				_lastCode = 0;
 				DisposeWebRequest();
 			}
 		}
 
-		private void CheckTimeout()
-		{
-			// 注意：在连续时间段内无新增下载数据及判定为超时
-			if (_isAbort == false)
-			{
-				if (_latestDownloadBytes != DownloadedBytes)
-				{
-					_latestDownloadBytes = DownloadedBytes;
-					_latestDownloadRealtime = Time.realtimeSinceStartup;
-				}
-
-				float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
-				if (offset > _timeout)
-				{
-					YooLogger.Warning($"Web file request timeout : {_requestURL}");
-					_webRequest.Abort();
-					_isAbort = true;
-				}
-			}
-		}
 		private void DisposeWebRequest()
 		{
 			if (_downloadHandle != null)

Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs.meta

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

Assets/YooAsset/Runtime/DownloadSystem/Downloader/TempDownloader.cs

@@ -1,20 +0,0 @@
-
-namespace YooAsset
-{
-	internal sealed class TempDownloader : DownloaderBase
-	{
-		public TempDownloader(BundleInfo bundleInfo) : base(bundleInfo)
-		{
-			_downloadProgress = 1f;
-			_downloadedBytes = (ulong)bundleInfo.Bundle.FileSize;
-			_steps = ESteps.Succeed;
-		}
-
-		public override void Update()
-		{
-		}
-		public override void Abort()
-		{
-		}
-	}
-}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs

@@ -0,0 +1,209 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	internal sealed class WebDownloader : DownloaderBase
+	{
+		private enum ESteps
+		{
+			None,
+			PrepareDownload,
+			CreateDownloader,
+			CheckDownload,
+			VerifyTempFile,
+			WaitingVerifyTempFile,
+			CachingFile,
+			TryAgain,
+			Done,
+		}
+
+		private bool _keepDownloadHandleLife = false;
+		private DownloadHandlerAssetBundle _downloadhandler;
+		private ESteps _steps = ESteps.None;
+
+
+		public WebDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
+		{
+		}
+		public override void SendRequest(params object[] param)
+		{
+			if (_steps == ESteps.None)
+			{
+				_keepDownloadHandleLife = (bool)param[0];
+				_steps = ESteps.PrepareDownload;
+			}
+		}
+		public override void Update()
+		{
+			if (_steps == ESteps.None)
+				return;
+			if (IsDone())
+				return;
+
+			// 创建下载器
+			if (_steps == ESteps.PrepareDownload)
+			{
+				// 重置变量
+				_downloadProgress = 0f;
+				_downloadedBytes = 0;
+
+				// 重置变量
+				_isAbort = false;
+				_latestDownloadBytes = 0;
+				_latestDownloadRealtime = Time.realtimeSinceStartup;
+				_tryAgainTimer = 0f;
+
+				// 获取请求地址
+				_requestURL = GetRequestURL();
+				_steps = ESteps.CreateDownloader;
+			}
+
+			// 创建下载器
+			if (_steps == ESteps.CreateDownloader)
+			{
+				_webRequest = DownloadSystem.NewRequest(_requestURL);
+
+				if (CacheSystem.DisableUnityCacheOnWebGL)
+				{
+					uint crc = _bundleInfo.Bundle.UnityCRC;
+					_downloadhandler = new DownloadHandlerAssetBundle(_requestURL, crc);
+					_downloadhandler.autoLoadAssetBundle = false;
+				}
+				else
+				{
+					uint crc = _bundleInfo.Bundle.UnityCRC;
+					var hash = Hash128.Parse(_bundleInfo.Bundle.FileHash);
+					_downloadhandler = new DownloadHandlerAssetBundle(_requestURL, hash, crc);
+					_downloadhandler.autoLoadAssetBundle = false;
+				}
+
+				_webRequest.downloadHandler = _downloadhandler;
+				_webRequest.disposeDownloadHandlerOnDispose = false;
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 检测下载结果
+			if (_steps == ESteps.CheckDownload)
+			{
+				_downloadProgress = _webRequest.downloadProgress;
+				_downloadedBytes = _webRequest.downloadedBytes;
+				if (_webRequest.isDone == false)
+				{
+					CheckTimeout();
+					return;
+				}
+
+				bool hasError = false;
+
+				// 检查网络错误
+#if UNITY_2020_3_OR_NEWER
+				if (_webRequest.result != UnityWebRequest.Result.Success)
+				{
+					hasError = true;
+					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
+				}
+#else
+				if (_webRequest.isNetworkError || _webRequest.isHttpError)
+				{
+					hasError = true;
+					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
+				}
+#endif
+
+				// 如果网络异常
+				if (hasError)
+				{
+					_steps = ESteps.TryAgain;
+				}
+				else
+				{
+					_status = EStatus.Succeed;
+					_steps = ESteps.Done;
+					_lastError = string.Empty;
+					_lastCode = 0;
+				}
+
+				// 最终释放请求
+				DisposeRequest();
+
+				if (_keepDownloadHandleLife == false)
+					DisposeHandler();
+			}
+
+			// 重新尝试下载
+			if (_steps == ESteps.TryAgain)
+			{
+				if (_failedTryAgain <= 0)
+				{
+					DisposeRequest();
+					DisposeHandler();
+					ReportError();
+					_status = EStatus.Failed;
+					_steps = ESteps.Done;
+					return;
+				}
+
+				_tryAgainTimer += Time.unscaledDeltaTime;
+				if (_tryAgainTimer > 1f)
+				{
+					_failedTryAgain--;
+					_steps = ESteps.PrepareDownload;
+					ReportWarning();
+					YooLogger.Warning($"Try again download : {_requestURL}");
+				}
+			}
+		}
+		public override void Abort()
+		{
+			if (IsDone() == false)
+			{
+				_status = EStatus.Failed;
+				_steps = ESteps.Done;
+				_lastError = "user abort";
+				_lastCode = 0;
+	
+				DisposeRequest();
+				DisposeHandler();
+			}
+		}
+		private void DisposeRequest()
+		{
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose();
+				_webRequest = null;
+			}
+		}
+
+		/// <summary>
+		/// 获取资源包
+		/// </summary>
+		public AssetBundle GetAssetBundle()
+		{
+			if (_downloadhandler != null)
+				return _downloadhandler.assetBundle;
+
+			return null;
+		}
+
+		/// <summary>
+		/// 释放下载句柄
+		/// </summary>
+		public void DisposeHandler()
+		{
+			if (_downloadhandler != null)
+			{
+				_downloadhandler.Dispose();
+				_downloadhandler = null;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs.meta

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

Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs

@@ -2,38 +2,26 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine.Networking;
+using UnityEngine;
 
 namespace YooAsset
 {
-	/// <summary>
+	internal class UnityWebDataRequester : UnityWebRequesterBase
-	/// 下载器
-	/// 说明：UnityWebRequest(UWR) supports reading streaming assets since 2017.1
-	/// </summary>
-	internal class UnityWebDataRequester
 	{
-		private UnityWebRequest _webRequest;
-		private UnityWebRequestAsyncOperation _operationHandle;
-
-		/// <summary>
-		/// 请求URL地址
-		/// </summary>
-		public string URL { private set; get; }
-
-
 		/// <summary>
 		/// 发送GET请求
 		/// </summary>
-		/// <param name="timeout">超时：从请求开始计时</param>
+		public void SendRequest(string url, int timeout = 60)
-		public void SendRequest(string url, int timeout = 0)
 		{
 			if (_webRequest == null)
 			{
 				URL = url;
+				ResetTimeout(timeout);
+
 				_webRequest = DownloadSystem.NewRequest(URL);
 				DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
 				_webRequest.downloadHandler = handler;
 				_webRequest.disposeDownloadHandlerOnDispose = true;
-				_webRequest.timeout = timeout;
 				_operationHandle = _webRequest.SendWebRequest();
 			}
 		}
@@ -59,65 +47,5 @@ namespace YooAsset
 			else
 				return null;
 		}
-
-		/// <summary>
-		/// 释放下载器
-		/// </summary>
-		public void Dispose()
-		{
-			if (_webRequest != null)
-			{
-				_webRequest.Dispose();
-				_webRequest = null;
-				_operationHandle = null;
-			}
-		}
-
-		/// <summary>
-		/// 是否完毕（无论成功失败）
-		/// </summary>
-		public bool IsDone()
-		{
-			if (_operationHandle == null)
-				return false;
-			return _operationHandle.isDone;
-		}
-
-		/// <summary>
-		/// 下载进度
-		/// </summary>
-		public float Progress()
-		{
-			if (_operationHandle == null)
-				return 0;
-			return _operationHandle.progress;
-		}
-
-		/// <summary>
-		/// 下载是否发生错误
-		/// </summary>
-		public bool HasError()
-		{
-#if UNITY_2020_3_OR_NEWER
-			return _webRequest.result != UnityWebRequest.Result.Success;
-#else
-			if (_webRequest.isNetworkError || _webRequest.isHttpError)
-				return true;
-			else
-				return false;
-#endif
-		}
-
-		/// <summary>
-		/// 获取错误信息
-		/// </summary>
-		public string GetError()
-		{
-			if (_webRequest != null)
-			{
-				return $"URL : {URL} Error : {_webRequest.error}";
-			}
-			return string.Empty;
-		}
 	}
 }

Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs

@@ -6,129 +6,25 @@ using UnityEngine;
 
 namespace YooAsset
 {
-	/// <summary>
+	internal class UnityWebFileRequester : UnityWebRequesterBase
-	/// 下载器
-	/// 说明：UnityWebRequest(UWR) supports reading streaming assets since 2017.1
-	/// </summary>
-	internal class UnityWebFileRequester
 	{
-		private UnityWebRequest _webRequest;
-		private UnityWebRequestAsyncOperation _operationHandle;
-
-		// 超时相关
-		private float _timeout;
-		private bool _isAbort = false;
-		private ulong _latestDownloadBytes;
-		private float _latestDownloadRealtime;
-
-		/// <summary>
-		/// 请求URL地址
-		/// </summary>
-		public string URL { private set; get; }
-
-
 		/// <summary>
 		/// 发送GET请求
 		/// </summary>
-		public void SendRequest(string url, string savePath, float timeout = 60)
+		public void SendRequest(string url, string fileSavePath, int timeout = 60)
 		{
 			if (_webRequest == null)
 			{
 				URL = url;
-				_timeout = timeout;
+				ResetTimeout(timeout);
-				_latestDownloadBytes = 0;
-				_latestDownloadRealtime = Time.realtimeSinceStartup;
 
 				_webRequest = DownloadSystem.NewRequest(URL);
-				DownloadHandlerFile handler = new DownloadHandlerFile(savePath);
+				DownloadHandlerFile handler = new DownloadHandlerFile(fileSavePath);
 				handler.removeFileOnAbort = true;
 				_webRequest.downloadHandler = handler;
 				_webRequest.disposeDownloadHandlerOnDispose = true;
 				_operationHandle = _webRequest.SendWebRequest();
 			}
-		}
+		}	
-
-		/// <summary>
-		/// 释放下载器
-		/// </summary>
-		public void Dispose()
-		{
-			if (_webRequest != null)
-			{
-				_webRequest.Dispose();
-				_webRequest = null;
-				_operationHandle = null;
-			}
-		}
-
-		/// <summary>
-		/// 是否完毕（无论成功失败）
-		/// </summary>
-		public bool IsDone()
-		{
-			if (_operationHandle == null)
-				return false;
-			return _operationHandle.isDone;
-		}
-
-		/// <summary>
-		/// 下载进度
-		/// </summary>
-		public float Progress()
-		{
-			if (_operationHandle == null)
-				return 0;
-			return _operationHandle.progress;
-		}
-
-		/// <summary>
-		/// 下载是否发生错误
-		/// </summary>
-		public bool HasError()
-		{
-#if UNITY_2020_3_OR_NEWER
-			return _webRequest.result != UnityWebRequest.Result.Success;
-#else
-			if (_webRequest.isNetworkError || _webRequest.isHttpError)
-				return true;
-			else
-				return false;
-#endif
-		}
-
-		/// <summary>
-		/// 获取错误信息
-		/// </summary>
-		public string GetError()
-		{
-			if (_webRequest != null)
-			{
-				return $"URL : {URL} Error : {_webRequest.error}";
-			}
-			return string.Empty;
-		}
-
-		/// <summary>
-		/// 检测超时
-		/// </summary>
-		public void CheckTimeout()
-		{
-			// 注意：在连续时间段内无新增下载数据及判定为超时
-			if (_isAbort == false)
-			{
-				if (_latestDownloadBytes != _webRequest.downloadedBytes)
-				{
-					_latestDownloadBytes = _webRequest.downloadedBytes;
-					_latestDownloadRealtime = Time.realtimeSinceStartup;
-				}
-
-				float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
-				if (offset > _timeout)
-				{
-					_webRequest.Abort();
-					_isAbort = true;
-				}
-			}
-		}
 	}
 }

Assets/YooAsset/Runtime/DownloadSystem/UnityWebRequesterBase.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using UnityEngine.Networking;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal abstract class UnityWebRequesterBase
+	{
+		protected UnityWebRequest _webRequest;
+		protected UnityWebRequestAsyncOperation _operationHandle;
+
+		// 超时相关
+		private float _timeout;
+		private bool _isAbort = false;
+		private ulong _latestDownloadBytes;
+		private float _latestDownloadRealtime;
+
+		/// <summary>
+		/// 请求URL地址
+		/// </summary>
+		public string URL { protected set; get; }
+
+
+		protected void ResetTimeout(float timeout)
+		{
+			_timeout = timeout;
+			_latestDownloadBytes = 0;
+			_latestDownloadRealtime = Time.realtimeSinceStartup;
+		}
+
+		/// <summary>
+		/// 释放下载器
+		/// </summary>
+		public void Dispose()
+		{
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose();
+				_webRequest = null;
+				_operationHandle = null;
+			}
+		}
+
+		/// <summary>
+		/// 是否完毕（无论成功失败）
+		/// </summary>
+		public bool IsDone()
+		{
+			if (_operationHandle == null)
+				return false;
+			return _operationHandle.isDone;
+		}
+
+		/// <summary>
+		/// 下载进度
+		/// </summary>
+		public float Progress()
+		{
+			if (_operationHandle == null)
+				return 0;
+			return _operationHandle.progress;
+		}
+
+		/// <summary>
+		/// 下载是否发生错误
+		/// </summary>
+		public bool HasError()
+		{
+#if UNITY_2020_3_OR_NEWER
+			return _webRequest.result != UnityWebRequest.Result.Success;
+#else
+			if (_webRequest.isNetworkError || _webRequest.isHttpError)
+				return true;
+			else
+				return false;
+#endif
+		}
+
+		/// <summary>
+		/// 获取错误信息
+		/// </summary>
+		public string GetError()
+		{
+			if (_webRequest != null)
+			{
+				return $"URL : {URL} Error : {_webRequest.error}";
+			}
+			return string.Empty;
+		}
+
+		/// <summary>
+		/// 检测超时
+		/// </summary>
+		public void CheckTimeout()
+		{
+			// 注意：在连续时间段内无新增下载数据及判定为超时
+			if (_isAbort == false)
+			{
+				if (_latestDownloadBytes != _webRequest.downloadedBytes)
+				{
+					_latestDownloadBytes = _webRequest.downloadedBytes;
+					_latestDownloadRealtime = Time.realtimeSinceStartup;
+				}
+
+				float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
+				if (offset > _timeout)
+				{
+					_webRequest.Abort();
+					_isAbort = true;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/UnityWebRequesterBase.cs.meta

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

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -20,6 +20,11 @@ namespace YooAsset
 		/// 联机运行模式
 		/// </summary>
 		HostPlayMode,
+
+		/// <summary>
+		/// WebGL运行模式
+		/// </summary>
+		WebPlayMode,
 	}
 
 	/// <summary>
@@ -90,4 +95,20 @@ namespace YooAsset
 		/// </summary>
 		public IRemoteServices RemoteServices = null;
 	}
+
+	/// <summary>
+	/// WebGL运行模式的初始化参数
+	/// </summary>
+	public class WebPlayModeParameters : InitializeParameters
+	{
+		/// <summary>
+		/// 内置资源查询服务接口
+		/// </summary>
+		public IQueryServices QueryServices = null;
+
+		/// <summary>
+		/// 远端资源地址查询服务类
+		/// </summary>
+		public IRemoteServices RemoteServices = null;
+	}
 }

Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs

@@ -61,6 +61,7 @@ namespace YooAsset
 				{
 					var packageBundle = manifest.BundleList[i];
 					buffer.WriteUTF8(packageBundle.BundleName);
+					buffer.WriteUInt32(packageBundle.UnityCRC);
 					buffer.WriteUTF8(packageBundle.FileHash);
 					buffer.WriteUTF8(packageBundle.FileCRC);
 					buffer.WriteInt64(packageBundle.FileSize);
@@ -139,6 +140,7 @@ namespace YooAsset
 				{
 					var packageBundle = new PackageBundle();
 					packageBundle.BundleName = buffer.ReadUTF8();
+					packageBundle.UnityCRC = buffer.ReadUInt32();
 					packageBundle.FileHash = buffer.ReadUTF8();
 					packageBundle.FileCRC = buffer.ReadUTF8();
 					packageBundle.FileSize = buffer.ReadInt64();
@@ -208,7 +210,7 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 批量转换解压为BundleInfo
+		/// 批量转换为解压BundleInfo
 		/// </summary>
 		public static List<BundleInfo> ConvertToUnpackInfos(List<PackageBundle> unpackList)
 		{

Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs

@@ -135,8 +135,6 @@ namespace YooAsset
 					if (downloader.IsDone() == false)
 						continue;
 
-					BundleInfo bundleInfo = downloader.GetBundleInfo();
-
 					// 检测是否下载失败
 					if (downloader.HasError())
 					{
@@ -148,7 +146,7 @@ namespace YooAsset
 					// 下载成功
 					_removeList.Add(downloader);
 					_cachedDownloadCount++;
-					_cachedDownloadBytes += bundleInfo.Bundle.FileSize;
+					_cachedDownloadBytes += downloader.GetDownloadFileSize();
 				}
 
 				// 移除已经完成的下载器（无论成功或失败）
@@ -177,8 +175,9 @@ namespace YooAsset
 					{
 						int index = _downloadList.Count - 1;
 						var bundleInfo = _downloadList[index];
-						var operation = DownloadSystem.BeginDownload(bundleInfo, _failedTryAgain, _timeout);
+						var downloader = DownloadSystem.CreateDownload(bundleInfo, _failedTryAgain, _timeout);
-						_downloaders.Add(operation);
+						downloader.SendRequest();
+						_downloaders.Add(downloader);
 						_downloadList.RemoveAt(index);
 						OnStartDownloadFileCallback?.Invoke(bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
 					}
@@ -190,7 +189,7 @@ namespace YooAsset
 					if (_failedList.Count > 0)
 					{
 						var failedDownloader = _failedList[0];
-						string fileName = failedDownloader.GetBundleInfo().Bundle.BundleName;
+						string fileName = failedDownloader.GetDownloadBundleName();
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
 						Error = $"Failed to download file : {fileName}";

Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs

@@ -364,6 +364,93 @@ namespace YooAsset
 		}
 	}
 
+	/// <summary>
+	/// WebGL运行模式的初始化操作
+	/// </summary>
+	internal sealed class WebPlayModeInitializationOperation : InitializationOperation
+	{
+		private enum ESteps
+		{
+			None,
+			QueryWebPackageVersion,
+			LoadWebManifest,
+			Done,
+		}
+
+		private readonly WebPlayModeImpl _impl;
+		private readonly string _packageName;
+		private QueryBuildinPackageVersionOperation _queryWebPackageVersionOp;
+		private LoadBuildinManifestOperation _loadWebManifestOp;
+		private ESteps _steps = ESteps.None;
+
+		internal WebPlayModeInitializationOperation(WebPlayModeImpl impl, string packageName)
+		{
+			_impl = impl;
+			_packageName = packageName;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.QueryWebPackageVersion;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.QueryWebPackageVersion)
+			{
+				if (_queryWebPackageVersionOp == null)
+				{
+					_queryWebPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
+					OperationSystem.StartOperation(_queryWebPackageVersionOp);
+				}
+
+				if (_queryWebPackageVersionOp.IsDone == false)
+					return;
+
+				if (_queryWebPackageVersionOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.LoadWebManifest;
+				}
+				else
+				{
+					// 注意：WebGL平台可能因为网络的原因会导致请求失败。如果内置清单不存在或者超时也不需要报错！
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					string error = _queryWebPackageVersionOp.Error;
+					YooLogger.Log($"Failed to load web package version file : {error}");
+				}
+			}
+
+			if (_steps == ESteps.LoadWebManifest)
+			{
+				if (_loadWebManifestOp == null)
+				{
+					_loadWebManifestOp = new LoadBuildinManifestOperation(_packageName, _queryWebPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_loadWebManifestOp);
+				}
+
+				Progress = _loadWebManifestOp.Progress;
+				if (_loadWebManifestOp.IsDone == false)
+					return;
+
+				if (_loadWebManifestOp.Status == EOperationStatus.Succeed)
+				{
+					PackageVersion = _loadWebManifestOp.Manifest.PackageVersion;
+					_impl.ActiveManifest = _loadWebManifestOp.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _loadWebManifestOp.Error;
+				}
+			}
+		}
+	}
+
 	/// <summary>
 	/// 应用程序水印
 	/// </summary>

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs

@@ -196,6 +196,7 @@ namespace YooAsset
 					{
 						var packageBundle = new PackageBundle();
 						packageBundle.BundleName = _buffer.ReadUTF8();
+						packageBundle.UnityCRC = _buffer.ReadUInt32();
 						packageBundle.FileHash = _buffer.ReadUTF8();
 						packageBundle.FileCRC = _buffer.ReadUTF8();
 						packageBundle.FileSize = _buffer.ReadInt64();

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs

@@ -0,0 +1,150 @@
+
+namespace YooAsset
+{
+	internal class LoadRemoteManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			DownloadPackageHashFile,
+			DownloadManifestFile,
+			VerifyFileHash,
+			CheckDeserializeManifest,
+			Done,
+		}
+
+		private static int RequestCount = 0;
+		private readonly IRemoteServices _remoteServices;
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private readonly int _timeout;
+		private QueryRemotePackageHashOperation _queryRemotePackageHashOp;
+		private UnityWebDataRequester _downloader;
+		private DeserializeManifestOperation _deserializer;
+		private byte[] _fileData;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 加载的清单实例
+		/// </summary>
+		public PackageManifest Manifest { private set; get; }
+
+
+		internal LoadRemoteManifestOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
+		{
+			_remoteServices = remoteServices;
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			RequestCount++;
+			_steps = ESteps.DownloadPackageHashFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.DownloadPackageHashFile)
+			{
+				if (_queryRemotePackageHashOp == null)
+				{
+					_queryRemotePackageHashOp = new QueryRemotePackageHashOperation(_remoteServices, _packageName, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_queryRemotePackageHashOp);
+				}
+
+				if (_queryRemotePackageHashOp.IsDone == false)
+					return;
+
+				if (_queryRemotePackageHashOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.DownloadManifestFile;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _queryRemotePackageHashOp.Error;
+				}
+			}
+
+			if (_steps == ESteps.DownloadManifestFile)
+			{
+				if (_downloader == null)
+				{
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
+					string webURL = GetDownloadRequestURL(fileName);
+					YooLogger.Log($"Beginning to download manifest file : {webURL}");
+					_downloader = new UnityWebDataRequester();
+					_downloader.SendRequest(webURL, _timeout);
+				}
+
+				_downloader.CheckTimeout();
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					_fileData = _downloader.GetData();
+					_steps = ESteps.VerifyFileHash;
+				}
+
+				_downloader.Dispose();
+			}
+
+			if (_steps == ESteps.VerifyFileHash)
+			{
+				string fileHash = HashUtility.BytesMD5(_fileData);
+				if (fileHash != _queryRemotePackageHashOp.PackageHash)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Failed to verify remote manifest file hash !";
+				}
+				else
+				{
+					_deserializer = new DeserializeManifestOperation(_fileData);
+					OperationSystem.StartOperation(_deserializer);
+					_steps = ESteps.CheckDeserializeManifest;
+				}
+			}
+
+			if (_steps == ESteps.CheckDeserializeManifest)
+			{
+				Progress = _deserializer.Progress;
+				if (_deserializer.IsDone == false)
+					return;
+
+				if (_deserializer.Status == EOperationStatus.Succeed)
+				{
+					Manifest = _deserializer.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _deserializer.Error;
+				}
+			}
+		}
+
+		private string GetDownloadRequestURL(string fileName)
+		{
+			// 轮流返回请求地址
+			if (RequestCount % 2 == 0)
+				return _remoteServices.GetRemoteFallbackURL(fileName);
+			else
+				return _remoteServices.GetRemoteMainURL(fileName);
+		}
+	}
+}

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs

@@ -0,0 +1,99 @@
+
+namespace YooAsset
+{
+	internal class QueryRemotePackageHashOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			DownloadPackageHash,
+			Done,
+		}
+		
+		private static int RequestCount = 0;
+		private readonly IRemoteServices _remoteServices;
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private readonly int _timeout;
+		private UnityWebDataRequester _downloader;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 包裹哈希值
+		/// </summary>
+		public string PackageHash { private set; get; }
+
+
+		public QueryRemotePackageHashOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
+		{
+			_remoteServices = remoteServices;
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			RequestCount++;
+			_steps = ESteps.DownloadPackageHash;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.DownloadPackageHash)
+			{
+				if (_downloader == null)
+				{
+					string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
+					string webURL = GetPackageHashRequestURL(fileName);
+					YooLogger.Log($"Beginning to request package hash : {webURL}");
+					_downloader = new UnityWebDataRequester();
+					_downloader.SendRequest(webURL, _timeout);
+				}
+
+				Progress = _downloader.Progress();
+				_downloader.CheckTimeout();
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					PackageHash = _downloader.GetText();
+					if (string.IsNullOrEmpty(PackageHash))
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"Remote package hash is empty : {_downloader.URL}";
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+					}
+				}
+
+				_downloader.Dispose();
+			}
+		}
+
+		private string GetPackageHashRequestURL(string fileName)
+		{
+			string url;
+
+			// 轮流返回请求地址
+			if (RequestCount % 2 == 0)
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
+			else
+				url = _remoteServices.GetRemoteMainURL(fileName);
+
+			return url;
+		}
+	}
+}

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs.meta

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

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs

@@ -1,5 +1,4 @@
-using System.IO;
+
-
 namespace YooAsset
 {
 	internal class QueryRemotePackageVersionOperation : AsyncOperationBase
@@ -54,6 +53,7 @@ namespace YooAsset
 				}
 
 				Progress = _downloader.Progress();
+				_downloader.CheckTimeout();
 				if (_downloader.IsDone() == false)
 					return;
 

Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs

@@ -286,4 +286,14 @@ namespace YooAsset
 			return operation;
 		}
 	}
+	internal class WebPlayModePreDownloadContentOperation : PreDownloadContentOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
 }

Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs

@@ -184,9 +184,87 @@ namespace YooAsset
 			}
 		}
 
-		public override void SavePackageVersion() 
+		public override void SavePackageVersion()
 		{
 			_impl.FlushManifestVersionFile();
 		}
 	}
+
+	/// <summary>
+	/// WebGL模式的更新清单操作
+	/// </summary>
+	internal sealed class WebPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
+	{
+		private enum ESteps
+		{
+			None,
+			CheckActiveManifest,
+			LoadRemoteManifest,
+			Done,
+		}
+
+		private readonly WebPlayModeImpl _impl;
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private readonly int _timeout;
+		private LoadRemoteManifestOperation _loadCacheManifestOp;
+		private ESteps _steps = ESteps.None;
+
+
+		internal WebPlayModeUpdatePackageManifestOperation(WebPlayModeImpl impl, string packageName, string packageVersion, int timeout)
+		{
+			_impl = impl;
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.CheckActiveManifest;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.CheckActiveManifest)
+			{
+				// 检测当前激活的清单对象	
+				if (_impl.ActiveManifest != null && _impl.ActiveManifest.PackageVersion == _packageVersion)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.LoadRemoteManifest;
+				}
+			}
+
+			if (_steps == ESteps.LoadRemoteManifest)
+			{
+				if (_loadCacheManifestOp == null)
+				{
+					_loadCacheManifestOp = new LoadRemoteManifestOperation(_impl.RemoteServices, _packageName, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_loadCacheManifestOp);
+				}
+
+				if (_loadCacheManifestOp.IsDone == false)
+					return;
+
+				if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_impl.ActiveManifest = _loadCacheManifestOp.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _loadCacheManifestOp.Error;
+				}
+			}
+		}
+	}
 }

Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs

@@ -104,4 +104,66 @@ namespace YooAsset
 			}
 		}
 	}
+	
+	/// <summary>
+	/// WebGL模式的请求远端包裹的最新版本
+	/// </summary>
+	internal sealed class WebPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
+	{
+		private enum ESteps
+		{
+			None,
+			QueryRemotePackageVersion,
+			Done,
+		}
+
+		private readonly WebPlayModeImpl _impl;
+		private readonly string _packageName;
+		private readonly bool _appendTimeTicks;
+		private readonly int _timeout;
+		private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
+		private ESteps _steps = ESteps.None;
+		
+		internal WebPlayModeUpdatePackageVersionOperation(WebPlayModeImpl impl, string packageName, bool appendTimeTicks, int timeout)
+		{
+			_impl = impl;
+			_packageName = packageName;
+			_appendTimeTicks = appendTimeTicks;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.QueryRemotePackageVersion;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.QueryRemotePackageVersion)
+			{
+				if (_queryRemotePackageVersionOp == null)
+				{
+					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _packageName, _appendTimeTicks, _timeout);
+					OperationSystem.StartOperation(_queryRemotePackageVersionOp);
+				}
+
+				if (_queryRemotePackageVersionOp.IsDone == false)
+					return;
+
+				if (_queryRemotePackageVersionOp.Status == EOperationStatus.Succeed)
+				{
+					PackageVersion = _queryRemotePackageVersionOp.PackageVersion;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _queryRemotePackageVersionOp.Error;
+				}
+			}
+		}
+	}
 }

Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs

@@ -11,6 +11,11 @@ namespace YooAsset
 		/// </summary>
 		public string BundleName;
 
+		/// <summary>
+		/// Unity引擎生成的CRC
+		/// </summary>
+		public uint UnityCRC;
+
 		/// <summary>
 		/// 文件哈希值
 		/// </summary>

Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class WebPlayModeImpl : IPlayModeServices, IBundleServices
+	{
+		private PackageManifest _activeManifest;
+
+		// 参数相关
+		private string _packageName;
+		private IQueryServices _queryServices;
+		private IRemoteServices _remoteServices;
+
+		public IRemoteServices RemoteServices
+		{
+			get { return _remoteServices; }
+		}
+
+		/// <summary>
+		/// 异步初始化
+		/// </summary>
+		public InitializationOperation InitializeAsync(string packageName, IQueryServices queryServices, IRemoteServices remoteServices)
+		{
+			_packageName = packageName;
+			_queryServices = queryServices;
+			_remoteServices = remoteServices;
+
+			var operation = new WebPlayModeInitializationOperation(this, packageName);
+			OperationSystem.StartOperation(operation);
+			return operation;
+		}
+
+		// 下载相关
+		private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle)
+		{
+			string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName);
+			string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName);
+			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
+			return bundleInfo;
+		}
+
+		#region IPlayModeServices接口
+		public PackageManifest ActiveManifest
+		{
+			set
+			{
+				_activeManifest = value;
+			}
+			get
+			{
+				return _activeManifest;
+			}
+		}
+		public void FlushManifestVersionFile()
+		{
+		}
+
+		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
+		{
+			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+		}
+
+		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
+		{
+			var operation = new WebPlayModeUpdatePackageVersionOperation(this, _packageName, appendTimeTicks, timeout);
+			OperationSystem.StartOperation(operation);
+			return operation;
+		}
+		UpdatePackageManifestOperation IPlayModeServices.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
+		{
+			var operation = new WebPlayModeUpdatePackageManifestOperation(this, _packageName, packageVersion, timeout);
+			OperationSystem.StartOperation(operation);
+			return operation;
+		}
+		PreDownloadContentOperation IPlayModeServices.PreDownloadContentAsync(string packageVersion, int timeout)
+		{
+			var operation = new WebPlayModePreDownloadContentOperation();
+			OperationSystem.StartOperation(operation);
+			return operation;
+		}
+
+		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
+		}
+		#endregion
+
+		#region IBundleServices接口
+		private BundleInfo CreateBundleInfo(PackageBundle packageBundle)
+		{
+			if (packageBundle == null)
+				throw new Exception("Should never get here !");
+
+			// 查询APP资源
+			if (IsBuildinPackageBundle(packageBundle))
+			{
+				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
+				return bundleInfo;
+			}
+
+			// 从服务端下载
+			return ConvertToDownloadInfo(packageBundle);
+		}
+		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
+			return CreateBundleInfo(packageBundle);
+		}
+		BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var depends = _activeManifest.GetAllDependencies(assetInfo.AssetPath);
+			List<BundleInfo> result = new List<BundleInfo>(depends.Length);
+			foreach (var packageBundle in depends)
+			{
+				BundleInfo bundleInfo = CreateBundleInfo(packageBundle);
+				result.Add(bundleInfo);
+			}
+			return result.ToArray();
+		}
+		string IBundleServices.GetBundleName(int bundleID)
+		{
+			return _activeManifest.GetBundleName(bundleID);
+		}
+		bool IBundleServices.IsServicesValid()
+		{
+			return _activeManifest != null;
+		}
+		#endregion
+	}
+}

Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs.meta

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

Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs

@@ -126,6 +126,22 @@ namespace YooAsset
 					initializeParameters.RemoteServices
 					);
 			}
+			else if (_playMode == EPlayMode.WebPlayMode)
+			{
+				var webPlayModeImpl = new WebPlayModeImpl();
+				_bundleServices = webPlayModeImpl;
+				_playModeServices = webPlayModeImpl;
+				_assetSystemImpl.Initialize(PackageName, false,
+					parameters.LoadingMaxTimeSlice, parameters.DownloadFailedTryAgain,
+					parameters.DecryptionServices, _bundleServices);
+
+				var initializeParameters = parameters as WebPlayModeParameters;
+				initializeOperation = webPlayModeImpl.InitializeAsync(
+					PackageName,
+					initializeParameters.QueryServices,
+					initializeParameters.RemoteServices
+					);
+			}
 			else
 			{
 				throw new NotImplementedException();
@@ -184,9 +200,19 @@ namespace YooAsset
 				_playMode = EPlayMode.OfflinePlayMode;
 			else if (parameters is HostPlayModeParameters)
 				_playMode = EPlayMode.HostPlayMode;
+			else if (parameters is WebPlayModeParameters)
+				_playMode = EPlayMode.WebPlayMode;
 			else
 				throw new NotImplementedException();
 
+			// 检测运行平台
+			if (_playMode == EPlayMode.HostPlayMode || _playMode == EPlayMode.OfflinePlayMode)
+			{
+#if UNITY_WEBGL
+				throw new Exception($"WebGL plateform not support : {_playMode} ! Please use {nameof(EPlayMode.WebPlayMode)}");
+#endif
+			}
+
 			// 检测参数范围
 			if (parameters.LoadingMaxTimeSlice < 10)
 			{

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -24,7 +24,7 @@ namespace YooAsset
 		/// <summary>
 		/// 清单文件格式版本
 		/// </summary>
-		public const string ManifestFileVersion = "1.4.17";
+		public const string ManifestFileVersion = "1.5.2";
 
 
 		/// <summary>

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: prop_asteroid_01_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/Materials/prop_asteroid_01_mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2028e985f7c2d9740858bcf7b567af05
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_01/prop_asteroid_01_mat.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: prop_asteroid_01_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -27,6 +27,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -47,6 +51,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -56,24 +64,40 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.316
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.112127006
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.41911763, g: 0.39786422, b: 0.34207395, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: prop_asteroid_02_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/Materials/prop_asteroid_02_mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec1ef84828f4b1e478c51c1c468a3fb6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_02/prop_asteroid_02_mat.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: prop_asteroid_02_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -27,6 +27,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -47,6 +51,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -56,24 +64,40 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.385
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.044885967
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.3897059, g: 0.3606163, b: 0.29801038, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: prop_asteroid_03_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/Materials/prop_asteroid_03_mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bb585fc32e8ff0d4ca301d5ace6cb531
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_dff.tif.meta

@@ -1,53 +1,145 @@
 fileFormatVersion: 2
 guid: 836be25be3e1e8c41ae5545bc8a9a4d7
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 2
+  externalObjects: {}
+  serializedVersion: 12
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 512
   textureSettings:
-    filterMode: -1
+    serializedVersion: 2
-    aniso: -1
+    filterMode: 1
-    mipBias: -1
+    aniso: 1
-    wrapMode: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
   alphaIsTransparency: 0
-  textureType: -1
+  spriteTessellationDetail: -1
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
+    serializedVersion: 2
     sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid/prop_asteroid_03/prop_asteroid_03_mat.mat

@@ -5,9 +5,10 @@ Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: prop_asteroid_03_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -26,6 +27,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -46,6 +51,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -55,24 +64,40 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.454
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.05909175
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.33823532, g: 0.32863027, b: 0.30341697, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vehicle_enemyShip_glow_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_glow_mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 675de5eae7418564e9f77608fb14ce96
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vehicle_enemyShip_metal_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
-  m_LightmapFlags: 2
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/Materials/vehicle_enemyShip_metal_mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 66c224bd8cd9b7d44bf7944e32b603fe
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_glow_mat.mat

@@ -5,9 +5,10 @@ Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: vehicle_enemyShip_glow_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -26,6 +27,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -50,6 +55,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -59,19 +68,39 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
     - _EmissionLM: 0
+    - _EmissionStrength: 1
+    - _GlossMapScale: 1
     - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0.50735295, g: 0.8573022, b: 1, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_enemyShip/vehicle_enemyShip_metal_mat.mat

@@ -5,9 +5,10 @@ Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: vehicle_enemyShip_metal_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -30,6 +31,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -50,6 +55,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -59,25 +68,41 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.413
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.07927559
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectColor: {r: 0.4044118, g: 0.4578092, b: 1, a: 0.5019608}
     - _SpecColor: {r: 0.8308824, g: 0.986004, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_glass_mat.mat

@@ -5,9 +5,10 @@ Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: vehicle_playerShip_glass_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -30,6 +31,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -50,6 +55,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -59,25 +68,41 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.2981632
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectColor: {r: 0.6014814, g: 0.8271126, b: 0.9191176, a: 0.5019608}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/vehicle_playerShip_metal_mat.mat

@@ -5,9 +5,10 @@ Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: vehicle_playerShip_metal_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: ba67c8b1d5e59dc428ad9fc9270f8353, type: 3}
   m_ShaderKeywords: _EMISSION _NORMALMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -30,6 +31,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -50,6 +55,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -59,25 +68,41 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _AmbiencePower: 1
+    - _Brightness: 0
     - _BumpScale: 1
+    - _ColorToggle: 0
+    - _Contrast: 1
     - _Cutoff: 0.5
+    - _Detail: 0
     - _DetailNormalMapScale: 1
+    - _DetailStrength: 1
+    - _DiffusePower: 1
     - _DstBlend: 0
+    - _Emission: 0
+    - _EmissionStrength: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.515
     - _GlossyReflections: 1
+    - _Mask: 0
     - _Metallic: 0
     - _Mode: 0
+    - _Normal: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Phong: 0
     - _Shininess: 0.15252854
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
+    - _SpecularPower: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _PointLightColor: {r: 1, g: 1, b: 1, a: 1}
+    - _PointLightPosition: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectColor: {r: 0.99264705, g: 0.9855999, b: 0.8904628, a: 0.5019608}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs

@@ -74,6 +74,18 @@ internal class FsmInitialize : IStateNode
 			initializationOperation = package.InitializeAsync(createParameters);
 		}
 
+		// WebGL运行模式
+		if(playMode == EPlayMode.WebPlayMode)
+		{
+			string defaultHostServer = GetHostServerURL();
+			string fallbackHostServer = GetHostServerURL();
+			var createParameters = new WebPlayModeParameters();
+			createParameters.DecryptionServices = new GameDecryptionServices();
+			createParameters.QueryServices = new GameQueryServices();
+			createParameters.RemoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
+			initializationOperation = package.InitializeAsync(createParameters);
+		}
+
 		yield return initializationOperation;
 		if (initializationOperation.Status == EOperationStatus.Succeed)
 		{

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmUpdateVersion.cs

@@ -39,6 +39,7 @@ internal class FsmUpdateVersion : IStateNode
 		if (operation.Status == EOperationStatus.Succeed)
 		{
 			PatchManager.Instance.PackageVersion = operation.PackageVersion;
+			Debug.Log($"远端最新版本为: {operation.PackageVersion}");
 			_machine.ChangeState<FsmUpdateManifest>();
 		}
 		else

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "1.5.1",
+    "version": "1.5.2-preview",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {