Update CHANGELOG.md

适配unity2019引擎

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.2.2-preview] - 2024-07-31
+
+### Fixed
+
+- (#321) 修复了在Unity2022里编辑器下离线模式运行失败的问题。
+- (#325) 修复了在Unity2019里编译报错问题。
+
+## [2.2.1-preview] - 2024-07-10
+
+统一了所有PlayMode的初始化逻辑，EditorSimulateMode和OfflinePlayMode初始化不再主动加载资源清单！
+
+### Added
+
+- 新增了IFileSystem.ReadFileData方法，支持原生文件自定义获取文本和二进制数据。
+
+### Improvements
+
+- 优化了DefaultWebFileSystem和DefaultBuildFileSystem文件系统的内部初始化逻辑。
+
 ## [2.2.0-preview] - 2024-07-07
 
 重构了运行时代码，新增了文件系统接口（IFileSystem）方便开发者扩展特殊需求。

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -73,12 +73,7 @@ namespace YooAsset.Editor
             if (buildResult.Success)
             {
                 SimulateBuildResult reulst = new SimulateBuildResult();
-                string versionFileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
-                string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
-                string hashFileName = YooAssetSettingsData.GetPackageHashFileName(packageName, packageVersion);
-                reulst.PackageVersionFilePath = $"{buildResult.OutputPackageDirectory}/{versionFileName}";
-                reulst.PackageManifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-                reulst.PackageHashFilePath = $"{buildResult.OutputPackageDirectory}/{hashFileName}";
+                reulst.PackageRootDirectory = buildResult.OutputPackageDirectory;
                 return reulst;
             }
             else

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

@@ -180,9 +180,9 @@ namespace YooAsset.Editor
             for (int index = 0; index < manifest.BundleList.Count; index++)
             {
                 var packageBundle = manifest.BundleList[index];
-                if (_cacheBundleTags.ContainsKey(index))
+                if (_cacheBundleTags.TryGetValue(index, out var value))
                 {
-                    packageBundle.Tags = _cacheBundleTags[index].ToArray();
+                    packageBundle.Tags = value.ToArray();
                 }
                 else
                 {

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

@@ -56,9 +56,9 @@ namespace YooAsset.Editor
                 string bundleName = collectAssetInfo.BundleName;
                 foreach (var dependAsset in collectAssetInfo.DependAssets)
                 {
-                    if (allBuildAssetInfos.ContainsKey(dependAsset.AssetPath))
+                    if (allBuildAssetInfos.TryGetValue(dependAsset.AssetPath, out var value))
                     {
-                        allBuildAssetInfos[dependAsset.AssetPath].AddReferenceBundleName(bundleName);
+                        value.AddReferenceBundleName(bundleName);
                     }
                     else
                     {

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs

@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)
         {
-            return new string[] { };
+            return Array.Empty<string>();
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs

@@ -3,6 +3,6 @@ namespace YooAsset.Editor
 {
     public interface IBuildPipeline
     {
-        public BuildResult Run(BuildParameters buildParameters, bool enableLog);
+        BuildResult Run(BuildParameters buildParameters, bool enableLog);
     }
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -23,7 +23,7 @@ namespace YooAsset.Editor
 
         private static readonly Dictionary<string, System.Type> _cacheIgnoreRuleTypes = new Dictionary<string, System.Type>();
         private static readonly Dictionary<string, IIgnoreRule> _cacheIgnoreRuleInstance = new Dictionary<string, IIgnoreRule>();
-        
+
         /// <summary>
         /// 配置数据是否被修改
         /// </summary>
@@ -275,23 +275,23 @@ namespace YooAsset.Editor
 
         public static bool HasActiveRuleName(string ruleName)
         {
-            return _cacheActiveRuleTypes.Keys.Contains(ruleName);
+            return _cacheActiveRuleTypes.ContainsKey(ruleName);
         }
         public static bool HasAddressRuleName(string ruleName)
         {
-            return _cacheAddressRuleTypes.Keys.Contains(ruleName);
+            return _cacheAddressRuleTypes.ContainsKey(ruleName);
         }
         public static bool HasPackRuleName(string ruleName)
         {
-            return _cachePackRuleTypes.Keys.Contains(ruleName);
+            return _cachePackRuleTypes.ContainsKey(ruleName);
         }
         public static bool HasFilterRuleName(string ruleName)
         {
-            return _cacheFilterRuleTypes.Keys.Contains(ruleName);
+            return _cacheFilterRuleTypes.ContainsKey(ruleName);
         }
         public static bool HasIgnoreRuleName(string ruleName)
         {
-            return _cacheIgnoreRuleTypes.Keys.Contains(ruleName);
+            return _cacheIgnoreRuleTypes.ContainsKey(ruleName);
         }
 
         public static IActiveRule GetActiveRuleInstance(string ruleName)

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

@@ -20,7 +20,8 @@ namespace YooAsset.Editor
     {
         public bool IsCollectAsset(FilterRuleData data)
         {
-            return Path.GetExtension(data.AssetPath) == ".unity";
+            string extension = Path.GetExtension(data.AssetPath);
+            return extension == ".unity" || extension == ".scene";
         }
     }
 

Assets/YooAsset/Editor/EditorTools.cs

@@ -559,6 +559,21 @@ namespace YooAsset.Editor
         {
             return path.Replace('\\', '/').Replace("\\", "/"); //替换为Linux路径格式
         }
+    
+        /// <summary>
+        /// 移除路径里的后缀名
+        /// </summary>
+        public static string RemoveExtension(string str)
+        {
+            if (string.IsNullOrEmpty(str))
+                return str;
+
+            int index = str.LastIndexOf('.');
+            if (index == -1)
+                return str;
+            else
+                return str.Remove(index); //"assets/config/test.unity3d" --> "assets/config/test"
+        }
 
         /// <summary>
         /// 获取项目工程路径

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

@@ -106,19 +106,13 @@ namespace YooAsset
         }
         public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync()
         {
-#if UNITY_EDITOR
-            var operation = new DBFSInitializeInEditorPlayModeOperation(this);
-            OperationSystem.StartOperation(PackageName, operation);
-            return operation;
-#else
             var operation = new DBFSInitializeOperation(this);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
-#endif
         }
         public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout)
         {
-            var operation = new DBFSLoadPackageManifestOperation(this);
+            var operation = new DBFSLoadPackageManifestOperation(this, packageVersion);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -254,6 +248,29 @@ namespace YooAsset
             return false;
         }
 
+        public virtual byte[] ReadFileData(PackageBundle bundle)
+        {
+            if (NeedUnpack(bundle))
+                return _unpackFileSystem.ReadFileData(bundle);
+
+            if (Exists(bundle) == false)
+                return null;
+
+            string filePath = GetBuildinFileLoadPath(bundle);
+            return FileUtility.ReadAllBytes(filePath);
+        }
+        public virtual string ReadFileText(PackageBundle bundle)
+        {
+            if (NeedUnpack(bundle))
+                return _unpackFileSystem.ReadFileText(bundle);
+
+            if (Exists(bundle) == false)
+                return null;
+
+            string filePath = GetBuildinFileLoadPath(bundle);
+            return FileUtility.ReadAllText(filePath);
+        }
+
         #region 内部方法
         protected string GetDefaultRoot()
         {
@@ -288,7 +305,12 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
-
+        public string GetStreamingAssetsPackageRoot()
+        {
+            string rootPath = PathUtility.Combine(Application.dataPath, "StreamingAssets", YooAssetSettingsData.Setting.DefaultYooFolderName);
+            return PathUtility.Combine(rootPath, PackageName);
+        }
+        
         /// <summary>
         /// 记录文件信息
         /// </summary>

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

@@ -5,7 +5,7 @@ using UnityEngine;
 
 namespace YooAsset
 {
-    internal class DefaultBuildinFileSystemBuild : UnityEditor.Build.IPreprocessBuildWithReport
+    public class DefaultBuildinFileSystemBuild : UnityEditor.Build.IPreprocessBuildWithReport
     {
         public int callbackOrder { get { return 0; } }
 
@@ -24,7 +24,7 @@ namespace YooAsset
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
             {
-                Debug.LogWarning($"Can not found buildin root folder : {rootPath}");
+                Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
                 return;
             }
 
@@ -32,10 +32,14 @@ namespace YooAsset
             DirectoryInfo[] subDirectories = rootDirectory.GetDirectories();
             foreach (var subDirectory in subDirectories)
             {
-                CreateBuildinManifest(subDirectory.Name, subDirectory.FullName);
+                CreateBuildinCatalogFile(subDirectory.Name, subDirectory.FullName);
             }
         }
-        private void CreateBuildinManifest(string packageName, string pacakgeDirectory)
+
+        /// <summary>
+        /// 生成包裹的内置资源目录文件
+        /// </summary>
+        public static void CreateBuildinCatalogFile(string packageName, string pacakgeDirectory)
         {
             // 获取资源清单版本
             string packageVersion;
@@ -86,7 +90,8 @@ namespace YooAsset
             foreach (var fileInfo in fileInfos)
             {
                 if (fileInfo.Extension == ".meta" || fileInfo.Extension == ".version" ||
-                    fileInfo.Extension == ".hash" || fileInfo.Extension == ".bytes")
+                    fileInfo.Extension == ".hash" || fileInfo.Extension == ".bytes" ||
+                    fileInfo.Extension == ".json")
                     continue;
 
                 string fileName = fileInfo.Name;
@@ -105,8 +110,12 @@ namespace YooAsset
             FileUtility.CreateFileDirectory(saveFilePath);
 
             UnityEditor.AssetDatabase.CreateAsset(buildinFileCatalog, saveFilePath);
+            UnityEditor.EditorUtility.SetDirty(buildinFileCatalog);
+#if UNITY_2019
             UnityEditor.AssetDatabase.SaveAssets();
-            UnityEditor.AssetDatabase.Refresh();
+#else
+            UnityEditor.AssetDatabase.SaveAssetIfDirty(buildinFileCatalog);
+#endif
             Debug.Log($"Succeed to save buildin file catalog : {saveFilePath}");
         }
     }

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

@@ -56,6 +56,13 @@ namespace YooAsset
             {
                 if (_loadCatalogFileOp == null)
                 {
+#if UNITY_EDITOR
+                    // 兼容性初始化
+                    // 说明：内置文件系统在编辑器下运行时需要动态生成
+                    string packageRoot = _fileSystem.GetStreamingAssetsPackageRoot();
+                    DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
+#endif
+
                     _loadCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _loadCatalogFileOp);
                 }
@@ -77,110 +84,4 @@ namespace YooAsset
             }
         }
     }
-
-    /// <summary>
-    /// 在编辑器下离线模式的兼容性初始化
-    /// </summary>
-    internal sealed class DBFSInitializeInEditorPlayModeOperation : FSInitializeFileSystemOperation
-    {
-        private enum ESteps
-        {
-            None,
-            InitUnpackFileSystem,
-            LoadPackageManifest,
-            RecordFiles,
-            Done,
-        }
-
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
-        private DBFSLoadPackageManifestOperation _loadPackageManifestOp;
-        private ESteps _steps = ESteps.None;
-
-        internal DBFSInitializeInEditorPlayModeOperation(DefaultBuildinFileSystem fileSystem)
-        {
-            _fileSystem = fileSystem;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.InitUnpackFileSystem;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.InitUnpackFileSystem)
-            {
-                if (_initUnpackFIleSystemOp == null)
-                    _initUnpackFIleSystemOp = _fileSystem.InitializeUpackFileSystem();
-
-                Progress = _initUnpackFIleSystemOp.Progress;
-                if (_initUnpackFIleSystemOp.IsDone == false)
-                    return;
-
-                if (_initUnpackFIleSystemOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadPackageManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _initUnpackFIleSystemOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadPackageManifest)
-            {
-                if (_loadPackageManifestOp == null)
-                {
-                    _loadPackageManifestOp = new DBFSLoadPackageManifestOperation(_fileSystem);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _loadPackageManifestOp);
-                }
-
-                if (_loadPackageManifestOp.IsDone == false)
-                    return;
-
-                if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.RecordFiles;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _loadPackageManifestOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.RecordFiles)
-            {
-                PackageManifest manifest = _loadPackageManifestOp.Manifest;
-                string pacakgeDirectory = _fileSystem.FileRoot;
-                DirectoryInfo rootDirectory = new DirectoryInfo(pacakgeDirectory);
-                FileInfo[] fileInfos = rootDirectory.GetFiles();
-                foreach (var fileInfo in fileInfos)
-                {
-                    if (fileInfo.Extension == ".meta" || fileInfo.Extension == ".version" ||
-                        fileInfo.Extension == ".hash" || fileInfo.Extension == ".bytes")
-                        continue;
-
-                    string fileName = fileInfo.Name;
-                    if (manifest.TryGetPackageBundleByFileName(fileName, out PackageBundle value))
-                    {
-                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(fileName);
-                        _fileSystem.RecordFile(value.BundleGUID, fileWrapper);
-                    }
-                    else
-                    {
-                        YooLogger.Warning($"Failed to mapping buildin bundle file : {fileName}");
-                    }
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-            }
-        }
-    }
 }

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

@@ -111,7 +111,6 @@ namespace YooAsset
         {
             None,
             LoadBuildinRawBundle,
-            CheckLoadBuildinResult,
             Done,
         }
 
@@ -139,32 +138,17 @@ namespace YooAsset
             if (_steps == ESteps.LoadBuildinRawBundle)
             {
                 string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
-                Result = filePath;
-                _steps = ESteps.CheckLoadBuildinResult;
-            }
-
-            if (_steps == ESteps.CheckLoadBuildinResult)
-            {
-                if (Result != null)
+                if (File.Exists(filePath))
                 {
-                    string filePath = Result as string;
-                    if (File.Exists(filePath))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Can not found buildin raw bundle file : {filePath}";
-                    }
+                    _steps = ESteps.Done;
+                    Result = new RawBundle(_fileSystem, _bundle, filePath);
+                    Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load buildin raw bundle file : {_bundle.BundleName}";
+                    Error = $"Can not found buildin raw bundle file : {filePath}";
                 }
             }
         }

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

@@ -6,61 +6,37 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            RequestBuildinPackageVersion,
             RequestBuildinPackageHash,
             LoadBuildinPackageManifest,
             Done,
         }
 
         private readonly DefaultBuildinFileSystem _fileSystem;
-        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
+        private readonly string _packageVersion;
         private RequestBuildinPackageHashOperation _requestBuildinPackageHashOp;
         private LoadBuildinPackageManifestOperation _loadBuildinPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
 
-        public DBFSLoadPackageManifestOperation(DefaultBuildinFileSystem fileSystem)
+        public DBFSLoadPackageManifestOperation(DefaultBuildinFileSystem fileSystem, string packageVersion)
         {
             _fileSystem = fileSystem;
+            _packageVersion = packageVersion;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.RequestBuildinPackageVersion;
+            _steps = ESteps.RequestBuildinPackageHash;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.RequestBuildinPackageVersion)
-            {
-                if (_requestBuildinPackageVersionOp == null)
-                {
-                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
-                    OperationSystem.StartOperation(_fileSystem.PackageName, _requestBuildinPackageVersionOp);
-                }
-
-                if (_requestBuildinPackageVersionOp.IsDone == false)
-                    return;
-
-                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.RequestBuildinPackageHash;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _requestBuildinPackageVersionOp.Error;
-                }
-            }
-
             if (_steps == ESteps.RequestBuildinPackageHash)
             {
                 if (_requestBuildinPackageHashOp == null)
                 {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
-                    _requestBuildinPackageHashOp = new RequestBuildinPackageHashOperation(_fileSystem, packageVersion);
+                    _requestBuildinPackageHashOp = new RequestBuildinPackageHashOperation(_fileSystem, _packageVersion);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _requestBuildinPackageHashOp);
                 }
 
@@ -83,9 +59,8 @@ namespace YooAsset
             {
                 if (_loadBuildinPackageManifestOp == null)
                 {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
                     string packageHash = _requestBuildinPackageHashOp.PackageHash;
-                    _loadBuildinPackageManifestOp = new LoadBuildinPackageManifestOperation(_fileSystem, packageVersion, packageHash);
+                    _loadBuildinPackageManifestOp = new LoadBuildinPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _loadBuildinPackageManifestOp);
                 }
 

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

@@ -303,6 +303,23 @@ namespace YooAsset
             return Exists(bundle) == false;
         }
 
+        public virtual byte[] ReadFileData(PackageBundle bundle)
+        {
+            if (Exists(bundle) == false)
+                return null;
+
+            string filePath = GetCacheFileLoadPath(bundle);
+            return FileUtility.ReadAllBytes(filePath);
+        }
+        public virtual string ReadFileText(PackageBundle bundle)
+        {
+            if (Exists(bundle) == false)
+                return null;
+
+            string filePath = GetCacheFileLoadPath(bundle);
+            return FileUtility.ReadAllText(filePath);
+        }
+
         #region 内部方法
         private readonly BufferWriter _sharedBuffer = new BufferWriter(1024);
         public void WriteInfoFile(string filePath, string dataFileCRC, long dataFileSize)
@@ -368,7 +385,7 @@ namespace YooAsset
             }
             return filePath;
         }
-        public string GetFileLoadPath(PackageBundle bundle)
+        public string GetCacheFileLoadPath(PackageBundle bundle)
         {
             return GetDataFilePath(bundle);
         }

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

@@ -78,7 +78,7 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadAssetBundle)
             {
-                string filePath = _fileSystem.GetFileLoadPath(_bundle);
+                string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
                 if (_isWaitForAsyncComplete)
                 {
                     Result = AssetBundle.LoadFromFile(filePath);
@@ -122,7 +122,7 @@ namespace YooAsset
                     {
                         // 注意：在安卓移动平台，华为和三星真机上有极小概率加载资源包失败。
                         // 说明：大多数情况在首次安装下载资源到沙盒内，游戏过程中切换到后台再回到游戏内有很大概率触发！
-                        string filePath = _fileSystem.GetFileLoadPath(_bundle);
+                        string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
                         byte[] fileData = FileUtility.ReadAllBytes(filePath);
                         if (fileData != null && fileData.Length > 0)
                         {
@@ -165,7 +165,7 @@ namespace YooAsset
 
             while (true)
             {
-                if(_downloadFileOp != null)
+                if (_downloadFileOp != null)
                     _downloadFileOp.WaitForAsyncComplete();
 
                 if (ExecuteWhileDone())
@@ -195,8 +195,7 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            LoadRawBundle,
-            CheckResult,
+            LoadCacheRawBundle,
             Done,
         }
 
@@ -226,7 +225,7 @@ namespace YooAsset
                 {
                     DownloadProgress = 1f;
                     DownloadedBytes = _bundle.FileSize;
-                    _steps = ESteps.LoadRawBundle;
+                    _steps = ESteps.LoadCacheRawBundle;
                 }
                 else
                 {
@@ -249,7 +248,7 @@ namespace YooAsset
 
                 if (_downloadFileOp.Status == EOperationStatus.Succeed)
                 {
-                    _steps = ESteps.LoadRawBundle;
+                    _steps = ESteps.LoadCacheRawBundle;
                 }
                 else
                 {
@@ -259,35 +258,20 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.LoadRawBundle)
+            if (_steps == ESteps.LoadCacheRawBundle)
             {
-                string filePath = _fileSystem.GetFileLoadPath(_bundle);
-                Result = filePath;
-                _steps = ESteps.CheckResult;
-            }
-
-            if (_steps == ESteps.CheckResult)
-            {
-                if (Result != null)
+                string filePath = _fileSystem.GetCacheFileLoadPath(_bundle);
+                if (File.Exists(filePath))
                 {
-                    string filePath = Result as string;
-                    if (File.Exists(filePath))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Can not found cache raw bundle file : {filePath}";
-                    }
+                    _steps = ESteps.Done;
+                    Result = new RawBundle(_fileSystem, _bundle, filePath);
+                    Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load cache raw bundle file : {_bundle.BundleName}";
+                    Error = $"Can not found cache raw bundle file : {filePath}";
                 }
             }
         }

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

@@ -1,4 +1,5 @@
-
+using System;
+
 namespace YooAsset
 {
     /// <summary>
@@ -35,13 +36,6 @@ namespace YooAsset
             }
         }
 
-        #region 自定义参数
-        /// <summary>
-        /// 自定义参数：模拟构建结果
-        /// </summary>
-        public SimulateBuildResult BuildResult { private set; get; } = null;
-        #endregion
-
 
         public DefaultEditorFileSystem()
         {
@@ -54,7 +48,7 @@ namespace YooAsset
         }
         public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout)
         {
-            var operation = new DEFSLoadPackageManifestOperation(this);
+            var operation = new DEFSLoadPackageManifestOperation(this, packageVersion);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -92,23 +86,17 @@ namespace YooAsset
 
         public virtual void SetParameter(string name, object value)
         {
-            if (name == "SIMULATE_BUILD_RESULT")
-            {
-                BuildResult = (SimulateBuildResult)value;
-            }
-            else
-            {
-                YooLogger.Warning($"Invalid parameter : {name}");
-            }
+            YooLogger.Warning($"Invalid parameter : {name}");
         }
         public virtual void OnCreate(string packageName, string rootDirectory)
         {
             PackageName = packageName;
 
             if (string.IsNullOrEmpty(rootDirectory))
-                rootDirectory = GetDefaultRoot();
+                throw new Exception($"{nameof(DefaultEditorFileSystem)} root directory is null or empty !");
 
-            _packageRoot = PathUtility.Combine(rootDirectory, packageName);
+            // 注意：基础目录即为包裹目录
+            _packageRoot = rootDirectory;
         }
         public virtual void OnUpdate()
         {
@@ -135,10 +123,30 @@ namespace YooAsset
             return false;
         }
 
-        #region 内部方法
-        protected string GetDefaultRoot()
+        public virtual byte[] ReadFileData(PackageBundle bundle)
         {
-            return "Assets/";
+            throw new System.NotImplementedException();
+        }
+        public virtual string ReadFileText(PackageBundle bundle)
+        {
+            throw new System.NotImplementedException();
+        }
+        
+        #region 内部方法
+        public string GetEditorPackageVersionFilePath()
+        {
+            string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
+            return PathUtility.Combine(FileRoot, fileName);
+        }
+        public string GetEditorPackageHashFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
+            return PathUtility.Combine(FileRoot, fileName);
+        }
+        public string GetEditorPackageManifestFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
+            return PathUtility.Combine(FileRoot, fileName);
         }
         #endregion
     }

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

@@ -6,33 +6,61 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            LoadEditorPackageHash,
             LoadEditorPackageManifest,
             Done,
         }
 
         private readonly DefaultEditorFileSystem _fileSystem;
+        private readonly string _packageVersion;
+        private LoadEditorPackageHashOperation _loadEditorPackageHashOpe;
         private LoadEditorPackageManifestOperation _loadEditorPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
 
-        internal DEFSLoadPackageManifestOperation(DefaultEditorFileSystem fileSystem)
+        internal DEFSLoadPackageManifestOperation(DefaultEditorFileSystem fileSystem, string packageVersion)
         {
             _fileSystem = fileSystem;
+            _packageVersion = packageVersion;
         }
         internal override void InternalOnStart()
         {
-            _steps = ESteps.LoadEditorPackageManifest;
+            _steps = ESteps.LoadEditorPackageHash;
         }
         internal override void InternalOnUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.LoadEditorPackageHash)
+            {
+                if (_loadEditorPackageHashOpe == null)
+                {
+                    _loadEditorPackageHashOpe = new LoadEditorPackageHashOperation(_fileSystem, _packageVersion);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _loadEditorPackageHashOpe);
+                }
+
+                if (_loadEditorPackageHashOpe.IsDone == false)
+                    return;
+
+                if (_loadEditorPackageHashOpe.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadEditorPackageManifest;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _loadEditorPackageHashOpe.Error;
+                }
+            }
+
             if (_steps == ESteps.LoadEditorPackageManifest)
             {
                 if (_loadEditorPackageManifestOp == null)
                 {
-                    _loadEditorPackageManifestOp = new LoadEditorPackageManifestOperation(_fileSystem);
+                    string packageHash = _loadEditorPackageHashOpe.PackageHash;
+                    _loadEditorPackageManifestOp = new LoadEditorPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _loadEditorPackageManifestOp);
                 }
 

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

@@ -0,0 +1,56 @@
+using System.IO;
+
+namespace YooAsset
+{
+    internal class LoadEditorPackageHashOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            LoadHash,
+            Done,
+        }
+
+        private readonly DefaultEditorFileSystem _fileSystem;
+        private readonly string _packageVersion;
+        private ESteps _steps = ESteps.None;
+
+        /// <summary>
+        /// 包裹哈希值
+        /// </summary>
+        public string PackageHash { private set; get; }
+
+
+        internal LoadEditorPackageHashOperation(DefaultEditorFileSystem fileSystem, string packageVersion)
+        {
+            _fileSystem = fileSystem;
+            _packageVersion = packageVersion;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.LoadHash;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.LoadHash)
+            {
+                string hashFilePath = _fileSystem.GetEditorPackageHashFilePath(_packageVersion);
+                if (File.Exists(hashFilePath))
+                {
+                    _steps = ESteps.Done;
+                    PackageHash = FileUtility.ReadAllText(hashFilePath);
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Can not found simulation package hash file : {hashFilePath}";
+                }
+            }
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageHashOperation.cs.meta

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

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

@@ -8,11 +8,14 @@ namespace YooAsset
         {
             None,
             LoadFileData,
+            VerifyFileData,
             LoadManifest,
             Done,
         }
 
         private readonly DefaultEditorFileSystem _fileSystem;
+        private readonly string _packageVersion;
+        private readonly string _packageHash;
         private DeserializeManifestOperation _deserializer;
         private byte[] _fileData;
         private ESteps _steps = ESteps.None;
@@ -23,9 +26,11 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadEditorPackageManifestOperation(DefaultEditorFileSystem fileSystem)
+        internal LoadEditorPackageManifestOperation(DefaultEditorFileSystem fileSystem, string packageVersion, string packageHash)
         {
             _fileSystem = fileSystem;
+            _packageVersion = packageVersion;
+            _packageHash = packageHash;
         }
         internal override void InternalOnStart()
         {
@@ -38,10 +43,10 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadFileData)
             {
-                string manifestFilePath = _fileSystem.BuildResult.PackageManifestFilePath;
+                string manifestFilePath = _fileSystem.GetEditorPackageManifestFilePath(_packageVersion);
                 if (File.Exists(manifestFilePath))
                 {
-                    _steps = ESteps.LoadManifest;
+                    _steps = ESteps.VerifyFileData;
                     _fileData = FileUtility.ReadAllBytes(manifestFilePath);
                 }
                 else
@@ -52,6 +57,21 @@ namespace YooAsset
                 }
             }
 
+            if (_steps == ESteps.VerifyFileData)
+            {
+                string fileHash = HashUtility.BytesMD5(_fileData);
+                if (fileHash == _packageHash)
+                {
+                    _steps = ESteps.LoadManifest;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Failed to verify simulation package manifest file !";
+                }
+            }
+
             if (_steps == ESteps.LoadManifest)
             {
                 if (_deserializer == null)
@@ -67,7 +87,7 @@ namespace YooAsset
                 if (_deserializer.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
-                    Manifest = _deserializer.Manifest;             
+                    Manifest = _deserializer.Manifest;
                     Status = EOperationStatus.Succeed;
                 }
                 else

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

@@ -35,7 +35,7 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadVersion)
             {
-                string versionFilePath = _fileSystem.BuildResult.PackageVersionFilePath;
+                string versionFilePath = _fileSystem.GetEditorPackageVersionFilePath();
                 if (File.Exists(versionFilePath))
                 {
                     _steps = ESteps.Done;

Assets/YooAsset/Runtime/FileSystem/DefaultWebFileSystem/DefaultWebFileSystem.cs

@@ -157,6 +157,15 @@ namespace YooAsset
             return false;
         }
 
+        public virtual byte[] ReadFileData(PackageBundle bundle)
+        {
+            throw new System.NotImplementedException();
+        }
+        public virtual string ReadFileText(PackageBundle bundle)
+        {
+            throw new System.NotImplementedException();
+        }
+
         #region 内部方法
         protected string GetDefaultWebRoot()
         {
@@ -192,6 +201,11 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
+        public string GetStreamingAssetsPackageRoot()
+        {
+            string rootPath = PathUtility.Combine(Application.dataPath, "StreamingAssets", YooAssetSettingsData.Setting.DefaultYooFolderName);
+            return PathUtility.Combine(rootPath, PackageName);
+        }
 
         /// <summary>
         /// 记录文件信息

Assets/YooAsset/Runtime/FileSystem/DefaultWebFileSystem/Operation/DWFSInitializeOperation.cs

@@ -32,6 +32,13 @@ namespace YooAsset
             {
                 if (_loadCatalogFileOp == null)
                 {
+#if UNITY_EDITOR
+                    // 兼容性初始化
+                    // 说明：内置文件系统在编辑器下运行时需要动态生成
+                    string packageRoot = _fileSystem.GetStreamingAssetsPackageRoot();
+                    DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
+#endif
+
                     _loadCatalogFileOp = new LoadWebCatalogFileOperation(_fileSystem);
                     OperationSystem.StartOperation(_fileSystem.PackageName, _loadCatalogFileOp);
                 }

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

@@ -38,7 +38,7 @@ namespace YooAsset
         /// 清空所有的文件
         /// </summary>
         FSClearAllBundleFilesOperation ClearAllBundleFilesAsync();
-        
+
         /// <summary>
         /// 清空未使用的文件
         /// </summary>
@@ -95,10 +95,21 @@ namespace YooAsset
         /// 是否需要解压
         /// </summary>
         bool NeedUnpack(PackageBundle bundle);
-        
+
         /// <summary>
         /// 是否需要导入
         /// </summary>
         bool NeedImport(PackageBundle bundle);
+
+
+        /// <summary>
+        /// 读取文件二进制数据
+        /// </summary>
+        byte[] ReadFileData(PackageBundle bundle);
+
+        /// <summary>
+        /// 读取文件文本数据
+        /// </summary>
+        string ReadFileText(PackageBundle bundle);
     }
 }

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -92,8 +92,7 @@ namespace YooAsset
         public static FileSystemParameters CreateDefaultEditorFileSystemParameters(SimulateBuildResult simulateBuildResult)
         {
             string fileSystemClass = typeof(DefaultEditorFileSystem).FullName;
-            var fileSystemParams = new FileSystemParameters(fileSystemClass, null);
-            fileSystemParams.AddParameter("SIMULATE_BUILD_RESULT", simulateBuildResult);
+            var fileSystemParams = new FileSystemParameters(fileSystemClass, simulateBuildResult.PackageRootDirectory);
             return fileSystemParams;
         }
 

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

@@ -67,7 +67,7 @@ namespace YooAsset
         /// <summary>
         /// 子资源对象集合
         /// </summary>
-        public UnityEngine.Object[] AllAssetObjects
+        public IReadOnlyList<UnityEngine.Object> AllAssetObjects
         {
             get
             {

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

@@ -72,8 +72,7 @@ namespace YooAsset
         {
             if (IsValidWithWarning == false)
                 return null;
-            string filePath = Provider.RawFilePath;
-            return FileUtility.ReadAllBytes(filePath);
+            return Provider.RawBundleObject.ReadFileData();
         }
 
         /// <summary>
@@ -83,8 +82,7 @@ namespace YooAsset
         {
             if (IsValidWithWarning == false)
                 return null;
-            string filePath = Provider.RawFilePath;
-            return FileUtility.ReadAllText(filePath);
+            return Provider.RawBundleObject.ReadFileText();
         }
 
         /// <summary>
@@ -94,7 +92,7 @@ namespace YooAsset
         {
             if (IsValidWithWarning == false)
                 return string.Empty;
-            return Provider.RawFilePath;
+            return Provider.RawBundleObject.GetFilePath();
         }
     }
 }

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

@@ -67,7 +67,7 @@ namespace YooAsset
         /// <summary>
         /// 子资源对象集合
         /// </summary>
-        public UnityEngine.Object[] AllAssetObjects
+        public IReadOnlyList<UnityEngine.Object> AllAssetObjects
         {
             get
             {

Assets/YooAsset/Runtime/ResourceManager/Loader/LoadBundleFileOperation.cs

@@ -45,7 +45,7 @@ namespace YooAsset
         public long DownloadedBytes { set; get; } = 0;
 
         /// <summary>
-        /// 下载结果
+        /// 加载结果
         /// </summary>
         public object Result { set; get; }
 

Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs

@@ -32,7 +32,7 @@ namespace YooAsset
                     return;
                 }
 
-                if (LoadBundleFileOp.Result is string == false)
+                if (LoadBundleFileOp.Result is RawBundle == false)
                 {
                     string error = "Try load AssetBundle file using load raw file method !";
                     InvokeCompletion(error, EOperationStatus.Failed);
@@ -45,7 +45,7 @@ namespace YooAsset
             // 2. 检测加载结果
             if (_steps == ESteps.Checking)
             {
-                RawFilePath = LoadBundleFileOp.Result as string;
+                RawBundleObject = LoadBundleFileOp.Result as RawBundle;
                 InvokeCompletion(string.Empty, EOperationStatus.Succeed);
             }
         }

Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs

@@ -53,7 +53,7 @@ namespace YooAsset
             // 2. 检测加载结果
             if (_steps == ESteps.Checking)
             {
-                RawFilePath = MainAssetInfo.AssetPath;
+                RawBundleObject = new RawBundle(null, null, MainAssetInfo.AssetPath);
                 InvokeCompletion(string.Empty, EOperationStatus.Succeed);
             }
 #endif

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs

@@ -46,16 +46,16 @@ namespace YooAsset
         /// </summary>
         public UnityEngine.SceneManagement.Scene SceneObject { protected set; get; }
 
+        /// <summary>
+        /// 获取的原生对象
+        /// </summary>
+        public RawBundle RawBundleObject { protected set; get; }
+
         /// <summary>
         /// 加载的场景名称
         /// </summary>
         public string SceneName { protected set; get; }
 
-        /// <summary>
-        /// 原生文件路径
-        /// </summary>
-        public string RawFilePath { protected set; get; }
-
         /// <summary>
         /// 引用计数
         /// </summary>

Assets/YooAsset/Runtime/ResourceManager/RawBundle.cs

@@ -0,0 +1,36 @@
+
+namespace YooAsset
+{
+    internal class RawBundle
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly PackageBundle _packageBundle;
+        private readonly string _filePath;
+
+        internal RawBundle(IFileSystem fileSystem, PackageBundle packageBundle, string filePath)
+        {
+            _fileSystem = fileSystem;
+            _packageBundle = packageBundle;
+            _filePath = filePath;
+        }
+
+        public string GetFilePath()
+        {
+            return _filePath;
+        }
+        public byte[] ReadFileData()
+        {
+            if (_fileSystem != null)
+                return _fileSystem.ReadFileData(_packageBundle);
+            else
+                return FileUtility.ReadAllBytes(_filePath);
+        }
+        public string ReadFileText()
+        {
+            if (_fileSystem != null)
+                return _fileSystem.ReadFileText(_packageBundle);
+            else
+                return FileUtility.ReadAllText(_filePath);
+        }
+    }
+}

Assets/YooAsset/Runtime/ResourceManager/RawBundle.cs.meta

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

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

@@ -18,14 +18,12 @@ namespace YooAsset
             None,
             CreateFileSystem,
             InitFileSystem,
-            LoadManifestFile,
             Done,
         }
 
         private readonly EditorSimulateModeImpl _impl;
         private readonly EditorSimulateModeParameters _parameters;
         private FSInitializeFileSystemOperation _initFileSystemOp;
-        private FSLoadPackageManifestOperation _loadPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
         internal EditorSimulateModeInitializationOperation(EditorSimulateModeImpl impl, EditorSimulateModeParameters parameters)
@@ -71,37 +69,15 @@ namespace YooAsset
                     return;
 
                 if (_initFileSystemOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadManifestFile;
-                }
-                else
                 {
                     _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _initFileSystemOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadManifestFile)
-            {
-                if (_loadPackageManifestOp == null)
-                    _loadPackageManifestOp = _impl.EditorFileSystem.LoadPackageManifestAsync(null, int.MaxValue);
-
-                Progress = _loadPackageManifestOp.Progress;
-                if (_loadPackageManifestOp.IsDone == false)
-                    return;
-
-                if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    _impl.ActiveManifest = _loadPackageManifestOp.Manifest;
                     Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadPackageManifestOp.Error;
+                    Error = _initFileSystemOp.Error;
                 }
             }
         }
@@ -117,13 +93,13 @@ namespace YooAsset
             None,
             CreateFileSystem,
             InitFileSystem,
-            LoadManifestFile,
             Done,
         }
 
         private readonly OfflinePlayModeImpl _impl;
         private readonly OfflinePlayModeParameters _parameters;
         private FSInitializeFileSystemOperation _initFileSystemOp;
+        private FSRequestPackageVersionOperation _requestPackageVersionOp;
         private FSLoadPackageManifestOperation _loadPackageManifestOp;
         private ESteps _steps = ESteps.None;
 
@@ -173,37 +149,15 @@ namespace YooAsset
                     return;
 
                 if (_initFileSystemOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadManifestFile;
-                }
-                else
                 {
                     _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _initFileSystemOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadManifestFile)
-            {
-                if (_loadPackageManifestOp == null)
-                    _loadPackageManifestOp = _impl.BuildinFileSystem.LoadPackageManifestAsync(null, int.MaxValue);
-
-                Progress = _loadPackageManifestOp.Progress;
-                if (_loadPackageManifestOp.IsDone == false)
-                    return;
-
-                if (_loadPackageManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    _impl.ActiveManifest = _loadPackageManifestOp.Manifest;
                     Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadPackageManifestOp.Error;
+                    Error = _initFileSystemOp.Error;
                 }
             }
         }

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -344,7 +344,7 @@ namespace YooAsset
             if (string.IsNullOrEmpty(location) == false)
             {
                 // 检查路径末尾是否有空格
-                int index = location.LastIndexOf(" ");
+                int index = location.LastIndexOf(' ');
                 if (index != -1)
                 {
                     if (location.Length == index + 1)

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

@@ -3,8 +3,6 @@ namespace YooAsset
 {
     public class SimulateBuildResult
     {
-        public string PackageVersionFilePath;
-        public string PackageManifestFilePath;
-        public string PackageHashFilePath;
+        public string PackageRootDirectory;
     }
 }

Assets/YooAsset/Runtime/Utility/YooUtility.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Security.Cryptography;
+using System.Text;
 
 namespace YooAsset
 {
@@ -29,7 +27,7 @@ namespace YooAsset
             if (string.IsNullOrEmpty(str))
                 return str;
 
-            int index = str.LastIndexOf(".");
+            int index = str.LastIndexOf('.');
             if (index == -1)
                 return str;
             else
@@ -121,7 +119,7 @@ namespace YooAsset
         public static string ReadAllText(string filePath)
         {
             if (File.Exists(filePath) == false)
-                return string.Empty;
+                return null;
             return File.ReadAllText(filePath, Encoding.UTF8);
         }
 

Assets/YooAsset/Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs

@@ -11,8 +11,10 @@ using UnityEditor;
 public class ShaderVariantCollectionManifest
 {
     [Serializable]
-    public class ShaderVariantElement
+    public class ShaderVariantElement : IComparable<ShaderVariantElement>
     {
+        public string SortValue { private set; get; }
+
         /// <summary>
         ///  Pass type to use in this variant.
         /// </summary>
@@ -22,11 +24,31 @@ public class ShaderVariantCollectionManifest
         /// Array of shader keywords to use in this variant.
         /// </summary>
         public string[] Keywords;
+
+        public void MakeSortValue()
+        {
+            string combineKeyword = string.Empty;
+            for (int i = 0; i < Keywords.Length; i++)
+            {
+                if (i == 0)
+                    combineKeyword = Keywords[0];
+                else
+                    combineKeyword = $"{combineKeyword}+{Keywords[0]}";
+            }
+
+            SortValue = $"{PassType}+{combineKeyword}";
+        }
+        public int CompareTo(ShaderVariantElement other)
+        {
+            return SortValue.CompareTo(other.SortValue);
+        }
     }
 
     [Serializable]
     public class ShaderVariantInfo : IComparable<ShaderVariantInfo>
     {
+        public string SortValue { private set; get; }
+
         /// <summary>
         /// 着色器资源路径.
         /// </summary>
@@ -47,11 +69,13 @@ public class ShaderVariantCollectionManifest
         /// </summary>
         public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
 
+        public void MakeSortValue()
+        {
+            SortValue = AssetPath + "+" + ShaderName;
+        }
         public int CompareTo(ShaderVariantInfo other)
         {
-            string thisStr = AssetPath + "+" +ShaderName;
-            string otherStr = other.AssetPath + "+" + other.ShaderName;
-            return thisStr.CompareTo(otherStr);
+            return SortValue.CompareTo(other.SortValue);
         }
     }
 
@@ -76,10 +100,15 @@ public class ShaderVariantCollectionManifest
     /// </summary>
     public void AddShaderVariant(string assetPath, string shaderName, PassType passType, string[] keywords)
     {
+        // 排序Keyword列表
+        List<string> temper = new List<string>(keywords);
+        temper.Sort();
+
         var info = GetOrCreateShaderVariantInfo(assetPath, shaderName);
         ShaderVariantElement element = new ShaderVariantElement();
         element.PassType = passType;
-        element.Keywords = keywords;
+        element.Keywords = temper.ToArray();
+        element.MakeSortValue();
         info.ShaderVariantElements.Add(element);
         info.ShaderVariantCount++;
     }
@@ -91,6 +120,7 @@ public class ShaderVariantCollectionManifest
             ShaderVariantInfo newInfo = new ShaderVariantInfo();
             newInfo.AssetPath = assetPath;
             newInfo.ShaderName = shaderName;
+            newInfo.MakeSortValue();
             ShaderVariantInfos.Add(newInfo);
             return newInfo;
         }
@@ -150,6 +180,11 @@ public class ShaderVariantCollectionManifest
 
         // 重新排序
         manifest.ShaderVariantInfos.Sort();
+        foreach (var shaderVariantInfo in manifest.ShaderVariantInfos)
+        {
+            shaderVariantInfo.ShaderVariantElements.Sort();
+        }
+
         return manifest;
     }
 }

Assets/YooAsset/Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -21,8 +21,8 @@ public static class ShaderVariantCollector
         WaitingDone,
     }
 
-    private const float WaitMilliseconds = 1000f;
-    private const float SleepMilliseconds = 2000f;
+    private const float WaitMilliseconds = 3000f;
+    private const float SleepMilliseconds = 3000f;
     private static string _savePath;
     private static string _packageName;
     private static int _processMaxNum;

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/WXFSDownloadFileOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using UnityEngine;
 using UnityEngine.Networking;
 using YooAsset;

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/WXFSInitializeOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal partial class WXFSInitializeOperation : FSInitializeFileSystemOperation

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/WXFSLoadBundleOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using UnityEngine;
 using UnityEngine.Networking;
 using YooAsset;

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOperation

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal class LoadWechatPackageManifestOperation : AsyncOperationBase

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal class RequestWechatPackageHashOperation : AsyncOperationBase

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using YooAsset;
 
 internal class RequestWechatPackageVersionOperation : AsyncOperationBase

Assets/YooAsset/Samples~/Extension Sample/Runtime/WechatFileSystem/WechatFileSystem.cs

@@ -1,4 +1,4 @@
-#if UNITY_WECHAT_GAME
+#if UNITY_WEBGL && WEIXINMINIGAME
 using System.Collections.Generic;
 using UnityEngine;
 using YooAsset;
@@ -52,12 +52,12 @@ internal class WechatFileSystem : IFileSystem
         }
     }
 
-    #region 自定义参数
+#region 自定义参数
     /// <summary>
     /// 自定义参数：远程服务接口
     /// </summary>
     public IRemoteServices RemoteServices { private set; get; } = null;
-    #endregion
+#endregion
 
 
     public WechatFileSystem()
@@ -162,7 +162,16 @@ internal class WechatFileSystem : IFileSystem
         return false;
     }
 
-    #region 内部方法
+    public virtual byte[] ReadFileData(PackageBundle bundle)
+    {
+        throw new System.NotImplementedException();
+    }
+    public virtual string ReadFileText(PackageBundle bundle)
+    {
+        throw new System.NotImplementedException();
+    }
+
+#region 内部方法
     private string GetWXFileLoadPath(PackageBundle bundle)
     {
         if (_wxFilePaths.TryGetValue(bundle.BundleGUID, out string filePath) == false)
@@ -172,6 +181,6 @@ internal class WechatFileSystem : IFileSystem
         }
         return filePath;
     }
-    #endregion
+#endregion
 }
 #endif

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/BattleLogic/BattleRoom.cs

@@ -100,12 +100,12 @@ public class BattleRoom
             if (_startWaitTimer.Update(Time.deltaTime))
             {
                 // 生成实体
-                var handle = YooAssets.LoadAssetAsync<GameObject>("player_ship");
-                handle.Completed += (AssetHandle handle) =>
+                var assetHandle = YooAssets.LoadAssetAsync<GameObject>("player_ship");
+                assetHandle.Completed += (AssetHandle handle) =>
                 {
                     handle.InstantiateSync(_roomRoot.transform);
                 };
-                _handles.Add(handle);
+                _handles.Add(assetHandle);
                 _steps = ESteps.SpawnEnemy;
             }
         }
@@ -117,12 +117,12 @@ public class BattleRoom
             Quaternion spawnRotation = Quaternion.identity;
 
             // 生成实体
-            var handle = YooAssets.LoadAssetAsync<GameObject>(enemyLocation);
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>(enemyLocation);
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(spawnPosition, spawnRotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
 
             _waveSpawnCount++;
             if (_waveSpawnCount >= EnemyCount)
@@ -166,12 +166,12 @@ public class BattleRoom
             var msg = message as BattleEventDefine.PlayerDead;
 
             // 创建爆炸效果
-            var handle = YooAssets.LoadAssetAsync<GameObject>("explosion_player");
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>("explosion_player");
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(msg.Position, msg.Rotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
 
             _steps = ESteps.GameOver;
             BattleEventDefine.GameOver.SendEventMessage();
@@ -181,12 +181,12 @@ public class BattleRoom
             var msg = message as BattleEventDefine.EnemyDead;
 
             // 创建爆炸效果
-            var handle = YooAssets.LoadAssetAsync<GameObject>("explosion_enemy");
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>("explosion_enemy");
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(msg.Position, msg.Rotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
 
             _totalScore += EnemyScore;
             BattleEventDefine.ScoreChange.SendEventMessage(_totalScore);
@@ -196,12 +196,12 @@ public class BattleRoom
             var msg = message as BattleEventDefine.AsteroidExplosion;
 
             // 创建爆炸效果
-            var handle = YooAssets.LoadAssetAsync<GameObject>("explosion_asteroid");
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>("explosion_asteroid");
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(msg.Position, msg.Rotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
 
             _totalScore += AsteroidScore;
             BattleEventDefine.ScoreChange.SendEventMessage(_totalScore);
@@ -211,24 +211,24 @@ public class BattleRoom
             var msg = message as BattleEventDefine.PlayerFireBullet;
 
             // 创建子弹实体
-            var handle = YooAssets.LoadAssetAsync<GameObject>("player_bullet");
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>("player_bullet");
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(msg.Position, msg.Rotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
         }
         else if (message is BattleEventDefine.EnemyFireBullet)
         {
             var msg = message as BattleEventDefine.EnemyFireBullet;
 
             // 创建子弹实体
-            var handle = YooAssets.LoadAssetAsync<GameObject>("enemy_bullet");
-            handle.Completed += (AssetHandle handle) =>
+            var assetHandle = YooAssets.LoadAssetAsync<GameObject>("enemy_bullet");
+            assetHandle.Completed += (AssetHandle handle) =>
             {
                 handle.InstantiateSync(msg.Position, msg.Rotation, _roomRoot.transform);
             };
-            _handles.Add(handle);
+            _handles.Add(assetHandle);
         }
     }
 }

Assets/YooAsset/package.json

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