fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化多层事件逻辑

Browse Source
This commit is contained in:
uye
2025-08-01 00:28:56 +08:00
parent f1560fa4ca
commit 3d40a4d4ee
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resource/tasks/Roguelike/base.json
View File

@@ -1231,14 +1231,14 @@
"Roguelike@StageEncounterJudgeClick": {
"algorithm": "JustReturn",
"action": "ClickRect",
"specificRect": [640, 360, 0, 0],
"specificRect": [640, 360, 1, 1],
"preDelay": 150,
"next": ["Roguelike@StageEncounterJudgeClick2"]
},
"Roguelike@StageEncounterJudgeClick2": {
"algorithm": "JustReturn",
"action": "ClickRect",
"specificRect": [640, 360, 0, 0],
"specificRect": [640, 360, 1, 1],
"preDelay": 150,
"next": ["Roguelike@StageEncounterJudgeOption"]
},

27
src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp
View File

@@ -165,18 +165,25 @@ std::optional<std::string> asst::RoguelikeStageEncounterTaskPlugin::handle_singl
}
if (hp_disappeared) {
if (!event.next_event.empty()) {
for (int i = 0; i < 3; ++i) {
ProcessTask(*this, { "Roguelike@StageEncounterJudgeClick" }).run();
ProcessTask(*this, { "Roguelike@StageEncounterJudgeClick2" }).run();
image = ctrler()->get_image();
if (hp(image) >= 0) {
Log.debug("HP gone, going to next_event:", event.next_event);
return event.next_event;
}
if (event.next_event.empty()) {
return std::nullopt;
}
const auto& task = Task.get("Roguelike@StageEncounterJudgeClick");
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 2; ++j) {
ctrler()->click(task->specific_rect);
sleep(500);
}
image = ctrler()->get_image();
if (hp(image) >= 0) {
Log.debug("HP restored, going to next_event:", event.next_event);
// 多点一次，确保选项恢复
ctrler()->click(task->specific_rect);
sleep(500);
return event.next_event;
}
}
return std::nullopt;
}
// 兜底处理，从 option_num-option_num 点到 1-1