Simplify the concept of resource version

简化资源版本概念

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

@@ -34,15 +34,13 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			LoadAppManifest,
-			CheckAppManifest,
+			Update,
 			Done,
 		}
 
-		private OfflinePlayModeImpl _impl;
+		private readonly OfflinePlayModeImpl _impl;
+		private readonly AppManifestLoader _appManifestLoader = new AppManifestLoader();
 		private ESteps _steps = ESteps.None;
-		private UnityWebDataRequester _downloader;
-		private string _downloadURL;
 
 		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl)
 		{
@@ -50,41 +48,32 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.LoadAppManifest;
+			_steps = ESteps.Update;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
-
-			if (_steps == ESteps.LoadAppManifest)
+			
+			if (_steps == ESteps.Update)
 			{
-				string filePath = PathHelper.MakeStreamingLoadPath(YooAssetSettingsData.Setting.PatchManifestFileName);
-				_downloadURL = PathHelper.ConvertToWWWPath(filePath);
-				_downloader = new UnityWebDataRequester();
-				_downloader.SendRequest(_downloadURL);
-				_steps = ESteps.CheckAppManifest;
-			}
-
-			if (_steps == ESteps.CheckAppManifest)
-			{
-				if (_downloader.IsDone() == false)
+				_appManifestLoader.Update();
+				if (_appManifestLoader.IsDone() == false)
 					return;
 
-				if (_downloader.HasError())
-				{
-					Error = _downloader.GetError();
-					_downloader.Dispose();
+				if (_appManifestLoader.Result == null)
+				{			
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					throw new System.Exception($"Fatal error : Failed load application patch manifest file : {_downloadURL}");
+					Error = _appManifestLoader.Error;
+					throw new System.Exception($"FATAL : {_appManifestLoader.Error}");
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					_impl.AppPatchManifest = _appManifestLoader.Result;
 				}
-
-				// 解析APP里的补丁清单
-				_impl.AppPatchManifest = PatchManifest.Deserialize(_downloader.GetText());
-				_downloader.Dispose();
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
 			}
 		}
 	}
@@ -98,16 +87,13 @@ namespace YooAsset
 		{
 			None,
 			InitCache,
-			LoadAppManifest,
-			CheckAppManifest,
-			LoadSandboxManifest,
+			Update,
 			Done,
 		}
 
-		private HostPlayModeImpl _impl;
+		private readonly HostPlayModeImpl _impl;
+		private readonly AppManifestLoader _appManifestLoader = new AppManifestLoader();
 		private ESteps _steps = ESteps.None;
-		private UnityWebDataRequester _downloader;
-		private string _downloadURL;
 
 		internal HostPlayModeInitializationOperation(HostPlayModeImpl impl)
 		{
@@ -137,60 +123,137 @@ namespace YooAsset
 						SandboxHelper.DeleteSandboxCacheFolder();
 					}
 
-					// 删除清单文件
-					SandboxHelper.DeleteSandboxPatchManifestFile();
 					// 更新缓存文件
 					PatchCache.UpdateCache();
 				}
-				_steps = ESteps.LoadAppManifest;
+				_steps = ESteps.Update;
+			}
+
+			if (_steps == ESteps.Update)
+			{
+				_appManifestLoader.Update();
+				if (_appManifestLoader.IsDone() == false)
+					return;
+
+				if (_appManifestLoader.Result == null)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _appManifestLoader.Error;
+					throw new System.Exception($"FATAL : {_appManifestLoader.Error}");
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					_impl.AppPatchManifest = _appManifestLoader.Result;
+					_impl.LocalPatchManifest = _appManifestLoader.Result;
+				}
+			}
+		}
+	}
+
+	/// <summary>
+	/// 内置补丁清单加载器
+	/// </summary>
+	internal class AppManifestLoader
+	{
+		private enum ESteps
+		{
+			LoadStaticVersion,
+			CheckStaticVersion,
+			LoadAppManifest,
+			CheckAppManifest,
+			Succeed,
+			Failed,
+		}
+
+		private ESteps _steps = ESteps.LoadStaticVersion;
+		private UnityWebDataRequester _downloader1;
+		private UnityWebDataRequester _downloader2;
+		private int _staticVersion = 0;
+
+		/// <summary>
+		/// 错误日志
+		/// </summary>
+		public string Error { private set; get; }
+
+		/// <summary>
+		/// 补丁清单
+		/// </summary>
+		public PatchManifest Result { private set; get; }
+
+		/// <summary>
+		/// 是否已经完成
+		/// </summary>
+		public bool IsDone()
+		{
+			if (_steps == ESteps.Succeed || _steps == ESteps.Failed)
+				return true;
+			else
+				return false;
+		}
+
+		public void Update()
+		{
+			if (IsDone())
+				return;
+
+			if (_steps == ESteps.LoadStaticVersion)
+			{
+				YooLogger.Log($"Load application static version.");
+				string filePath = PathHelper.MakeStreamingLoadPath(YooAssetSettings.VersionFileName);
+				string url = PathHelper.ConvertToWWWPath(filePath);
+				_downloader1 = new UnityWebDataRequester();
+				_downloader1.SendRequest(url);
+				_steps = ESteps.CheckStaticVersion;
+			}
+
+			if (_steps == ESteps.CheckStaticVersion)
+			{
+				if (_downloader1.IsDone() == false)
+					return;
+
+				if (_downloader1.HasError())
+				{
+					Error = _downloader1.GetError();
+					_steps = ESteps.Failed;
+				}
+				else
+				{
+					_staticVersion = int.Parse(_downloader1.GetText());
+					_steps = ESteps.LoadAppManifest;
+				}
+				_downloader1.Dispose();
 			}
 
 			if (_steps == ESteps.LoadAppManifest)
 			{
-				// 加载APP内的补丁清单
 				YooLogger.Log($"Load application patch manifest.");
-				string filePath = PathHelper.MakeStreamingLoadPath(YooAssetSettingsData.Setting.PatchManifestFileName);
-				_downloadURL = PathHelper.ConvertToWWWPath(filePath);
-				_downloader = new UnityWebDataRequester();
-				_downloader.SendRequest(_downloadURL);
+				string filePath = PathHelper.MakeStreamingLoadPath(YooAssetSettingsData.GetPatchManifestFileName(_staticVersion));
+				string url = PathHelper.ConvertToWWWPath(filePath);
+				_downloader2 = new UnityWebDataRequester();
+				_downloader2.SendRequest(url);
 				_steps = ESteps.CheckAppManifest;
 			}
 
 			if (_steps == ESteps.CheckAppManifest)
 			{
-				if (_downloader.IsDone() == false)
+				if (_downloader2.IsDone() == false)
 					return;
 
-				if (_downloader.HasError())
+				if (_downloader2.HasError())
 				{
-					Error = _downloader.GetError();
-					_downloader.Dispose();
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					throw new System.Exception($"Fatal error : Failed load application patch manifest file : {_downloadURL}");
+					Error = _downloader2.GetError();		
+					_steps = ESteps.Failed;
 				}
-
-				// 解析补丁清单
-				string jsonData = _downloader.GetText();
-				_impl.AppPatchManifest = PatchManifest.Deserialize(jsonData);
-				_impl.LocalPatchManifest = _impl.AppPatchManifest;
-				_downloader.Dispose();
-				_steps = ESteps.LoadSandboxManifest;
-			}
-
-			if (_steps == ESteps.LoadSandboxManifest)
-			{
-				// 加载沙盒内的补丁清单	
-				if (SandboxHelper.CheckSandboxPatchManifestFileExist())
+				else
 				{
-					YooLogger.Log($"Load sandbox patch manifest.");
-					string filePath = PathHelper.MakePersistentLoadPath(YooAssetSettingsData.Setting.PatchManifestFileName);
-					string jsonData = File.ReadAllText(filePath);
-					_impl.LocalPatchManifest = PatchManifest.Deserialize(jsonData);
+					// 解析APP里的补丁清单
+					Result = PatchManifest.Deserialize(_downloader2.GetText());
+					_steps = ESteps.Succeed;
 				}
-
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
+				_downloader2.Dispose();
 			}
 		}
 	}

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdateManifestOperation.cs

@@ -59,7 +59,6 @@ namespace YooAsset
 		}
 
 		private static int RequestCount = 0;
-
 		private readonly HostPlayModeImpl _impl;
 		private readonly int _updateResourceVersion;
 		private readonly int _timeout;
@@ -78,15 +77,6 @@ namespace YooAsset
 		{
 			RequestCount++;
 			_steps = ESteps.LoadWebManifestHash;
-
-			if (_impl.IgnoreResourceVersion && _updateResourceVersion > 0)
-			{
-				YooLogger.Warning($"Update resource version {_updateResourceVersion} is invalid when ignore resource version.");
-			}
-			else
-			{
-				YooLogger.Log($"Update patch manifest : update resource version is  {_updateResourceVersion}");
-			}
 		}
 		internal override void Update()
 		{
@@ -95,7 +85,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadWebManifestHash)
 			{
-				string webURL = GetPatchManifestRequestURL(_updateResourceVersion, YooAssetSettingsData.Setting.PatchManifestHashFileName);
+				string webURL = GetPatchManifestRequestURL(YooAssetSettingsData.GetPatchManifestHashFileName(_updateResourceVersion));
 				YooLogger.Log($"Beginning to request patch manifest hash : {webURL}");
 				_downloaderHash = new UnityWebDataRequester();
 				_downloaderHash.SendRequest(webURL, _timeout);
@@ -107,37 +97,36 @@ namespace YooAsset
 				if (_downloaderHash.IsDone() == false)
 					return;
 
-				// Check fatal
+				// Check error
 				if (_downloaderHash.HasError())
 				{
-					Error = _downloaderHash.GetError();				
-					_downloaderHash.Dispose();
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					return;
-				}
-
-				// 获取补丁清单文件的哈希值
-				string webManifestHash = _downloaderHash.GetText();
-				_downloaderHash.Dispose();
-
-				// 如果补丁清单文件的哈希值相同
-				string currentFileHash = SandboxHelper.GetSandboxPatchManifestFileHash();
-				if (currentFileHash == webManifestHash)
-				{
-					YooLogger.Log($"Patch manifest file hash is not change : {webManifestHash}");
-					_steps = ESteps.InitPrepareCache;
+					Error = _downloaderHash.GetError();
 				}
 				else
 				{
-					YooLogger.Log($"Patch manifest hash is change : {webManifestHash} -> {currentFileHash}");
-					_steps = ESteps.LoadWebManifest;
+					string webManifestHash = _downloaderHash.GetText();
+					string cachedManifestHash = GetSandboxPatchManifestFileHash(_updateResourceVersion);
+
+					// 如果补丁清单文件的哈希值相同
+					if (cachedManifestHash == webManifestHash)
+					{
+						YooLogger.Log($"Patch manifest file hash is not change : {webManifestHash}");
+						_steps = ESteps.InitPrepareCache;
+					}
+					else
+					{
+						YooLogger.Log($"Patch manifest hash is change : {webManifestHash} -> {cachedManifestHash}");
+						_steps = ESteps.LoadWebManifest;
+					}
 				}
+				_downloaderHash.Dispose();
 			}
 
 			if (_steps == ESteps.LoadWebManifest)
 			{
-				string webURL = GetPatchManifestRequestURL(_updateResourceVersion, YooAssetSettingsData.Setting.PatchManifestFileName);
+				string webURL = GetPatchManifestRequestURL(YooAssetSettingsData.GetPatchManifestFileName(_updateResourceVersion));
 				YooLogger.Log($"Beginning to request patch manifest : {webURL}");
 				_downloaderManifest = new UnityWebDataRequester();
 				_downloaderManifest.SendRequest(webURL, _timeout);
@@ -149,20 +138,28 @@ namespace YooAsset
 				if (_downloaderManifest.IsDone() == false)
 					return;
 
-				// Check fatal
+				// Check error
 				if (_downloaderManifest.HasError())
-				{
-					Error = _downloaderManifest.GetError();			
-					_downloaderManifest.Dispose();
+				{			
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					return;
+					Error = _downloaderManifest.GetError();
+				}
+				else
+				{
+					// 解析补丁清单			
+					if (ParseAndSaveRemotePatchManifest(_updateResourceVersion, _downloaderManifest.GetText()))
+					{
+						_steps = ESteps.InitPrepareCache;
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"URL : {_downloaderManifest.URL} Error : remote patch manifest content is invalid";
+					}
 				}
-
-				// 解析补丁清单			
-				ParseAndSaveRemotePatchManifest(_downloaderManifest.GetText());
 				_downloaderManifest.Dispose();
-				_steps = ESteps.InitPrepareCache;
 			}
 
 			if (_steps == ESteps.InitPrepareCache)
@@ -184,30 +181,47 @@ namespace YooAsset
 			}
 		}
 
-		private string GetPatchManifestRequestURL(int updateResourceVersion, string fileName)
+		private string GetPatchManifestRequestURL(string fileName)
 		{
-			string url;
-
 			// 轮流返回请求地址
 			if (RequestCount % 2 == 0)
-				url = _impl.GetPatchDownloadFallbackURL(updateResourceVersion, fileName);
+				return _impl.GetPatchDownloadFallbackURL(fileName);
 			else
-				url = _impl.GetPatchDownloadMainURL(updateResourceVersion, fileName);
-
-			// 注意：在URL末尾添加时间戳
-			if (_impl.IgnoreResourceVersion)
-				url = $"{url}?{System.DateTime.UtcNow.Ticks}";
-
-			return url;
+				return _impl.GetPatchDownloadMainURL(fileName);
 		}
-		private void ParseAndSaveRemotePatchManifest(string content)
-		{
-			_impl.LocalPatchManifest = PatchManifest.Deserialize(content);
 
-			// 注意：这里会覆盖掉沙盒内的补丁清单文件
-			YooLogger.Log("Save remote patch manifest file.");
-			string savePath = PathHelper.MakePersistentLoadPath(YooAssetSettingsData.Setting.PatchManifestFileName);
-			PatchManifest.Serialize(savePath, _impl.LocalPatchManifest);
+		/// <summary>
+		/// 解析并保存远端请求的补丁清单
+		/// </summary>
+		private bool ParseAndSaveRemotePatchManifest(int updateResourceVersion, string content)
+		{
+			try
+			{
+				_impl.LocalPatchManifest = PatchManifest.Deserialize(content);
+
+				YooLogger.Log("Save remote patch manifest file.");
+				string savePath = PathHelper.MakePersistentLoadPath(YooAssetSettingsData.GetPatchManifestFileName(updateResourceVersion));
+				PatchManifest.Serialize(savePath, _impl.LocalPatchManifest);
+				return true;
+			}
+			catch (Exception e)
+			{
+				YooLogger.Warning(e.ToString());
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// 获取沙盒内补丁清单文件的哈希值
+		/// 注意：如果沙盒内补丁清单文件不存在，返回空字符串
+		/// </summary>
+		private string GetSandboxPatchManifestFileHash(int updateResourceVersion)
+		{
+			string filePath = PathHelper.MakePersistentLoadPath(YooAssetSettingsData.GetPatchManifestFileName(updateResourceVersion));
+			if (File.Exists(filePath))
+				return HashUtility.FileMD5(filePath);
+			else
+				return string.Empty;
 		}
 
 		#region 多线程相关

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdateStaticVersionOperation.cs

@@ -0,0 +1,134 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 更新静态版本操作
+	/// </summary>
+	public abstract class UpdateStaticVersionOperation : AsyncOperationBase
+	{
+		/// <summary>
+		/// 资源版本号
+		/// </summary>
+		public int ResourceVersion { protected set; get; } = 0;
+	}
+
+	/// <summary>
+	/// 编辑器下模拟运行的更新静态版本操作
+	/// </summary>
+	internal class EditorModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+
+	/// <summary>
+	/// 离线模式的更新静态版本操作
+	/// </summary>
+	internal class OfflinePlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+
+	/// <summary>
+	/// 网络模式的更新静态版本操作
+	/// </summary>
+	internal class HostPlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
+	{
+		private enum ESteps
+		{
+			None,
+			LoadStaticVersion,
+			CheckStaticVersion,
+			Done,
+		}
+
+		private static int RequestCount = 0;
+		private readonly HostPlayModeImpl _impl;
+		private readonly int _timeout;
+		private ESteps _steps = ESteps.None;
+		private UnityWebDataRequester _downloader;
+
+		internal HostPlayModeUpdateStaticVersionOperation(HostPlayModeImpl impl, int timeout)
+		{
+			_impl = impl;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			RequestCount++;
+			_steps = ESteps.LoadStaticVersion;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadStaticVersion)
+			{
+				string webURL = GetStaticVersionRequestURL(YooAssetSettings.VersionFileName);
+				YooLogger.Log($"Beginning to request static version : {webURL}");
+				_downloader = new UnityWebDataRequester();
+				_downloader.SendRequest(webURL, _timeout);
+				_steps = ESteps.CheckStaticVersion;
+			}
+
+			if (_steps == ESteps.CheckStaticVersion)
+			{
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					if (int.TryParse(_downloader.GetText(), out int value))
+					{
+						ResourceVersion = value;
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+					}
+					else
+					{						
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"URL : {_downloader.URL} Error : static version content is invalid.";
+					}
+				}
+				_downloader.Dispose();
+			}
+		}
+
+		private string GetStaticVersionRequestURL(string fileName)
+		{
+			string url;
+
+			// 轮流返回请求地址
+			if (RequestCount % 2 == 0)
+				url = _impl.GetPatchDownloadFallbackURL(fileName);
+			else
+				url = _impl.GetPatchDownloadMainURL(fileName);
+
+			// 注意：在URL末尾添加时间戳
+			return $"{url}?{System.DateTime.UtcNow.Ticks}";
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdateStaticVersionOperation.cs.meta

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