Merge 0b4f6d6639 into 4d2df5b705

Assets/YooAsset/CHANGELOG.md

@@ -2,15 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.5-preview] - 2025-03-14
-
-### Fixed
-
-- (#502) 修复了原生缓存文件由于文件格式变动导致的加载本地缓存文件失败的问题。
-- (#504) 修复了MacOS平台Offline Play Mode模式请求本地资源清单失败的问题。
-- (#506) 修复了v2.3x版本LoadAllAssets方法计算依赖Bundle不完整的问题。
-- (#506) 修复了微信小游戏文件系统，在启用加密算法后卸载bundle报错的问题。
-
 ## [2.3.4-preview] - 2025-03-08
 
 ### Improvements

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/DefaultCacheFileSystem.cs

@@ -333,13 +333,6 @@ namespace YooAsset
         {
             return _records.Keys.ToList();
         }
-        public RecordFileElement GetRecordFileElement(PackageBundle bundle)
-        {
-            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element))
-                return element;
-            else
-                return null;
-        }
 
         public string GetTempFilePath(PackageBundle bundle)
         {
@@ -391,10 +384,10 @@ namespace YooAsset
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element) == false)
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
                 return EFileVerifyResult.CacheNotFound;
 
-            EFileVerifyResult result = FileVerifyHelper.FileVerify(element.DataFilePath, element.DataFileSize, element.DataFileCRC, EFileVerifyLevel.High);
+            EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
             return result;
         }
         public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
@@ -434,10 +427,22 @@ namespace YooAsset
         }
         public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_records.TryGetValue(bundleGUID, out RecordFileElement element))
+            if (_records.TryGetValue(bundleGUID, out RecordFileElement wrapper))
             {
-                _records.Remove(bundleGUID);
-                return element.DeleteFolder();
+                try
+                {
+                    string dataFilePath = wrapper.DataFilePath;
+                    FileInfo fileInfo = new FileInfo(dataFilePath);
+                    if (fileInfo.Exists)
+                        fileInfo.Directory.Delete(true);
+                    _records.Remove(bundleGUID);
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+                    return false;
+                }
             }
             else
             {

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Elements/RecordFileElement.cs

@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-
+
 namespace YooAsset
 {
     internal class RecordFileElement
@@ -9,7 +7,7 @@ namespace YooAsset
         public string DataFilePath { private set; get; }
         public string DataFileCRC { private set; get; }
         public long DataFileSize { private set; get; }
-
+        
         public RecordFileElement(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
         {
             InfoFilePath = infoFilePath;
@@ -17,31 +15,5 @@ namespace YooAsset
             DataFileCRC = dataFileCRC;
             DataFileSize = dataFileSize;
         }
-
-        /// <summary>
-        /// 删除记录文件
-        /// </summary>
-        public bool DeleteFolder()
-        {
-            try
-            {
-                string directory = Path.GetDirectoryName(InfoFilePath);
-                DirectoryInfo directoryInfo = new DirectoryInfo(directory);
-                if (directoryInfo.Exists)
-                {
-                    directoryInfo.Delete(true);
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            catch (Exception e)
-            {
-                YooLogger.Error($"Failed to delete cache file ! {e.Message}");
-                return false;
-            }
-        }
     }
 }

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using UnityEngine;
 
 namespace YooAsset
@@ -261,30 +260,9 @@ namespace YooAsset
             {
                 if (_fileSystem.Exists(_bundle))
                 {
-                    // 注意：缓存的原生文件的格式，可能会在业务端根据需求发生变动！
-                    // 注意：这里需要校验文件格式，如果不一致对本地文件进行修正！
-                    string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
-                    if (File.Exists(filePath) == false)
-                    {
-                        try
-                        {
-                            var recordFileElement = _fileSystem.GetRecordFileElement(_bundle);
-                            File.Move(recordFileElement.DataFilePath, filePath);
-                            _steps = ESteps.LoadCacheRawBundle;
-                        }
-                        catch (Exception e)
-                        {
-                            _steps = ESteps.Done;
-                            Status = EOperationStatus.Failed;
-                            Error = $"Faild rename raw data file : {e.Message}";
-                        }
-                    }
-                    else
-                    {
-                        DownloadProgress = 1f;
-                        DownloadedBytes = _bundle.FileSize;
-                        _steps = ESteps.LoadCacheRawBundle;
-                    }
+                    DownloadProgress = 1f;
+                    DownloadedBytes = _bundle.FileSize;
+                    _steps = ESteps.LoadCacheRawBundle;
                 }
                 else
                 {

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

@@ -7,10 +7,9 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             CheckArgs,
-            GetClearCacheFiles,
-            ClearFilterCacheFiles,
+            GetTagsCacheFiles,
+            ClearTagsCacheFiles,
             Done,
         }
 
@@ -30,27 +29,13 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.CheckArgs;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.CheckManifest)
-            {
-                if (_manifest == null)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Can not found active package manifest !";
-                }
-                else
-                {
-                    _steps = ESteps.CheckArgs;
-                }
-            }
-
             if (_steps == ESteps.CheckArgs)
             {
                 if (_clearParam == null)
@@ -82,17 +67,17 @@ namespace YooAsset
                     return;
                 }
 
-                _steps = ESteps.GetClearCacheFiles;
+                _steps = ESteps.GetTagsCacheFiles;
             }
 
-            if (_steps == ESteps.GetClearCacheFiles)
+            if (_steps == ESteps.GetTagsCacheFiles)
             {
-                _clearBundleGUIDs = GetBundleGUIDsByTag();
+                _clearBundleGUIDs = GetTagsBundleGUIDs();
                 _clearFileTotalCount = _clearBundleGUIDs.Count;
-                _steps = ESteps.ClearFilterCacheFiles;
+                _steps = ESteps.ClearTagsCacheFiles;
             }
 
-            if (_steps == ESteps.ClearFilterCacheFiles)
+            if (_steps == ESteps.ClearTagsCacheFiles)
             {
                 for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
                 {
@@ -115,7 +100,7 @@ namespace YooAsset
                 }
             }
         }
-        private List<string> GetBundleGUIDsByTag()
+        private List<string> GetTagsBundleGUIDs()
         {
             var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);

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

@@ -8,7 +8,6 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             GetUnusedCacheFiles,
             ClearUnusedCacheFiles,
             Done,
@@ -20,7 +19,7 @@ namespace YooAsset
         private int _unusedFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
-
+        
         internal ClearUnusedCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
         {
             _fileSystem = fileSystem;
@@ -28,29 +27,15 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.GetUnusedCacheFiles;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.CheckManifest)
-            {
-                if (_manifest == null)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Can not found active package manifest !";
-                }
-                else
-                {
-                    _steps = ESteps.GetUnusedCacheFiles;
-                }
-            }
-
             if (_steps == ESteps.GetUnusedCacheFiles)
-            {
+            {    
                 _unusedBundleGUIDs = GetUnusedBundleGUIDs();
                 _unusedFileTotalCount = _unusedBundleGUIDs.Count;
                 _steps = ESteps.ClearUnusedCacheFiles;

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

@@ -8,7 +8,6 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             ClearUnusedCacheFiles,
             Done,
         }
@@ -25,27 +24,13 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.ClearUnusedCacheFiles;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.CheckManifest)
-            {
-                if (_manifest == null)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Can not found active package manifest !";
-                }
-                else
-                {
-                    _steps = ESteps.ClearUnusedCacheFiles;
-                }
-            }
-
             if (_steps == ESteps.ClearUnusedCacheFiles)
             {
                 try

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

@@ -92,7 +92,12 @@ namespace YooAsset
                     if (_fileSystem.AppendFileExtension)
                     {
                         string dataFileExtension = FindDataFileExtension(chidDirectory);
-                        if (string.IsNullOrEmpty(dataFileExtension) == false)
+                        if (string.IsNullOrEmpty(dataFileExtension))
+                        {
+                            //注意：覆盖安装的情况下，缓存文件可能会没有后缀格式，需要删除重新下载！
+                            dataFilePath = string.Empty;
+                        }
+                        else
                         {
                             dataFilePath += dataFileExtension;
                         }

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -263,7 +263,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
         {
-            DebugCheckInitialize(false);
+            DebugCheckInitialize();
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode.ToString(), clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
@@ -276,7 +276,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
         {
-            DebugCheckInitialize(false);
+            DebugCheckInitialize();
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;

Assets/YooAsset/package.json

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