diff --git a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs index d2f98eda06f..3e59e64408c 100644 --- a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs +++ b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs @@ -49,54 +49,6 @@ internal class BatchBuild /// Release上传地址 /// private const string Release_PostUrl = "http://openapi.kedrgame.com/api/v1/"; - - #region ChannelSetting - - /// - /// 宏列表key - /// - private const string DefineListKey = "Define_list:"; - - /// - /// 包名列表key - /// - private const string PackageNameKey = "PackageName:"; - - /// - /// 上传AppConfig id - /// - private const string AppConfigAccessKeyId = "ConfigAccessKeyId:"; - - /// - /// 上传AppConfig Key - /// - private const string AppConfigAccessKeySecret = "ConfigAccessKeySecret:"; - - /// - /// 上传AppConfig桶名 - /// - private const string AppConfigBucketName = "ConfigBucketName:"; - - /// - /// 上传AppConfig url - /// - private const string AppConfigURL = "ConfigURL:"; - - /// - /// 应用access - /// - private const string AppAccessKey = "AppAccessKey:"; - - /// - /// 应用key - /// - private const string AppKey = "AppKey:"; - - private const string CRASH_SIGHT_KEY_ANDROID = "CrashSight_Android:"; - private const string CRASH_SIGHT_KEY_IOS = "CrashSight_iOS:"; - private const string ChannelSetting = "/../ChannelSetting.txt"; - - #endregion public static void _RevertScriptDefines() { @@ -388,8 +340,8 @@ internal class BatchBuild { public List Define_list { get; set; } public string PackageName { get; set; } - public string Language { get; set; } - public string Version { get; set; } + + public int BuildCode { get; set; } public string ConfigAccessKeyId { get; set; } @@ -467,6 +419,17 @@ internal class BatchBuild } } + // 处理BuildCode + if (config.BuildCode != 0) + { + Debug.Log("设置BuildCode:" + config.BuildCode); +#if UNITY_IOS + PlayerSettings.iOS.buildNumber = config.BuildCode.ToString(); +#elif UNITY_ANDROID + PlayerSettings.Android.bundleVersionCode = config.BuildCode; +#endif + } + // 处理AppConfig上传id if (config.ConfigAccessKeyId != null) { diff --git a/Tool/Channels/Banshu/ChannelSetting.txt b/Tool/Channels/Banshu/ChannelSetting.txt deleted file mode 100644 index 526bf9bf820..00000000000 --- a/Tool/Channels/Banshu/ChannelSetting.txt +++ /dev/null @@ -1,7 +0,0 @@ -Define_list:"BanShu" - -PackageName:"com.phxh.banshu.nld" - -Version:"0.1.0" - -Language:"Lan_Default" \ No newline at end of file diff --git a/Tool/Channels/Banshu/ChannelSetting.yaml b/Tool/Channels/Banshu/ChannelSetting.yaml index d7bebc9e9ca..856f46dd70a 100644 --- a/Tool/Channels/Banshu/ChannelSetting.yaml +++ b/Tool/Channels/Banshu/ChannelSetting.yaml @@ -10,3 +10,6 @@ Language: "Lan_Default" # 当前版本号 Version: "0.1.0" + +# BuildCode +BuildCode: 4 diff --git a/Tool/Channels/BilibiliDev/ChannelSetting.txt b/Tool/Channels/BilibiliDev/ChannelSetting.txt deleted file mode 100644 index b96819b40de..00000000000 --- a/Tool/Channels/BilibiliDev/ChannelSetting.txt +++ /dev/null @@ -1,20 +0,0 @@ -Define_list:"SDK_BILIBILI","SDK_CRASHSIGHT","LOGIN_PHONE" - -PackageName:"com.phxh.bibilidev.nld" - -Language:"Lan_Default" - -Version:"0.6.0" - -OssRemoteUploadPath:"oss://nld-dev-tuiqkbrtfjhuiaoz/client_res/Build" -AssetsEndPoint:"oss-cn-chengdu.aliyuncs.com" - -ConfigAccessKeyId:LTAI5tSoxnie6B5hot9PJVHC -ConfigAccessKeySecret:UF4mUjfxkE457WyfhKqSVOOn5uOB0H -ConfigBucketName:nld-dev-tuiqkbrtfjhuiaoz -ConfigURL:http://tuiqkbrtfjhuiaoz.kedrgame.com - -AppAccessKey:g90ls13Phj0BmESK -AppKey:Ca0bZsFJhFq7e-nrIpJEkBySf1zZwspGcW6UXKe5Rjw= - -CrashSight_Android: 669a94ce69, d9412717-2416-4270-b8bc-f7a0805f988f \ No newline at end of file diff --git a/Tool/Channels/BilibiliDev/ChannelSetting.yaml b/Tool/Channels/BilibiliDev/ChannelSetting.yaml index 2ecbd33cff4..9c4ba768874 100644 --- a/Tool/Channels/BilibiliDev/ChannelSetting.yaml +++ b/Tool/Channels/BilibiliDev/ChannelSetting.yaml @@ -14,6 +14,9 @@ Language: "Lan_Default" # 当前版本号 Version: "0.6.0" +# BuildCode +BuildCode: 4 + # 构建资源远程上传路径 OssRemoteUploadPath: "oss://nld-dev-tuiqkbrtfjhuiaoz/client_res/Build" AssetsEndPoint: "oss-cn-chengdu.aliyuncs.com" diff --git a/Tool/Channels/Dev/ChannelSetting.txt b/Tool/Channels/Dev/ChannelSetting.txt deleted file mode 100644 index c79369c3972..00000000000 --- a/Tool/Channels/Dev/ChannelSetting.txt +++ /dev/null @@ -1,21 +0,0 @@ -Define_list:"SDK_CRASHSIGHT","SDK_POCO","BI_PHXH" - -PackageName:"com.phxh.official.nld" - -Language:"Lan_CN" - -Version:"0.1.0" - -OssRemoteUploadPath:"oss://nld-dev-tuiqkbrtfjhuiaoz/client_res/Build" -AssetsEndPoint:"oss-cn-chengdu.aliyuncs.com" - -ConfigAccessKeyId:LTAI5tSoxnie6B5hot9PJVHC -ConfigAccessKeySecret:UF4mUjfxkE457WyfhKqSVOOn5uOB0H -ConfigBucketName:nld-dev-tuiqkbrtfjhuiaoz -ConfigURL:http://tuiqkbrtfjhuiaoz.kedrgame.com - -AppAccessKey:0SoE48O9sayjkG8J -AppKey:uUi_UI1oMKWo0VOSN1zme17Z70-FlAv3Lcx2mNhoYe4= - -CrashSight_Android: 669a94ce69, d9412717-2416-4270-b8bc-f7a0805f988f -CrashSight_iOS: 6ff03772f9, unknown \ No newline at end of file diff --git a/Tool/Channels/Dev/ChannelSetting.yaml b/Tool/Channels/Dev/ChannelSetting.yaml index 6d9deaff3d6..5fc97907ea4 100644 --- a/Tool/Channels/Dev/ChannelSetting.yaml +++ b/Tool/Channels/Dev/ChannelSetting.yaml @@ -13,6 +13,9 @@ Language: "Lan_CN" # 当前版本号 Version: "0.1.0" +# BuildCode +BuildCode: 4 + # 构建资源远程上传路径 OssRemoteUploadPath: "oss://nld-dev-tuiqkbrtfjhuiaoz/client_res/Build" AssetsEndPoint: "oss-cn-chengdu.aliyuncs.com"