From 9fc4dfd4e351cf0c3c3d0111f668dd463f4d1b7a Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Sun, 27 Jul 2025 11:17:27 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=AE=80=E5=8C=96=E9=95=BF=E6=9C=9F?= =?UTF-8?q?=E5=89=BF=E7=81=AD=E4=BB=BB=E5=8A=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/YoStarEN/resource/tasks/tasks.json | 6 +-- .../global/YoStarJP/resource/tasks/tasks.json | 6 +-- .../global/YoStarKR/resource/tasks/tasks.json | 6 +-- .../global/txwy/resource/tasks/tasks.json | 6 +-- resource/tasks/tasks.json | 40 ++++++++++++------- .../FightSettingsUserControlModel.cs | 6 +-- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/resource/global/YoStarEN/resource/tasks/tasks.json b/resource/global/YoStarEN/resource/tasks/tasks.json index c0451c5381..923dee402f 100644 --- a/resource/global/YoStarEN/resource/tasks/tasks.json +++ b/resource/global/YoStarEN/resource/tasks/tasks.json @@ -885,13 +885,13 @@ "text": ["Submitting feedback", "to the neural network"], "roi": [675, 605, 427, 115] }, - "Chernobog": { + "Chernobog@AnnihilationStage": { "text": ["Chernobog"] }, - "LungmenOutskirts": { + "LungmenOutskirts@AnnihilationStage": { "text": ["Lungmen Outskirts"] }, - "LungmenDowntown": { + "LungmenDowntown@AnnihilationStage": { "text": ["Lungmen Downtown"] }, "AnnihilationSwitchButton": { diff --git a/resource/global/YoStarJP/resource/tasks/tasks.json b/resource/global/YoStarJP/resource/tasks/tasks.json index 6437af7bae..ba20a3b062 100644 --- a/resource/global/YoStarJP/resource/tasks/tasks.json +++ b/resource/global/YoStarJP/resource/tasks/tasks.json @@ -867,13 +867,13 @@ "text": ["ニューラル", "コネクタ", "接続中"], "roi": [700, 600, 350, 120] }, - "Chernobog": { + "Chernobog@AnnihilationStage": { "text": ["チェルノボーグ"] }, - "LungmenOutskirts": { + "LungmenOutskirts@AnnihilationStage": { "text": ["龍門郊外"] }, - "LungmenDowntown": { + "LungmenDowntown@AnnihilationStage": { "text": ["龍門市街"] }, "AnnihilationSwitchButton": { diff --git a/resource/global/YoStarKR/resource/tasks/tasks.json b/resource/global/YoStarKR/resource/tasks/tasks.json index 189c069365..ccd69f0321 100644 --- a/resource/global/YoStarKR/resource/tasks/tasks.json +++ b/resource/global/YoStarKR/resource/tasks/tasks.json @@ -940,13 +940,13 @@ "text": ["피드백", "전달"], "roi": [700, 620, 400, 80] }, - "Chernobog": { + "Chernobog@AnnihilationStage": { "text": ["체르노보그"] }, - "LungmenOutskirts": { + "LungmenOutskirts@AnnihilationStage": { "text": ["용문외곽"] }, - "LungmenDowntown": { + "LungmenDowntown@AnnihilationStage": { "text": ["용문시내"] }, "AnnihilationSwitchButton": { diff --git a/resource/global/txwy/resource/tasks/tasks.json b/resource/global/txwy/resource/tasks/tasks.json index 44f8828885..d36bc34931 100644 --- a/resource/global/txwy/resource/tasks/tasks.json +++ b/resource/global/txwy/resource/tasks/tasks.json @@ -580,13 +580,13 @@ "LoadingText": { "text": ["正在提交", "反饋至神經"] }, - "Chernobog": { + "Chernobog@AnnihilationStage": { "text": ["切爾諾伯格"] }, - "LungmenOutskirts": { + "LungmenOutskirts@AnnihilationStage": { "text": ["龍門外環"] }, - "LungmenDowntown": { + "LungmenDowntown@AnnihilationStage": { "text": ["龍門市區"] }, "AnnihilationSwitchButton": { diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index de4b4f987b..f6cfba0fdd 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -1150,26 +1150,37 @@ "StartUp@ClickCorner": { "next": ["StartUp@ReturnButtons#next", "StartUp", "StartUp@CloseAnnos#next", "StartUp@OfflineConfirm"] }, - "Chernobog": { + "Chernobog@Annihilation": { + "template": "StageAnnihilation.png", + "next": ["Chernobog@AnnihilationReturn"] + }, + "LungmenOutskirts@Annihilation": { + "template": "StageAnnihilation.png", + "next": ["LungmenOutskirts@AnnihilationReturn"] + }, + "LungmenDowntown@Annihilation": { + "template": "StageAnnihilation.png", + "next": ["LungmenDowntown@AnnihilationReturn"] + }, + "AnnihilationStage": { + "algorithm": "OcrDetect", + "text": [], + "action": "ClickSelf" + }, + "Chernobog@AnnihilationStage": { "Doc": "切换剿灭关卡-切尔诺伯格", - "algorithm": "OcrDetect", "text": ["切尔诺伯格"], - "roi": [721, 22, 529, 693], - "action": "ClickSelf" + "roi": [721, 22, 529, 693] }, - "LungmenOutskirts": { + "LungmenOutskirts@AnnihilationStage": { "Doc": "切换剿灭关卡-龙门外环", - "algorithm": "OcrDetect", "text": ["龙门外环"], - "roi": [721, 22, 529, 693], - "action": "ClickSelf" + "roi": [721, 22, 529, 693] }, - "LungmenDowntown": { + "LungmenDowntown@AnnihilationStage": { "Doc": "切换剿灭关卡-龙门市区", - "algorithm": "OcrDetect", "text": ["龙门市区"], - "roi": [721, 22, 529, 693], - "action": "ClickSelf" + "roi": [721, 22, 529, 693] }, "AnnihilationSwitchButton": { "Doc": "切换剿灭关卡（菜单按钮）", @@ -1177,7 +1188,7 @@ "text": ["切换"], "action": "ClickSelf", "roi": [966, 577, 315, 142], - "next": ["#back"] + "next": ["AnnihilationStage"] }, "AnnihilationReturn": { "Doc": "从剿灭关卡界面退回到含有切换按钮的界面", @@ -1195,8 +1206,7 @@ "templThreshold": 0.9, "action": "ClickSelf", "roi": [900, 70, 380, 400], - "maskRange": [1, 255], - "next": ["#back"] + "maskRange": [1, 255] }, "StageBegin": { "algorithm": "JustReturn", diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs index 85144a4fd9..f192e8dd3a 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs @@ -710,9 +710,9 @@ public class FightSettingsUserControlModel : TaskViewModel public static Dictionary AnnihilationModeList { get; } = new() { { LocalizationHelper.GetString("Annihilation"), "Annihilation" }, - { LocalizationHelper.GetString("Chernobog"), "Chernobog@AnnihilationReturn@Annihilation" }, - { LocalizationHelper.GetString("LungmenOutskirts"), "LungmenOutskirts@AnnihilationReturn@Annihilation" }, - { LocalizationHelper.GetString("LungmenDowntown"), "LungmenDowntown@AnnihilationReturn@Annihilation" }, + { LocalizationHelper.GetString("Chernobog"), "Chernobog@Annihilation" }, + { LocalizationHelper.GetString("LungmenOutskirts"), "LungmenOutskirts@Annihilation" }, + { LocalizationHelper.GetString("LungmenDowntown"), "LungmenDowntown@Annihilation" }, }; private bool _useCustomAnnihilation = ConfigurationHelper.GetValue(ConfigurationKeys.UseCustomAnnihilation, false);