diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs index eb11b8f7..5b1b71e1 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 GetStreamingAssetsRoot() { - return YooAssetSettingsData.GetYooDefaultBuildinRoot(); + return YooAssetSettingsData.GetYooDefaultBuiltinRoot(); } } } \ No newline at end of file diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs index 3bb0ad7b..56a20ebf 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs @@ -43,28 +43,28 @@ namespace YooAsset.Editor EditorPrefs.SetInt(key, (int)fileNameStyle); } - // EBuildinFileCopyOption - public static EBuildinFileCopyOption GetPackageBuildinFileCopyOption(string packageName, string buildPipeline) + // EBuiltinFileCopyOption + public static EBuiltinFileCopyOption GetPackageBuiltinFileCopyOption(string packageName, string buildPipeline) { - string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}"; - return (EBuildinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuildinFileCopyOption.None); + string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuiltinFileCopyOption)}"; + return (EBuiltinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuiltinFileCopyOption.None); } - public static void SetPackageBuildinFileCopyOption(string packageName, string buildPipeline, EBuildinFileCopyOption buildinFileCopyOption) + public static void SetPackageBuiltinFileCopyOption(string packageName, string buildPipeline, EBuiltinFileCopyOption builtinFileCopyOption) { - string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}"; - EditorPrefs.SetInt(key, (int)buildinFileCopyOption); + string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuiltinFileCopyOption)}"; + EditorPrefs.SetInt(key, (int)builtinFileCopyOption); } // BuildFileCopyParams - public static string GetPackageBuildinFileCopyParams(string packageName, string buildPipeline) + public static string GetPackageBuiltinFileCopyParams(string packageName, string buildPipeline) { string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams"; return EditorPrefs.GetString(key, string.Empty); } - public static void SetPackageBuildinFileCopyParams(string packageName, string buildPipeline, string buildinFileCopyParams) + public static void SetPackageBuiltinFileCopyParams(string packageName, string buildPipeline, string builtinFileCopyParams) { string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams"; - EditorPrefs.SetString(key, buildinFileCopyParams); + EditorPrefs.SetString(key, builtinFileCopyParams); } // EncyptionServicesClassName diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs index 4930d7df..e5ae5a48 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs @@ -17,15 +17,15 @@ namespace YooAsset.Editor { var buildParameters = new EditorSimulateBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); - buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = EBuildPipeline.EditorSimulateBuildPipeline.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle; buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget; buildParameters.PackageName = packageName; buildParameters.PackageVersion = "Simulate"; buildParameters.FileNameStyle = EFileNameStyle.HashName; - buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None; - buildParameters.BuildinFileCopyParams = string.Empty; + buildParameters.BuiltinFileCopyOption = EBuiltinFileCopyOption.None; + buildParameters.BuiltinFileCopyParams = string.Empty; buildParameters.UseAssetDependencyDB = true; var pipeline = new EditorSimulateBuildPipeline(); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs index 95db7e3c..11b54cb4 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs @@ -19,7 +19,7 @@ namespace YooAsset.Editor /// /// 内置文件的根目录 /// - public string BuildinFileRoot; + public string BuiltinFileRoot; /// /// 构建管线名称 @@ -86,12 +86,12 @@ namespace YooAsset.Editor /// /// 内置文件的拷贝选项 /// - public EBuildinFileCopyOption BuildinFileCopyOption = EBuildinFileCopyOption.None; + public EBuiltinFileCopyOption BuiltinFileCopyOption = EBuiltinFileCopyOption.None; /// /// 内置文件的拷贝参数 /// - public string BuildinFileCopyParams; + public string BuiltinFileCopyParams; /// /// 资源包加密服务类 @@ -111,7 +111,7 @@ namespace YooAsset.Editor private string _pipelineOutputDirectory = string.Empty; private string _packageOutputDirectory = string.Empty; private string _packageRootDirectory = string.Empty; - private string _buildinRootDirectory = string.Empty; + private string _builtinRootDirectory = string.Empty; /// /// 检测构建参数是否合法 @@ -136,9 +136,9 @@ namespace YooAsset.Editor string message = BuildLogger.GetErrorMessage(ErrorCode.BuildOutputRootIsNullOrEmpty, "Build output root is null or empty !"); throw new Exception(message); } - if (string.IsNullOrEmpty(BuildinFileRoot)) + if (string.IsNullOrEmpty(BuiltinFileRoot)) { - string message = BuildLogger.GetErrorMessage(ErrorCode.BuildinFileRootIsNullOrEmpty, "Buildin file root is null or empty !"); + string message = BuildLogger.GetErrorMessage(ErrorCode.BuiltinFileRootIsNullOrEmpty, "Builtin file root is null or empty !"); throw new Exception(message); } if (string.IsNullOrEmpty(BuildPipeline)) @@ -210,13 +210,13 @@ namespace YooAsset.Editor /// /// 获取内置资源的根目录 /// - public virtual string GetBuildinRootDirectory() + public virtual string GetBuiltinRootDirectory() { - if (string.IsNullOrEmpty(_buildinRootDirectory)) + if (string.IsNullOrEmpty(_builtinRootDirectory)) { - _buildinRootDirectory = $"{BuildinFileRoot}/{PackageName}"; + _builtinRootDirectory = $"{BuiltinFileRoot}/{PackageName}"; } - return _buildinRootDirectory; + return _builtinRootDirectory; } } } \ No newline at end of file diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs index 07aa6523..0c0f16d3 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs @@ -55,9 +55,9 @@ namespace YooAsset.Editor /// /// 获取内置资源的根目录 /// - public string GetBuildinRootDirectory() + public string GetBuiltinRootDirectory() { - return Parameters.GetBuildinRootDirectory(); + return Parameters.GetBuiltinRootDirectory(); } } } \ No newline at end of file diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuiltinFiles.cs similarity index 69% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuiltinFiles.cs index 45794107..e3dfc5dc 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuiltinFiles.cs @@ -6,30 +6,30 @@ using UnityEngine; namespace YooAsset.Editor { - public class TaskCopyBuildinFiles + public class TaskCopyBuiltinFiles { /// /// 拷贝首包资源文件 /// - internal void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, PackageManifest manifest) + internal void CopyBuiltinFilesToStreaming(BuildParametersContext buildParametersContext, PackageManifest manifest) { - EBuildinFileCopyOption copyOption = buildParametersContext.Parameters.BuildinFileCopyOption; + EBuiltinFileCopyOption copyOption = buildParametersContext.Parameters.BuiltinFileCopyOption; string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory(); - string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory(); + string builtinRootDirectory = buildParametersContext.GetBuiltinRootDirectory(); string buildPackageName = buildParametersContext.Parameters.PackageName; string buildPackageVersion = buildParametersContext.Parameters.PackageVersion; // 清空内置文件的目录 - if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.ClearAndCopyByTags) + if (copyOption == EBuiltinFileCopyOption.ClearAndCopyAll || copyOption == EBuiltinFileCopyOption.ClearAndCopyByTags) { - EditorTools.ClearFolder(buildinRootDirectory); + EditorTools.ClearFolder(builtinRootDirectory); } // 拷贝补丁清单文件 { string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion); string sourcePath = $"{packageOutputDirectory}/{fileName}"; - string destPath = $"{buildinRootDirectory}/{fileName}"; + string destPath = $"{builtinRootDirectory}/{fileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } @@ -37,7 +37,7 @@ namespace YooAsset.Editor { string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion); string sourcePath = $"{packageOutputDirectory}/{fileName}"; - string destPath = $"{buildinRootDirectory}/{fileName}"; + string destPath = $"{builtinRootDirectory}/{fileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } @@ -45,38 +45,38 @@ namespace YooAsset.Editor { string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName); string sourcePath = $"{packageOutputDirectory}/{fileName}"; - string destPath = $"{buildinRootDirectory}/{fileName}"; + string destPath = $"{builtinRootDirectory}/{fileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } // 拷贝文件列表（所有文件） - if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.OnlyCopyAll) + if (copyOption == EBuiltinFileCopyOption.ClearAndCopyAll || copyOption == EBuiltinFileCopyOption.OnlyCopyAll) { foreach (var packageBundle in manifest.BundleList) { string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}"; - string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}"; + string destPath = $"{builtinRootDirectory}/{packageBundle.FileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } } // 拷贝文件列表（带标签的文件） - if (copyOption == EBuildinFileCopyOption.ClearAndCopyByTags || copyOption == EBuildinFileCopyOption.OnlyCopyByTags) + if (copyOption == EBuiltinFileCopyOption.ClearAndCopyByTags || copyOption == EBuiltinFileCopyOption.OnlyCopyByTags) { - string[] tags = buildParametersContext.Parameters.BuildinFileCopyParams.Split(';'); + string[] tags = buildParametersContext.Parameters.BuiltinFileCopyParams.Split(';'); foreach (var packageBundle in manifest.BundleList) { if (packageBundle.HasTag(tags) == false) continue; string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}"; - string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}"; + string destPath = $"{builtinRootDirectory}/{packageBundle.FileName}"; EditorTools.CopyFile(sourcePath, destPath, true); } } // 刷新目录 AssetDatabase.Refresh(); - BuildLogger.Log($"Buildin files copy complete: {buildinRootDirectory}"); + BuildLogger.Log($"Builtin files copy complete: {builtinRootDirectory}"); } } } \ No newline at end of file diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuiltinFiles.cs.meta similarity index 100% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs.meta rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuiltinFiles.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs index e408a20e..754f816b 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs @@ -12,10 +12,10 @@ namespace YooAsset.Editor /// internal void CreateCatalogFile(BuildParametersContext buildParametersContext) { - string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory(); + string builtinRootDirectory = buildParametersContext.GetBuiltinRootDirectory(); string buildPackageName = buildParametersContext.Parameters.PackageName; var manifestServices = buildParametersContext.Parameters.ManifestRestoreServices; - CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, buildinRootDirectory); + CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, builtinRootDirectory); // 刷新目录 AssetDatabase.Refresh(); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_BBP.cs similarity index 66% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_BBP.cs index 28e6c420..0e16197f 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_BBP.cs @@ -6,15 +6,15 @@ using UnityEngine; namespace YooAsset.Editor { - public class TaskCopyBuildinFiles_BBP : TaskCopyBuildinFiles, IBuildTask + public class TaskCopyBuiltinFiles_BBP : TaskCopyBuiltinFiles, IBuildTask { void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); var manifestContext = context.GetContextObject(); - if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { - CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest); + CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest); } } } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_BBP.cs.meta similarity index 100% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs.meta rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_BBP.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs index 88ea3ec4..513074c4 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs @@ -11,7 +11,7 @@ namespace YooAsset.Editor void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); - if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { CreateCatalogFile(buildParametersContext); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs index 21168628..1d443674 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs @@ -35,7 +35,7 @@ namespace YooAsset.Editor new TaskCreateManifest_BBP(), new TaskCreateReport_BBP(), new TaskCreatePackage_BBP(), - new TaskCopyBuildinFiles_BBP(), + new TaskCopyBuiltinFiles_BBP(), new TaskCreateCatalog_BBP() }; return pipeline; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_RFBP.cs similarity index 74% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_RFBP.cs index 037d19eb..9ac68e64 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_RFBP.cs @@ -6,16 +6,16 @@ using UnityEngine; namespace YooAsset.Editor { - public class TaskCopyBuildinFiles_RFBP : TaskCopyBuildinFiles, IBuildTask + public class TaskCopyBuiltinFiles_RFBP : TaskCopyBuiltinFiles, IBuildTask { void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); var buildParameters = buildParametersContext.Parameters; var manifestContext = context.GetContextObject(); - if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { - CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest); + CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest); } } } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_RFBP.cs.meta similarity index 100% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs.meta rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_RFBP.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs index 4896bc5c..cac52430 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs @@ -11,7 +11,7 @@ namespace YooAsset.Editor void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); - if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { CreateCatalogFile(buildParametersContext); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs index 38627bea..d4ee184c 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs @@ -37,7 +37,7 @@ namespace YooAsset.Editor new TaskCreateManifest_RFBP(), new TaskCreateReport_RFBP(), new TaskCreatePackage_RFBP(), - new TaskCopyBuildinFiles_RFBP(), + new TaskCopyBuiltinFiles_RFBP(), new TaskCreateCatalog_RFBP() }; return pipeline; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_SBP.cs similarity index 66% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_SBP.cs index aa95380f..a1b4ee7e 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_SBP.cs @@ -6,15 +6,15 @@ using UnityEngine; namespace YooAsset.Editor { - public class TaskCopyBuildinFiles_SBP : TaskCopyBuildinFiles, IBuildTask + public class TaskCopyBuiltinFiles_SBP : TaskCopyBuiltinFiles, IBuildTask { void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); var manifestContext = context.GetContextObject(); - if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { - CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest); + CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest); } } } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_SBP.cs.meta similarity index 100% rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs.meta rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuiltinFiles_SBP.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs index 370da5e5..60feb003 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs @@ -11,7 +11,7 @@ namespace YooAsset.Editor void IBuildTask.Run(BuildContext context) { var buildParametersContext = context.GetContextObject(); - if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None) + if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None) { CreateCatalogFile(buildParametersContext); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs index cab36611..98d899b5 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs @@ -35,7 +35,7 @@ namespace YooAsset.Editor new TaskCreateManifest_SBP(), new TaskCreateReport_SBP(), new TaskCreatePackage_SBP(), - new TaskCopyBuildinFiles_SBP(), + new TaskCopyBuiltinFiles_SBP(), new TaskCreateCatalog_SBP() }; return pipeline; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/ErrorCode.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/ErrorCode.cs index 20d4f99e..b7cbbf04 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/ErrorCode.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/ErrorCode.cs @@ -10,7 +10,7 @@ namespace YooAsset.Editor PackageNameIsNullOrEmpty = 111, PackageVersionIsNullOrEmpty = 112, BuildOutputRootIsNullOrEmpty = 113, - BuildinFileRootIsNullOrEmpty = 114, + BuiltinFileRootIsNullOrEmpty = 114, PackageOutputDirectoryExists = 115, BuildPipelineIsNullOrEmpty = 116, BuildBundleTypeIsUnknown = 117, diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs similarity index 95% rename from Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs rename to Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs index 0efa8d2a..a4594800 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs @@ -4,7 +4,7 @@ namespace YooAsset.Editor /// /// 首包资源文件的拷贝方式 /// - public enum EBuildinFileCopyOption + public enum EBuiltinFileCopyOption { /// /// 不拷贝任何文件 diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs.meta similarity index 100% rename from Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs.meta rename to Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs index 4b65e3b5..16d38c41 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs @@ -127,35 +127,35 @@ namespace YooAsset.Editor }); UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth); } - protected void SetCopyBuildinFileOptionField(EnumField enumField, TextField tagField) + protected void SetCopyBuiltinFileOptionField(EnumField enumField, TextField tagField) { // 首包文件拷贝选项 - var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - enumField.Init(buildinFileCopyOption); - enumField.SetValueWithoutNotify(buildinFileCopyOption); + var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + enumField.Init(builtinFileCopyOption); + enumField.SetValueWithoutNotify(builtinFileCopyOption); enumField.style.width = StyleWidth; enumField.RegisterValueChangedCallback(evt => { - AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, PipelineName, (EBuildinFileCopyOption)enumField.value); + AssetBundleBuilderSetting.SetPackageBuiltinFileCopyOption(PackageName, PipelineName, (EBuiltinFileCopyOption)enumField.value); // 设置内置资源标签显隐 - SetCopyBuildinFileTagsVisible(tagField); + SetCopyBuiltinFileTagsVisible(tagField); }); UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth); } - protected void SetCopyBuildinFileTagsVisible(TextField tagField) + protected void SetCopyBuiltinFileTagsVisible(TextField tagField) { - var option = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - tagField.visible = option == EBuildinFileCopyOption.ClearAndCopyByTags || option == EBuildinFileCopyOption.OnlyCopyByTags; + var option = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + tagField.visible = option == EBuiltinFileCopyOption.ClearAndCopyByTags || option == EBuiltinFileCopyOption.OnlyCopyByTags; } - protected void SetCopyBuildinFileTagsField(TextField textField) + protected void SetCopyBuiltinFileTagsField(TextField textField) { // 首包文件拷贝参数 - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName); - textField.SetValueWithoutNotify(buildinFileCopyParams); + var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName); + textField.SetValueWithoutNotify(builtinFileCopyParams); textField.RegisterValueChangedCallback(evt => { - AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, PipelineName, textField.value); + AssetBundleBuilderSetting.SetPackageBuiltinFileCopyParams(PackageName, PipelineName, textField.value); }); UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs index df39d4e4..b8e4bfe3 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs @@ -21,8 +21,8 @@ namespace YooAsset.Editor protected PopupField _manifestRestoreServicesField; protected EnumField _compressionField; protected EnumField _outputNameStyleField; - protected EnumField _copyBuildinFileOptionField; - protected TextField _copyBuildinFileTagsField; + protected EnumField _copyBuiltinFileOptionField; + protected TextField _copyBuiltinFileTagsField; protected Toggle _clearBuildCacheToggle; protected Toggle _useAssetDependencyDBToggle; @@ -60,13 +60,13 @@ namespace YooAsset.Editor SetOutputNameStyleField(_outputNameStyleField); // 首包文件拷贝参数 - _copyBuildinFileTagsField = Root.Q("CopyBuildinFileParam"); - SetCopyBuildinFileTagsField(_copyBuildinFileTagsField); - SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField); + _copyBuiltinFileTagsField = Root.Q("CopyBuiltinFileParam"); + SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField); + SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField); // 首包文件拷贝选项 - _copyBuildinFileOptionField = Root.Q("CopyBuildinFileOption"); - SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField); + _copyBuiltinFileOptionField = Root.Q("CopyBuiltinFileOption"); + SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField); // 清理构建缓存 _clearBuildCacheToggle = Root.Q("ClearBuildCache"); @@ -99,15 +99,15 @@ namespace YooAsset.Editor protected virtual void ExecuteBuild() { var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName); - var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName); + var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName); var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName); var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName); var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName); BuiltinBuildParameters buildParameters = new BuiltinBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); - buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = PipelineName.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle; buildParameters.BuildTarget = BuildTarget; @@ -116,8 +116,8 @@ namespace YooAsset.Editor buildParameters.EnableSharePackRule = true; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = fileNameStyle; - buildParameters.BuildinFileCopyOption = buildinFileCopyOption; - buildParameters.BuildinFileCopyParams = buildinFileCopyParams; + buildParameters.BuiltinFileCopyOption = builtinFileCopyOption; + buildParameters.BuiltinFileCopyParams = builtinFileCopyParams; buildParameters.CompressOption = compressOption; buildParameters.ClearBuildCacheFiles = clearBuildCache; buildParameters.UseAssetDependencyDB = useAssetDependencyDB; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml index 7c7f8bf2..11009adc 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml @@ -7,8 +7,8 @@ - - + + diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs index 1e1422c2..0eee94d5 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs @@ -59,12 +59,12 @@ namespace YooAsset.Editor protected virtual void ExecuteBuild() { var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName); - var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName); + var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName); EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); - buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = PipelineName.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle; buildParameters.BuildTarget = BuildTarget; @@ -72,8 +72,8 @@ namespace YooAsset.Editor buildParameters.PackageVersion = _buildVersionField.value; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = fileNameStyle; - buildParameters.BuildinFileCopyOption = buildinFileCopyOption; - buildParameters.BuildinFileCopyParams = buildinFileCopyParams; + buildParameters.BuiltinFileCopyOption = builtinFileCopyOption; + buildParameters.BuiltinFileCopyParams = builtinFileCopyParams; EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline(); var buildResult = pipeline.Run(buildParameters, true); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs index 2383d14b..9fae4263 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs @@ -20,8 +20,8 @@ namespace YooAsset.Editor protected PopupField _manifestProcessServicesField; protected PopupField _manifestRestoreServicesField; protected EnumField _outputNameStyleField; - protected EnumField _copyBuildinFileOptionField; - protected TextField _copyBuildinFileTagsField; + protected EnumField _copyBuiltinFileOptionField; + protected TextField _copyBuiltinFileTagsField; protected Toggle _clearBuildCacheToggle; protected Toggle _useAssetDependencyDBToggle; @@ -55,13 +55,13 @@ namespace YooAsset.Editor SetOutputNameStyleField(_outputNameStyleField); // 首包文件拷贝参数 - _copyBuildinFileTagsField = Root.Q("CopyBuildinFileParam"); - SetCopyBuildinFileTagsField(_copyBuildinFileTagsField); - SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField); + _copyBuiltinFileTagsField = Root.Q("CopyBuiltinFileParam"); + SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField); + SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField); // 首包文件拷贝选项 - _copyBuildinFileOptionField = Root.Q("CopyBuildinFileOption"); - SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField); + _copyBuiltinFileOptionField = Root.Q("CopyBuiltinFileOption"); + SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField); // 清理构建缓存 _clearBuildCacheToggle = Root.Q("ClearBuildCache"); @@ -94,14 +94,14 @@ namespace YooAsset.Editor protected virtual void ExecuteBuild() { var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName); - var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName); + var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName); var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName); var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName); RawFileBuildParameters buildParameters = new RawFileBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); - buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = PipelineName.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.RawBundle; buildParameters.BuildTarget = BuildTarget; @@ -109,8 +109,8 @@ namespace YooAsset.Editor buildParameters.PackageVersion = _buildVersionField.value; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = fileNameStyle; - buildParameters.BuildinFileCopyOption = buildinFileCopyOption; - buildParameters.BuildinFileCopyParams = buildinFileCopyParams; + buildParameters.BuiltinFileCopyOption = builtinFileCopyOption; + buildParameters.BuiltinFileCopyParams = builtinFileCopyParams; buildParameters.ClearBuildCacheFiles = clearBuildCache; buildParameters.UseAssetDependencyDB = useAssetDependencyDB; buildParameters.EncryptionServices = CreateEncryptionServicesInstance(); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml index 24ef3807..6e72b5c4 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml @@ -6,8 +6,8 @@ - - + + diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs index febe4a74..be754266 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs @@ -21,8 +21,8 @@ namespace YooAsset.Editor protected PopupField _manifestRestoreServicesField; protected EnumField _compressionField; protected EnumField _outputNameStyleField; - protected EnumField _copyBuildinFileOptionField; - protected TextField _copyBuildinFileTagsField; + protected EnumField _copyBuiltinFileOptionField; + protected TextField _copyBuiltinFileTagsField; protected Toggle _clearBuildCacheToggle; protected Toggle _useAssetDependencyDBToggle; @@ -60,13 +60,13 @@ namespace YooAsset.Editor SetOutputNameStyleField(_outputNameStyleField); // 首包文件拷贝参数 - _copyBuildinFileTagsField = Root.Q("CopyBuildinFileParam"); - SetCopyBuildinFileTagsField(_copyBuildinFileTagsField); - SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField); + _copyBuiltinFileTagsField = Root.Q("CopyBuiltinFileParam"); + SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField); + SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField); // 首包文件拷贝选项 - _copyBuildinFileOptionField = Root.Q("CopyBuildinFileOption"); - SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField); + _copyBuiltinFileOptionField = Root.Q("CopyBuiltinFileOption"); + SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField); // 清理构建缓存 _clearBuildCacheToggle = Root.Q("ClearBuildCache"); @@ -99,15 +99,15 @@ namespace YooAsset.Editor protected virtual void ExecuteBuild() { var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName); - var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName); - var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName); + var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName); + var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName); var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName); var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName); var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName); ScriptableBuildParameters buildParameters = new ScriptableBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); - buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); buildParameters.BuildPipeline = PipelineName.ToString(); buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle; buildParameters.BuildTarget = BuildTarget; @@ -116,8 +116,8 @@ namespace YooAsset.Editor buildParameters.EnableSharePackRule = true; buildParameters.VerifyBuildingResult = true; buildParameters.FileNameStyle = fileNameStyle; - buildParameters.BuildinFileCopyOption = buildinFileCopyOption; - buildParameters.BuildinFileCopyParams = buildinFileCopyParams; + buildParameters.BuiltinFileCopyOption = builtinFileCopyOption; + buildParameters.BuiltinFileCopyParams = builtinFileCopyParams; buildParameters.CompressOption = compressOption; buildParameters.ClearBuildCacheFiles = clearBuildCache; buildParameters.UseAssetDependencyDB = useAssetDependencyDB; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml index 7c7f8bf2..11009adc 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml @@ -7,8 +7,8 @@ - - + + diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs index 1b96888d..75dd5772 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs @@ -53,10 +53,10 @@ namespace YooAsset } // 创建内置清单实例 - var buildinFileCatalog = new DefaultBuildinFileCatalog(); - buildinFileCatalog.FileVersion = CatalogDefine.FileVersion; - buildinFileCatalog.PackageName = packageName; - buildinFileCatalog.PackageVersion = packageVersion; + var builtinFileCatalog = new DefaultBuiltinFileCatalog(); + builtinFileCatalog.FileVersion = CatalogDefine.FileVersion; + builtinFileCatalog.PackageName = packageName; + builtinFileCatalog.PackageVersion = packageVersion; // 创建白名单查询集合 HashSet whiteFileList = new HashSet @@ -68,8 +68,8 @@ namespace YooAsset $"{packageName}_{packageVersion}.hash", $"{packageName}_{packageVersion}.json", $"{packageName}_{packageVersion}.report", - DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName, - DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName + DefaultBuiltinFileSystemDefine.BuiltinCatalogJsonFileName, + DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName }; // 记录所有内置资源文件 @@ -86,10 +86,10 @@ namespace YooAsset string fileName = fileInfo.Name; if (fileMapping.TryGetValue(fileName, out string bundleGUID)) { - var wrapper = new DefaultBuildinFileCatalog.FileWrapper(); + var wrapper = new DefaultBuiltinFileCatalog.FileWrapper(); wrapper.BundleGUID = bundleGUID; wrapper.FileName = fileName; - buildinFileCatalog.Wrappers.Add(wrapper); + builtinFileCatalog.Wrappers.Add(wrapper); } else { @@ -98,16 +98,16 @@ namespace YooAsset } // 创建输出文件 - string jsonFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}"; + string jsonFilePath = $"{packageDirectory}/{DefaultBuiltinFileSystemDefine.BuiltinCatalogJsonFileName}"; if (File.Exists(jsonFilePath)) File.Delete(jsonFilePath); - SerializeToJson(jsonFilePath, buildinFileCatalog); + SerializeToJson(jsonFilePath, builtinFileCatalog); // 创建输出文件 - string binaryFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}"; + string binaryFilePath = $"{packageDirectory}/{DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName}"; if (File.Exists(binaryFilePath)) File.Delete(binaryFilePath); - SerializeToBinary(binaryFilePath, buildinFileCatalog); + SerializeToBinary(binaryFilePath, builtinFileCatalog); UnityEditor.AssetDatabase.Refresh(); Debug.Log($"Succeed to save catalog file : {binaryFilePath}"); @@ -118,7 +118,7 @@ namespace YooAsset /// /// 序列化（JSON文件） /// - public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog) + public static void SerializeToJson(string savePath, DefaultBuiltinFileCatalog catalog) { string json = JsonUtility.ToJson(catalog, true); FileUtility.WriteAllText(savePath, json); @@ -127,15 +127,15 @@ namespace YooAsset /// /// 反序列化（JSON文件） /// - public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent) + public static DefaultBuiltinFileCatalog DeserializeFromJson(string jsonContent) { - return JsonUtility.FromJson(jsonContent); + return JsonUtility.FromJson(jsonContent); } /// /// 序列化（二进制文件） /// - public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog) + public static void SerializeToBinary(string savePath, DefaultBuiltinFileCatalog catalog) { using (FileStream fs = new FileStream(savePath, FileMode.Create)) { @@ -170,7 +170,7 @@ namespace YooAsset /// /// 反序列化（二进制文件） /// - public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData) + public static DefaultBuiltinFileCatalog DeserializeFromBinary(byte[] binaryData) { // 创建缓存器 BufferReader buffer = new BufferReader(binaryData); @@ -185,7 +185,7 @@ namespace YooAsset if (fileVersion != CatalogDefine.FileVersion) throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}"); - DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog(); + DefaultBuiltinFileCatalog catalog = new DefaultBuiltinFileCatalog(); { // 读取文件头信息 catalog.FileVersion = fileVersion; @@ -194,10 +194,10 @@ namespace YooAsset // 读取资源包列表 int fileCount = buffer.ReadInt32(); - catalog.Wrappers = new List(fileCount); + catalog.Wrappers = new List(fileCount); for (int i = 0; i < fileCount; i++) { - var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper(); + var fileWrapper = new DefaultBuiltinFileCatalog.FileWrapper(); fileWrapper.BundleGUID = buffer.ReadUTF8(); fileWrapper.FileName = buffer.ReadUTF8(); catalog.Wrappers.Add(fileWrapper); diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileCatalog.cs similarity index 94% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileCatalog.cs index 6c59e986..a92a84f8 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileCatalog.cs @@ -8,7 +8,7 @@ namespace YooAsset /// 内置资源清单目录 /// [Serializable] - internal class DefaultBuildinFileCatalog + internal class DefaultBuiltinFileCatalog { [Serializable] public class FileWrapper diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileCatalog.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileCatalog.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystem.cs similarity index 90% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystem.cs index 6ffa508f..3ab5c430 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystem.cs @@ -8,7 +8,7 @@ namespace YooAsset /// /// 内置文件系统 /// - internal class DefaultBuildinFileSystem : IFileSystem + internal class DefaultBuiltinFileSystem : IFileSystem { public class FileWrapper { @@ -21,7 +21,7 @@ namespace YooAsset } protected readonly Dictionary _wrappers = new Dictionary(10000); - protected readonly Dictionary _buildinFilePathMapping = new Dictionary(10000); + protected readonly Dictionary _builtinFilePathMapping = new Dictionary(10000); protected IFileSystem _unpackFileSystem; protected string _packageRoot; @@ -81,13 +81,13 @@ namespace YooAsset /// /// 自定义参数：拷贝内置清单 /// - public bool CopyBuildinPackageManifest { private set; get; } = false; + public bool CopyBuiltinPackageManifest { private set; get; } = false; /// /// 自定义参数：拷贝内置清单的目标目录 /// 注意：该参数为空的时候，会获取默认的沙盒目录！ /// - public string CopyBuildinPackageManifestDestRoot { private set; get; } + public string CopyBuiltinPackageManifestDestRoot { private set; get; } /// /// 自定义参数：解密服务接口的实例类 @@ -106,7 +106,7 @@ namespace YooAsset #endregion - public DefaultBuildinFileSystem() + public DefaultBuiltinFileSystem() { } public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync() @@ -131,7 +131,7 @@ namespace YooAsset public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options) { // 注意：业务层的解压器会依赖该方法 - options.ImportFilePath = GetBuildinFileLoadPath(bundle); + options.ImportFilePath = GetBuiltinFileLoadPath(bundle); return _unpackFileSystem.DownloadFileAsync(bundle, options); } public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle) @@ -153,7 +153,7 @@ namespace YooAsset } else { - string error = $"{nameof(DefaultBuildinFileSystem)} not support load bundle type : {bundle.BundleType}"; + string error = $"{nameof(DefaultBuiltinFileSystem)} not support load bundle type : {bundle.BundleType}"; var operation = new FSLoadBundleCompleteOperation(error); return operation; } @@ -184,11 +184,11 @@ namespace YooAsset } else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST) { - CopyBuildinPackageManifest = Convert.ToBoolean(value); + CopyBuiltinPackageManifest = Convert.ToBoolean(value); } else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT) { - CopyBuildinPackageManifestDestRoot = (string)value; + CopyBuiltinPackageManifestDestRoot = (string)value; } else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES) { @@ -212,7 +212,7 @@ namespace YooAsset PackageName = packageName; if (string.IsNullOrEmpty(packageRoot)) - _packageRoot = GetDefaultBuildinPackageRoot(packageName); + _packageRoot = GetDefaultBuiltinPackageRoot(packageName); else _packageRoot = packageRoot; @@ -269,7 +269,7 @@ namespace YooAsset if (IsUnpackBundleFile(bundle)) return _unpackFileSystem.GetBundleFilePath(bundle); - return GetBuildinFileLoadPath(bundle); + return GetBuiltinFileLoadPath(bundle); } public virtual byte[] ReadBundleFileData(PackageBundle bundle) { @@ -281,7 +281,7 @@ namespace YooAsset #if UNITY_ANDROID //TODO : 安卓平台内置文件属于APK压缩包内的文件。 - YooLogger.Error($"Android platform not support read buildin bundle file data !"); + YooLogger.Error($"Android platform not support read builtin bundle file data !"); return null; #else if (bundle.Encrypted) @@ -292,7 +292,7 @@ namespace YooAsset return null; } - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); var fileInfo = new DecryptFileInfo() { BundleName = bundle.BundleName, @@ -303,7 +303,7 @@ namespace YooAsset } else { - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); return FileUtility.ReadAllBytes(filePath); } #endif @@ -318,7 +318,7 @@ namespace YooAsset #if UNITY_ANDROID //TODO : 安卓平台内置文件属于APK压缩包内的文件。 - YooLogger.Error($"Android platform not support read buildin bundle file text !"); + YooLogger.Error($"Android platform not support read builtin bundle file text !"); return null; #else if (bundle.Encrypted) @@ -329,7 +329,7 @@ namespace YooAsset return null; } - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); var fileInfo = new DecryptFileInfo() { BundleName = bundle.BundleName, @@ -340,7 +340,7 @@ namespace YooAsset } else { - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); return FileUtility.ReadAllText(filePath); } #endif @@ -368,38 +368,38 @@ namespace YooAsset } #region 内部方法 - protected string GetDefaultBuildinPackageRoot(string packageName) + protected string GetDefaultBuiltinPackageRoot(string packageName) { - string rootDirectory = YooAssetSettingsData.GetYooDefaultBuildinRoot(); + string rootDirectory = YooAssetSettingsData.GetYooDefaultBuiltinRoot(); return PathUtility.Combine(rootDirectory, packageName); } - public string GetBuildinFileLoadPath(PackageBundle bundle) + public string GetBuiltinFileLoadPath(PackageBundle bundle) { - if (_buildinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false) + if (_builtinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false) { filePath = PathUtility.Combine(_packageRoot, bundle.FileName); - _buildinFilePathMapping.Add(bundle.BundleGUID, filePath); + _builtinFilePathMapping.Add(bundle.BundleGUID, filePath); } return filePath; } - public string GetBuildinPackageVersionFilePath() + public string GetBuiltinPackageVersionFilePath() { string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName); return PathUtility.Combine(_packageRoot, fileName); } - public string GetBuildinPackageHashFilePath(string packageVersion) + public string GetBuiltinPackageHashFilePath(string packageVersion) { string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion); return PathUtility.Combine(_packageRoot, fileName); } - public string GetBuildinPackageManifestFilePath(string packageVersion) + public string GetBuiltinPackageManifestFilePath(string packageVersion) { string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion); return PathUtility.Combine(_packageRoot, fileName); } public string GetCatalogBinaryFileLoadPath() { - return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName); + return PathUtility.Combine(_packageRoot, DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName); } /// @@ -409,7 +409,7 @@ namespace YooAsset { if (_wrappers.ContainsKey(bundleGUID)) { - YooLogger.Error($"{nameof(DefaultBuildinFileSystem)} has element : {bundleGUID}"); + YooLogger.Error($"{nameof(DefaultBuiltinFileSystem)} has element : {bundleGUID}"); return false; } @@ -430,7 +430,7 @@ namespace YooAsset /// public DecryptResult LoadEncryptedAssetBundle(PackageBundle bundle) { - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); var fileInfo = new DecryptFileInfo() { BundleName = bundle.BundleName, @@ -445,7 +445,7 @@ namespace YooAsset /// public DecryptResult LoadEncryptedAssetBundleAsync(PackageBundle bundle) { - string filePath = GetBuildinFileLoadPath(bundle); + string filePath = GetBuiltinFileLoadPath(bundle); var fileInfo = new DecryptFileInfo() { BundleName = bundle.BundleName, diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystem.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystem.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystemDefine.cs similarity index 54% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystemDefine.cs index 59a67980..4f364338 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystemDefine.cs @@ -1,16 +1,16 @@  namespace YooAsset { - internal class DefaultBuildinFileSystemDefine + internal class DefaultBuiltinFileSystemDefine { /// /// 内置清单JSON文件名称 /// - public const string BuildinCatalogJsonFileName = "BuildinCatalog.json"; + public const string BuiltinCatalogJsonFileName = "BuiltinCatalog.json"; /// /// 内置清单二进制文件名称 /// - public const string BuildinCatalogBinaryFileName = "BuildinCatalog.bytes"; + public const string BuiltinCatalogBinaryFileName = "BuiltinCatalog.bytes"; } } \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystemDefine.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuiltinFileSystemDefine.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs index 657b7b6d..41cf156b 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs @@ -8,23 +8,23 @@ namespace YooAsset private enum ESteps { None, - LoadBuildinPackageVersion, - CopyBuildinPackageHash, - CopyBuildinPackageManifest, + LoadBuiltinPackageVersion, + CopyBuiltinPackageHash, + CopyBuiltinPackageManifest, InitUnpackFileSystem, LoadCatalogFile, Done, } - private readonly DefaultBuildinFileSystem _fileSystem; - private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp; - private CopyBuildinFileOperation _copyBuildinHashFileOp; - private CopyBuildinFileOperation _copyBuildinManifestFileOp; + private readonly DefaultBuiltinFileSystem _fileSystem; + private RequestBuiltinPackageVersionOperation _requestBuiltinPackageVersionOp; + private CopyBuiltinFileOperation _copyBuiltinHashFileOp; + private CopyBuiltinFileOperation _copyBuiltinManifestFileOp; private FSInitializeFileSystemOperation _initUnpackFIleSystemOp; - private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp; + private LoadBuiltinCatalogFileOperation _loadBuiltinCatalogFileOp; private ESteps _steps = ESteps.None; - internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem) + internal DBFSInitializeOperation(DefaultBuiltinFileSystem fileSystem) { _fileSystem = fileSystem; } @@ -33,10 +33,10 @@ namespace YooAsset #if UNITY_WEBGL _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !"; + Error = $"{nameof(DefaultBuiltinFileSystem)} is not support WEBGL platform !"; #else - if (_fileSystem.CopyBuildinPackageManifest) - _steps = ESteps.LoadBuildinPackageVersion; + if (_fileSystem.CopyBuiltinPackageManifest) + _steps = ESteps.LoadBuiltinPackageVersion; else _steps = ESteps.InitUnpackFileSystem; #endif @@ -46,76 +46,76 @@ namespace YooAsset if (_steps == ESteps.None || _steps == ESteps.Done) return; - if (_steps == ESteps.LoadBuildinPackageVersion) + if (_steps == ESteps.LoadBuiltinPackageVersion) { - if (_requestBuildinPackageVersionOp == null) + if (_requestBuiltinPackageVersionOp == null) { - _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem); - _requestBuildinPackageVersionOp.StartOperation(); - AddChildOperation(_requestBuildinPackageVersionOp); + _requestBuiltinPackageVersionOp = new RequestBuiltinPackageVersionOperation(_fileSystem); + _requestBuiltinPackageVersionOp.StartOperation(); + AddChildOperation(_requestBuiltinPackageVersionOp); } - _requestBuildinPackageVersionOp.UpdateOperation(); - if (_requestBuildinPackageVersionOp.IsDone == false) + _requestBuiltinPackageVersionOp.UpdateOperation(); + if (_requestBuiltinPackageVersionOp.IsDone == false) return; - if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed) + if (_requestBuiltinPackageVersionOp.Status == EOperationStatus.Succeed) { - _steps = ESteps.CopyBuildinPackageHash; + _steps = ESteps.CopyBuiltinPackageHash; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _requestBuildinPackageVersionOp.Error; + Error = _requestBuiltinPackageVersionOp.Error; } } - if (_steps == ESteps.CopyBuildinPackageHash) + if (_steps == ESteps.CopyBuiltinPackageHash) { - if (_copyBuildinHashFileOp == null) + if (_copyBuiltinHashFileOp == null) { - string packageVersion = _requestBuildinPackageVersionOp.PackageVersion; + string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion; string destFilePath = GetCopyPackageHashDestPath(packageVersion); - string sourceFilePath = _fileSystem.GetBuildinPackageHashFilePath(packageVersion); - _copyBuildinHashFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath); - _copyBuildinHashFileOp.StartOperation(); - AddChildOperation(_copyBuildinHashFileOp); + string sourceFilePath = _fileSystem.GetBuiltinPackageHashFilePath(packageVersion); + _copyBuiltinHashFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath); + _copyBuiltinHashFileOp.StartOperation(); + AddChildOperation(_copyBuiltinHashFileOp); } - _copyBuildinHashFileOp.UpdateOperation(); - if (_copyBuildinHashFileOp.IsDone == false) + _copyBuiltinHashFileOp.UpdateOperation(); + if (_copyBuiltinHashFileOp.IsDone == false) return; - if (_copyBuildinHashFileOp.Status == EOperationStatus.Succeed) + if (_copyBuiltinHashFileOp.Status == EOperationStatus.Succeed) { - _steps = ESteps.CopyBuildinPackageManifest; + _steps = ESteps.CopyBuiltinPackageManifest; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _copyBuildinHashFileOp.Error; + Error = _copyBuiltinHashFileOp.Error; } } - if (_steps == ESteps.CopyBuildinPackageManifest) + if (_steps == ESteps.CopyBuiltinPackageManifest) { - if (_copyBuildinManifestFileOp == null) + if (_copyBuiltinManifestFileOp == null) { - string packageVersion = _requestBuildinPackageVersionOp.PackageVersion; + string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion; string destFilePath = GetCopyPackageManifestDestPath(packageVersion); - string sourceFilePath = _fileSystem.GetBuildinPackageManifestFilePath(packageVersion); - _copyBuildinManifestFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath); - _copyBuildinManifestFileOp.StartOperation(); - AddChildOperation(_copyBuildinManifestFileOp); + string sourceFilePath = _fileSystem.GetBuiltinPackageManifestFilePath(packageVersion); + _copyBuiltinManifestFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath); + _copyBuiltinManifestFileOp.StartOperation(); + AddChildOperation(_copyBuiltinManifestFileOp); } - _copyBuildinManifestFileOp.UpdateOperation(); - if (_copyBuildinManifestFileOp.IsDone == false) + _copyBuiltinManifestFileOp.UpdateOperation(); + if (_copyBuiltinManifestFileOp.IsDone == false) return; - if (_copyBuildinManifestFileOp.Status == EOperationStatus.Succeed) + if (_copyBuiltinManifestFileOp.Status == EOperationStatus.Succeed) { _steps = ESteps.InitUnpackFileSystem; } @@ -123,7 +123,7 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _copyBuildinManifestFileOp.Error; + Error = _copyBuiltinManifestFileOp.Error; } } @@ -163,20 +163,20 @@ namespace YooAsset if (_steps == ESteps.LoadCatalogFile) { - if (_loadBuildinCatalogFileOp == null) + if (_loadBuiltinCatalogFileOp == null) { - _loadBuildinCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem); - _loadBuildinCatalogFileOp.StartOperation(); - AddChildOperation(_loadBuildinCatalogFileOp); + _loadBuiltinCatalogFileOp = new LoadBuiltinCatalogFileOperation(_fileSystem); + _loadBuiltinCatalogFileOp.StartOperation(); + AddChildOperation(_loadBuiltinCatalogFileOp); } - _loadBuildinCatalogFileOp.UpdateOperation(); - if (_loadBuildinCatalogFileOp.IsDone == false) + _loadBuiltinCatalogFileOp.UpdateOperation(); + if (_loadBuiltinCatalogFileOp.IsDone == false) return; - if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed) + if (_loadBuiltinCatalogFileOp.Status == EOperationStatus.Succeed) { - var catalog = _loadBuildinCatalogFileOp.Catalog; + var catalog = _loadBuiltinCatalogFileOp.Catalog; if (catalog == null) { _steps = ESteps.Done; @@ -195,11 +195,11 @@ namespace YooAsset foreach (var wrapper in catalog.Wrappers) { - var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName); + var fileWrapper = new DefaultBuiltinFileSystem.FileWrapper(wrapper.FileName); _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper); } - YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}"); + YooLogger.Log($"Package '{_fileSystem.PackageName}' builtin catalog files count : {catalog.Wrappers.Count}"); _steps = ESteps.Done; Status = EOperationStatus.Succeed; } @@ -207,14 +207,14 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _loadBuildinCatalogFileOp.Error; + Error = _loadBuiltinCatalogFileOp.Error; } } } private string GetCopyManifestFileRoot() { - string destRoot = _fileSystem.CopyBuildinPackageManifestDestRoot; + string destRoot = _fileSystem.CopyBuiltinPackageManifestDestRoot; if (string.IsNullOrEmpty(destRoot)) { string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot(); diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs index 9c363233..7de05b6a 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs @@ -16,7 +16,7 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private readonly PackageBundle _bundle; private AssetBundleCreateRequest _createRequest; private AssetBundle _assetBundle; @@ -24,7 +24,7 @@ namespace YooAsset private ESteps _steps = ESteps.None; - internal DBFSLoadAssetBundleOperation(DefaultBuildinFileSystem fileSystem, PackageBundle bundle) + internal DBFSLoadAssetBundleOperation(DefaultBuiltinFileSystem fileSystem, PackageBundle bundle) { _fileSystem = fileSystem; _bundle = bundle; @@ -64,7 +64,7 @@ namespace YooAsset } else { - string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle); + string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle); _assetBundle = AssetBundle.LoadFromFile(filePath); } } @@ -78,7 +78,7 @@ namespace YooAsset } else { - string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle); + string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle); _createRequest = AssetBundle.LoadFromFileAsync(filePath); } } @@ -110,14 +110,14 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}"; + Error = $"Failed to load encrypted builtin asset bundle file : {_bundle.BundleName}"; YooLogger.Error(Error); } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}"; + Error = $"Failed to load builtin asset bundle file : {_bundle.BundleName}"; YooLogger.Error(Error); } } @@ -150,16 +150,16 @@ namespace YooAsset private enum ESteps { None, - LoadBuildinRawBundle, + LoadBuiltinRawBundle, Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private readonly PackageBundle _bundle; private ESteps _steps = ESteps.None; - internal DBFSLoadRawBundleOperation(DefaultBuildinFileSystem fileSystem, PackageBundle bundle) + internal DBFSLoadRawBundleOperation(DefaultBuiltinFileSystem fileSystem, PackageBundle bundle) { _fileSystem = fileSystem; _bundle = bundle; @@ -168,22 +168,22 @@ namespace YooAsset { DownloadProgress = 1f; DownloadedBytes = _bundle.FileSize; - _steps = ESteps.LoadBuildinRawBundle; + _steps = ESteps.LoadBuiltinRawBundle; } internal override void InternalUpdate() { if (_steps == ESteps.None || _steps == ESteps.Done) return; - if (_steps == ESteps.LoadBuildinRawBundle) + if (_steps == ESteps.LoadBuiltinRawBundle) { - string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle); + string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle); #if UNITY_ANDROID //TODO : 安卓平台内置文件属于APK压缩包内的文件。 _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Can not load android buildin raw bundle file : {filePath}"; + Error = $"Can not load android builtin raw bundle file : {filePath}"; YooLogger.Error(Error); #else if (File.Exists(filePath)) @@ -196,7 +196,7 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Can not found buildin raw bundle file : {filePath}"; + Error = $"Can not found builtin raw bundle file : {filePath}"; YooLogger.Error(Error); } #endif diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs index 0aa56daf..5b3c9cb7 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs @@ -6,82 +6,82 @@ namespace YooAsset private enum ESteps { None, - RequestBuildinPackageHash, - LoadBuildinPackageManifest, + RequestBuiltinPackageHash, + LoadBuiltinPackageManifest, Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private readonly string _packageVersion; - private RequestBuildinPackageHashOperation _requestBuildinPackageHashOp; - private LoadBuildinPackageManifestOperation _loadBuildinPackageManifestOp; + private RequestBuiltinPackageHashOperation _requestBuiltinPackageHashOp; + private LoadBuiltinPackageManifestOperation _loadBuiltinPackageManifestOp; private ESteps _steps = ESteps.None; - public DBFSLoadPackageManifestOperation(DefaultBuildinFileSystem fileSystem, string packageVersion) + public DBFSLoadPackageManifestOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion) { _fileSystem = fileSystem; _packageVersion = packageVersion; } internal override void InternalStart() { - _steps = ESteps.RequestBuildinPackageHash; + _steps = ESteps.RequestBuiltinPackageHash; } internal override void InternalUpdate() { if (_steps == ESteps.None || _steps == ESteps.Done) return; - if (_steps == ESteps.RequestBuildinPackageHash) + if (_steps == ESteps.RequestBuiltinPackageHash) { - if (_requestBuildinPackageHashOp == null) + if (_requestBuiltinPackageHashOp == null) { - _requestBuildinPackageHashOp = new RequestBuildinPackageHashOperation(_fileSystem, _packageVersion); - _requestBuildinPackageHashOp.StartOperation(); - AddChildOperation(_requestBuildinPackageHashOp); + _requestBuiltinPackageHashOp = new RequestBuiltinPackageHashOperation(_fileSystem, _packageVersion); + _requestBuiltinPackageHashOp.StartOperation(); + AddChildOperation(_requestBuiltinPackageHashOp); } - _requestBuildinPackageHashOp.UpdateOperation(); - if (_requestBuildinPackageHashOp.IsDone == false) + _requestBuiltinPackageHashOp.UpdateOperation(); + if (_requestBuiltinPackageHashOp.IsDone == false) return; - if (_requestBuildinPackageHashOp.Status == EOperationStatus.Succeed) + if (_requestBuiltinPackageHashOp.Status == EOperationStatus.Succeed) { - _steps = ESteps.LoadBuildinPackageManifest; + _steps = ESteps.LoadBuiltinPackageManifest; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _requestBuildinPackageHashOp.Error; + Error = _requestBuiltinPackageHashOp.Error; } } - if (_steps == ESteps.LoadBuildinPackageManifest) + if (_steps == ESteps.LoadBuiltinPackageManifest) { - if (_loadBuildinPackageManifestOp == null) + if (_loadBuiltinPackageManifestOp == null) { - string packageHash = _requestBuildinPackageHashOp.PackageHash; - _loadBuildinPackageManifestOp = new LoadBuildinPackageManifestOperation(_fileSystem, _packageVersion, packageHash); - _loadBuildinPackageManifestOp.StartOperation(); - AddChildOperation(_loadBuildinPackageManifestOp); + string packageHash = _requestBuiltinPackageHashOp.PackageHash; + _loadBuiltinPackageManifestOp = new LoadBuiltinPackageManifestOperation(_fileSystem, _packageVersion, packageHash); + _loadBuiltinPackageManifestOp.StartOperation(); + AddChildOperation(_loadBuiltinPackageManifestOp); } - _loadBuildinPackageManifestOp.UpdateOperation(); - if (_loadBuildinPackageManifestOp.IsDone == false) + _loadBuiltinPackageManifestOp.UpdateOperation(); + if (_loadBuiltinPackageManifestOp.IsDone == false) return; - if (_loadBuildinPackageManifestOp.Status == EOperationStatus.Succeed) + if (_loadBuiltinPackageManifestOp.Status == EOperationStatus.Succeed) { _steps = ESteps.Done; - Manifest = _loadBuildinPackageManifestOp.Manifest; + Manifest = _loadBuiltinPackageManifestOp.Manifest; Status = EOperationStatus.Succeed; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _loadBuildinPackageManifestOp.Error; + Error = _loadBuiltinPackageManifestOp.Error; } } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs index 24b4a6e8..5fe3e2e3 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs @@ -10,12 +10,12 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; - private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp; + private readonly DefaultBuiltinFileSystem _fileSystem; + private RequestBuiltinPackageVersionOperation _requestBuiltinPackageVersionOp; private ESteps _steps = ESteps.None; - internal DBFSRequestPackageVersionOperation(DefaultBuildinFileSystem fileSystem) + internal DBFSRequestPackageVersionOperation(DefaultBuiltinFileSystem fileSystem) { _fileSystem = fileSystem; } @@ -30,28 +30,28 @@ namespace YooAsset if (_steps == ESteps.RequestPackageVersion) { - if (_requestBuildinPackageVersionOp == null) + if (_requestBuiltinPackageVersionOp == null) { - _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem); - _requestBuildinPackageVersionOp.StartOperation(); - AddChildOperation(_requestBuildinPackageVersionOp); + _requestBuiltinPackageVersionOp = new RequestBuiltinPackageVersionOperation(_fileSystem); + _requestBuiltinPackageVersionOp.StartOperation(); + AddChildOperation(_requestBuiltinPackageVersionOp); } - _requestBuildinPackageVersionOp.UpdateOperation(); - if (_requestBuildinPackageVersionOp.IsDone == false) + _requestBuiltinPackageVersionOp.UpdateOperation(); + if (_requestBuiltinPackageVersionOp.IsDone == false) return; - if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed) + if (_requestBuiltinPackageVersionOp.Status == EOperationStatus.Succeed) { _steps = ESteps.Done; - PackageVersion = _requestBuildinPackageVersionOp.PackageVersion; + PackageVersion = _requestBuiltinPackageVersionOp.PackageVersion; Status = EOperationStatus.Succeed; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _requestBuildinPackageVersionOp.Error; + Error = _requestBuiltinPackageVersionOp.Error; } } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs similarity index 94% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinFileOperation.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs index 462aec69..75c7f337 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs @@ -3,7 +3,7 @@ using System.IO; namespace YooAsset { - internal class CopyBuildinFileOperation : AsyncOperationBase + internal class CopyBuiltinFileOperation : AsyncOperationBase { private enum ESteps { @@ -19,7 +19,7 @@ namespace YooAsset private readonly string _destFilePath; private ESteps _steps = ESteps.None; - public CopyBuildinFileOperation(string sourceFilePath, string destFilePath) + public CopyBuiltinFileOperation(string sourceFilePath, string destFilePath) { _sourceFilePath = sourceFilePath; _destFilePath = destFilePath; @@ -61,7 +61,7 @@ namespace YooAsset } catch (Exception ex) { - YooLogger.Warning($"Failed copy buildin file : {ex.Message}"); + YooLogger.Warning($"Failed copy builtin file : {ex.Message}"); _steps = ESteps.UnpackFile; } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinFileOperation.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuildinFileOperation.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs similarity index 92% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs index 8b4e53f7..edcd8929 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs @@ -3,7 +3,7 @@ using System.IO; namespace YooAsset { - internal sealed class LoadBuildinCatalogFileOperation : AsyncOperationBase + internal sealed class LoadBuiltinCatalogFileOperation : AsyncOperationBase { private enum ESteps { @@ -14,7 +14,7 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private UnityWebDataRequestOperation _webDataRequestOp; private byte[] _fileData; private ESteps _steps = ESteps.None; @@ -22,9 +22,9 @@ namespace YooAsset /// /// 内置资源目录 /// - public DefaultBuildinFileCatalog Catalog; + public DefaultBuiltinFileCatalog Catalog; - internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem) + internal LoadBuiltinCatalogFileOperation(DefaultBuiltinFileSystem fileSystem) { _fileSystem = fileSystem; } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs similarity index 90% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs index 76b912bb..9e2d05f7 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs @@ -2,7 +2,7 @@ namespace YooAsset { - internal class LoadBuildinPackageManifestOperation : AsyncOperationBase + internal class LoadBuiltinPackageManifestOperation : AsyncOperationBase { private enum ESteps { @@ -14,7 +14,7 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private readonly string _packageVersion; private readonly string _packageHash; private UnityWebDataRequestOperation _webDataRequestOp; @@ -28,7 +28,7 @@ namespace YooAsset public PackageManifest Manifest { private set; get; } - internal LoadBuildinPackageManifestOperation(DefaultBuildinFileSystem fileSystem, string packageVersion, string packageHash) + internal LoadBuiltinPackageManifestOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion, string packageHash) { _fileSystem = fileSystem; _packageVersion = packageVersion; @@ -45,7 +45,7 @@ namespace YooAsset if (_steps == ESteps.TryLoadFileData) { - string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion); + string filePath = _fileSystem.GetBuiltinPackageManifestFilePath(_packageVersion); if (File.Exists(filePath)) { _fileData = File.ReadAllBytes(filePath); @@ -61,7 +61,7 @@ namespace YooAsset { if (_webDataRequestOp == null) { - string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion); + string filePath = _fileSystem.GetBuiltinPackageManifestFilePath(_packageVersion); string url = DownloadSystemHelper.ConvertToWWWPath(filePath); _webDataRequestOp = new UnityWebDataRequestOperation(url, 60); _webDataRequestOp.StartOperation(); @@ -95,7 +95,7 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = "Failed to verify buildin package manifest file !"; + Error = "Failed to verify builtin package manifest file !"; } } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinPackageManifestOperation.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs similarity index 88% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs index df4a156a..7a328d16 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs @@ -2,7 +2,7 @@ namespace YooAsset { - internal class RequestBuildinPackageHashOperation : AsyncOperationBase + internal class RequestBuiltinPackageHashOperation : AsyncOperationBase { private enum ESteps { @@ -13,7 +13,7 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private readonly string _packageVersion; private UnityWebTextRequestOperation _webTextRequestOp; private ESteps _steps = ESteps.None; @@ -24,7 +24,7 @@ namespace YooAsset public string PackageHash { private set; get; } - internal RequestBuildinPackageHashOperation(DefaultBuildinFileSystem fileSystem, string packageVersion) + internal RequestBuiltinPackageHashOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion) { _fileSystem = fileSystem; _packageVersion = packageVersion; @@ -40,7 +40,7 @@ namespace YooAsset if (_steps == ESteps.TryLoadPackageHash) { - string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion); + string filePath = _fileSystem.GetBuiltinPackageHashFilePath(_packageVersion); if (File.Exists(filePath)) { PackageHash = File.ReadAllText(filePath); @@ -56,7 +56,7 @@ namespace YooAsset { if (_webTextRequestOp == null) { - string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion); + string filePath = _fileSystem.GetBuiltinPackageHashFilePath(_packageVersion); string url = DownloadSystemHelper.ConvertToWWWPath(filePath); _webTextRequestOp = new UnityWebTextRequestOperation(url, 60); _webTextRequestOp.StartOperation(); @@ -86,7 +86,7 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Buildin package hash file content is empty !"; + Error = $"Builtin package hash file content is empty !"; } else { diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageHashOperation.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageVersionOperation.cs similarity index 86% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageVersionOperation.cs index d93e2ea2..9e77f35c 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageVersionOperation.cs @@ -2,7 +2,7 @@ namespace YooAsset { - internal class RequestBuildinPackageVersionOperation : AsyncOperationBase + internal class RequestBuiltinPackageVersionOperation : AsyncOperationBase { private enum ESteps { @@ -13,7 +13,7 @@ namespace YooAsset Done, } - private readonly DefaultBuildinFileSystem _fileSystem; + private readonly DefaultBuiltinFileSystem _fileSystem; private UnityWebTextRequestOperation _webTextRequestOp; private ESteps _steps = ESteps.None; @@ -23,7 +23,7 @@ namespace YooAsset public string PackageVersion { private set; get; } - internal RequestBuildinPackageVersionOperation(DefaultBuildinFileSystem fileSystem) + internal RequestBuiltinPackageVersionOperation(DefaultBuiltinFileSystem fileSystem) { _fileSystem = fileSystem; } @@ -38,7 +38,7 @@ namespace YooAsset if (_steps == ESteps.TryLoadPackageVersion) { - string filePath = _fileSystem.GetBuildinPackageVersionFilePath(); + string filePath = _fileSystem.GetBuiltinPackageVersionFilePath(); if (File.Exists(filePath)) { PackageVersion = File.ReadAllText(filePath); @@ -54,7 +54,7 @@ namespace YooAsset { if (_webTextRequestOp == null) { - string filePath = _fileSystem.GetBuildinPackageVersionFilePath(); + string filePath = _fileSystem.GetBuiltinPackageVersionFilePath(); string url = DownloadSystemHelper.ConvertToWWWPath(filePath); _webTextRequestOp = new UnityWebTextRequestOperation(url, 60); _webTextRequestOp.StartOperation(); @@ -84,7 +84,7 @@ namespace YooAsset { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = $"Buildin package version file content is empty !"; + Error = $"Builtin package version file content is empty !"; } else { diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs.meta b/Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageVersionOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuildinPackageVersionOperation.cs.meta rename to Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/RequestBuiltinPackageVersionOperation.cs.meta diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackRemoteServices.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackRemoteServices.cs index 519db3ac..879b6f39 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackRemoteServices.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackRemoteServices.cs @@ -4,12 +4,12 @@ namespace YooAsset { internal class DefaultUnpackRemoteServices : IRemoteServices { - private readonly string _buildinPackageRoot; + private readonly string _builtinPackageRoot; protected readonly Dictionary _mapping = new Dictionary(10000); - public DefaultUnpackRemoteServices(string buildinPackRoot) + public DefaultUnpackRemoteServices(string builtinPackRoot) { - _buildinPackageRoot = buildinPackRoot; + _builtinPackageRoot = builtinPackRoot; } string IRemoteServices.GetRemoteMainURL(string fileName) { @@ -24,7 +24,7 @@ namespace YooAsset { if (_mapping.TryGetValue(fileName, out string url) == false) { - string filePath = PathUtility.Combine(_buildinPackageRoot, fileName); + string filePath = PathUtility.Combine(_builtinPackageRoot, fileName); url = DownloadSystemHelper.ConvertToWWWPath(filePath); _mapping.Add(fileName, url); } diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs index d90049e8..019ce885 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs @@ -180,7 +180,7 @@ namespace YooAsset #region 内部方法 protected string GetDefaultWebPackageRoot(string packageName) { - string rootDirectory = YooAssetSettingsData.GetYooDefaultBuildinRoot(); + string rootDirectory = YooAssetSettingsData.GetYooDefaultBuiltinRoot(); return PathUtility.Combine(rootDirectory, packageName); } public string GetWebFileLoadPath(PackageBundle bundle) @@ -209,7 +209,7 @@ namespace YooAsset } public string GetCatalogBinaryFileLoadPath() { - return PathUtility.Combine(_webPackageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName); + return PathUtility.Combine(_webPackageRoot, DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName); } /// diff --git a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs index 8fa2ec29..9cf0f84a 100644 --- a/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs +++ b/Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs @@ -77,7 +77,7 @@ namespace YooAsset _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper); } - YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}"); + YooLogger.Log($"Package '{_fileSystem.PackageName}' builtin catalog files count : {catalog.Wrappers.Count}"); _steps = ESteps.Done; Status = EOperationStatus.Succeed; } diff --git a/Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs b/Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs index 6a927ae5..13d01baa 100644 --- a/Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs +++ b/Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs @@ -83,9 +83,9 @@ namespace YooAsset /// /// 加密文件解密服务类 /// 文件系统的根目录 - public static FileSystemParameters CreateDefaultBuildinFileSystemParameters(IDecryptionServices decryptionServices = null, string packageRoot = null) + public static FileSystemParameters CreateDefaultBuiltinFileSystemParameters(IDecryptionServices decryptionServices = null, string packageRoot = null) { - string fileSystemClass = typeof(DefaultBuildinFileSystem).FullName; + string fileSystemClass = typeof(DefaultBuiltinFileSystem).FullName; var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices); return fileSystemParams; diff --git a/Assets/YooAsset/Runtime/InitializeParameters.cs b/Assets/YooAsset/Runtime/InitializeParameters.cs index 058330d1..1bb0cb9a 100644 --- a/Assets/YooAsset/Runtime/InitializeParameters.cs +++ b/Assets/YooAsset/Runtime/InitializeParameters.cs @@ -71,7 +71,7 @@ namespace YooAsset /// public class OfflinePlayModeParameters : InitializeParameters { - public FileSystemParameters BuildinFileSystemParameters; + public FileSystemParameters BuiltinFileSystemParameters; } /// @@ -79,7 +79,7 @@ namespace YooAsset /// public class HostPlayModeParameters : InitializeParameters { - public FileSystemParameters BuildinFileSystemParameters; + public FileSystemParameters BuiltinFileSystemParameters; public FileSystemParameters CacheFileSystemParameters; } diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs index 452893c5..620b1ca1 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs @@ -112,12 +112,12 @@ namespace YooAsset else if (_playMode == EPlayMode.OfflinePlayMode) { var initializeParameters = parameters as OfflinePlayModeParameters; - initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters); + initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuiltinFileSystemParameters); } else if (_playMode == EPlayMode.HostPlayMode) { var initializeParameters = parameters as HostPlayModeParameters; - initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuildinFileSystemParameters, initializeParameters.CacheFileSystemParameters); + initializeOperation = playModeImpl.InitializeAsync(initializeParameters.BuiltinFileSystemParameters, initializeParameters.CacheFileSystemParameters); } else if (_playMode == EPlayMode.WebPlayMode) { diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs index e67f2c47..8c1ec1e9 100644 --- a/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs +++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs @@ -191,7 +191,7 @@ namespace YooAsset /// /// 获取YOO默认的内置文件根目录 /// - internal static string GetYooDefaultBuildinRoot() + internal static string GetYooDefaultBuiltinRoot() { if (string.IsNullOrEmpty(Setting.DefaultYooFolderName)) return Application.streamingAssetsPath;