update package system

增加对清单激活的检测

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

@@ -72,6 +72,11 @@ namespace YooAsset
 					_steps = ESteps.LoadFile;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
+				{
+					_steps = ESteps.LoadFile;
+					FileLoadPath = MainBundleInfo.DeliveryFilePath;
+				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());

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

@@ -54,6 +54,11 @@ namespace YooAsset
 					_steps = ESteps.CheckFile;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
+				{
+					_steps = ESteps.CheckFile;
+					FileLoadPath = MainBundleInfo.DeliveryFilePath;
+				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());

Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs

@@ -6,6 +6,7 @@ namespace YooAsset
 		public enum ELoadMode
 		{
 			None,
+			LoadFromDelivery,
 			LoadFromStreaming,
 			LoadFromCache,
 			LoadFromRemote,
@@ -25,6 +26,11 @@ namespace YooAsset
 		/// </summary>
 		public string RemoteFallbackURL { private set; get; }
 
+		/// <summary>
+		/// 开发者分发的文件地址
+		/// </summary>
+		public string DeliveryFilePath { private set; get; }
+		
 		/// <summary>
 		/// 注意：该字段只用于帮助编辑器下的模拟模式。
 		/// </summary>
@@ -40,6 +46,15 @@ namespace YooAsset
 			LoadMode = loadMode;
 			RemoteMainURL = mainURL;
 			RemoteFallbackURL = fallbackURL;
+			DeliveryFilePath = string.Empty;
+		}
+		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string deliveryFilePath)
+		{
+			Bundle = bundle;
+			LoadMode = loadMode;
+			RemoteMainURL = string.Empty;
+			RemoteFallbackURL = string.Empty;
+			DeliveryFilePath = deliveryFilePath;
 		}
 		public BundleInfo(PackageBundle bundle, ELoadMode loadMode)
 		{
@@ -47,6 +62,7 @@ namespace YooAsset
 			LoadMode = loadMode;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;
+			DeliveryFilePath = string.Empty;
 		}
 
 		/// <summary>

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

@@ -74,7 +74,7 @@ namespace YooAsset
 					string savePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageManifestFilePath(_packageVersion);
 					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
 					string webURL = GetDownloadRequestURL(fileName);
-					YooLogger.Log($"Beginning to download manifest file : {webURL}");
+					YooLogger.Log($"Beginning to download package manifest file : {webURL}");
 					_downloader2 = new UnityWebFileRequester();
 					_downloader2.SendRequest(webURL, savePath, _timeout);
 				}

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

@@ -58,6 +58,7 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
+			CheckParams,
 			CheckActiveManifest,
 			TryLoadCacheManifest,
 			DownloadManifest,
@@ -87,13 +88,34 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.CheckActiveManifest;
+			_steps = ESteps.CheckParams;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
+			if (_steps == ESteps.CheckParams)
+			{
+				if (string.IsNullOrEmpty(_packageName))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Package name is null or empty.";
+					return;
+				}
+
+				if (string.IsNullOrEmpty(_packageVersion))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Package version is null or empty.";
+					return;
+				}
+
+				_steps = ESteps.CheckActiveManifest;
+			}
+
 			if (_steps == ESteps.CheckActiveManifest)
 			{
 				// 检测当前激活的清单对象	
@@ -198,6 +220,7 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
+			CheckParams,
 			CheckActiveManifest,
 			LoadRemoteManifest,
 			Done,
@@ -220,13 +243,34 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.CheckActiveManifest;
+			_steps = ESteps.CheckParams;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
+			if (_steps == ESteps.CheckParams)
+			{
+				if (string.IsNullOrEmpty(_packageName))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Package name is null or empty.";
+					return;
+				}
+
+				if (string.IsNullOrEmpty(_packageVersion))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Package version is null or empty.";
+					return;
+				}
+
+				_steps = ESteps.CheckActiveManifest;
+			}
+
 			if (_steps == ESteps.CheckActiveManifest)
 			{
 				// 检测当前激活的清单对象	

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

@@ -51,6 +51,24 @@ namespace YooAsset
 			return bundleInfo;
 		}
 
+		// 查询相关
+		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
+		{
+			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+		}
+		private bool IsCachedPackageBundle(PackageBundle packageBundle)
+		{
+			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
+		}
+		private bool IsDeliveryPackageBundle(PackageBundle packageBundle, out string deliveryFilePath)
+		{
+			deliveryFilePath = _queryServices.QueryDeliveryFiles(_packageName, packageBundle.FileName);
+			if (string.IsNullOrEmpty(deliveryFilePath))
+				return false;
+			else
+				return true;
+		}
+
 		#region IPlayModeServices接口
 		public PackageManifest ActiveManifest
 		{
@@ -71,15 +89,6 @@ namespace YooAsset
 			}
 		}
 
-		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
-		{
-			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
-		}
-		private bool IsCachedPackageBundle(PackageBundle packageBundle)
-		{
-			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
-		}
-
 		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
 		{
 			var operation = new HostPlayModeUpdatePackageVersionOperation(this, _packageName, appendTimeTicks, timeout);
@@ -269,6 +278,13 @@ namespace YooAsset
 			if (packageBundle == null)
 				throw new Exception("Should never get here !");
 
+			// 查询分发资源
+			if (IsDeliveryPackageBundle(packageBundle, out string deliveryFilePath))
+			{
+				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromDelivery, deliveryFilePath);
+				return bundleInfo;
+			}
+
 			// 查询沙盒资源
 			if (IsCachedPackageBundle(packageBundle))
 			{

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

@@ -18,6 +18,12 @@ namespace YooAsset
 			return operation;
 		}
 
+		// 查询相关
+		private bool IsCachedPackageBundle(PackageBundle packageBundle)
+		{
+			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
+		}
+
 		#region IPlayModeServices接口
 		public PackageManifest ActiveManifest
 		{
@@ -34,11 +40,6 @@ namespace YooAsset
 		{
 		}
 
-		private bool IsCachedPackageBundle(PackageBundle packageBundle)
-		{
-			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
-		}
-
 		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
 		{
 			var operation = new OfflinePlayModeUpdatePackageVersionOperation();

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

@@ -41,6 +41,12 @@ namespace YooAsset
 			return bundleInfo;
 		}
 
+		// 查询相关
+		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
+		{
+			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+		}
+
 		#region IPlayModeServices接口
 		public PackageManifest ActiveManifest
 		{
@@ -57,11 +63,6 @@ namespace YooAsset
 		{
 		}
 
-		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);

Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs

@@ -238,7 +238,7 @@ namespace YooAsset
 		/// <param name="timeout">超时时间（默认值：60秒）</param>
 		public UpdatePackageVersionOperation UpdatePackageVersionAsync(bool appendTimeTicks = true, int timeout = 60)
 		{
-			DebugCheckInitialize();
+			DebugCheckInitialize(false);
 			return _playModeServices.UpdatePackageVersionAsync(appendTimeTicks, timeout);
 		}
 
@@ -250,7 +250,7 @@ namespace YooAsset
 		/// <param name="timeout">超时时间（默认值：60秒）</param>
 		public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion = true, int timeout = 60)
 		{
-			DebugCheckInitialize();
+			DebugCheckInitialize(false);
 			DebugCheckUpdateManifest();
 			return _playModeServices.UpdatePackageManifestAsync(packageVersion, autoSaveVersion, timeout);
 		}
@@ -262,7 +262,7 @@ namespace YooAsset
 		/// <param name="timeout">超时时间（默认值：60秒）</param>
 		public PreDownloadContentOperation PreDownloadContentAsync(string packageVersion, int timeout = 60)
 		{
-			DebugCheckInitialize();
+			DebugCheckInitialize(false);
 			return _playModeServices.PreDownloadContentAsync(packageVersion, timeout);
 		}
 
@@ -294,8 +294,6 @@ namespace YooAsset
 		public string GetPackageVersion()
 		{
 			DebugCheckInitialize();
-			if (_playModeServices.ActiveManifest == null)
-				return string.Empty;
 			return _playModeServices.ActiveManifest.PackageVersion;
 		}
 
@@ -967,12 +965,18 @@ namespace YooAsset
 
 		#region 调试方法
 		[Conditional("DEBUG")]
-		private void DebugCheckInitialize()
+		private void DebugCheckInitialize(bool checkActiveManifest = true)
 		{
 			if (_initializeStatus == EOperationStatus.None)
 				throw new Exception("Package initialize not completed !");
 			else if (_initializeStatus == EOperationStatus.Failed)
 				throw new Exception($"Package initialize failed ! {_initializeError}");
+
+			if (checkActiveManifest)
+			{
+				if (_playModeServices.ActiveManifest == null)
+					throw new Exception("Not found active manifest !");
+			}
 		}
 
 		[Conditional("DEBUG")]

Assets/YooAsset/Runtime/Services/IQueryServices.cs

@@ -4,8 +4,13 @@ namespace YooAsset
 	public interface IQueryServices
 	{
 		/// <summary>
-		/// 查询内置资源
+		/// 查询应用程序里的内置资源是否存在
 		/// </summary>
 		bool QueryStreamingAssets(string packageName, string fileName);
+
+		/// <summary>
+		/// 查询开发者分发的文件加载路径
+		/// </summary>
+		string QueryDeliveryFiles(string packageName, string fileName);
 	}
 }

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

@@ -142,11 +142,11 @@ internal class FsmInitialize : IStateNode
 			_defaultHostServer = defaultHostServer;
 			_fallbackHostServer = fallbackHostServer;
 		}
-		string IRemoteServices.GetRemoteFallbackURL(string fileName)
+		string IRemoteServices.GetRemoteMainURL(string fileName)
 		{
 			return $"{_defaultHostServer}/{fileName}";
 		}
-		string IRemoteServices.GetRemoteMainURL(string fileName)
+		string IRemoteServices.GetRemoteFallbackURL(string fileName)
 		{
 			return $"{_fallbackHostServer}/{fileName}";
 		}

Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs

@@ -8,6 +8,11 @@ using YooAsset;
 /// </summary>
 public class GameQueryServices : IQueryServices
 {
+	public string QueryDeliveryFiles(string packageName, string fileName)
+	{
+		return null;
+	}
+
 	public bool QueryStreamingAssets(string packageName, string fileName)
 	{
 		// 注意：fileName包含文件格式

Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs

@@ -11,6 +11,11 @@ using YooAsset;
 /// </summary>
 public class GameQueryServices2 : IQueryServices
 {
+	public string QueryDeliveryFiles(string packageName, string fileName)
+	{
+		return null;
+	}
+
 	public bool QueryStreamingAssets(string packageName, string fileName)
 	{
 		return StreamingAssetsHelper2.FileExists($"{StreamingAssetsDefine.RootFolderName}/{packageName}/{fileName}");