diff --git a/Editor/BuildTool/AppBuilder.cs b/Editor/BuildTool/AppBuilder.cs index 9706b2e..dac7783 100644 --- a/Editor/BuildTool/AppBuilder.cs +++ b/Editor/BuildTool/AppBuilder.cs @@ -14,17 +14,17 @@ namespace Guru.Editor /// public partial class AppBuilder { - public static int AndroidTargetSdkVersion = 34; - public static string IOSTargetOSVersion = "13.0"; - public static string GuruIOSTeamId = "39253T242A"; - public static string GuruKeystoreName => "guru_key.jks"; - public static string GuruKeystorePass => "guru0622"; - public static string GuruAliasName => "guru"; - public static string GuruAliasPass => "guru0622"; - public static string GuruKeystorePath => Application.dataPath + $"/Plugins/Android/{GuruKeystoreName}"; - public static string ProguardName => "proguard-user.txt"; - public static string ProguardPath => Application.dataPath + $"/Plugins/Android/{ProguardName}"; - public static string OutputDirName => "BuildOutput"; + private const int DefaultAndroidTargetSdkVersion = 34; + private const string IOSTargetOSVersion = "13.0"; + private const string GuruIOSTeamId = "39253T242A"; + private const string GuruKeystoreName = "guru_key.jks"; + private const string GuruKeystorePass = "guru0622"; + private const string GuruAliasName = "guru"; + private const string GuruAliasPass = "guru0622"; + private static string GuruKeystorePath => Application.dataPath + $"/Plugins/Android/{GuruKeystoreName}"; + private static string ProguardName => "proguard-user.txt"; + private static string ProguardPath => Application.dataPath + $"/Plugins/Android/{ProguardName}"; + private static string OutputDirName => "BuildOutput"; #region 构建接口 @@ -74,7 +74,8 @@ namespace Guru.Editor var isDebug = !buildParam.IsBuildRelease; var useMinify = buildParam.AndroidUseMinify; var buildNumber= GetBuildNumberString(BuildTarget.Android); - if(buildParam.AutoSetBuildNumber) buildNumber = ChangeBuildNumber(BuildTarget.Android); + var androidTargetVersion = buildParam.AndroidTargetVersion == 0 ? DefaultAndroidTargetSdkVersion : buildParam.AndroidTargetVersion; + if (buildParam.AutoSetBuildNumber) buildNumber = ChangeBuildNumber(BuildTarget.Android); // 保存版本信息 SaveBuildVersion(buildParam.BuildVersion, buildNumber); @@ -112,10 +113,9 @@ namespace Guru.Editor PlayerSettings.Android.keyaliasPass = buildParam.AndroidAliasPass; } - PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64; //只构建 armv7 和 arm64 + PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64 | AndroidArchitecture.X86_64; // 构建 armv7, arm64, X86_64 PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel22; - if (buildParam.AndroidTargetVersion > 0) AndroidTargetSdkVersion = buildParam.AndroidTargetVersion; - PlayerSettings.Android.targetSdkVersion = (AndroidSdkVersions)AndroidTargetSdkVersion; // 默认设置API为33 + PlayerSettings.Android.targetSdkVersion = (AndroidSdkVersions)androidTargetVersion; // 设置 API Version //打包 string symbolDefine = buildParam.IsBuildRelease ? GameDefine.MACRO_RELEASE : GameDefine.MACRO_DEBUG;