diff --git a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs index 985d8ee5820..8880eed40b9 100644 --- a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs +++ b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs @@ -189,24 +189,48 @@ internal class BatchBuild private static bool _hasYooAsset; + private const string DefineListKey = "Define_list:"; + private const string PackageNameKey = "PackageName:"; + private const string NewPlayerSettingsPath = "/../PlayerSettings.txt"; + + //[MenuItem("Tools/Modify Settings from Text File")] private static void _InitScriptDefines() { var hasYooAsset = false; // 判断本地是否有define_list.txt文件 - var defineListPath = Application.dataPath + "/../define_list.txt"; + var filePath = Application.dataPath + NewPlayerSettingsPath; var appendDefineList = new List(); - if (File.Exists(defineListPath)) + string newPackageName = ""; + if (File.Exists(filePath)) { - var defineList = System.IO.File.ReadAllLines(defineListPath); - foreach (var define in defineList) + var fileContents = System.IO.File.ReadAllText(filePath); + string[] lines = fileContents.Split('\n'); + + foreach (var line in lines) { - if (string.IsNullOrEmpty(define)) - continue; - appendDefineList.Add(define); - Debug.Log("追加宏定义:" + define); - if (define == "USE_YOO") + if (line.StartsWith(DefineListKey)) { - hasYooAsset = true; + // 解析宏定义 + var prefixLength = DefineListKey.Length; + string definePart = line.Substring(prefixLength).Trim(); // 去掉 "definde:" 后的部分 + string[] defines = definePart.Split(','); + + foreach (var define in defines) + { + string cleanDefine = define.Trim(new char[] { '"', ' ', '\r', '\n' }); + if (!string.IsNullOrEmpty(cleanDefine)) + { + appendDefineList.Add(cleanDefine); + Debug.Log("追加宏定义:" + cleanDefine); + } + } + } + else if (line.StartsWith(PackageNameKey)) + { + // 解析包名 + var prefixLength = PackageNameKey.Length; + newPackageName = line.Substring(prefixLength).Trim(); + Debug.Log("设置新包名:" + newPackageName); } } } @@ -236,6 +260,12 @@ internal class BatchBuild newDefineList.AddRange(appendDefineList); PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTargetGroup, string.Join(";", newDefineList)); } + //只有安卓平台下修改 + if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android && !string.IsNullOrEmpty(newPackageName)) + { + PlayerSettings.applicationIdentifier = newPackageName; + //PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, newPackageName); + } // 现已修改为使用YooAsset _hasYooAsset = hasYooAsset; diff --git a/Tool/Channels/AudioTest/PlayerSettings.txt b/Tool/Channels/AudioTest/PlayerSettings.txt new file mode 100644 index 00000000000..016e235ee71 --- /dev/null +++ b/Tool/Channels/AudioTest/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list:"CHANNEL_AUDIO_TEST" + +PackageName: + diff --git a/Tool/Channels/AudioTest/define_list.txt b/Tool/Channels/AudioTest/define_list.txt deleted file mode 100644 index 85e9cad0c51..00000000000 --- a/Tool/Channels/AudioTest/define_list.txt +++ /dev/null @@ -1 +0,0 @@ -CHANNEL_AUDIO_TEST \ No newline at end of file diff --git a/Tool/Channels/Banshu/PlayerSettings.txt b/Tool/Channels/Banshu/PlayerSettings.txt new file mode 100644 index 00000000000..2cfc463c1e5 --- /dev/null +++ b/Tool/Channels/Banshu/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list: + +PackageName:"com.phxh.banshu.nld" + diff --git a/Tool/Channels/Banshu/define_list.txt b/Tool/Channels/Banshu/define_list.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Tool/Channels/Dev/PlayerSettings.txt b/Tool/Channels/Dev/PlayerSettings.txt new file mode 100644 index 00000000000..7f41b5c56de --- /dev/null +++ b/Tool/Channels/Dev/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list: + +PackageName:"com.phxh.dev.nld" + diff --git a/Tool/Channels/Dev/define_list.txt b/Tool/Channels/Dev/define_list.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Tool/Channels/DevYoo/PlayerSettings.txt b/Tool/Channels/DevYoo/PlayerSettings.txt new file mode 100644 index 00000000000..5450546e52e --- /dev/null +++ b/Tool/Channels/DevYoo/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list:"USE_YOO" + +PackageName:"com.phxh.devyoo.nld" + diff --git a/Tool/Channels/DevYoo/define_list.txt b/Tool/Channels/DevYoo/define_list.txt deleted file mode 100644 index 79b9e7466da..00000000000 --- a/Tool/Channels/DevYoo/define_list.txt +++ /dev/null @@ -1 +0,0 @@ -USE_YOO \ No newline at end of file diff --git a/Tool/Channels/StableDev/PlayerSettings.txt b/Tool/Channels/StableDev/PlayerSettings.txt new file mode 100644 index 00000000000..dd6dd57eef4 --- /dev/null +++ b/Tool/Channels/StableDev/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list: + +PackageName:"com.phxh.stabledev.nld" + diff --git a/Tool/Channels/StableDev/define_list.txt b/Tool/Channels/StableDev/define_list.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Tool/Channels/TapTap/PlayerSettings.txt b/Tool/Channels/TapTap/PlayerSettings.txt new file mode 100644 index 00000000000..59a5c728cd5 --- /dev/null +++ b/Tool/Channels/TapTap/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list:"SDK_TAPTAP","SDK_CRASHSIGHT" + +PackageName:"com.phxh.taptap.nld" + diff --git a/Tool/Channels/TapTap/define_list.txt b/Tool/Channels/TapTap/define_list.txt deleted file mode 100644 index 7445f7383eb..00000000000 --- a/Tool/Channels/TapTap/define_list.txt +++ /dev/null @@ -1,2 +0,0 @@ -SDK_TAPTAP -SDK_CRASHSIGHT \ No newline at end of file diff --git a/Tool/Channels/Wanmei/PlayerSettings.txt b/Tool/Channels/Wanmei/PlayerSettings.txt new file mode 100644 index 00000000000..3064f4488c6 --- /dev/null +++ b/Tool/Channels/Wanmei/PlayerSettings.txt @@ -0,0 +1,4 @@ +Define_list: + +PackageName:"com.phxh.wanmei.nld" + diff --git a/Tool/Channels/Wanmei/define_list.txt b/Tool/Channels/Wanmei/define_list.txt deleted file mode 100644 index e69de29bb2d..00000000000