新增ChannelSetting参数
parent
788329a3e9
commit
d695120235
|
|
@ -37,11 +37,47 @@ internal class BatchBuild
|
|||
/// </summary>
|
||||
private const string DEBUG = "DEBUG";
|
||||
|
||||
#region ChannelSetting
|
||||
/// <summary>
|
||||
/// 宏列表key
|
||||
/// </summary>
|
||||
private const string DefineListKey = "Define_list:";
|
||||
/// <summary>
|
||||
/// 包名列表key
|
||||
/// </summary>
|
||||
private const string PackageNameKey = "PackageName:";
|
||||
/// <summary>
|
||||
/// 上传AppConfig id
|
||||
/// </summary>
|
||||
private const string AppConfigAccessKeyId = "ConfigAccessKeyId:";
|
||||
/// <summary>
|
||||
/// 上传AppConfig Key
|
||||
/// </summary>
|
||||
private const string AppConfigAccessKeySecret = "ConfigAccessKeySecret:";
|
||||
/// <summary>
|
||||
/// 上传AppConfig桶名
|
||||
/// </summary>
|
||||
private const string AppConfigBucketName = "ConfigBucketName:";
|
||||
/// <summary>
|
||||
/// 上传AppConfig url
|
||||
/// </summary>
|
||||
private const string AppConfigURL = "ConfigURL:";
|
||||
/// <summary>
|
||||
/// http请求url
|
||||
/// </summary>
|
||||
private const string HttpUrl = "PostUrl:";
|
||||
/// <summary>
|
||||
/// 应用access
|
||||
/// </summary>
|
||||
private const string AppAccessKey = "AppAccessKey:";
|
||||
/// <summary>
|
||||
/// 应用key
|
||||
/// </summary>
|
||||
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
|
||||
|
||||
//[MenuItem("Tools/Modify Settings from Text File")]
|
||||
private static void _InitScriptDefines()
|
||||
|
|
@ -56,10 +92,10 @@ internal class BatchBuild
|
|||
Debug.Log("追加宏定义:" + DEBUG);
|
||||
}
|
||||
|
||||
string newPackageName = "";
|
||||
if (System.IO.File.Exists(filePath))
|
||||
string newPackageName = string.Empty;
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
string fileContents = System.IO.File.ReadAllText(filePath);
|
||||
string fileContents = File.ReadAllText(filePath);
|
||||
string[] lines = fileContents.Split('\n');
|
||||
|
||||
foreach (string line in lines)
|
||||
|
|
@ -84,17 +120,57 @@ internal class BatchBuild
|
|||
Debug.Log("追加宏定义:" + cleanDefine);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // 宏定义
|
||||
else if (line.StartsWith(PackageNameKey))
|
||||
{
|
||||
// 解析包名
|
||||
int prefixLength = PackageNameKey.Length;
|
||||
newPackageName = line[prefixLength..].Trim();
|
||||
Debug.Log("设置新包名:" + newPackageName);
|
||||
Debug.Log($"设置新包名:{newPackageName}");
|
||||
} // 包名
|
||||
else if (line.StartsWith(AppConfigAccessKeyId))
|
||||
{
|
||||
int prefixLength = AppConfigAccessKeyId.Length;
|
||||
YooAssetBuildBase.appConfigAccessKeyId = line[prefixLength..].Trim();
|
||||
Debug.Log($"设置AppConfig上传id:{YooAssetBuildBase.appConfigAccessKeyId}");
|
||||
}
|
||||
|
||||
else if (line.StartsWith(CRASH_SIGHT_KEY_ANDROID))
|
||||
else if (line.StartsWith(AppConfigAccessKeySecret))
|
||||
{
|
||||
int prefixLegth = AppConfigAccessKeySecret.Length;
|
||||
YooAssetBuildBase.appConfigAccessKeySecret = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置AppConfig上传key:{YooAssetBuildBase.appConfigAccessKeySecret}");
|
||||
}
|
||||
else if (line.StartsWith(AppConfigBucketName))
|
||||
{
|
||||
int prefixLegth = AppConfigBucketName.Length;
|
||||
YooAssetBuildBase.appConfigBucketName = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置AppConfig上传桶名:{YooAssetBuildBase.appConfigBucketName}");
|
||||
}
|
||||
else if (line.StartsWith(AppConfigURL))
|
||||
{
|
||||
int prefixLegth = AppConfigURL.Length;
|
||||
YooAssetBuildBase.appConfigURL = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置AppConfig上传url:{YooAssetBuildBase.appConfigURL}");
|
||||
}
|
||||
else if (line.StartsWith(HttpUrl))
|
||||
{
|
||||
int prefixLegth = HttpUrl.Length;
|
||||
YooAssetBuildBase.httpURL = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置http请求url:{YooAssetBuildBase.httpURL}");
|
||||
}
|
||||
else if (line.StartsWith(AppAccessKey))
|
||||
{
|
||||
int prefixLegth = AppAccessKey.Length;
|
||||
YooAssetBuildBase.httpAccessKey = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置http请求id:{YooAssetBuildBase.httpAccessKey}");
|
||||
}
|
||||
else if (line.StartsWith(AppKey))
|
||||
{
|
||||
int prefixLegth = AppKey.Length;
|
||||
YooAssetBuildBase.httpKey = line[prefixLegth..].Trim();
|
||||
Debug.Log($"设置http请求id:{YooAssetBuildBase.httpKey}");
|
||||
}
|
||||
else if (line.StartsWith(CRASH_SIGHT_KEY_ANDROID)) //
|
||||
{
|
||||
Debug.Log("检测到CrashSight配置:" + line);
|
||||
// 判断当前打包平台
|
||||
|
|
@ -119,7 +195,6 @@ internal class BatchBuild
|
|||
|
||||
Debug.Log("CrashSight配置已保存:" + crashSightData.id + "|" + crashSightData.key);
|
||||
}
|
||||
|
||||
else if (line.StartsWith(CRASH_SIGHT_KEY_IOS))
|
||||
{
|
||||
Debug.Log("检测到CrashSight配置:" + line);
|
||||
|
|
@ -203,17 +278,20 @@ internal class BatchBuild
|
|||
{
|
||||
_InitScriptDefines();
|
||||
|
||||
var enableHotUpdate = YooAssetBuildBase.Init();
|
||||
var bundleVersionCode = GetBundleVersionCode();
|
||||
bool enableHotUpdate = YooAssetBuildBase.Init();
|
||||
string bundleVersionCode = GetBundleVersionCode();
|
||||
|
||||
// 写入版本信息到Resources/LocalInfo.json
|
||||
UpdateLocalInfo info = new()
|
||||
{
|
||||
workSpace = YooAssetBuildBase.workSpace,
|
||||
accessKeyId = YooAssetBuildBase.accessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.accessKeySecret,
|
||||
bucketName = YooAssetBuildBase.bucketName,
|
||||
originalUrl = YooAssetBuildBase.originalUrl,
|
||||
accessKeyId = YooAssetBuildBase.appConfigAccessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.appConfigAccessKeySecret,
|
||||
bucketName = YooAssetBuildBase.appConfigBucketName,
|
||||
configOriginalUrl = YooAssetBuildBase.appConfigURL,
|
||||
httpUrl = YooAssetBuildBase.httpURL,
|
||||
httpAccessKey = YooAssetBuildBase.httpAccessKey,
|
||||
httpKey = YooAssetBuildBase.httpKey,
|
||||
version = YooAssetBuildBase.appVersion,
|
||||
isDev = YooAssetBuildBase.isDev,
|
||||
buildTicks = DateTime.Now.Ticks,
|
||||
|
|
|
|||
|
|
@ -118,10 +118,13 @@ class BuildLauncher
|
|||
UpdateLocalInfo info = new()
|
||||
{
|
||||
workSpace = YooAssetBuildBase.workSpace,
|
||||
accessKeyId = YooAssetBuildBase.accessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.accessKeySecret,
|
||||
bucketName = YooAssetBuildBase.bucketName,
|
||||
originalUrl = YooAssetBuildBase.originalUrl,
|
||||
accessKeyId = YooAssetBuildBase.appConfigAccessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.appConfigAccessKeySecret,
|
||||
bucketName = YooAssetBuildBase.appConfigBucketName,
|
||||
configOriginalUrl = YooAssetBuildBase.appConfigURL,
|
||||
httpUrl = YooAssetBuildBase.httpURL,
|
||||
httpAccessKey = YooAssetBuildBase.httpAccessKey,
|
||||
httpKey = YooAssetBuildBase.httpKey,
|
||||
version = YooAssetBuildBase.appVersion,
|
||||
isDev = YooAssetBuildBase.isDev,
|
||||
buildTicks = DateTime.Now.Ticks,
|
||||
|
|
@ -156,10 +159,13 @@ class BuildLauncher
|
|||
UpdateLocalInfo info = new()
|
||||
{
|
||||
workSpace = YooAssetBuildBase.workSpace,
|
||||
accessKeyId = YooAssetBuildBase.accessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.accessKeySecret,
|
||||
bucketName = YooAssetBuildBase.bucketName,
|
||||
originalUrl = YooAssetBuildBase.originalUrl,
|
||||
accessKeyId = YooAssetBuildBase.appConfigAccessKeyId,
|
||||
accessKeySecret = YooAssetBuildBase.appConfigAccessKeySecret,
|
||||
bucketName = YooAssetBuildBase.appConfigBucketName,
|
||||
configOriginalUrl = YooAssetBuildBase.appConfigURL,
|
||||
httpUrl = YooAssetBuildBase.httpURL,
|
||||
httpAccessKey = YooAssetBuildBase.httpAccessKey,
|
||||
httpKey = YooAssetBuildBase.httpKey,
|
||||
version = YooAssetBuildBase.appVersion,
|
||||
isDev = YooAssetBuildBase.isDev,
|
||||
buildTicks = DateTime.Now.Ticks,
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit c774a43a2ef8f94c675786fe40a3b01b6b42b005
|
||||
Subproject commit 949d25136a1682b91d8b2860a6b0b12b7e074c05
|
||||
|
|
@ -1,12 +1 @@
|
|||
{
|
||||
"workSpace": "Dev",
|
||||
"accessKeyId": "LTAI5tSoxnie6B5hot9PJVHC",
|
||||
"accessKeySecret": "UF4mUjfxkE457WyfhKqSVOOn5uOB0H",
|
||||
"bucketName": "nld-dev-tuiqkbrtfjhuiaoz",
|
||||
"originalUrl": "http://tuiqkbrtfjhuiaoz.kedrgame.com",
|
||||
"version": "0.1.0",
|
||||
"pathRoot": "Build",
|
||||
"localFullVersion": "empty",
|
||||
"isDev": true,
|
||||
"buildTicks": 638827516353031790
|
||||
}
|
||||
{"workSpace":"Dev","accessKeyId":"LTAI5tSoxnie6B5hot9PJVHC","accessKeySecret":"UF4mUjfxkE457WyfhKqSVOOn5uOB0H","bucketName":"nld-dev-tuiqkbrtfjhuiaoz","configOriginalUrl":"http://tuiqkbrtfjhuiaoz.kedrgame.com","httpUrl":"http://dev_openapi.kedrgame.com/api/v1/","httpAccessKey":"g90ls13Phj0BmESK","httpKey":"Ca0bZsFJhFq7e-nrIpJEkBySf1zZwspGcW6UXKe5Rjw=","version":"0.1.0","pathRoot":"Build","localFullVersion":"empty","isDev":true,"buildTicks":638838806104406691,"buildCode":""}
|
||||
|
|
@ -13,4 +13,8 @@ ConfigBucketName:"nld-dev-tuiqkbrtfjhuiaoz"
|
|||
ConfigURL:"http://tuiqkbrtfjhuiaoz.kedrgame.com"
|
||||
AssetsEndPoint:"oss-cn-chengdu.aliyuncs.com"
|
||||
|
||||
PostUrl:"http://dev_openapi.kedrgame.com/api/v1/"
|
||||
AppAccessKey:"g90ls13Phj0BmESK"
|
||||
AppKey:"Ca0bZsFJhFq7e-nrIpJEkBySf1zZwspGcW6UXKe5Rjw="
|
||||
|
||||
CrashSight_Android: 9e1297bfd2, b36d6985-5891-440f-993b-ae1ed8e79ff8
|
||||
Loading…
Reference in New Issue