From 33a1b9d4bff065497dfbe8b6cd88130437e8b6f6 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Mon, 6 Feb 2023 17:50:36 +0800
Subject: [PATCH] update shader variant collector

---
 .../ShaderVariantCollector.cs                       |  5 +++--
 .../YooAsset/Runtime/Settings/YooAssetSettings.cs   | 13 ++++++++++++-
 .../Runtime/Settings/YooAssetSettingsData.cs        |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs b/Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs
index bdc683e..420e7e4 100644
--- a/Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs
+++ b/Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs
@@ -23,6 +23,7 @@ namespace YooAsset.Editor
 		}
 
 		private const float WaitMilliseconds = 1000f;
+		private const float SleepMilliseconds = 100f;
 		private static string _savePath;
 		private static string _packageName;
 		private static int _processMaxNum;
@@ -107,7 +108,7 @@ namespace YooAsset.Editor
 
 			if (_steps == ESteps.CollectSleeping)
 			{
-				if (_elapsedTime.ElapsedMilliseconds > WaitMilliseconds)
+				if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds)
 				{
 					DestroyAllSpheres();
 					_elapsedTime.Stop();
@@ -236,7 +237,7 @@ namespace YooAsset.Editor
 			_allSpheres.Clear();
 
 			// 尝试释放编辑器加载的资源
-			EditorUtility.UnloadUnusedAssetsImmediate();
+			EditorUtility.UnloadUnusedAssetsImmediate(true);
 		}
 		private static void CreateManifest()
 		{
diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
index ea0b1df..31cecfe 100644
--- a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
+++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
@@ -8,7 +8,7 @@ namespace YooAsset
 		/// <summary>
 		/// AssetBundle文件的后缀名
 		/// </summary>
-		public string AssetBundleFileVariant = "bundle";
+		public string BundleFileVariant = "bundle";
 
 		/// <summary>
 		/// 原生文件的后缀名
@@ -41,6 +41,17 @@ namespace YooAsset
 		/// </summary>
 		public const string PatchManifestFileVersion = "1.4.0";
 
+		
+		/// <summary>
+		/// 缓存的数据文件名称
+		/// </summary>
+		public const string CacheBundleDataFileName = "__data";
+
+		/// <summary>
+		/// 缓存的信息文件名称
+		/// </summary>
+		public const string CacheBundleInfoFileName = "__info";
+
 
 		/// <summary>
 		/// 构建输出文件夹名称
diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs
index 05cbf2a..874fefc 100644
--- a/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs
+++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs
@@ -79,9 +79,9 @@ namespace YooAsset
 		{
 			string shareBundleName;
 			if (uniqueBundleName)
-				shareBundleName = $"{packageName.ToLower()}_{YooAssetSettings.UnityShadersBundleName}.{Setting.AssetBundleFileVariant}";
+				shareBundleName = $"{packageName.ToLower()}_{YooAssetSettings.UnityShadersBundleName}.{Setting.BundleFileVariant}";
 			else
-				shareBundleName = $"{YooAssetSettings.UnityShadersBundleName}.{Setting.AssetBundleFileVariant}";
+				shareBundleName = $"{YooAssetSettings.UnityShadersBundleName}.{Setting.BundleFileVariant}";
 			return shareBundleName.ToLower();
 		}
 	}