Update CHANGELOG.md

新增初始化参数 BundleLoadingMaxConcurrency

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,62 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.7] - 2025-04-01
+
+### Improvements
+
+- (#526) 运行时资源清单的哈希值验证兼容了MD5和CRC32两种方式。
+- (#515) 优化了资源路径大小写不敏感的逻辑代码，减少字符串操作产生的GC。
+- (#523) UnloadUnusedAssetsOperation方法支持了分帧处理。
+
+### Fixed
+
+- (#520) 修复了UWP平台获取WWW加载路径未适配的问题。
+
+### Added
+
+- 新增了文件系统初始化参数：INSTALL_CLEAR_MODE
+
+  ```csharp
+  /// <summary>
+  /// 覆盖安装清理模式
+  /// </summary>
+  public enum EOverwriteInstallClearMode
+  {
+      /// <summary>
+      /// 不做任何处理
+      /// </summary>
+      None = 0,
+   
+      /// <summary>
+      /// 清理所有缓存文件（包含资源文件和清单文件）
+      /// </summary>
+      ClearAllCacheFiles = 1,
+   
+      /// <summary>
+      /// 清理所有缓存的资源文件
+      /// </summary>
+      ClearAllBundleFiles = 2,
+   
+      /// <summary>
+      /// 清理所有缓存的清单文件
+      /// </summary>
+      ClearAllManifestFiles = 3,
+  }
+  ```
+
+- 新增了初始化参数：BundleLoadingMaxConcurrency
+
+  ```csharp
+  public abstract class InitializeParameters
+  {
+      /// <summary>
+      /// 同时加载Bundle文件的最大并发数
+      /// </summary>
+      public int BundleLoadingMaxConcurrency = int.MaxValue;
+  }
+  ```
+
 ## [2.3.6] - 2025-03-25
 
 ### Improvements

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs

@@ -69,8 +69,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
-                if (fileHash == _packageHash)
+                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/LoadCachePackageManifestOperation.cs

@@ -59,8 +59,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesCRC32(_fileData);
-                if (fileHash == _packageHash)
+                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }

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

@@ -59,8 +59,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesCRC32(_fileData);
-                if (fileHash == _packageHash)
+                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs

@@ -72,8 +72,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
-                if (fileHash == _packageHash)
+                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerPackageManifestOperation.cs

@@ -69,8 +69,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
-                if (fileHash == _packageHash)
+                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -38,6 +38,10 @@ namespace YooAsset
     /// </summary>
     public abstract class InitializeParameters
     {
+        /// <summary>
+        /// 同时加载Bundle文件的最大并发数
+        /// </summary>
+        public int BundleLoadingMaxConcurrency = int.MaxValue;
     }
 
     /// <summary>

Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs

@@ -9,7 +9,8 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            LoadFile,
+            CheckConcurrency,
+            LoadBundleFile,
             Done,
         }
 
@@ -57,17 +58,32 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.LoadFile;
+            _steps = ESteps.CheckConcurrency;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.LoadFile)
+            if (_steps == ESteps.CheckConcurrency)
+            {
+                if (IsWaitForAsyncComplete)
+                {
+                    _steps = ESteps.LoadBundleFile;
+                }
+                else
+                {
+                    if (_resourceManager.BundleLoadingIsBusy())
+                        return;
+                    _steps = ESteps.LoadBundleFile;
+                }
+            }
+
+            if (_steps == ESteps.LoadBundleFile)
             {
                 if (_loadBundleOp == null)
                 {
+                    _resourceManager.BundleLoadingCounter++;
                     _loadBundleOp = LoadBundleInfo.LoadBundleFile();
                     _loadBundleOp.StartOperation();
                     AddChildOperation(_loadBundleOp);
@@ -103,6 +119,9 @@ namespace YooAsset
                     Status = EOperationStatus.Failed;
                     Error = _loadBundleOp.Error;
                 }
+
+                // 统计计数减少
+                _resourceManager.BundleLoadingCounter--;
             }
         }
         internal override void InternalWaitForAsyncComplete()

Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs

@@ -15,6 +15,7 @@ namespace YooAsset
 
         private readonly ResourceManager _resManager;
         private readonly int _loopCount;
+        private int _loopCounter = 0;
         private ESteps _steps = ESteps.None;
 
         internal UnloadUnusedAssetsOperation(ResourceManager resourceManager, int loopCount)
@@ -25,6 +26,7 @@ namespace YooAsset
         internal override void InternalStart()
         {
             _steps = ESteps.UnloadUnused;
+            _loopCounter = _loopCount;
         }
         internal override void InternalUpdate()
         {
@@ -33,13 +35,23 @@ namespace YooAsset
 
             if (_steps == ESteps.UnloadUnused)
             {
-                for (int i = 0; i < _loopCount; i++)
+                while (_loopCounter > 0)
                 {
+                    _loopCounter--;
                     LoopUnloadUnused();
+
+                    if (IsWaitForAsyncComplete == false)
+                    {
+                        if (OperationSystem.IsBusy)
+                            break;
+                    }
                 }
 
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
+                if (_loopCounter <= 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
             }
         }
         internal override void InternalWaitForAsyncComplete()

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -14,6 +14,7 @@ namespace YooAsset
         internal readonly List<SceneHandle> SceneHandles = new List<SceneHandle>(100);
         private long _sceneCreateIndex = 0;
         private IBundleQuery _bundleQuery;
+        private int _bundleLoadingMaxConcurrency;
 
         /// <summary>
         /// 所属包裹
@@ -25,6 +26,11 @@ namespace YooAsset
         /// </summary>
         public bool LockLoadOperation = false;
 
+        /// <summary>
+        /// 统计正在加载的Bundle文件数量
+        /// </summary>
+        public int BundleLoadingCounter = 0;
+
 
         public ResourceManager(string packageName)
         {
@@ -34,8 +40,9 @@ namespace YooAsset
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(IBundleQuery bundleServices)
+        public void Initialize(InitializeParameters parameters, IBundleQuery bundleServices)
         {
+            _bundleLoadingMaxConcurrency = parameters.BundleLoadingMaxConcurrency;
             _bundleQuery = bundleServices;
             SceneManager.sceneUnloaded += OnSceneUnloaded;
         }
@@ -310,6 +317,10 @@ namespace YooAsset
         {
             return LoaderDic.Count > 0;
         }
+        internal bool BundleLoadingIsBusy()
+        {
+            return BundleLoadingCounter >= _bundleLoadingMaxConcurrency;
+        }
 
         private LoadBundleFileOperation CreateBundleFileLoaderInternal(BundleInfo bundleInfo)
         {

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -8,6 +8,30 @@ namespace YooAsset
 {
     internal static class ManifestTools
     {
+        /// <summary>
+        /// 验证清单文件的二进制数据
+        /// </summary>
+        public static bool VerifyManifestData(byte[] fileData, string hashValue)
+        {
+            if (fileData == null || fileData.Length == 0)
+                return false;
+            if (string.IsNullOrEmpty(hashValue))
+                return false;
+
+            // 注意：兼容俩种验证方式
+            // 注意：计算MD5的哈希值通常为32个字符
+            string fileHash;
+            if (hashValue.Length == 32)
+                fileHash = HashUtility.BytesMD5(fileData);
+            else
+                fileHash = HashUtility.BytesCRC32(fileData);
+
+            if (fileHash == hashValue)
+                return true;
+            else
+                return false;
+        }
+
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>
@@ -197,9 +221,16 @@ namespace YooAsset
             manifest.AssetDic = new Dictionary<string, PackageAsset>(assetCount);
 
             if (manifest.EnableAddressable)
+            {
                 manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 3);
+            }
             else
-                manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
+            {
+                if (manifest.LocationToLower)
+                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2, StringComparer.OrdinalIgnoreCase);
+                else
+                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
+            }
 
             if (manifest.IncludeAssetGUID)
                 manifest.AssetPathMapping2 = new Dictionary<string, string>(assetCount);
@@ -221,8 +252,6 @@ namespace YooAsset
             // 填充AssetPathMapping1
             {
                 string location = packageAsset.AssetPath;
-                if (manifest.LocationToLower)
-                    location = location.ToLower();
 
                 // 添加原生路径的映射
                 if (manifest.AssetPathMapping1.ContainsKey(location))

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -138,9 +138,6 @@ namespace YooAsset
             if (string.IsNullOrEmpty(location))
                 return string.Empty;
 
-            if (LocationToLower)
-                location = location.ToLower();
-
             if (AssetPathMapping1.TryGetValue(location, out string assetPath))
                 return assetPath;
             else
@@ -307,9 +304,6 @@ namespace YooAsset
                 return string.Empty;
             }
 
-            if (LocationToLower)
-                location = location.ToLower();
-
             if (AssetPathMapping1.TryGetValue(location, out string assetPath))
             {
                 return assetPath;

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -100,7 +100,7 @@ namespace YooAsset
             var playModeImpl = new PlayModeImpl(PackageName, _playMode);
             _bundleQuery = playModeImpl;
             _playModeImpl = playModeImpl;
-            _resourceManager.Initialize(_bundleQuery);
+            _resourceManager.Initialize(parameters, _bundleQuery);
 
             // 初始化资源系统
             InitializationOperation initializeOperation;
@@ -162,6 +162,10 @@ namespace YooAsset
                 throw new Exception($"Editor simulate mode only support unity editor.");
 #endif
 
+            // 检测初始化参数
+            if (parameters.BundleLoadingMaxConcurrency <= 0)
+                throw new Exception($"{nameof(parameters.BundleLoadingMaxConcurrency)} value must be greater than zero.");
+
             // 鉴定运行模式
             if (parameters is EditorSimulateModeParameters)
                 _playMode = EPlayMode.EditorSimulateMode;

Assets/YooAsset/package.json

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