Update CHANGELOG.md

ClearCacheBundleFilesAsync重命名为ClearCacheFilesAsync

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,80 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.2.8-preview] - 2025-01-03
+
+新增了单元测试用例。
+
+### Improvements
+
+- EditorSimulateModeHelper.SimulateBuild()方法提供指定自定义构建类
+
+  ```csharp
+  public class EditorSimulateBuildParam
+  {
+      /// <summary>
+      /// 模拟构建类所属程序集名称
+      /// </summary>
+      public string InvokeAssmeblyName = "YooAsset.Editor";
+  
+      /// <summary>
+      /// 模拟构建执行的类名全称       
+      /// 注意：类名必须包含命名空间！  
+      /// </summary>    
+      public string InvokeClassFullName = "YooAsset.Editor.AssetBundleSimulateBuilder";
+  
+      /// <summary>     
+      /// 模拟构建执行的方法名称    
+      /// 注意：执行方法必须满足 BindingFlags.Public | BindingFlags.Static      
+      /// </summary>       
+      public string InvokeMethodName = "SimulateBuild";
+  }
+  ```
+
+- 文件清理方式新增清理缓存清单。
+
+  ```csharp
+  /// <summary>
+  /// 文件清理方式
+  /// </summary>
+  public enum EFileClearMode
+  {
+      /// <summary>
+      /// 清理所有清单
+      /// </summary>
+      ClearAllManifestFiles,
+  
+      /// <summary>
+      /// 清理未在使用的清单 
+      /// </summary> 
+      ClearUnusedManifestFiles,    
+  }
+  ```
+
+### Fixed
+
+- (#426) 修复了鸿蒙next平台加载内置文件路径报错的问题。
+- (#428) 修复了鸿蒙next平台加载内置文件路径报错的问题。
+- (#434) 修复了2.2版本 catalog文件对Json格式原生文件不记录的问题。
+- (#435) 修复了WebGL平台调用MD5算法触发异常的问题。
+
+### Added
+
+- 新增了视频打包规则。
+
+  ```csharp
+  /// <summary>
+  /// 打包视频文件
+  /// </summary>
+  [DisplayName("打包视频文件")]
+  public class PackVideoFile : IPackRule
+  ```
+
+### Changed
+
+- 重命名FileSystemParameters.RootDirectory字段为PackageRoot
+- 重命名ResourcePackage.ClearCacheBundleFilesAsync()方法为ClearCacheFilesAsync()
+
 ## [2.2.7-preview] - 2024-12-30
 
 ### Improvements

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -68,7 +68,7 @@ namespace YooAsset.Editor
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
                 ManifestTools.SerializeToBinary(filePath, manifest);
-                packageHash = HashUtility.FileMD5(filePath);
+                packageHash = HashUtility.FileCRC32(filePath);
                 BuildLogger.Log($"Create package manifest file: {filePath}");
 
                 ManifestContext manifestContext = new ManifestContext();

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -201,7 +201,6 @@ namespace YooAsset.Editor
         public static void ClearAll()
         {
             Setting.ClearAll();
-            SaveFile();
         }
 
         public static List<RuleDisplayName> GetActiveRuleNames()

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyCache.cs

@@ -10,246 +10,23 @@ namespace YooAsset.Editor
 {
     public class AssetDependencyCache
     {
-        /// <summary>
+        private readonly AssetDependencyDatabase _database;
-        /// 资源依赖缓存数据库
-        /// </summary>
-        private class CacheDatabase
-        {
-            private class CacheInfo
-            {
-                /// <summary>
-                /// 此哈希函数会聚合了以下内容：源资源路径、源资源、元文件、目标平台以及导入器版本。
-                /// 如果此哈希值发送变化，则说明导入资源可能已更改，因此应重新搜集依赖关系。
-                /// </summary>
-                public string DependHash;
-
-                /// <summary>
-                /// 直接依赖资源的GUID列表
-                /// </summary>
-                public List<string> DependGUIDs = new List<string>();
-            }
-
-            private string _databaseFilePath;
-            private readonly Dictionary<string, CacheInfo> _database = new Dictionary<string, CacheInfo>(100000);
-
-            /// <summary>
-            /// 创建数据库
-            /// </summary>
-            public void CreateDatabase(string databaseFilePath, bool useCacheDatabase)
-            {
-                _databaseFilePath = databaseFilePath;
-                _database.Clear();
-
-                try
-                {
-                    if (useCacheDatabase && File.Exists(databaseFilePath))
-                    {
-                        // 解析缓存文件
-                        using var stream = File.OpenRead(databaseFilePath);
-                        using var reader = new BinaryReader(stream);
-                        var count = reader.ReadInt32();
-                        for (int i = 0; i < count; i++)
-                        {
-                            var assetPath = reader.ReadString();
-                            var cacheInfo = new CacheInfo
-                            {
-                                DependHash = reader.ReadString(),
-                                DependGUIDs = ReadStringList(reader),
-                            };
-                            _database.Add(assetPath, cacheInfo);
-                        }
-
-                        // 移除无效资源
-                        List<string> removeList = new List<string>(10000);
-                        foreach (var cacheInfoPair in _database)
-                        {
-                            var assetPath = cacheInfoPair.Key;
-                            var assetGUID = AssetDatabase.AssetPathToGUID(assetPath);
-                            if (string.IsNullOrEmpty(assetGUID))
-                            {
-                                removeList.Add(assetPath);
-                            }
-                        }
-                        foreach (var assetPath in removeList)
-                        {
-                            _database.Remove(assetPath);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ClearCache(true);
-                    Debug.LogError($"Failed to load cache database : {ex.Message}");
-                }
-
-                // 查找新增或变动资源
-                var allAssetPaths = AssetDatabase.GetAllAssetPaths();
-                foreach (var assetPath in allAssetPaths)
-                {
-                    if (_database.TryGetValue(assetPath, out CacheInfo cacheInfo))
-                    {
-                        var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
-                        if (dependHash.ToString() != cacheInfo.DependHash)
-                        {
-                            _database[assetPath] = CreateCacheInfo(assetPath);
-                        }
-                    }
-                    else
-                    {
-                        var newCacheInfo = CreateCacheInfo(assetPath);
-                        _database.Add(assetPath, newCacheInfo);
-                    }
-                }
-            }
-
-            /// <summary>
-            /// 保存缓存文件
-            /// </summary>
-            public void SaveCacheFile()
-            {
-                if (File.Exists(_databaseFilePath))
-                    File.Delete(_databaseFilePath);
-
-                try
-                {
-                    using var stream = File.Create(_databaseFilePath);
-                    using var writer = new BinaryWriter(stream);
-                    writer.Write(_database.Count);
-                    foreach (var assetPair in _database)
-                    {
-                        string assetPath = assetPair.Key;
-                        var assetInfo = assetPair.Value;
-                        writer.Write(assetPath);
-                        writer.Write(assetInfo.DependHash);
-                        WriteStringList(writer, assetInfo.DependGUIDs);
-                    }
-                    writer.Flush();
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogError($"Failed to save cache database : {ex.Message}");
-                }
-            }
-
-            /// <summary>
-            /// 清理缓存数据
-            /// </summary>
-            public void ClearCache(bool clearDatabaseFile)
-            {
-                if (clearDatabaseFile)
-                {
-                    if (File.Exists(_databaseFilePath))
-                        File.Delete(_databaseFilePath);
-                }
-
-                _database.Clear();
-            }
-
-            /// <summary>
-            ///  获取资源的依赖列表
-            /// </summary>
-            public string[] GetDependencies(string assetPath, bool recursive)
-            {
-                // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
-                // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
-
-                // 注意：机制上不允许存在未收录的资源
-                if (_database.ContainsKey(assetPath) == false)
-                {
-                    throw new Exception($"Fatal : can not found cache info : {assetPath}");
-                }
-
-                var result = new HashSet<string> { assetPath };
-                CollectDependencies(assetPath, result, recursive);
-
-                // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
-                return result.ToArray();
-            }
-            private void CollectDependencies(string assetPath, HashSet<string> result, bool recursive)
-            {
-                if (_database.TryGetValue(assetPath, out var cacheInfo) == false)
-                {
-                    throw new Exception($"Fatal : can not found cache info : {assetPath}");
-                }
-
-                foreach (var dependGUID in cacheInfo.DependGUIDs)
-                {
-                    string dependAssetPath = AssetDatabase.GUIDToAssetPath(dependGUID);
-                    if (string.IsNullOrEmpty(dependAssetPath))
-                        continue;
-
-                    // 如果是文件夹资源
-                    if (AssetDatabase.IsValidFolder(dependAssetPath))
-                        continue;
-
-                    // 如果已经收集过
-                    if (result.Contains(dependAssetPath))
-                        continue;
-
-                    result.Add(dependAssetPath);
-
-                    // 递归收集依赖
-                    if (recursive)
-                        CollectDependencies(dependAssetPath, result, recursive);
-                }
-            }
-
-            private List<string> ReadStringList(BinaryReader reader)
-            {
-                var count = reader.ReadInt32();
-                var values = new List<string>(count);
-                for (int i = 0; i < count; i++)
-                {
-                    values.Add(reader.ReadString());
-                }
-                return values;
-            }
-            private void WriteStringList(BinaryWriter writer, List<string> values)
-            {
-                writer.Write(values.Count);
-                foreach (var value in values)
-                {
-                    writer.Write(value);
-                }
-            }
-            private CacheInfo CreateCacheInfo(string assetPath)
-            {
-                var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
-                var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
-                var dependGUIDs = new List<string>();
-                foreach (var dependAssetPath in dependAssetPaths)
-                {
-                    string guid = AssetDatabase.AssetPathToGUID(dependAssetPath);
-                    if (string.IsNullOrEmpty(guid) == false)
-                    {
-                        dependGUIDs.Add(guid);
-                    }
-                }
-
-                var cacheInfo = new CacheInfo();
-                cacheInfo.DependHash = dependHash.ToString();
-                cacheInfo.DependGUIDs = dependGUIDs;
-                return cacheInfo;
-            }
-        }
-
-        private readonly CacheDatabase _database;
 
         /// <summary>
         /// 初始化资源依赖缓存系统
         /// </summary>
-        public AssetDependencyCache(bool useCacheDatabase)
+        public AssetDependencyCache(bool useAssetDependencyDB)
         {
-            if (useCacheDatabase)
+            if (useAssetDependencyDB)
                 Debug.Log("Use asset dependency database !");
 
             string databaseFilePath = "Library/AssetDependencyDB";
-            _database = new CacheDatabase();
+            _database = new AssetDependencyDatabase();
-            _database.CreateDatabase(databaseFilePath, useCacheDatabase);
+            _database.CreateDatabase(useAssetDependencyDB, databaseFilePath);
 
-            if (useCacheDatabase)
+            if (useAssetDependencyDB)
             {
-                _database.SaveCacheFile();
+                _database.SaveDatabase();
             }
         }
 

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 资源依赖数据库
+    /// </summary>
+    public class AssetDependencyDatabase
+    {
+        private const string FILE_VERSION = "1.0";
+
+        private class DependencyInfo
+        {
+            /// <summary>
+            /// 此哈希函数会聚合了以下内容：源资源路径、源资源、元文件、目标平台以及导入器版本。
+            /// 如果此哈希值发送变化，则说明导入资源可能已更改，因此应重新搜集依赖关系。
+            /// </summary>
+            public string DependHash;
+
+            /// <summary>
+            /// 直接依赖资源的GUID列表
+            /// </summary>
+            public List<string> DependGUIDs = new List<string>();
+        }
+
+        private string _databaseFilePath;
+        private readonly Dictionary<string, DependencyInfo> _database = new Dictionary<string, DependencyInfo>(100000);
+
+        /// <summary>
+        /// 创建缓存数据库
+        /// </summary>
+        public void CreateDatabase(bool readCacheDatabaseFile, string databaseFilePath)
+        {
+            _databaseFilePath = databaseFilePath;
+            _database.Clear();
+
+            try
+            {
+                if (readCacheDatabaseFile && File.Exists(databaseFilePath))
+                {
+                    // 解析缓存文件
+                    using var stream = File.OpenRead(databaseFilePath);
+                    using var reader = new BinaryReader(stream);
+                    string fileVersion = reader.ReadString();
+                    if (fileVersion != FILE_VERSION)
+                        throw new Exception("The database file version not match !");
+
+                    var count = reader.ReadInt32();
+                    for (int i = 0; i < count; i++)
+                    {
+                        var assetPath = reader.ReadString();
+                        var cacheInfo = new DependencyInfo
+                        {
+                            DependHash = reader.ReadString(),
+                            DependGUIDs = ReadStringList(reader),
+                        };
+                        _database.Add(assetPath, cacheInfo);
+                    }
+
+                    // 移除无效资源
+                    List<string> removeList = new List<string>(10000);
+                    foreach (var cacheInfoPair in _database)
+                    {
+                        var assetPath = cacheInfoPair.Key;
+                        var assetGUID = AssetDatabase.AssetPathToGUID(assetPath);
+                        if (string.IsNullOrEmpty(assetGUID))
+                        {
+                            removeList.Add(assetPath);
+                        }
+                    }
+                    foreach (var assetPath in removeList)
+                    {
+                        _database.Remove(assetPath);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ClearDatabase(true);
+                Debug.LogError($"Failed to load cache database : {ex.Message}");
+            }
+
+            // 查找新增或变动资源
+            var allAssetPaths = AssetDatabase.GetAllAssetPaths();
+            foreach (var assetPath in allAssetPaths)
+            {
+                if (_database.TryGetValue(assetPath, out DependencyInfo cacheInfo))
+                {
+                    var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
+                    if (dependHash.ToString() != cacheInfo.DependHash)
+                    {
+                        _database[assetPath] = CreateDependencyInfo(assetPath);
+                    }
+                }
+                else
+                {
+                    var newCacheInfo = CreateDependencyInfo(assetPath);
+                    _database.Add(assetPath, newCacheInfo);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存缓存数据库
+        /// </summary>
+        public void SaveDatabase()
+        {
+            if (File.Exists(_databaseFilePath))
+                File.Delete(_databaseFilePath);
+
+            try
+            {
+                using var stream = File.Create(_databaseFilePath);
+                using var writer = new BinaryWriter(stream);
+                writer.Write(FILE_VERSION);
+                writer.Write(_database.Count);
+                foreach (var assetPair in _database)
+                {
+                    string assetPath = assetPair.Key;
+                    var assetInfo = assetPair.Value;
+                    writer.Write(assetPath);
+                    writer.Write(assetInfo.DependHash);
+                    WriteStringList(writer, assetInfo.DependGUIDs);
+                }
+                writer.Flush();
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to save cache database : {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 清理缓存数据库
+        /// </summary>
+        public void ClearDatabase(bool deleteDatabaseFile)
+        {
+            if (deleteDatabaseFile)
+            {
+                if (File.Exists(_databaseFilePath))
+                    File.Delete(_databaseFilePath);
+            }
+
+            _database.Clear();
+        }
+
+        /// <summary>
+        ///  获取资源的依赖列表
+        /// </summary>
+        public string[] GetDependencies(string assetPath, bool recursive)
+        {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
+
+            // 注意：机制上不允许存在未收录的资源
+            if (_database.ContainsKey(assetPath) == false)
+            {
+                throw new Exception($"Fatal : can not found cache info : {assetPath}");
+            }
+
+            var result = new HashSet<string> { assetPath };
+            CollectDependencies(assetPath, result, recursive);
+
+            // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
+            return result.ToArray();
+        }
+        private void CollectDependencies(string assetPath, HashSet<string> result, bool recursive)
+        {
+            if (_database.TryGetValue(assetPath, out var cacheInfo) == false)
+            {
+                throw new Exception($"Fatal : can not found cache info : {assetPath}");
+            }
+
+            foreach (var dependGUID in cacheInfo.DependGUIDs)
+            {
+                string dependAssetPath = AssetDatabase.GUIDToAssetPath(dependGUID);
+                if (string.IsNullOrEmpty(dependAssetPath))
+                    continue;
+
+                // 如果是文件夹资源
+                if (AssetDatabase.IsValidFolder(dependAssetPath))
+                    continue;
+
+                // 如果已经收集过
+                if (result.Contains(dependAssetPath))
+                    continue;
+
+                result.Add(dependAssetPath);
+
+                // 递归收集依赖
+                if (recursive)
+                    CollectDependencies(dependAssetPath, result, recursive);
+            }
+        }
+
+        private List<string> ReadStringList(BinaryReader reader)
+        {
+            var count = reader.ReadInt32();
+            var values = new List<string>(count);
+            for (int i = 0; i < count; i++)
+            {
+                values.Add(reader.ReadString());
+            }
+            return values;
+        }
+        private void WriteStringList(BinaryWriter writer, List<string> values)
+        {
+            writer.Write(values.Count);
+            foreach (var value in values)
+            {
+                writer.Write(value);
+            }
+        }
+        private DependencyInfo CreateDependencyInfo(string assetPath)
+        {
+            var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
+            var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
+            var dependGUIDs = new List<string>();
+            foreach (var dependAssetPath in dependAssetPaths)
+            {
+                string guid = AssetDatabase.AssetPathToGUID(dependAssetPath);
+                if (string.IsNullOrEmpty(guid) == false)
+                {
+                    dependGUIDs.Add(guid);
+                }
+            }
+
+            var cacheInfo = new DependencyInfo();
+            cacheInfo.DependHash = dependHash.ToString();
+            cacheInfo.DependGUIDs = dependGUIDs;
+            return cacheInfo;
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f878bc9a12f5d2d40aee754ddfaada86
+guid: 38f3f2338cca06a42a0f845df9fbb563
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultPackRule.cs

@@ -147,6 +147,22 @@ namespace YooAsset.Editor
         }
     }
 
+    /// <summary>
+    /// 打包视频文件
+    /// </summary>
+    [DisplayName("打包视频文件")]
+    public class PackVideoFile : IPackRule
+    {
+        PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
+        {
+            string bundleName = data.AssetPath;
+            string fileExtension = Path.GetExtension(data.AssetPath);
+            fileExtension = fileExtension.Remove(0, 1);
+            PackRuleResult result = new PackRuleResult(bundleName, fileExtension);
+            return result;
+        }
+    }
+
     /// <summary>
     /// 打包着色器
     /// </summary>

Assets/YooAsset/Runtime/AssemblyInfo.cs

@@ -3,4 +3,5 @@
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
 [assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
 [assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
+[assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -39,12 +39,15 @@ namespace YooAsset
                 url = path;
             else
                 url = StringUtility.Format("jar:file://{0}", path);
+#elif UNITY_OPENHARMONY
+            if (path.StartsWith("jar:file://"))
+                url = path;
+            else
+                url = StringUtility.Format("jar:file://{0}", path);
 #elif UNITY_STANDALONE_OSX
             url = new System.Uri(path).ToString();
 #elif UNITY_STANDALONE
             url = StringUtility.Format("file:///{0}", path);
-#elif UNITY_OPENHARMONY
-            url = StringUtility.Format("file://{0}", path);
 #else
             throw new System.NotImplementedException();
 #endif

Assets/YooAsset/Runtime/FileSystem/CacheSystem/Interface/ICacheSystem.cs

@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-    internal interface ICacheSystem
-    {
-        /// <summary>
-        /// 获取缓存文件的根目录
-        /// </summary>
-        string GetCacheFileRoot();
-
-        /// <summary>
-        /// 获取临时缓存文件路径
-        /// </summary>
-        string GetTempFilePath(PackageBundle bundle);
-
-        /// <summary>
-        /// 获取数据文件路径
-        /// </summary>
-        string GetDataFilePath(PackageBundle bundle);
-
-        /// <summary>
-        /// 获取信息文件路径
-        /// </summary>
-        string GetInfoFilePath(PackageBundle bundle);
-
-        /// <summary>
-        /// 获取所有缓存文件的GUID
-        /// </summary>
-        List<string> GetAllCachedBundleGUIDs();
-
-        /// <summary>
-        /// 是否记录了文件
-        /// </summary>
-        bool IsRecordFile(string bundleGUID);
-
-        /// <summary>
-        /// 记录指定文件
-        /// </summary>
-        bool RecordFile(string bundleGUID, CacheWrapper wrapper);
-
-        /// <summary>
-        /// 验证缓存文件
-        /// </summary>
-        EFileVerifyResult VerifyCacheFile(PackageBundle bundle);
-
-        /// <summary>
-        /// 写入缓存文件
-        /// </summary>
-        bool WriteCacheFile(PackageBundle bundle, string copyPath);
-
-        /// <summary>
-        /// 删除缓存文件
-        /// </summary>
-        bool DeleteCacheFile(string bundleGUID);
-
-        /// <summary>
-        /// 写入文件信息
-        /// </summary>
-        void WriteInfoFile(string filePath, string dataFileCRC, long dataFileSize);
-
-        /// <summary>
-        /// 读取文件信息
-        /// </summary>
-        void ReadInfoFile(string filePath, out string dataFileCRC, out long dataFileSize);
-    }
-}

Assets/YooAsset/Runtime/FileSystem/CacheSystem/ThreadSyncContext.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Threading;
-
-namespace YooAsset
-{
-    /// <summary>
-    /// 同步其它线程里的回调到主线程里
-    /// 注意：Unity3D中需要设置Scripting Runtime Version为.NET4.6
-    /// </summary>
-    internal sealed class ThreadSyncContext : SynchronizationContext
-    {
-        private readonly ConcurrentQueue<Action> _safeQueue = new ConcurrentQueue<Action>();
-
-        /// <summary>
-        /// 更新同步队列
-        /// </summary>
-        public void Update()
-        {
-            while (true)
-            {
-                if (_safeQueue.TryDequeue(out Action action) == false)
-                    return;
-                action.Invoke();
-            }
-        }
-
-        /// <summary>
-        /// 向同步队列里投递一个回调方法
-        /// </summary>
-        public override void Post(SendOrPostCallback callback, object state)
-        {
-            Action action = new Action(() => { callback(state); });
-            _safeQueue.Enqueue(action);
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -96,9 +96,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        public virtual FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            return _unpackFileSystem.ClearCacheBundleFilesAsync(manifest, clearMode, clearParam);
+            return _unpackFileSystem.ClearCacheFilesAsync(manifest, clearMode, clearParam);
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
@@ -156,14 +156,14 @@ namespace YooAsset
                 YooLogger.Warning($"Invalid parameter : {name}");
             }
         }
-        public virtual void OnCreate(string packageName, string rootDirectory)
+        public virtual void OnCreate(string packageName, string packageRoot)
         {
             PackageName = packageName;
 
-            if (string.IsNullOrEmpty(rootDirectory))
+            if (string.IsNullOrEmpty(packageRoot))
-                rootDirectory = GetDefaultBuildinRoot();
+                _packageRoot = GetDefaultBuildinPackageRoot(packageName);
-
+            else
-            _packageRoot = PathUtility.Combine(rootDirectory, packageName);
+                _packageRoot = packageRoot;
 
             // 创建解压文件系统
             var remoteServices = new DefaultUnpackRemoteServices(_packageRoot);
@@ -282,9 +282,10 @@ namespace YooAsset
         }
 
         #region 内部方法
-        protected string GetDefaultBuildinRoot()
+        protected string GetDefaultBuildinPackageRoot(string packageName)
         {
-            return YooAssetSettingsData.GetYooMobileBuildinRoot();
+            string rootDirectory = YooAssetSettingsData.GetYooMobileBuildinRoot();
+            return PathUtility.Combine(rootDirectory, packageName);
         }
         public string GetBuildinFileLoadPath(PackageBundle bundle)
         {

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemBuild.cs

@@ -26,7 +26,8 @@ namespace YooAsset
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
             {
-                throw new System.Exception($"Can not found StreamingAssets root directory : {rootPath}");
+                UnityEngine.Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
+                return;
             }
 
             // 搜索所有Package目录
@@ -88,9 +89,20 @@ namespace YooAsset
             FileInfo[] fileInfos = rootDirectory.GetFiles();
             foreach (var fileInfo in fileInfos)
             {
-                if (fileInfo.Extension == ".meta" || fileInfo.Extension == ".version" ||
+                if (fileInfo.Extension == ".meta")
-                    fileInfo.Extension == ".hash" || fileInfo.Extension == ".bytes" ||
+                    continue;
-                    fileInfo.Extension == ".json")
+
+                if (fileInfo.Name == "link.xml" || fileInfo.Name == "buildlogtep.json")
+                    continue;
+                if (fileInfo.Name == $"{packageName}.version")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.bytes")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.hash")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.json")
+                    continue;
+                if (fileInfo.Name == $"{packageName}_{packageVersion}.report")
                     continue;
 
                 string fileName = fileInfo.Name;

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs

@@ -73,8 +73,7 @@ namespace YooAsset
 #if UNITY_EDITOR
                     // 兼容性初始化
                     // 说明：内置文件系统在编辑器下运行时需要动态生成
-                    string buildinRoot = YooAssetSettingsData.GetYooEditorBuildinRoot();
+                    string packageRoot = _fileSystem.FileRoot;
-                    string packageRoot = PathUtility.Combine(buildinRoot, _fileSystem.PackageName);
                     DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
 #endif
 

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

@@ -67,7 +67,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesMD5(_webDataRequestOp.Result);
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
                 if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;

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

@@ -100,13 +100,13 @@ namespace YooAsset
             DefaultDownloadFileOperation newDownloader;
             if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
             {
-                newDownloader = new DownloadResumeFileOperation(_fileSystem, _fileSystem, bundle, param, _fileSystem.ResumeDownloadResponseCodes);
+                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, param);
                 newDownloader.Reference();
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                newDownloader = new DownloadNormalFileOperation(_fileSystem, _fileSystem, bundle, param);
+                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, param);
                 newDownloader.Reference();
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }

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

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
 
 namespace YooAsset
 {
@@ -10,18 +9,18 @@ namespace YooAsset
     /// 缓存文件系统
     /// 说明：正在进行的下载器会在ResourcePackage销毁的时候执行Abort操作！
     /// </summary>
-    internal class DefaultCacheFileSystem : IFileSystem, ICacheSystem
+    internal class DefaultCacheFileSystem : IFileSystem
     {
-        protected readonly Dictionary<string, CacheWrapper> _wrappers = new Dictionary<string, CacheWrapper>(10000);
+        protected readonly Dictionary<string, RecordFileElement> _wrappers = new Dictionary<string, RecordFileElement>(10000);
-        protected readonly Dictionary<string, string> _dataFilePaths = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _bundleDataFilePaths = new Dictionary<string, string>(10000);
-        protected readonly Dictionary<string, string> _infoFilePaths = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _bundleInfoFilePaths = new Dictionary<string, string>(10000);
         protected readonly Dictionary<string, string> _tempFilePaths = new Dictionary<string, string>(10000);
         protected DefaultCacheDownloadCenter _downloadCenter;
 
         protected string _packageRoot;
-        protected string _cacheFileRoot;
+        protected string _tempFilesRoot;
-        protected string _tempFileRoot;
+        protected string _cacheBundleFilesRoot;
-        protected string _manifestFileRoot;
+        protected string _cacheManifestFilesRoot;
 
         /// <summary>
         /// 包裹名称
@@ -114,30 +113,42 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        public virtual FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
             if (clearMode == EFileClearMode.ClearAllBundleFiles.ToString())
             {
-                var operation = new ClearAllCacheFilesOperation(this);
+                var operation = new ClearAllCacheBundleFilesOperation(this);
                 OperationSystem.StartOperation(PackageName, operation);
                 return operation;
             }
             else if (clearMode == EFileClearMode.ClearUnusedBundleFiles.ToString())
             {
-                var operation = new ClearUnusedCacheFilesOperation(this, manifest);
+                var operation = new ClearUnusedCacheBundleFilesOperation(this, manifest);
                 OperationSystem.StartOperation(PackageName, operation);
                 return operation;
             }
             else if (clearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
             {
-                var operation = new ClearCacheFilesByTagsOperaiton(this, manifest, clearParam);
+                var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, clearParam);
+                OperationSystem.StartOperation(PackageName, operation);
+                return operation;
+            }
+            else if (clearMode == EFileClearMode.ClearAllManifestFiles.ToString())
+            {
+                var operation = new ClearAllCacheManifestFilesOperation(this);
+                OperationSystem.StartOperation(PackageName, operation);
+                return operation;
+            }
+            else if (clearMode == EFileClearMode.ClearUnusedManifestFiles.ToString())
+            {
+                var operation = new ClearUnusedCacheManifestFilesOperation(this, manifest);
                 OperationSystem.StartOperation(PackageName, operation);
                 return operation;
             }
             else
             {
                 string error = $"Invalid clear mode : {clearMode}";
-                var operation = new FSClearCacheBundleFilesCompleteOperation(error);
+                var operation = new FSClearCacheFilesCompleteOperation(error);
                 OperationSystem.StartOperation(PackageName, operation);
                 return operation;
             }
@@ -208,17 +219,18 @@ namespace YooAsset
                 YooLogger.Warning($"Invalid parameter : {name}");
             }
         }
-        public virtual void OnCreate(string packageName, string rootDirectory)
+        public virtual void OnCreate(string packageName, string packageRoot)
         {
             PackageName = packageName;
 
-            if (string.IsNullOrEmpty(rootDirectory))
+            if (string.IsNullOrEmpty(packageRoot))
-                rootDirectory = GetDefaultCacheRoot();
+                _packageRoot = GetDefaultCachePackageRoot(packageName);
+            else
+                _packageRoot = packageRoot;
 
-            _packageRoot = PathUtility.Combine(rootDirectory, packageName);
+            _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.BundleFilesFolderName);
-            _cacheFileRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.SaveFilesFolderName);
+            _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.TempFilesFolderName);
-            _tempFileRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.TempFilesFolderName);
+            _cacheManifestFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
-            _manifestFileRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
             _downloadCenter = new DefaultCacheDownloadCenter(this);
         }
         public virtual void OnUpdate()
@@ -256,7 +268,7 @@ namespace YooAsset
 
         public virtual string GetBundleFilePath(PackageBundle bundle)
         {
-            return GetCacheFileLoadPath(bundle);
+            return GetCacheBundleFileLoadPath(bundle);
         }
         public virtual byte[] ReadBundleFileData(PackageBundle bundle)
         {
@@ -271,7 +283,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetCacheFileLoadPath(bundle);
+                string filePath = GetCacheBundleFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -282,7 +294,7 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetCacheFileLoadPath(bundle);
+                string filePath = GetCacheBundleFileLoadPath(bundle);
                 return FileUtility.ReadAllBytes(filePath);
             }
         }
@@ -299,7 +311,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetCacheFileLoadPath(bundle);
+                string filePath = GetCacheBundleFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -310,85 +322,82 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetCacheFileLoadPath(bundle);
+                string filePath = GetCacheBundleFileLoadPath(bundle);
                 return FileUtility.ReadAllText(filePath);
             }
         }
 
-        #region 缓存系统
+        #region 缓存相关
-        public string GetCacheFileRoot()
-        {
-            return _cacheFileRoot;
-        }
-        public string GetTempFilePath(PackageBundle bundle)
-        {
-            if (_tempFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
-            {
-                filePath = PathUtility.Combine(_tempFileRoot, bundle.BundleGUID);
-                _tempFilePaths.Add(bundle.BundleGUID, filePath);
-            }
-            return filePath;
-        }
-        public string GetDataFilePath(PackageBundle bundle)
-        {
-            if (_dataFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
-            {
-                string folderName = bundle.FileHash.Substring(0, 2);
-                filePath = PathUtility.Combine(_cacheFileRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.SaveBundleDataFileName);
-                if (AppendFileExtension)
-                    filePath += bundle.FileExtension;
-                _dataFilePaths.Add(bundle.BundleGUID, filePath);
-            }
-            return filePath;
-        }
-        public string GetInfoFilePath(PackageBundle bundle)
-        {
-            if (_infoFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
-            {
-                string folderName = bundle.FileHash.Substring(0, 2);
-                filePath = PathUtility.Combine(_cacheFileRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.SaveBundleInfoFileName);
-                _infoFilePaths.Add(bundle.BundleGUID, filePath);
-            }
-            return filePath;
-        }
         public List<string> GetAllCachedBundleGUIDs()
         {
             return _wrappers.Keys.ToList();
         }
 
-        public bool IsRecordFile(string bundleGUID)
+        public string GetTempFilePath(PackageBundle bundle)
+        {
+            if (_tempFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            {
+                filePath = PathUtility.Combine(_tempFilesRoot, bundle.BundleGUID);
+                _tempFilePaths.Add(bundle.BundleGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetBundleDataFilePath(PackageBundle bundle)
+        {
+            if (_bundleDataFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            {
+                string folderName = bundle.FileHash.Substring(0, 2);
+                filePath = PathUtility.Combine(_cacheBundleFilesRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.BundleDataFileName);
+                if (AppendFileExtension)
+                    filePath += bundle.FileExtension;
+                _bundleDataFilePaths.Add(bundle.BundleGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetBundleInfoFilePath(PackageBundle bundle)
+        {
+            if (_bundleInfoFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            {
+                string folderName = bundle.FileHash.Substring(0, 2);
+                filePath = PathUtility.Combine(_cacheBundleFilesRoot, folderName, bundle.BundleGUID, DefaultCacheFileSystemDefine.BundleInfoFileName);
+                _bundleInfoFilePaths.Add(bundle.BundleGUID, filePath);
+            }
+            return filePath;
+        }
+
+        public bool IsRecordBundleFile(string bundleGUID)
         {
             return _wrappers.ContainsKey(bundleGUID);
         }
-        public bool RecordFile(string bundleGUID, CacheWrapper wrapper)
+        public bool RecordBundleFile(string bundleGUID, RecordFileElement element)
         {
             if (_wrappers.ContainsKey(bundleGUID))
             {
-                YooLogger.Error($"{nameof(DefaultCacheFileSystem)} has element : {bundleGUID}");
+                YooLogger.Error($"{nameof(DefaultCacheFileSystem)} has record file element : {bundleGUID}");
                 return false;
             }
 
-            _wrappers.Add(bundleGUID, wrapper);
+            _wrappers.Add(bundleGUID, element);
             return true;
         }
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_wrappers.TryGetValue(bundle.BundleGUID, out CacheWrapper wrapper) == false)
+            if (_wrappers.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
                 return EFileVerifyResult.CacheNotFound;
 
             EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
             return result;
         }
-        public bool WriteCacheFile(PackageBundle bundle, string copyPath)
+        public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
         {
             if (_wrappers.ContainsKey(bundle.BundleGUID))
             {
                 throw new Exception("Should never get here !");
             }
 
-            string infoFilePath = GetInfoFilePath(bundle);
+            string infoFilePath = GetBundleInfoFilePath(bundle);
-            string dataFilePath = GetDataFilePath(bundle);
+            string dataFilePath = GetBundleDataFilePath(bundle);
 
             try
             {
@@ -404,7 +413,7 @@ namespace YooAsset
                 fileInfo.CopyTo(dataFilePath);
 
                 // 写入文件信息
-                WriteInfoFile(infoFilePath, bundle.FileCRC, bundle.FileSize);
+                WriteBundleInfoFile(infoFilePath, bundle.FileCRC, bundle.FileSize);
             }
             catch (Exception e)
             {
@@ -412,12 +421,12 @@ namespace YooAsset
                 return false;
             }
 
-            var wrapper = new CacheWrapper(infoFilePath, dataFilePath, bundle.FileCRC, bundle.FileSize);
+            var recordFileElement = new RecordFileElement(infoFilePath, dataFilePath, bundle.FileCRC, bundle.FileSize);
-            return RecordFile(bundle.BundleGUID, wrapper);
+            return RecordBundleFile(bundle.BundleGUID, recordFileElement);
         }
-        public bool DeleteCacheFile(string bundleGUID)
+        public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_wrappers.TryGetValue(bundleGUID, out CacheWrapper wrapper))
+            if (_wrappers.TryGetValue(bundleGUID, out RecordFileElement wrapper))
             {
                 try
                 {
@@ -441,7 +450,7 @@ namespace YooAsset
         }
 
         private readonly BufferWriter _sharedBuffer = new BufferWriter(1024);
-        public void WriteInfoFile(string filePath, string dataFileCRC, long dataFileSize)
+        public void WriteBundleInfoFile(string filePath, string dataFileCRC, long dataFileSize)
         {
             using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
@@ -452,7 +461,7 @@ namespace YooAsset
                 fs.Flush();
             }
         }
-        public void ReadInfoFile(string filePath, out string dataFileCRC, out long dataFileSize)
+        public void ReadBundleInfoFile(string filePath, out string dataFileCRC, out long dataFileSize)
         {
             byte[] binaryData = FileUtility.ReadAllBytes(filePath);
             BufferReader buffer = new BufferReader(binaryData);
@@ -462,33 +471,45 @@ namespace YooAsset
         #endregion
 
         #region 内部方法
-        public string GetDefaultCacheRoot()
+        public string GetDefaultCachePackageRoot(string packageName)
         {
+            string rootDirectory;
+
 #if UNITY_EDITOR
-            return YooAssetSettingsData.GetYooEditorCacheRoot();
+            rootDirectory = YooAssetSettingsData.GetYooEditorCacheRoot();
 #elif UNITY_STANDALONE
-            return YooAssetSettingsData.GetYooStandaloneCacheRoot();
+            rootDirectory = YooAssetSettingsData.GetYooStandaloneCacheRoot();
 #else
-            return YooAssetSettingsData.GetYooMobileCacheRoot();
+            rootDirectory = YooAssetSettingsData.GetYooMobileCacheRoot();
 #endif
+
+            return PathUtility.Combine(rootDirectory, packageName);
         }
-        public string GetCacheFileLoadPath(PackageBundle bundle)
+        public string GetCacheBundleFileLoadPath(PackageBundle bundle)
         {
-            return GetDataFilePath(bundle);
+            return GetBundleDataFilePath(bundle);
         }
         public string GetCachePackageHashFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_manifestFileRoot, fileName);
+            return PathUtility.Combine(_cacheManifestFilesRoot, fileName);
         }
         public string GetCachePackageManifestFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_manifestFileRoot, fileName);
+            return PathUtility.Combine(_cacheManifestFilesRoot, fileName);
         }
         public string GetSandboxAppFootPrintFilePath()
         {
-            return PathUtility.Combine(_manifestFileRoot, DefaultCacheFileSystemDefine.AppFootPrintFileName);
+            return PathUtility.Combine(_cacheManifestFilesRoot, DefaultCacheFileSystemDefine.AppFootPrintFileName);
+        }
+        public string GetCacheBundleFilesRoot()
+        {
+            return _cacheBundleFilesRoot;
+        }
+        public string GetCacheManifestFilesRoot()
+        {
+            return _cacheManifestFilesRoot;
         }
 
         /// <summary>
@@ -496,9 +517,9 @@ namespace YooAsset
         /// </summary>
         public void DeleteAllManifestFiles()
         {
-            if (Directory.Exists(_manifestFileRoot))
+            if (Directory.Exists(_cacheManifestFilesRoot))
             {
-                Directory.Delete(_manifestFileRoot, true);
+                Directory.Delete(_cacheManifestFilesRoot, true);
             }
         }
 
@@ -507,7 +528,7 @@ namespace YooAsset
         /// </summary>
         public DecryptResult LoadEncryptedAssetBundle(PackageBundle bundle)
         {
-            string filePath = GetCacheFileLoadPath(bundle);
+            string filePath = GetCacheBundleFileLoadPath(bundle);
             var fileInfo = new DecryptFileInfo()
             {
                 BundleName = bundle.BundleName,
@@ -522,7 +543,7 @@ namespace YooAsset
         /// </summary>
         public DecryptResult LoadEncryptedAssetBundleAsync(PackageBundle bundle)
         {
-            string filePath = GetCacheFileLoadPath(bundle);
+            string filePath = GetCacheBundleFileLoadPath(bundle);
             var fileInfo = new DecryptFileInfo()
             {
                 BundleName = bundle.BundleName,

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

@@ -4,27 +4,27 @@ namespace YooAsset
     internal class DefaultCacheFileSystemDefine
     {
         /// <summary>
-        /// 保存的数据文件名称
+        /// 数据文件名称
         /// </summary>
-        public const string SaveBundleDataFileName = "__data";
+        public const string BundleDataFileName = "__data";
 
         /// <summary>
-        /// 保存的信息文件名称
+        /// 信息文件名称
         /// </summary>
-        public const string SaveBundleInfoFileName = "__info";
+        public const string BundleInfoFileName = "__info";
 
         /// <summary>
-        /// 保存的资源文件的文件夹名称
+        /// 资源文件的文件夹名称
         /// </summary>
-        public const string SaveFilesFolderName = "CacheFiles";
+        public const string BundleFilesFolderName = "BundleFiles";
 
         /// <summary>
-        /// 下载的临时文件的文件夹名称
+        /// 临时文件的文件夹名称
         /// </summary>
-        public const string TempFilesFolderName = "CacheTempFiles";
+        public const string TempFilesFolderName = "TempFiles";
 
         /// <summary>
-        /// 保存的清单文件的文件夹名称
+        /// 清单文件的文件夹名称
         /// </summary>
         public const string ManifestFilesFolderName = "ManifestFiles";
 

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

@@ -1,14 +1,14 @@
 
 namespace YooAsset
 {
-    internal class CacheWrapper
+    internal class RecordFileElement
     {
         public string InfoFilePath { private set; get; }
         public string DataFilePath { private set; get; }
         public string DataFileCRC { private set; get; }
         public long DataFileSize { private set; get; }
         
-        public CacheWrapper(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
+        public RecordFileElement(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
         {
             InfoFilePath = infoFilePath;
             DataFilePath = dataFilePath;

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

@@ -10,7 +10,7 @@ namespace YooAsset
         /// <summary>
         /// 注意：原子操作对象
         /// </summary>
-        public int Result = 0;
+        public volatile int Result = 0;
 
         public TempFileElement(string filePath, string fileCRC, long fileSize)
         {

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

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-    internal class CacheFileElement
+    internal class VerifyFileElement
     {
         public string PackageName { private set; get; }
         public string BundleGUID { private set; get; }
@@ -10,11 +10,15 @@ namespace YooAsset
         public string DataFilePath { private set; get; }
         public string InfoFilePath { private set; get; }
 
-        public EFileVerifyResult Result;
         public string DataFileCRC;
         public long DataFileSize;
 
-        public CacheFileElement(string packageName, string bundleGUID, string fileRootPath, string dataFilePath, string infoFilePath)
+        /// <summary>
+        /// 注意：原子操作对象
+        /// </summary>
+        public volatile int Result = 0;
+
+        public VerifyFileElement(string packageName, string bundleGUID, string fileRootPath, string dataFilePath, string infoFilePath)
         {
             PackageName = packageName;
             BundleGUID = bundleGUID;

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

@@ -57,7 +57,7 @@ namespace YooAsset
             {
                 if (_searchCacheFilesOp == null)
                 {
-                    _searchCacheFilesOp = new SearchCacheFilesOperation(_fileSystem, _fileSystem.PackageName, _fileSystem.AppendFileExtension);
+                    _searchCacheFilesOp = new SearchCacheFilesOperation(_fileSystem);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _searchCacheFilesOp);
                 }
 
@@ -72,7 +72,7 @@ namespace YooAsset
             {
                 if (_verifyCacheFilesOp == null)
                 {
-                    _verifyCacheFilesOp = new VerifyCacheFilesOperation(_fileSystem, _fileSystem.FileVerifyLevel, _searchCacheFilesOp.Result);
+                    _verifyCacheFilesOp = new VerifyCacheFilesOperation(_fileSystem, _searchCacheFilesOp.Result);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _verifyCacheFilesOp);
                 }
 

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

@@ -104,7 +104,7 @@ namespace YooAsset
                     }
                     else
                     {
-                        string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
+                        string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
                         _assetBundle = AssetBundle.LoadFromFile(filePath);
                     }
                 }
@@ -118,7 +118,7 @@ namespace YooAsset
                     }
                     else
                     {
-                        string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
+                        string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
                         _createRequest = AssetBundle.LoadFromFileAsync(filePath);
                     }
                 }
@@ -168,7 +168,7 @@ namespace YooAsset
 
                     // 注意：在安卓移动平台，华为和三星真机上有极小概率加载资源包失败。
                     // 说明：大多数情况在首次安装下载资源到沙盒内，游戏过程中切换到后台再回到游戏内有很大概率触发！
-                    string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
+                    string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
                     byte[] fileData = FileUtility.ReadAllBytes(filePath);
                     if (fileData != null && fileData.Length > 0)
                     {
@@ -198,7 +198,7 @@ namespace YooAsset
                 else
                 {
                     _steps = ESteps.Done;
-                    _fileSystem.DeleteCacheFile(_bundle.BundleGUID);
+                    _fileSystem.DeleteCacheBundleFile(_bundle.BundleGUID);
                     Status = EOperationStatus.Failed;
                     Error = $"Find corrupted asset bundle file and delete : {_bundle.BundleName}";
                     YooLogger.Error(Error);
@@ -304,7 +304,7 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadCacheRawBundle)
             {
-                string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
+                string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
                 if (File.Exists(filePath))
                 {
                     _steps = ESteps.Done;

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

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-    internal sealed class ClearAllCacheFilesOperation : FSClearCacheBundleFilesOperation
+    internal sealed class ClearAllCacheBundleFilesOperation : FSClearCacheFilesOperation
     {
         private enum ESteps
         {
@@ -13,15 +13,15 @@ namespace YooAsset
             Done,
         }
 
-        private readonly ICacheSystem _cacheSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
         private List<string> _allBundleGUIDs;
         private int _fileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
 
-        internal ClearAllCacheFilesOperation(ICacheSystem cacheSystem)
+        internal ClearAllCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem)
         {
-            _cacheSystem = cacheSystem;
+            _fileSystem = fileSystem;
         }
         internal override void InternalOnStart()
         {
@@ -34,7 +34,7 @@ namespace YooAsset
 
             if (_steps == ESteps.GetAllCacheFiles)
             {
-                _allBundleGUIDs = _cacheSystem.GetAllCachedBundleGUIDs();
+                _allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
                 _fileTotalCount = _allBundleGUIDs.Count;
                 _steps = ESteps.ClearAllCacheFiles;
                 YooLogger.Log($"Found all cache files count : {_fileTotalCount}");
@@ -45,7 +45,7 @@ namespace YooAsset
                 for (int i = _allBundleGUIDs.Count - 1; i >= 0; i--)
                 {
                     string bundleGUID = _allBundleGUIDs[i];
-                    _cacheSystem.DeleteCacheFile(bundleGUID);
+                    _fileSystem.DeleteCacheBundleFile(bundleGUID);
                     _allBundleGUIDs.RemoveAt(i);
                     if (OperationSystem.IsBusy)
                         break;

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

@@ -0,0 +1,63 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+    internal sealed class ClearAllCacheManifestFilesOperation : FSClearCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            ClearAllCacheFiles,
+            Done,
+        }
+
+        private readonly DefaultCacheFileSystem _fileSystem;
+        private ESteps _steps = ESteps.None;
+
+
+        internal ClearAllCacheManifestFilesOperation(DefaultCacheFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.ClearAllCacheFiles;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.ClearAllCacheFiles)
+            {
+                try
+                {
+                    // 注意：如果正在下载资源清单，会有几率触发异常！
+                    string directoryRoot = _fileSystem.GetCacheManifestFilesRoot();
+                    DirectoryInfo directoryInfo = new DirectoryInfo(directoryRoot);
+                    if (directoryInfo.Exists)
+                    {
+                        foreach (FileInfo fileInfo in directoryInfo.GetFiles())
+                        {
+                            string fileName = fileInfo.Name;
+                            if (fileName == DefaultCacheFileSystemDefine.AppFootPrintFileName)
+                                continue;
+
+                            fileInfo.Delete();
+                        }
+                    }
+
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                catch (Exception ex)
+                {
+                    _steps = ESteps.Done;
+                    Error = ex.Message;
+                    Status = EOperationStatus.Failed;
+                }
+            }
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearAllCacheManifestFilesOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c8ce2c52a3e9964fa50a9c031e4e593
+guid: 5643382e7031ba14cbb4ab0f4a9acd94
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-    internal class ClearCacheFilesByTagsOperaiton : FSClearCacheBundleFilesOperation
+    internal class ClearCacheBundleFilesByTagsOperaiton : FSClearCacheFilesOperation
     {
         private enum ESteps
         {
@@ -13,7 +13,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly ICacheSystem _cacheSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
         private readonly PackageManifest _manifest;
         private readonly object _clearParam;
         private string[] _tags;
@@ -21,9 +21,9 @@ namespace YooAsset
         private int _clearFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
-        internal ClearCacheFilesByTagsOperaiton(ICacheSystem cacheSystem, PackageManifest manifest, object clearParam)
+        internal ClearCacheBundleFilesByTagsOperaiton(DefaultCacheFileSystem fileSystem, PackageManifest manifest, object clearParam)
         {
-            _cacheSystem = cacheSystem;
+            _fileSystem = fileSystem;
             _manifest = manifest;
             _clearParam = clearParam;
         }
@@ -82,7 +82,7 @@ namespace YooAsset
                 for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
                 {
                     string bundleGUID = _clearBundleGUIDs[i];
-                    _cacheSystem.DeleteCacheFile(bundleGUID);
+                    _fileSystem.DeleteCacheBundleFile(bundleGUID);
                     _clearBundleGUIDs.RemoveAt(i);
                     if (OperationSystem.IsBusy)
                         break;
@@ -102,7 +102,7 @@ namespace YooAsset
         }
         private List<string> GetTagsBundleGUIDs()
         {
-            var allBundleGUIDs = _cacheSystem.GetAllCachedBundleGUIDs();
+            var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);
             foreach (var bundleGUID in allBundleGUIDs)
             {

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

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-    internal sealed class ClearUnusedCacheFilesOperation : FSClearCacheBundleFilesOperation
+    internal sealed class ClearUnusedCacheBundleFilesOperation : FSClearCacheFilesOperation
     {
         private enum ESteps
         {
@@ -13,16 +13,16 @@ namespace YooAsset
             Done,
         }
 
-        private readonly ICacheSystem _cacheSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
         private readonly PackageManifest _manifest;
         private List<string> _unusedBundleGUIDs;
         private int _unusedFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
         
-        internal ClearUnusedCacheFilesOperation(ICacheSystem cacheSystem, PackageManifest manifest)
+        internal ClearUnusedCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
         {
-            _cacheSystem = cacheSystem;
+            _fileSystem = fileSystem;
             _manifest = manifest;
         }
         internal override void InternalOnStart()
@@ -47,7 +47,7 @@ namespace YooAsset
                 for (int i = _unusedBundleGUIDs.Count - 1; i >= 0; i--)
                 {
                     string bundleGUID = _unusedBundleGUIDs[i];
-                    _cacheSystem.DeleteCacheFile(bundleGUID);
+                    _fileSystem.DeleteCacheBundleFile(bundleGUID);
                     _unusedBundleGUIDs.RemoveAt(i);
                     if (OperationSystem.IsBusy)
                         break;
@@ -68,7 +68,7 @@ namespace YooAsset
 
         private List<string> GetUnusedBundleGUIDs()
         {
-            var allBundleGUIDs = _cacheSystem.GetAllCachedBundleGUIDs();
+            var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);
             foreach (var bundleGUID in allBundleGUIDs)
             {

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

@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+    internal sealed class ClearUnusedCacheManifestFilesOperation : FSClearCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            ClearUnusedCacheFiles,
+            Done,
+        }
+
+        private readonly DefaultCacheFileSystem _fileSystem;
+        private readonly PackageManifest _manifest;
+        private ESteps _steps = ESteps.None;
+
+
+        internal ClearUnusedCacheManifestFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
+        {
+            _fileSystem = fileSystem;
+            _manifest = manifest;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.ClearUnusedCacheFiles;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.ClearUnusedCacheFiles)
+            {
+                try
+                {
+                    string activeManifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(_manifest.PackageName, _manifest.PackageVersion);
+                    string activeHashFileName = YooAssetSettingsData.GetPackageHashFileName(_manifest.PackageName, _manifest.PackageVersion);
+
+                    // 注意：如果正在下载资源清单，会有几率触发异常！
+                    string directoryRoot = _fileSystem.GetCacheManifestFilesRoot();
+                    DirectoryInfo directoryInfo = new DirectoryInfo(directoryRoot);
+                    if (directoryInfo.Exists)
+                    {
+                        foreach (FileInfo fileInfo in directoryInfo.GetFiles())
+                        {
+                            string fileName = fileInfo.Name;
+                            if (fileName == DefaultCacheFileSystemDefine.AppFootPrintFileName)
+                                continue;
+                            if (fileName == activeManifestFileName || fileName == activeHashFileName)
+                                continue;
+
+                            fileInfo.Delete();
+                        }
+                    }
+
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                catch (Exception ex)
+                {
+                    _steps = ESteps.Done;
+                    Error = ex.Message;
+                    Status = EOperationStatus.Failed;
+                }
+            }
+        }
+    }
+}

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

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

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

@@ -6,22 +6,20 @@ namespace YooAsset
 {
     internal sealed class DownloadNormalFileOperation : DefaultDownloadFileOperation
     {
-        private readonly IFileSystem _fileSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
-        private readonly ICacheSystem _cacheSystem;
         private VerifyTempFileOperation _verifyOperation;
         private bool _isReuqestLocalFile;
         private string _tempFilePath;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadNormalFileOperation(IFileSystem fileSystem, ICacheSystem cacheSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _fileSystem = fileSystem;
-            _cacheSystem = cacheSystem;
         }
         internal override void InternalOnStart()
         {
             _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
-            _tempFilePath = _cacheSystem.GetTempFilePath(Bundle);
+            _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }
         internal override void InternalOnUpdate()
@@ -106,7 +104,7 @@ namespace YooAsset
 
                 if (_verifyOperation.Status == EOperationStatus.Succeed)
                 {
-                    if (_cacheSystem.WriteCacheFile(Bundle, _tempFilePath))
+                    if (_fileSystem.WriteCacheBundleFile(Bundle, _tempFilePath))
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Succeed;

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

@@ -7,9 +7,7 @@ namespace YooAsset
 {
     internal sealed class DownloadResumeFileOperation : DefaultDownloadFileOperation
     {
-        private readonly IFileSystem _fileSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
-        private readonly ICacheSystem _cacheSystem;
-        private readonly List<long> _responseCodes;
         private DownloadHandlerFileRange _downloadHandle;
         private VerifyTempFileOperation _verifyOperation;
         private bool _isReuqestLocalFile;
@@ -18,16 +16,14 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal DownloadResumeFileOperation(IFileSystem fileSystem, ICacheSystem cacheSystem, PackageBundle bundle, DownloadParam param, List<long> responseCodes) : base(bundle, param)
+        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _fileSystem = fileSystem;
-            _cacheSystem = cacheSystem;
-            _responseCodes = responseCodes;
         }
         internal override void InternalOnStart()
         {
             _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
-            _tempFilePath = _cacheSystem.GetTempFilePath(Bundle);
+            _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }
         internal override void InternalOnUpdate()
@@ -129,7 +125,7 @@ namespace YooAsset
 
                 if (_verifyOperation.Status == EOperationStatus.Succeed)
                 {
-                    if (_cacheSystem.WriteCacheFile(Bundle, _tempFilePath))
+                    if (_fileSystem.WriteCacheBundleFile(Bundle, _tempFilePath))
                     {
                         Status = EOperationStatus.Succeed;
                         _steps = ESteps.Done;
@@ -247,11 +243,11 @@ namespace YooAsset
         }
         private void ClearTempFileWhenError()
         {
-            if (_responseCodes == null)
+            if (_fileSystem.ResumeDownloadResponseCodes == null)
                 return;
 
             //说明：如果遇到以下错误返回码，验证失败直接删除文件
-            if (_responseCodes.Contains(HttpCode))
+            if (_fileSystem.ResumeDownloadResponseCodes.Contains(HttpCode))
             {
                 if (File.Exists(_tempFilePath))
                     File.Delete(_tempFilePath);

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

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

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

@@ -15,9 +15,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly ICacheSystem _cacheSystem;
+        private readonly DefaultCacheFileSystem _fileSystem;
-        private readonly string _packageName;
-        private readonly bool _appendFileExtension;
         private IEnumerator<DirectoryInfo> _filesEnumerator = null;
         private float _verifyStartTime;
         private ESteps _steps = ESteps.None;
@@ -25,14 +23,12 @@ namespace YooAsset
         /// <summary>
         /// 需要验证的元素
         /// </summary>
-        public readonly List<CacheFileElement> Result = new List<CacheFileElement>(5000);
+        public readonly List<VerifyFileElement> Result = new List<VerifyFileElement>(5000);
 
 
-        internal SearchCacheFilesOperation(ICacheSystem cacheSystem, string packageName, bool appendFileExtension)
+        internal SearchCacheFilesOperation(DefaultCacheFileSystem fileSystem)
         {
-            _cacheSystem = cacheSystem;
+            _fileSystem = fileSystem;
-            _packageName = packageName;
-            _appendFileExtension = appendFileExtension;   
         }
         internal override void InternalOnStart()
         {
@@ -46,7 +42,7 @@ namespace YooAsset
 
             if (_steps == ESteps.Prepare)
             {
-                DirectoryInfo rootDirectory = new DirectoryInfo(_cacheSystem.GetCacheFileRoot());
+                DirectoryInfo rootDirectory = new DirectoryInfo(_fileSystem.GetCacheBundleFilesRoot());
                 if (rootDirectory.Exists)
                 {
                     var directorieInfos = rootDirectory.EnumerateDirectories();
@@ -84,23 +80,23 @@ namespace YooAsset
                 foreach (var chidDirectory in childDirectories)
                 {
                     string bundleGUID = chidDirectory.Name;
-                    if (_cacheSystem.IsRecordFile(bundleGUID))
+                    if (_fileSystem.IsRecordBundleFile(bundleGUID))
                         continue;
 
                     // 创建验证元素类
                     string fileRootPath = chidDirectory.FullName;
-                    string dataFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.SaveBundleDataFileName}";
+                    string dataFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleDataFileName}";
-                    string infoFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.SaveBundleInfoFileName}";
+                    string infoFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleInfoFileName}";
 
                     // 存储的数据文件追加文件格式
-                    if (_appendFileExtension)
+                    if (_fileSystem.AppendFileExtension)
                     {
                         string dataFileExtension = FindDataFileExtension(chidDirectory);
                         if (string.IsNullOrEmpty(dataFileExtension) == false)
                             dataFilePath += dataFileExtension;
                     }
 
-                    var element = new CacheFileElement(_packageName, bundleGUID, fileRootPath, dataFilePath, infoFilePath);
+                    var element = new VerifyFileElement(_fileSystem.PackageName, bundleGUID, fileRootPath, dataFilePath, infoFilePath);
                     Result.Add(element);
                 }
 
@@ -116,7 +112,7 @@ namespace YooAsset
             var fileInfos = directoryInfo.GetFiles();
             foreach (var fileInfo in fileInfos)
             {
-                if (fileInfo.Name.StartsWith(DefaultCacheFileSystemDefine.SaveBundleDataFileName))
+                if (fileInfo.Name.StartsWith(DefaultCacheFileSystemDefine.BundleDataFileName))
                 {
                     dataFileExtension = fileInfo.Extension;
                     break;

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

@@ -19,11 +19,10 @@ namespace YooAsset
             Done,
         }
 
-        private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+        private readonly DefaultCacheFileSystem _fileSystem;
-        private readonly ICacheSystem _cacheSystem;
+        private readonly EFileVerifyLevel _fileVerifyLevel;
-        private readonly EFileVerifyLevel _verifyLevel;
+        private List<VerifyFileElement> _waitingList;
-        private List<CacheFileElement> _waitingList;
+        private List<VerifyFileElement> _verifyingList;
-        private List<CacheFileElement> _verifyingList;
         private int _verifyMaxNum;
         private int _verifyTotalCount;
         private float _verifyStartTime;
@@ -32,11 +31,11 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal VerifyCacheFilesOperation(ICacheSystem cacheSystem, EFileVerifyLevel verifyLevel, List<CacheFileElement> elements)
+        internal VerifyCacheFilesOperation(DefaultCacheFileSystem fileSystem, List<VerifyFileElement> elements)
         {
-            _cacheSystem = cacheSystem;
+            _fileSystem = fileSystem;
-            _verifyLevel = verifyLevel;
             _waitingList = elements;
+            _fileVerifyLevel = fileSystem.FileVerifyLevel;
         }
         internal override void InternalOnStart()
         {
@@ -60,13 +59,23 @@ namespace YooAsset
                 if (_verifyMaxNum < 1)
                     _verifyMaxNum = 1;
 
-                _verifyingList = new List<CacheFileElement>(_verifyMaxNum);
+                _verifyingList = new List<VerifyFileElement>(_verifyMaxNum);
                 _steps = ESteps.UpdateVerify;
             }
 
             if (_steps == ESteps.UpdateVerify)
             {
-                _syncContext.Update();
+                // 检测校验结果
+                for (int i = _verifyingList.Count - 1; i >= 0; i--)
+                {
+                    var verifyElement = _verifyingList[i];
+                    int result = verifyElement.Result;
+                    if (result != 0)
+                    {
+                        _verifyingList.RemoveAt(i);
+                        RecordVerifyFile(verifyElement);
+                    }
+                }
 
                 Progress = GetProgress();
                 if (_waitingList.Count == 0 && _verifyingList.Count == 0)
@@ -86,7 +95,8 @@ namespace YooAsset
                         break;
 
                     var element = _waitingList[i];
-                    if (BeginVerifyFileWithThread(element))
+                    bool succeed = ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
+                    if (succeed)
                     {
                         _waitingList.RemoveAt(i);
                         _verifyingList.Add(element);
@@ -106,31 +116,23 @@ namespace YooAsset
                 return 1f;
             return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
         }
-        private bool BeginVerifyFileWithThread(CacheFileElement element)
-        {
-            return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
-        }
         private void VerifyInThread(object obj)
         {
-            CacheFileElement element = (CacheFileElement)obj;
+            VerifyFileElement element = (VerifyFileElement)obj;
-            element.Result = VerifyingCacheFile(element, _verifyLevel);
+            int verifyResult = (int)VerifyingCacheFile(element, _fileVerifyLevel);
-            _syncContext.Post(VerifyCallback, element);
+            element.Result = verifyResult;
         }
-        private void VerifyCallback(object obj)
+        private void RecordVerifyFile(VerifyFileElement element)
         {
-            CacheFileElement element = (CacheFileElement)obj;
+            if (element.Result == (int)EFileVerifyResult.Succeed)
-            _verifyingList.Remove(element);
-
-            if (element.Result == EFileVerifyResult.Succeed)
             {
                 _succeedCount++;
-                var fileWrapper = new CacheWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+                var recordFileElement = new RecordFileElement(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
-                _cacheSystem.RecordFile(element.BundleGUID, fileWrapper);
+                _fileSystem.RecordBundleFile(element.BundleGUID, recordFileElement);
             }
             else
             {
                 _failedCount++;
-
                 YooLogger.Warning($"Failed to verify file {element.Result} and delete files : {element.FileRootPath}");
                 element.DeleteFiles();
             }
@@ -139,7 +141,7 @@ namespace YooAsset
         /// <summary>
         /// 验证缓存文件（子线程内操作）
         /// </summary>
-        private EFileVerifyResult VerifyingCacheFile(CacheFileElement element, EFileVerifyLevel verifyLevel)
+        private EFileVerifyResult VerifyingCacheFile(VerifyFileElement element, EFileVerifyLevel verifyLevel)
         {
             try
             {
@@ -157,7 +159,7 @@ namespace YooAsset
                         return EFileVerifyResult.InfoFileNotExisted;
 
                     // 解析信息文件获取验证数据
-                    _cacheSystem.ReadInfoFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
+                    _fileSystem.ReadBundleInfoFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
                 }
             }
             catch (Exception)

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

@@ -40,7 +40,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFile)
             {
-                if (BeginVerifyFileWithThread(_element))
+                bool succeed = ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), _element);
+                if (succeed)
                 {
                     _steps = ESteps.Waiting;
                 }
@@ -77,10 +78,6 @@ namespace YooAsset
             }
         }
 
-        private bool BeginVerifyFileWithThread(TempFileElement element)
-        {
-            return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
-        }
         private void VerifyInThread(object obj)
         {
             TempFileElement element = (TempFileElement)obj;

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/DefaultEditorFileSystem.cs

@@ -69,9 +69,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        public virtual FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            var operation = new FSClearCacheBundleFilesCompleteOperation(null);
+            var operation = new FSClearCacheFilesCompleteOperation();
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -111,15 +111,14 @@ namespace YooAsset
                 YooLogger.Warning($"Invalid parameter : {name}");
             }
         }
-        public virtual void OnCreate(string packageName, string rootDirectory)
+        public virtual void OnCreate(string packageName, string packageRoot)
         {
             PackageName = packageName;
 
-            if (string.IsNullOrEmpty(rootDirectory))
+            if (string.IsNullOrEmpty(packageRoot))
                 throw new Exception($"{nameof(DefaultEditorFileSystem)} root directory is null or empty !");
 
-            // 注意：基础目录即为包裹目录
+            _packageRoot = packageRoot;
-            _packageRoot = rootDirectory;
         }
         public virtual void OnUpdate()
         {

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

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

Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackFileSystem.cs

@@ -14,8 +14,8 @@ namespace YooAsset
             base.OnCreate(packageName, rootDirectory);
 
             // 注意：重写保存根目录和临时目录
-            _cacheFileRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.SaveFilesFolderName);
+            _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.SaveFilesFolderName);
-            _tempFileRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.TempFilesFolderName);
+            _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.TempFilesFolderName);
         }
     }
 }

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -71,9 +71,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        public virtual FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            var operation = new FSClearCacheBundleFilesCompleteOperation(null);
+            var operation = new FSClearCacheFilesCompleteOperation();
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -113,7 +113,7 @@ namespace YooAsset
                 YooLogger.Warning($"Invalid parameter : {name}");
             }
         }
-        public virtual void OnCreate(string packageName, string rootDirectory)
+        public virtual void OnCreate(string packageName, string packageRoot)
         {
             PackageName = packageName;
         }

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

@@ -70,7 +70,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesMD5(_webDataRequestOp.Result);
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
                 if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -80,9 +80,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        public virtual FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            var operation = new FSClearCacheBundleFilesCompleteOperation(null);
+            var operation = new FSClearCacheFilesCompleteOperation();
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -118,14 +118,14 @@ namespace YooAsset
                 YooLogger.Warning($"Invalid parameter : {name}");
             }
         }
-        public virtual void OnCreate(string packageName, string rootDirectory)
+        public virtual void OnCreate(string packageName, string packageRoot)
         {
             PackageName = packageName;
 
-            if (string.IsNullOrEmpty(rootDirectory))
+            if (string.IsNullOrEmpty(packageRoot))
-                rootDirectory = GetDefaultWebRoot();
+                _webPackageRoot = GetDefaultWebPackageRoot(packageName);
-
+            else
-            _webPackageRoot = PathUtility.Combine(rootDirectory, packageName);
+                _webPackageRoot = packageRoot;
         }
         public virtual void OnUpdate()
         {
@@ -166,9 +166,10 @@ namespace YooAsset
         }
 
         #region 内部方法
-        protected string GetDefaultWebRoot()
+        protected string GetDefaultWebPackageRoot(string packageName)
         {
-            return YooAssetSettingsData.GetYooWebBuildinRoot();
+            string rootDirectory = YooAssetSettingsData.GetYooWebBuildinRoot();
+            return PathUtility.Combine(rootDirectory, packageName);
         }
         public string GetWebFileLoadPath(PackageBundle bundle)
         {

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

@@ -67,7 +67,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                string fileHash = HashUtility.BytesMD5(_webDataRequestOp.Result);
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
                 if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;

Assets/YooAsset/Runtime/FileSystem/EFileClearMode.cs

@@ -9,17 +9,28 @@ namespace YooAsset
         /// <summary>
         /// 清理所有文件
         /// </summary>
-        ClearAllBundleFiles = 1,
+        ClearAllBundleFiles,
 
         /// <summary>
         /// 清理未在使用的文件
         /// </summary>
-        ClearUnusedBundleFiles = 2,
+        ClearUnusedBundleFiles,
 
         /// <summary>
         /// 清理指定标签的文件
         /// 说明：需要指定参数，可选：string, string[], List<string>
         /// </summary>
-        ClearBundleFilesByTags = 3,
+        ClearBundleFilesByTags,
+
+
+        /// <summary>
+        /// 清理所有清单
+        /// </summary>
+        ClearAllManifestFiles,
+
+        /// <summary>
+        /// 清理未在使用的清单
+        /// </summary>
+        ClearUnusedManifestFiles,
     }
 }

Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs

@@ -20,13 +20,13 @@ namespace YooAsset
         /// <summary>
         /// 文件系统的根目录
         /// </summary>
-        public string RootDirectory { private set; get; }
+        public string PackageRoot { private set; get; }
 
 
-        public FileSystemParameters(string fileSystemClass, string rootDirectory)
+        public FileSystemParameters(string fileSystemClass, string packageRoot)
         {
             FileSystemClass = fileSystemClass;
-            RootDirectory = rootDirectory;
+            PackageRoot = packageRoot;
         }
 
         /// <summary>
@@ -62,19 +62,19 @@ namespace YooAsset
             {
                 instance.SetParameter(param.Key, param.Value);
             }
-            instance.OnCreate(packageName, RootDirectory);
+            instance.OnCreate(packageName, PackageRoot);
             return instance;
         }
 
         #region 创建默认的文件系统类
         /// <summary>
         /// 创建默认的编辑器文件系统参数
-        /// <param name="simulateBuildResult">模拟构建结果</param>
+        /// <param name="packageRoot">文件系统的根目录</param>
         /// </summary>
-        public static FileSystemParameters CreateDefaultEditorFileSystemParameters(EditorSimulateBuildResult simulateBuildResult)
+        public static FileSystemParameters CreateDefaultEditorFileSystemParameters(string packageRoot)
         {
             string fileSystemClass = typeof(DefaultEditorFileSystem).FullName;
-            var fileSystemParams = new FileSystemParameters(fileSystemClass, simulateBuildResult.PackageRootDirectory);
+            var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
             return fileSystemParams;
         }
 
@@ -82,14 +82,12 @@ namespace YooAsset
         /// 创建默认的内置文件系统参数
         /// </summary>
         /// <param name="decryptionServices">加密文件解密服务类</param>
-        /// <param name="verifyLevel">缓存文件的校验等级</param>
+        /// <param name="packageRoot">文件系统的根目录</param>
-        /// <param name="rootDirectory">内置文件的根路径</param>
+        public static FileSystemParameters CreateDefaultBuildinFileSystemParameters(IDecryptionServices decryptionServices = null, string packageRoot = null)
-        public static FileSystemParameters CreateDefaultBuildinFileSystemParameters(IDecryptionServices decryptionServices = null, EFileVerifyLevel verifyLevel = EFileVerifyLevel.Middle, string rootDirectory = null)
         {
             string fileSystemClass = typeof(DefaultBuildinFileSystem).FullName;
-            var fileSystemParams = new FileSystemParameters(fileSystemClass, rootDirectory);
+            var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
             fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
-            fileSystemParams.AddParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, verifyLevel);
             return fileSystemParams;
         }
 
@@ -98,15 +96,13 @@ namespace YooAsset
         /// </summary>
         /// <param name="remoteServices">远端资源地址查询服务类</param>
         /// <param name="decryptionServices">加密文件解密服务类</param>
-        /// <param name="verifyLevel">缓存文件的校验等级</param>
+        /// <param name="packageRoot">文件系统的根目录</param>
-        /// <param name="rootDirectory">文件系统的根目录</param>
+        public static FileSystemParameters CreateDefaultCacheFileSystemParameters(IRemoteServices remoteServices, IDecryptionServices decryptionServices = null, string packageRoot = null)
-        public static FileSystemParameters CreateDefaultCacheFileSystemParameters(IRemoteServices remoteServices, IDecryptionServices decryptionServices = null, EFileVerifyLevel verifyLevel = EFileVerifyLevel.Middle, string rootDirectory = null)
         {
             string fileSystemClass = typeof(DefaultCacheFileSystem).FullName;
-            var fileSystemParams = new FileSystemParameters(fileSystemClass, rootDirectory);
+            var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
             fileSystemParams.AddParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
             fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
-            fileSystemParams.AddParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, verifyLevel);
             return fileSystemParams;
         }
 

Assets/YooAsset/Runtime/FileSystem/FileVerifyHelper.cs

@@ -25,7 +25,7 @@ namespace YooAsset
                 // 再验证文件CRC
                 if (verifyLevel == EFileVerifyLevel.High)
                 {
-                    string crc = HashUtility.FileCRC32Safely(filePath);
+                    string crc = HashUtility.FileCRC32(filePath);
                     if (crc == fileCRC)
                         return EFileVerifyResult.Succeed;
                     else

Assets/YooAsset/Runtime/FileSystem/Interface/IFileSystem.cs

@@ -37,7 +37,7 @@ namespace YooAsset
         /// <summary>
         /// 清理缓存文件
         /// </summary>
-        FSClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(PackageManifest manifest, string clearMode, object clearParam);
+        FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam);
 
         /// <summary>
         /// 下载远端文件
@@ -48,7 +48,7 @@ namespace YooAsset
         /// 加载Bundle文件
         /// </summary>
         FSLoadBundleOperation LoadBundleFile(PackageBundle bundle);
-        
+
 
         /// <summary>
         /// 设置自定义参数
@@ -58,7 +58,7 @@ namespace YooAsset
         /// <summary>
         /// 创建缓存系统
         /// </summary>
-        void OnCreate(string packageName, string rootDirectory);
+        void OnCreate(string packageName, string packageRoot);
 
         /// <summary>
         /// 更新文件系统

Assets/YooAsset/Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs

@@ -1,15 +1,19 @@
 
 namespace YooAsset
 {
-    internal abstract class FSClearCacheBundleFilesOperation : AsyncOperationBase
+    internal abstract class FSClearCacheFilesOperation : AsyncOperationBase
     {
     }
 
-    internal sealed class FSClearCacheBundleFilesCompleteOperation : FSClearCacheBundleFilesOperation
+    internal sealed class FSClearCacheFilesCompleteOperation : FSClearCacheFilesOperation
     {
         private readonly string _error;
 
-        internal FSClearCacheBundleFilesCompleteOperation(string error)
+        internal FSClearCacheFilesCompleteOperation()
+        {
+            _error = null;
+        }
+        internal FSClearCacheFilesCompleteOperation(string error)
         {
             _error = error;
         }

Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs

@@ -113,7 +113,8 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 异步卸载子场景
+        /// 异步卸载场景对象
+        /// 注意：场景卸载成功后，会自动释放该handle的引用计数！
         /// </summary>
         public UnloadSceneOperation UnloadAsync()
         {

Assets/YooAsset/Runtime/ResourceManager/Operation/Internal.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58462a7dcef164e43878a037395d4417
+guid: dfb81dc2664ed4d4db4bd2b95caadae4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs

@@ -31,7 +31,7 @@ namespace YooAsset
         /// <summary>
         /// 清理缓存文件
         /// </summary>
-        ClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(string clearMode, object clearParam);
+        ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam);
 
         // 下载相关
         ResourceDownloaderOperation CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout);

Assets/YooAsset/Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs

@@ -1,10 +1,10 @@
 
 namespace YooAsset
 {
-    public abstract class ClearCacheBundleFilesOperation : AsyncOperationBase
+    public abstract class ClearCacheFilesOperation : AsyncOperationBase
     {
     }
-    internal sealed class ClearCacheBundleFilesImplOperation : ClearCacheBundleFilesOperation
+    internal sealed class ClearCacheFilesImplOperation : ClearCacheFilesOperation
     {
         private enum ESteps
         {
@@ -21,12 +21,12 @@ namespace YooAsset
         private readonly IFileSystem _fileSystemC;
         private readonly string _clearMode;
         private readonly object _clearParam;
-        private FSClearCacheBundleFilesOperation _clearCacheBundleFilesOpA;
+        private FSClearCacheFilesOperation _clearCacheFilesOpA;
-        private FSClearCacheBundleFilesOperation _clearCacheBundleFilesOpB;
+        private FSClearCacheFilesOperation _clearCacheFilesOpB;
-        private FSClearCacheBundleFilesOperation _clearCacheBundleFilesOpC;
+        private FSClearCacheFilesOperation _clearCacheFilesOpC;
         private ESteps _steps = ESteps.None;
         
-        internal ClearCacheBundleFilesImplOperation(IPlayMode impl, IFileSystem fileSystemA, IFileSystem fileSystemB, IFileSystem fileSystemC, string clearMode, object clearParam)
+        internal ClearCacheFilesImplOperation(IPlayMode impl, IFileSystem fileSystemA, IFileSystem fileSystemB, IFileSystem fileSystemC, string clearMode, object clearParam)
         {
             _impl = impl;
             _fileSystemA = fileSystemA;
@@ -52,14 +52,14 @@ namespace YooAsset
                     return;
                 }
 
-                if (_clearCacheBundleFilesOpA == null)
+                if (_clearCacheFilesOpA == null)
-                    _clearCacheBundleFilesOpA = _fileSystemA.ClearCacheBundleFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+                    _clearCacheFilesOpA = _fileSystemA.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
 
-                Progress = _clearCacheBundleFilesOpA.Progress;
+                Progress = _clearCacheFilesOpA.Progress;
-                if (_clearCacheBundleFilesOpA.IsDone == false)
+                if (_clearCacheFilesOpA.IsDone == false)
                     return;
 
-                if (_clearCacheBundleFilesOpA.Status == EOperationStatus.Succeed)
+                if (_clearCacheFilesOpA.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.ClearFileSystemB;
                 }
@@ -67,7 +67,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _clearCacheBundleFilesOpA.Error;
+                    Error = _clearCacheFilesOpA.Error;
                 }
             }
 
@@ -79,14 +79,14 @@ namespace YooAsset
                     return;
                 }
 
-                if (_clearCacheBundleFilesOpB == null)
+                if (_clearCacheFilesOpB == null)
-                    _clearCacheBundleFilesOpB = _fileSystemB.ClearCacheBundleFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+                    _clearCacheFilesOpB = _fileSystemB.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
 
-                Progress = _clearCacheBundleFilesOpB.Progress;
+                Progress = _clearCacheFilesOpB.Progress;
-                if (_clearCacheBundleFilesOpB.IsDone == false)
+                if (_clearCacheFilesOpB.IsDone == false)
                     return;
 
-                if (_clearCacheBundleFilesOpB.Status == EOperationStatus.Succeed)
+                if (_clearCacheFilesOpB.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.ClearFileSystemC;
                 }
@@ -94,7 +94,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _clearCacheBundleFilesOpB.Error;
+                    Error = _clearCacheFilesOpB.Error;
                 }
             }
 
@@ -107,14 +107,14 @@ namespace YooAsset
                     return;
                 }
 
-                if (_clearCacheBundleFilesOpC == null)
+                if (_clearCacheFilesOpC == null)
-                    _clearCacheBundleFilesOpC = _fileSystemC.ClearCacheBundleFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
+                    _clearCacheFilesOpC = _fileSystemC.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
 
-                Progress = _clearCacheBundleFilesOpC.Progress;
+                Progress = _clearCacheFilesOpC.Progress;
-                if (_clearCacheBundleFilesOpC.IsDone == false)
+                if (_clearCacheFilesOpC.IsDone == false)
                     return;
 
-                if (_clearCacheBundleFilesOpC.Status == EOperationStatus.Succeed)
+                if (_clearCacheFilesOpC.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
@@ -123,7 +123,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _clearCacheBundleFilesOpC.Error;
+                    Error = _clearCacheFilesOpC.Error;
                 }
             }
         }

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs

@@ -6,11 +6,33 @@ namespace YooAsset
         /// <summary>
         /// 包裹名称
         /// </summary>
-        public string PackageName;
+        public readonly string PackageName;
 
         /// <summary>
         /// 模拟构建管线名称
         /// </summary>
         public string BuildPipelineName = "EditorSimulateBuildPipeline";
+
+        /// <summary>
+        /// 模拟构建类所属程序集名称
+        /// </summary>
+        public string InvokeAssmeblyName = "YooAsset.Editor";
+
+        /// <summary>
+        /// 模拟构建执行的类名全称
+        /// 注意：类名必须包含命名空间！
+        /// </summary>
+        public string InvokeClassFullName = "YooAsset.Editor.AssetBundleSimulateBuilder";
+
+        /// <summary>
+        /// 模拟构建执行的方法名称
+        /// 注意：执行方法必须满足 BindingFlags.Public | BindingFlags.Static
+        /// </summary>
+        public string InvokeMethodName = "SimulateBuild";
+
+        public EditorSimulateBuildParam(string packageName)
+        {
+            PackageName = packageName;
+        }
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs

@@ -5,17 +5,16 @@ namespace YooAsset
 {
     public static class EditorSimulateModeHelper
     {
-        private static System.Type _classType;
-
         /// <summary>
         /// 编辑器下模拟构建清单
         /// </summary>
         public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam)
         {
-            if (_classType == null)
+            var assemblyName = buildParam.InvokeAssmeblyName;
-                _classType = Assembly.Load("YooAsset.Editor").GetType("YooAsset.Editor.AssetBundleSimulateBuilder");
+            var className = buildParam.InvokeClassFullName;
-
+            var methodName = buildParam.InvokeMethodName;
-            return (EditorSimulateBuildResult)InvokePublicStaticMethod(_classType, "SimulateBuild", buildParam);
+            var classType = Assembly.Load(assemblyName).GetType(className);
+            return (EditorSimulateBuildResult)InvokePublicStaticMethod(classType, methodName, buildParam);
         }
 
         private static object InvokePublicStaticMethod(System.Type type, string method, params object[] parameters)

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs

@@ -52,9 +52,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        ClearCacheBundleFilesOperation IPlayMode.ClearCacheBundleFilesAsync(string clearMode, object clearParam)
+        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(string clearMode, object clearParam)
         {
-            var operation = new ClearCacheBundleFilesImplOperation(this, EditorFileSystem, null, null, clearMode, clearParam);
+            var operation = new ClearCacheFilesImplOperation(this, EditorFileSystem, null, null, clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }

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

@@ -56,9 +56,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        ClearCacheBundleFilesOperation IPlayMode.ClearCacheBundleFilesAsync(string clearMode, object clearParam)
+        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(string clearMode, object clearParam)
         {
-            var operation = new ClearCacheBundleFilesImplOperation(this, BuildinFileSystem, CacheFileSystem, null, clearMode, clearParam);
+            var operation = new ClearCacheFilesImplOperation(this, BuildinFileSystem, CacheFileSystem, null, clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }

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

@@ -52,9 +52,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        ClearCacheBundleFilesOperation IPlayMode.ClearCacheBundleFilesAsync(string clearMode, object clearParam)
+        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(string clearMode, object clearParam)
         {
-            var operation = new ClearCacheBundleFilesImplOperation(this, BuildinFileSystem, null, null, clearMode, clearParam);
+            var operation = new ClearCacheFilesImplOperation(this, BuildinFileSystem, null, null, clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }

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

@@ -74,9 +74,9 @@ namespace YooAsset
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
-        ClearCacheBundleFilesOperation IPlayMode.ClearCacheBundleFilesAsync(string clearMode, object clearParam)
+        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(string clearMode, object clearParam)
         {
-            var operation = new ClearCacheBundleFilesImplOperation(this, WebServerFileSystem, WebRemoteFileSystem, null, clearMode, clearParam);
+            var operation = new ClearCacheFilesImplOperation(this, WebServerFileSystem, WebRemoteFileSystem, null, clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -220,7 +220,7 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 加载指定版本的资源清单
+        /// 更新并加载指定版本的资源清单
         /// </summary>
         /// <param name="packageVersion">包裹版本</param>
         /// <param name="timeout">超时时间（默认值：60秒）</param>
@@ -253,23 +253,24 @@ namespace YooAsset
         /// </summary>
         /// <param name="clearMode">清理方式</param>
         /// <param name="clearParam">执行参数</param>
-        public ClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(EFileClearMode clearMode, object clearParam = null)
+        public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
         {
             DebugCheckInitialize();
-            return _playModeImpl.ClearCacheBundleFilesAsync(clearMode.ToString(), clearParam);
+            return _playModeImpl.ClearCacheFilesAsync(clearMode.ToString(), clearParam);
         }
-
+        
         /// <summary>
         /// 清理缓存文件
         /// </summary>
         /// <param name="clearMode">清理方式</param>
         /// <param name="clearParam">执行参数</param>
-        public ClearCacheBundleFilesOperation ClearCacheBundleFilesAsync(string clearMode, object clearParam = null)
+        public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
         {
             DebugCheckInitialize();
-            return _playModeImpl.ClearCacheBundleFilesAsync(clearMode, clearParam);
+            return _playModeImpl.ClearCacheFilesAsync(clearMode, clearParam);
         }
 
+
         #region 包裹信息
         /// <summary>
         /// 获取当前加载包裹的版本信息

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 using YooAsset;
+using StarkSDKSpace;
 
 internal class BGFSDownloadFileOperation : DefaultDownloadFileOperation
 {

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs

@@ -1,8 +1,8 @@
 #if UNITY_WEBGL && BYTEMINIGAME
 using UnityEngine;
 using UnityEngine.Networking;
-using WeChatWASM;
 using YooAsset;
+using StarkSDKSpace;
 
 internal class BGFSLoadBundleOperation : FSLoadBundleOperation
 {
@@ -37,7 +37,7 @@ internal class BGFSLoadBundleOperation : FSLoadBundleOperation
             if (_webRequest == null)
             {
                 string mainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
-                _webRequest = UnityWebRequestAssetBundle.GetAssetBundle(mainURL);
+                _webRequest = TTAssetBundle.GetAssetBundle(mainURL);
                 _webRequest.SendWebRequest();
             }
 
@@ -49,11 +49,11 @@ internal class BGFSLoadBundleOperation : FSLoadBundleOperation
 
             if (CheckRequestResult())
             {
-                var assetBundle = (_webRequest.downloadHandler as DownloadHandlerAssetBundle).assetBundle;
+                var assetBundle = (_webRequest.downloadHandler as DownloadHandlerTTAssetBundle).assetBundle;
                 if (assetBundle == null)
                 {
                     _steps = ESteps.Done;
-                    Error = $"{nameof(DownloadHandlerAssetBundle)} loaded asset bundle is null !";
+                    Error = $"{nameof(DownloadHandlerTTAssetBundle)} loaded asset bundle is null !";
                     Status = EOperationStatus.Failed;
                 }
                 else

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionOperation/GetCacheBundleSizeOperation.cs

@@ -65,6 +65,6 @@ public class GetCacheBundleSizeOperation : GameAsyncOperation
     {
         string rootDirectory = YooAssetSettingsData.GetYooMobileCacheRoot();
         string packageRoot = PathUtility.Combine(rootDirectory, _packageName);
-        return PathUtility.Combine(packageRoot, DefaultCacheFileSystemDefine.SaveFilesFolderName);
+        return PathUtility.Combine(packageRoot, DefaultCacheFileSystemDefine.BundleFilesFolderName);
     }
 }

Assets/YooAsset/Samples~/Space Shooter/Boot.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -104,7 +103,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +116,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -130,7 +129,7 @@ LightingSettings:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Settings.lighting
-  serializedVersion: 3
+  serializedVersion: 6
   m_GIWorkflowMode: 1
   m_EnableBakedLightmaps: 1
   m_EnableRealtimeLightmaps: 0
@@ -143,7 +142,7 @@ LightingSettings:
   m_LightmapMaxSize: 1024
   m_BakeResolution: 40
   m_Padding: 2
-  m_TextureCompression: 1
+  m_LightmapCompression: 3
   m_AO: 0
   m_AOMaxDistance: 1
   m_CompAOExponent: 1
@@ -164,13 +163,13 @@ LightingSettings:
   m_PVRCulling: 1
   m_PVRSampling: 1
   m_PVRDirectSampleCount: 32
-  m_PVRSampleCount: 500
+  m_PVRSampleCount: 512
-  m_PVREnvironmentSampleCount: 500
+  m_PVREnvironmentSampleCount: 512
   m_PVREnvironmentReferencePointCount: 2048
   m_LightProbeSampleCountMultiplier: 4
   m_PVRBounces: 2
   m_PVRMinBounces: 2
-  m_PVREnvironmentMIS: 0
+  m_PVREnvironmentImportanceSampling: 0
   m_PVRFilteringMode: 2
   m_PVRDenoiserTypeDirect: 0
   m_PVRDenoiserTypeIndirect: 0
@@ -184,6 +183,9 @@ LightingSettings:
   m_PVRFilteringAtrousPositionSigmaDirect: 0.5
   m_PVRFilteringAtrousPositionSigmaIndirect: 2
   m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+  m_RespectSceneVisibilityWhenBakingGI: 0
 --- !u!1 &1281760859
 GameObject:
   m_ObjectHideFlags: 0
@@ -221,12 +223,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1281760859}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6920458660802423023
 GameObject:
@@ -268,9 +271,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -304,10 +315,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6920458660802423023}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 10, z: 5}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 6920458660802423026}
+  - {fileID: 1281760861}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Effect.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9f9f9848e17e5eb46b596a07391a42cc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cceb877e06414a648926ca1230374a57
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Asteroid.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4ff26c6a2993dbf48a8fe071b51ef606
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc38993f12e70694fb84c45607c9f24c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/Materials.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6638b178c52c9e44198ca3fd5f3c4bd8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/Materials/vehicle_playerShip_glass_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vehicle_playerShip_glass_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Entity/Vehicle/vehicle_playerShip/Materials/vehicle_playerShip_metal_mat.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vehicle_playerShip_metal_mat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _NORMALMAP
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Shader/StandardMobile.cginc

@@ -1,308 +0,0 @@
-#include "UnityCG.cginc"
-
-// DEFINES, CONSTRUCTORS AND STRUCTS
-
-sampler2D _MainTex;
-half4 _MainTex_ST;
-
-// Color, brightness and contrast
-#if COLOR_ON
-half4 _Color;
-half _Brightness;
-half _Contrast;
-#endif
-
-// Phong point light
-#if PHONG_ON
-uniform half4 _PointLightColor;
-uniform half3 _PointLightPosition;
-
-half _AmbiencePower;
-half _SpecularPower;
-half _DiffusePower;
-#endif
-
-// Detail map
-#if DETAIL_ON
-sampler2D _DetailMap;
-half _DetailStrength;
-#endif
-
-// Detail mask
-#if DETAIL_ON && DETAIL_MASK_ON
-sampler2D _DetailMask;
-#endif
-
-// Emission map
-#if EMISSION_ON
-sampler2D _EmissionMap;
-half _EmissionStrength;
-#endif
-
-// Normal map
-#if NORMAL_ON
-sampler2D _NormalMap;
-#endif
-
-struct appdata
-{
-  float4 vertex : POSITION;
-  half2 texcoord : TEXCOORD0;
-  #if PHONG_ON
-  float4 normal : NORMAL;
-  #endif
-  #if NORMAL_ON
-  float4 tangent : TANGENT;
-  #endif
-};
-
-struct appdata_lm
-{
-  float4 vertex : POSITION;
-  half2 texcoord : TEXCOORD0;
-  half2 texcoord_lm : TEXCOORD1;
-  #if PHONG_ON
-  float4 normal : NORMAL;
-  #endif
-  #if NORMAL_ON
-  float4 tangent : TANGENT;
-  #endif
-};
-
-struct v2f
-{
-  float4 vertex : SV_POSITION;
-  half2 uv_main : TEXCOORD0;
-  UNITY_FOG_COORDS(1)
-  #if PHONG_ON
-  float4 worldVertex : TEXCOORD2; // worldPos
-  #endif
-  #if PHONG_ON || NORMAL_ON
-  half3 worldNormal : TEXCOORD3;
-  #endif
-  #if NORMAL_ON
-  // these three vectors will hold a 3x3 rotation matrix
-  // that transforms from tangent to world space
-  half3 tspace0 : TEXCOORD4; // tangent.x, bitangent.x, normal.x
-  half3 tspace1 : TEXCOORD5; // tangent.y, bitangent.y, normal.y
-  half3 tspace2 : TEXCOORD6; // tangent.z, bitangent.z, normal.z
-  #endif
-};
-
-struct v2f_lm
-{
-  float4 vertex : SV_POSITION;
-  half2 uv_main : TEXCOORD0;
-  half2 uv_lm : TEXCOORD1;
-  UNITY_FOG_COORDS(2)
-  #if PHONG_ON
-  float4 worldVertex : TEXCOORD3;
-  #endif
-  #if PHONG_ON || NORMAL_ON
-  half3 worldNormal : TEXCOORD4;
-  #endif
-  #if NORMAL_ON
-  // these three vectors will hold a 3x3 rotation matrix
-  // that transforms from tangent to world space
-  half3 tspace0 : TEXCOORD5; // tangent.x, bitangent.x, normal.x
-  half3 tspace1 : TEXCOORD6; // tangent.y, bitangent.y, normal.y
-  half3 tspace2 : TEXCOORD7; // tangent.z, bitangent.z, normal.z
-  #endif
-};
-
-// VERTEX SHADERS
-
-v2f vert(appdata v)
-{
-  v2f o;
-  o.vertex = UnityObjectToClipPos(v.vertex);
-
-  #if PHONG_ON
-  o.worldVertex = mul(unity_ObjectToWorld, v.vertex);
-  o.worldNormal = UnityObjectToWorldNormal(v.normal);
-  #endif
-
-  #if NORMAL_ON
-  half3 wTangent = UnityObjectToWorldDir(v.tangent.xyz);
-  // compute bitangent from cross product of normal and tangent
-  half tangentSign = v.tangent.w * unity_WorldTransformParams.w;
-  half3 wBitangent = cross(o.worldNormal, wTangent) * tangentSign;
-  // output the tangent space matrix
-  o.tspace0 = half3(wTangent.x, wBitangent.x, o.worldNormal.x);
-  o.tspace1 = half3(wTangent.y, wBitangent.y, o.worldNormal.y);
-  o.tspace2 = half3(wTangent.z, wBitangent.z, o.worldNormal.z);
-  #endif
-
-  o.uv_main = TRANSFORM_TEX(v.texcoord, _MainTex);
-  UNITY_TRANSFER_FOG(o, o.vertex);
-
-  return o;
-}
-
-v2f_lm vert_lm(appdata_lm v)
-{
-  v2f_lm o;
-  o.vertex = UnityObjectToClipPos(v.vertex); // XXX: Is this efficient?
-
-  #if PHONG_ON
-  o.worldVertex = mul(unity_ObjectToWorld, v.vertex);
-  o.worldNormal = UnityObjectToWorldNormal(v.normal);
-  #endif
-
-  #if NORMAL_ON && PHONG_ON
-  half3 wTangent = UnityObjectToWorldDir(v.tangent.xyz);
-  // compute bitangent from cross product of normal and tangent
-  half tangentSign = v.tangent.w * unity_WorldTransformParams.w;
-  half3 wBitangent = cross(o.worldNormal, wTangent) * tangentSign;
-  // output the tangent space matrix
-  o.tspace0 = half3(wTangent.x, wBitangent.x, o.worldNormal.x);
-  o.tspace1 = half3(wTangent.y, wBitangent.y, o.worldNormal.y);
-  o.tspace2 = half3(wTangent.z, wBitangent.z, o.worldNormal.z);
-  #endif
-
-  o.uv_main = TRANSFORM_TEX(v.texcoord, _MainTex);
-  // lightmapped uv
-  o.uv_lm = v.texcoord_lm.xy * unity_LightmapST.xy + unity_LightmapST.zw;
-  UNITY_TRANSFER_FOG(o, o.vertex);
-
-  return o;
-}
-
-// FRAGMENT SHADERS
-
-#if COLOR_ON
-// Fix the brightness, contrast and color
-half4 bcc(half4 main_color)
-{
-  main_color.rgb /= main_color.a;
-  main_color.rgb = ((main_color.rgb - 0.5f) * max(_Contrast, 0)) + 0.5f;
-  main_color.rgb += _Brightness * 0.05;
-  main_color.rgb *= main_color.a;
-
-  //main_color.rgb = lerp(main_color.rgb, _Color.rgb, _Color.a);
-  main_color *= _Color;
-
-  return main_color;
-}
-#endif
-
-fixed4 frag(v2f i) : SV_Target
-{
-  half4 returnColor = tex2D(_MainTex, i.uv_main);
-
-  #if DETAIL_ON
-  half4 mask = half4(1, 1, 1, 1);
-  #endif
-  #if DETAIL_ON && DETAIL_MASK_ON
-  mask = tex2D(_DetailMask, i.uv_main);
-  #endif
-  #if DETAIL_ON
-  half4 detailMap = tex2D(_DetailMap, i.uv_main) * mask;
-  const fixed3 constantList = fixed3(1.0, 0.5, 0.0);
-  returnColor = (returnColor + _DetailStrength*detailMap) * constantList.xxxz + (returnColor + _DetailStrength*detailMap) * constantList.zzzy;
-  #endif
-
-  #if EMISSION_ON
-  returnColor += tex2D(_EmissionMap, i.uv_main)*_EmissionStrength*0.2;
-  #endif
-
-  #if NORMAL_ON
-  // sample the normal map, and decode from the Unity encoding
-  half3 tnormal = UnpackNormal(tex2D(_NormalMap, i.uv_main));
-  // transform normal from tangent to world space
-  half3 worldNormal;
-  worldNormal.x = dot(i.tspace0, tnormal);
-  worldNormal.y = dot(i.tspace1, tnormal);
-  worldNormal.z = dot(i.tspace2, tnormal);
-  float3 normal = normalize(worldNormal);
-  #endif
-  #if !NORMAL_ON && PHONG_ON
-  float3 normal = normalize(i.worldNormal.xyz);
-  #endif
-
-  #if PHONG_ON
-  float3 localCoords = i.worldVertex.xyz;
-  // ambient intensities
-  half3 amb = returnColor.rgb * unity_AmbientSky * _AmbiencePower;
-  // diffuse intensities
-  half3 L = normalize(_PointLightPosition - localCoords);
-  half LdotN = dot(L, normal);
-  half3 dif = _PointLightColor.rgb * returnColor.rgb * saturate(LdotN) * _DiffusePower;
-  // specular intensities
-  half3 V = normalize(_WorldSpaceCameraPos - localCoords);
-  half3 H = normalize(V+L);
-  half3 spe = _PointLightColor.rgb * pow(saturate(dot(normal, H)), 25) * _SpecularPower;
-
-  returnColor.rgb = lerp(returnColor.rgb, amb.rgb+dif.rgb+spe.rgb, _PointLightColor.a);
-  #endif
-
-  UNITY_APPLY_FOG(i.fogCoord, returnColor);
-
-  #if COLOR_ON
-  returnColor = bcc(returnColor);
-  #endif
-
-  return returnColor;
-}
-
-fixed4 frag_lm(v2f_lm i) : SV_Target
-{
-  half4 returnColor = tex2D(_MainTex, i.uv_main);
-
-  #if DETAIL_ON
-  half4 mask = half4(1, 1, 1, 1);
-  #endif
-  #if DETAIL_ON && DETAIL_MASK_ON
-  mask = tex2D(_DetailMask, i.uv_main);
-  #endif
-  #if DETAIL_ON
-  half4 detailMap = tex2D(_DetailMap, i.uv_main) * mask;
-  const fixed3 constantList = fixed3(1.0, 0.5, 0.0);
-  returnColor = (returnColor + _DetailStrength*detailMap) * constantList.xxxz + (returnColor + _DetailStrength*detailMap) * constantList.zzzy;
-  #endif
-
-  #if EMISSION_ON
-  returnColor += tex2D(_EmissionMap, i.uv_main)*_EmissionStrength/5;
-  #endif
-  returnColor.rgb *= DecodeLightmap(UNITY_SAMPLE_TEX2D(unity_Lightmap, i.uv_lm));
-
-  #if NORMAL_ON
-  // sample the normal map, and decode from the Unity encoding
-  half3 tnormal = UnpackNormal(tex2D(_NormalMap, i.uv_main));
-  // transform normal from tangent to world space
-  half3 worldNormal;
-  worldNormal.x = dot(i.tspace0, tnormal);
-  worldNormal.y = dot(i.tspace1, tnormal);
-  worldNormal.z = dot(i.tspace2, tnormal);
-  float3 normal = normalize(worldNormal);
-  #endif
-  #if !NORMAL_ON && PHONG_ON
-  float3 normal = normalize(i.worldNormal.xyz);
-  #endif
-
-  #if PHONG_ON
-  float3 localCoords = i.worldVertex.xyz;
-  // ambient intensities
-  half3 amb = returnColor.rgb * unity_AmbientSky * _AmbiencePower;
-  // diffuse intensities
-  half3 L = normalize(_PointLightPosition - localCoords);
-  half LdotN = dot(L, normal);
-  half3 dif = _PointLightColor.rgb * returnColor.rgb * saturate(LdotN) * _DiffusePower;
-  // specular intensities
-  half3 V = normalize(_WorldSpaceCameraPos - localCoords);
-  half3 H = normalize(V+L);
-  half3 spe = _PointLightColor.rgb * pow(saturate(dot(normal, H)), 25) * _SpecularPower;
-
-  returnColor.rgb = lerp(returnColor.rgb, amb.rgb+dif.rgb+spe.rgb, _PointLightColor.a);
-  #endif
-
-  UNITY_APPLY_FOG(i.fogCoord, returnColor);
-
-  #if COLOR_ON
-  returnColor = bcc(returnColor);
-  #endif
-
-  return returnColor;
-}
-
-// SURFACE SHADERS

Assets/YooAsset/Samples~/Space Shooter/GameArt/Shader/StandardMobile.cginc.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 3da53e94e926e0140a44a19326e2b2b3
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  preprocessorOverride: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/Shader/StandardMobile.shader

@@ -1,110 +0,0 @@
-// Standard shader for mobile
-// Written by Nihal Mirpuri @nylonee
-
-Shader "Mobile/Standard"
-{
-  Properties
-  {
-    _MainTex("Albedo", 2D) = "white" {}
-
-    [Toggle(COLOR_ON)] _ColorToggle("Color, Brightness, Contrast Toggle", Int) = 0
-    _Color("Color", Color) = (1,1,1)
-    _Brightness ("Brightness", Range(-10.0, 10.0)) = 0.0
-    _Contrast ("Contrast", Range(0.0, 3.0)) = 1
-
-    [Toggle(PHONG_ON)] _Phong("Point Light Toggle", Int) = 0
-    _PointLightColor("Point Light Color", Color) = (1,1,1,1)
-    _PointLightPosition("Point Light Position", Vector) = (0.0,0.0,0.0)
-    _AmbiencePower("Ambience intensity", Range(0.0,2.0)) = 1.0
-    _SpecularPower("Specular intensity", Range(0.0,2.0)) = 1.0
-    _DiffusePower("Diffuse intensity", Range(0.0,2.0)) = 1.0
-
-    [Toggle(DETAIL_ON)] _Detail("Detail Map Toggle", Int) = 0
-    _DetailMap("Detail Map", 2D) = "white" {}
-    _DetailStrength("Detail Map Strength", Range(0.0, 2.0)) = 1
-    [Toggle(DETAIL_MASK_ON)] _Mask("Detail Mask Toggle", Int) = 0
-    _DetailMask("Detail Mask", 2D) = "white" {}
-
-    [Toggle(EMISSION_ON)] _Emission("Emission Map Toggle", Int) = 0
-    _EmissionMap("Emission", 2D) = "white" {}
-    _EmissionStrength("Emission Strength", Range(0.0,10.0)) = 1
-
-    [Toggle(NORMAL_ON)] _Normal("Normal Map Toggle", Int) = 0
-    _NormalMap("Normal Map", 2D) = "bump" {}
-  }
-
-  SubShader {
-  	Tags { "RenderType" = "Opaque" }
-  	LOD 150
-
-    // Render the relevant pass based on whether lightmap data is being passed in
-    Pass {
-      Tags { "LightMode" = "VertexLM" }
-      Lighting Off
-      Cull Back
-  		CGPROGRAM
-      #pragma vertex vert_lm
-      #pragma fragment frag_lm
-
-      #pragma multi_compile_fog
-      #pragma skip_variants FOG_LINEAR FOG_EXP
-
-      #pragma shader_feature COLOR_ON
-      #pragma shader_feature PHONG_ON
-      #pragma shader_feature DETAIL_ON
-      #pragma shader_feature DETAIL_MASK_ON
-      #pragma shader_feature EMISSION_ON
-      #pragma shader_feature NORMAL_ON
-
-      #include "StandardMobile.cginc"
-      ENDCG
-    }
-
-    Pass {
-      Tags { "LightMode" = "VertexLMRGBM" }
-      Lighting Off
-      Cull Back
-      CGPROGRAM
-      #pragma vertex vert_lm
-      #pragma fragment frag_lm
-
-      #pragma multi_compile_fog
-      #pragma skip_variants FOG_LINEAR FOG_EXP
-
-      #pragma shader_feature COLOR_ON
-      #pragma shader_feature PHONG_ON
-      #pragma shader_feature DETAIL_ON
-      #pragma shader_feature DETAIL_MASK_ON
-      #pragma shader_feature EMISSION_ON
-      #pragma shader_feature NORMAL_ON
-
-      #include "StandardMobile.cginc"
-      ENDCG
-    }
-
-    Pass {
-      Tags { "LightMode" = "Vertex" }
-      Lighting Off
-      Cull Back
-      CGPROGRAM
-      #pragma vertex vert
-      #pragma fragment frag
-
-      #pragma multi_compile_fog
-      #pragma skip_variants FOG_LINEAR FOG_EXP
-
-      #pragma shader_feature COLOR_ON
-      #pragma shader_feature PHONG_ON
-      #pragma shader_feature DETAIL_ON
-      #pragma shader_feature DETAIL_MASK_ON
-      #pragma shader_feature EMISSION_ON
-      #pragma shader_feature NORMAL_ON
-
-      #include "StandardMobile.cginc"
-      ENDCG
-    }
-
-  }
-
-  FallBack "Mobile/VertexLit"
-}

Assets/YooAsset/Samples~/Space Shooter/GameArt/Shader/StandardMobile.shader.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: ba67c8b1d5e59dc428ad9fc9270f8353
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  preprocessorOverride: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/UIAnim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ede1368ba1fd90949ba1a0b4c74c6970
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameArt/UIFont/zekton free.ttf.meta

@@ -1,16 +0,0 @@
-fileFormatVersion: 2
-guid: 8297a2bf97dbbba468bd2518d003a876
-TrueTypeFontImporter:
-  serializedVersion: 2
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 1
-  characterPadding: 0
-  includeFontData: 1
-  use2xBehaviour: 0
-  fontNames: []
-  customCharacters: 
-  fontRenderingMode: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/YooAsset/Samples~/Space Shooter/GameRes/Effect/Engines.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 27267307e339645e08d812c2bd97702c
-folderAsset: yes
-timeCreated: 1438075911
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: