diff --git a/Editor/Build.meta b/Editor/Build.meta index 14b8047..8994c1a 100644 --- a/Editor/Build.meta +++ b/Editor/Build.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: cf685193bc1e8cd4193c4c0003a1ef33 -timeCreated: 1737627977 \ No newline at end of file +guid: aaa18fe06ddc42c0872e3178d851e588 +timeCreated: 1742451366 \ No newline at end of file diff --git a/Editor/Build/BuildCLI/AppBuildHelper.cs b/Editor/Build/BuildCLI/AppBuildHelper.cs index a7a91bb..6640908 100644 --- a/Editor/Build/BuildCLI/AppBuildHelper.cs +++ b/Editor/Build/BuildCLI/AppBuildHelper.cs @@ -21,7 +21,7 @@ public static class AppBuildHelper Debug.Log("Starting build application"); - BuilderGenerate.GeneratAppBuilderSetting(appBuildParameter.language, appBuildParameter.developBuild, appBuildParameter.resMode); + BuilderGenerate.GeneratAppBuilderSetting(appBuildParameter.language, appBuildParameter.showDebugWnd, appBuildParameter.resMode); Debug.Log("Generate AppBuilderSetting.bytes"); diff --git a/Editor/Build/BuildCLI/BuildParameter.cs b/Editor/Build/BuildCLI/BuildParameter.cs index ed9219e..d026f60 100644 --- a/Editor/Build/BuildCLI/BuildParameter.cs +++ b/Editor/Build/BuildCLI/BuildParameter.cs @@ -5,10 +5,11 @@ using UnityEngine.Serialization; using YooAsset.Editor; [System.Serializable] -public struct AppBuildParameter +public class AppBuildParameter { public BuildTarget buildTarget; public string outPutPath; + public bool showDebugWnd; public bool developBuild; public int resMode; public string fileName; @@ -16,17 +17,18 @@ public struct AppBuildParameter } -public struct ResourceBuildParameter +public class ResourceBuildParameter { - public BuildTarget ResourceBuildTarget; - public string PackageVersion; - public bool UseDefaultPackageVersion; - public string OutputPath; - public ResourceBuildMode BuildMode; + public BuildTarget resourceBuildTarget; + public string packageVersion; + public bool useDefaultPackageVersion; + public string outputPath; + public ResourceBuildMode buildMode; - public const ECompressOption CompressOption = ECompressOption.LZ4; - public const EFileNameStyle FileNameStyle = EFileNameStyle.BundleName_HashName; - public const string EncryptionServiceType = "AlicizaX.Resource.Editor.FileOffsetEncryption"; + + public ECompressOption compressOption = ECompressOption.LZ4; + public EFileNameStyle fileNameStyle = EFileNameStyle.BundleName_HashName; + public string encryptionServiceType = "AlicizaX.Resource.Editor.FileOffsetEncryption"; } public enum ResourceBuildMode diff --git a/Editor/Build/BuildCLI/ResourceBuildHelper.cs b/Editor/Build/BuildCLI/ResourceBuildHelper.cs index bf7dbc0..d22f78e 100644 --- a/Editor/Build/BuildCLI/ResourceBuildHelper.cs +++ b/Editor/Build/BuildCLI/ResourceBuildHelper.cs @@ -20,16 +20,16 @@ public static class ResourceBuildHelper public static void BuildResourcePackage(ResourceBuildParameter buildParameter) { - if (!Directory.Exists(buildParameter.OutputPath)) + if (!Directory.Exists(buildParameter.outputPath)) { - Directory.CreateDirectory(buildParameter.OutputPath); + Directory.CreateDirectory(buildParameter.outputPath); } try { string copyParams = string.Empty; EBuildinFileCopyOption copyOption = EBuildinFileCopyOption.None; - if (buildParameter.BuildMode == ResourceBuildMode.Online) + if (buildParameter.buildMode == ResourceBuildMode.Online) { copyOption = EBuildinFileCopyOption.ClearAndCopyByTags; copyParams = "Launch"; @@ -41,21 +41,21 @@ public static class ResourceBuildHelper var parameters = new ScriptableBuildParameters { - BuildOutputRoot = buildParameter.OutputPath, - BuildTarget = buildParameter.ResourceBuildTarget, + BuildOutputRoot = buildParameter.outputPath, + BuildTarget = buildParameter.resourceBuildTarget, PackageName = BuildPackageName, BuildBundleType = (int)EBuildBundleType.AssetBundle, BuildPipeline = EBuildPipeline.ScriptableBuildPipeline.ToString(), BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(), - PackageVersion = buildParameter.UseDefaultPackageVersion ? GeneratePackageVersion() : buildParameter.PackageVersion, - CompressOption = ResourceBuildParameter.CompressOption, - FileNameStyle = ResourceBuildParameter.FileNameStyle, + PackageVersion = buildParameter.useDefaultPackageVersion ? GeneratePackageVersion() : buildParameter.packageVersion, + CompressOption = buildParameter.compressOption, + FileNameStyle = buildParameter.fileNameStyle, VerifyBuildingResult = true, ClearBuildCacheFiles = false, BuildinFileCopyOption = copyOption, BuildinFileCopyParams = copyParams, EnableSharePackRule = EnableSharePack, - EncryptionServices = CreateEncryptionInstance(ResourceBuildParameter.EncryptionServiceType) + EncryptionServices = CreateEncryptionInstance(buildParameter.encryptionServiceType) }; ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();