From 144fe7d3988ec76e56d037f0d641f54fabf3b973 Mon Sep 17 00:00:00 2001 From: hevinci Date: Wed, 23 Mar 2022 18:22:37 +0800 Subject: [PATCH] Update AssetBundleBuilder --- .../AssetBundleBuilderHelper.cs | 4 ++-- .../AssetBundleBuilderWindow.cs | 4 ++-- .../AssetBundleBuilder/BuildBundleInfo.cs | 4 ++-- .../BuildTasks/TaskCopyBuildinFiles.cs | 8 ++++---- .../BuildTasks/TaskCreatePatchManifest.cs | 4 ++-- .../BuildTasks/TaskCreatePatchPackage.cs | 20 +++++++++---------- .../BuildTasks/TaskCreateReport.cs | 2 +- .../BuildTasks/TaskGetBuildMap.cs | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs index c06e862..a416c30 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs @@ -22,7 +22,7 @@ namespace YooAsset.Editor /// public static string MakePipelineOutputDirectory(string outputRoot, BuildTarget buildTarget) { - return $"{outputRoot}/{buildTarget}/{ResourceSettingData.Setting.UnityManifestFileName}"; + return $"{outputRoot}/{buildTarget}/{YooAssetSettingsData.Setting.UnityManifestFileName}"; } /// @@ -126,7 +126,7 @@ namespace YooAsset.Editor /// internal static PatchManifest LoadPatchManifestFile(string fileDirectory) { - string filePath = $"{fileDirectory}/{ResourceSettingData.Setting.PatchManifestFileName}"; + string filePath = $"{fileDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}"; if (File.Exists(filePath) == false) { throw new System.Exception($"Not found patch manifest file : {filePath}"); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs index 0a601ac..0a025ed 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs @@ -140,10 +140,10 @@ namespace YooAsset.Editor buildParameters.OutputRoot = defaultOutputRoot; buildParameters.BuildTarget = _buildTarget; buildParameters.BuildVersion = _buildVersion; - buildParameters.EncryptionServices = CreateEncryptionServicesInstance(); - buildParameters.RedundancyServices = CreateRedundancyServicesInstance(); buildParameters.CompressOption = _compressOption; buildParameters.AppendFileExtension = _appendExtension; + buildParameters.EncryptionServices = CreateEncryptionServicesInstance(); + buildParameters.RedundancyServices = CreateRedundancyServicesInstance(); buildParameters.ForceRebuild = _forceRebuild; buildParameters.BuildinTags = _buildinTags; _assetBuilder.Run(buildParameters); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs index 1270897..8fb91c8 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs @@ -73,9 +73,9 @@ namespace YooAsset.Editor public string GetAppendExtension() { if (IsRawFile) - return $".{ResourceSettingData.Setting.RawFileVariant}"; + return $".{YooAssetSettingsData.Setting.RawFileVariant}"; else - return $".{ResourceSettingData.Setting.AssetBundleFileVariant}"; + return $".{YooAssetSettingsData.Setting.AssetBundleFileVariant}"; } /// diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs index bdfb867..77810fc 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs @@ -45,15 +45,15 @@ namespace YooAsset.Editor // 拷贝清单文件 { - string sourcePath = $"{pipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestFileName}"; - string destPath = $"{Application.dataPath}/StreamingAssets/{ResourceSettingData.Setting.PatchManifestFileName}"; + string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}"; + string destPath = $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.PatchManifestFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } // 拷贝清单哈希文件 { - string sourcePath = $"{pipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestHashFileName}"; - string destPath = $"{Application.dataPath}/StreamingAssets/{ResourceSettingData.Setting.PatchManifestHashFileName}"; + string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}"; + string destPath = $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.PatchManifestHashFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs index d37a938..51e4266 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs @@ -32,12 +32,12 @@ namespace YooAsset.Editor patchManifest.AssetList = GetAllPatchAsset(buildMapContext, patchManifest); // 创建补丁清单文件 - string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestFileName}"; + string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}"; UnityEngine.Debug.Log($"创建补丁清单文件：{manifestFilePath}"); PatchManifest.Serialize(manifestFilePath, patchManifest); // 创建补丁清单哈希文件 - string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestHashFileName}"; + string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}"; string manifestHash = HashUtility.FileMD5(manifestFilePath); UnityEngine.Debug.Log($"创建补丁清单哈希文件：{manifestHashFilePath}"); FileUtility.CreateFile(manifestHashFilePath, manifestHash); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs index d8b9b71..dd1065d 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs @@ -24,40 +24,40 @@ namespace YooAsset.Editor // 拷贝Report文件 { - string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.ReportFileName}"; - string destPath = $"{packageDirectory}/{ResourceSettingData.Setting.ReportFileName}"; + string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.ReportFileName}"; + string destPath = $"{packageDirectory}/{YooAssetSettings.ReportFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); UnityEngine.Debug.Log($"拷贝Report文件到：{destPath}"); } // 拷贝PatchManifest文件 { - string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestFileName}"; - string destPath = $"{packageDirectory}/{ResourceSettingData.Setting.PatchManifestFileName}"; + string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}"; + string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); UnityEngine.Debug.Log($"拷贝PatchManifest文件到：{destPath}"); } // 拷贝PatchManifest哈希文件 { - string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.PatchManifestHashFileName}"; - string destPath = $"{packageDirectory}/{ResourceSettingData.Setting.PatchManifestHashFileName}"; + string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}"; + string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); UnityEngine.Debug.Log($"拷贝PatchManifest哈希文件到：{destPath}"); } // 拷贝UnityManifest序列化文件 { - string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.UnityManifestFileName}"; - string destPath = $"{packageDirectory}/{ResourceSettingData.Setting.UnityManifestFileName}"; + string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}"; + string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}"; EditorTools.CopyFile(sourcePath, destPath, true); UnityEngine.Debug.Log($"拷贝UnityManifest文件到：{destPath}"); } // 拷贝UnityManifest文本文件 { - string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.UnityManifestFileName}.manifest"; - string destPath = $"{packageDirectory}/{ResourceSettingData.Setting.UnityManifestFileName}.manifest"; + string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest"; + string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest"; EditorTools.CopyFile(sourcePath, destPath, true); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs index 2c1b323..5919f2e 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs @@ -105,7 +105,7 @@ namespace YooAsset.Editor } // 删除旧文件 - string filePath = $"{buildParameters.PipelineOutputDirectory}/{ResourceSettingData.Setting.ReportFileName}"; + string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.ReportFileName}"; if (File.Exists(filePath)) File.Delete(filePath); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs index 1732a79..df63f23 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs @@ -234,9 +234,9 @@ namespace YooAsset.Editor var assetInfo = pair.Value; var bundleLabel = AssetBundleCollectorSettingData.GetBundleLabel(assetInfo.AssetPath); if (assetInfo.IsRawAsset) - assetInfo.SetBundleLabelAndVariant(bundleLabel, ResourceSettingData.Setting.RawFileVariant); + assetInfo.SetBundleLabelAndVariant(bundleLabel, YooAssetSettingsData.Setting.RawFileVariant); else - assetInfo.SetBundleLabelAndVariant(bundleLabel, ResourceSettingData.Setting.AssetBundleFileVariant); + assetInfo.SetBundleLabelAndVariant(bundleLabel, YooAssetSettingsData.Setting.AssetBundleFileVariant); EditorTools.DisplayProgressBar("设置资源包名", ++progressValue, buildAssetDic.Count); } EditorTools.ClearProgressBar();