mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-15 17:30:27 +08:00
feat: 增加 保存代理指挥记录 支持; 新增合成玉掉落检查, 0掉落结束 (#16356)
* fix: 增加在剿灭代理记录更新界面,点击确认按钮的任务和图片资源 fix: 增加剿灭模式下,对合成玉的掉落检测。不掉落合成玉时,结束战斗任务 * perf: 使用代理卡时不会更新记录 Co-authored-by: Status102 <102887808+status102@users.noreply.github.com> --------- Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
This commit is contained in:
@@ -1296,6 +1296,12 @@
|
||||
"specificRect_Doc": "避免第二次点击时点到StartButton2",
|
||||
"specificRect": [1260, 650, 1, 1]
|
||||
},
|
||||
"AnnihilationPrtsRecordConfirm": {
|
||||
"action": "ClickSelf",
|
||||
"preDelay": 500,
|
||||
"roi": [600, 630, 100, 100],
|
||||
"next": ["EndOfActionAnnihilation", "EndOfAction"]
|
||||
},
|
||||
"AnnihilationConfirm": {
|
||||
"action": "ClickSelf",
|
||||
"roi": [992, 584, 288, 136],
|
||||
@@ -1369,6 +1375,7 @@
|
||||
"maxTimes": 10,
|
||||
"postDelay": 3000,
|
||||
"next": [
|
||||
"AnnihilationPrtsRecordConfirm",
|
||||
"EndOfActionAnnihilation",
|
||||
"EndOfAction",
|
||||
"(ClickCorner + WaitAfterPRTS + StartUpThemes)#next ^ #self",
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
@@ -207,6 +207,15 @@ bool asst::StageDropsTaskPlugin::recognize_drops()
|
||||
}
|
||||
|
||||
if (m_is_annihilation) {
|
||||
bool has_orundum = std::ranges::any_of(m_cur_drops, [](const auto& drop) {
|
||||
return drop.item_id == "4003"; // see StageDropType::Reward
|
||||
});
|
||||
if (!has_orundum) {
|
||||
LogInfo << __FUNCTION__ << "No orundum dropped in annihilation, stopping task";
|
||||
stop_task();
|
||||
return true;
|
||||
}
|
||||
|
||||
RegionOCRer ocr(image);
|
||||
ocr.set_task_info("StageDrops-AnnihilationWeeklyLimit");
|
||||
m_annihilation_weekly_process = {};
|
||||
|
||||
Reference in New Issue
Block a user