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

fix: 肉鸽宣告成功后闪退

Browse Source
This commit is contained in:
uye
2023-12-15 00:26:19 +08:00
parent 68b6b41689
commit 0f88a2a292
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp
View File

@@ -101,8 +101,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
if (need_exit()) {
return;
}
auto iter_up = ranges::find(list, up_board);
if (iter_up == list.end() || boards_to_skip.contains(up_board)) {
if (auto iter_up = ranges::find(list, up_board); iter_up == list.end() || boards_to_skip.contains(up_board)) {
continue;
}
@@ -111,8 +110,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
if (need_exit()) {
return;
}
auto iter_down = ranges::find(list, down_board);
if (iter_down == list.end() || boards_to_skip.contains(down_board)) {
if (auto iter_down = ranges::find(list, down_board); iter_down == list.end() || boards_to_skip.contains(down_board)) {
continue;
}
const auto result = use_board(up_board, down_board);
@@ -138,7 +136,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
break;
}
if (result == UseBoardResult::UpBoardNotFound) {
list.erase(iter_up);
list.erase(ranges::find(list, up_board));
Log.info("Up board not found! Delete up board:", up_board);
break;
}
@@ -149,16 +147,16 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
continue;
}
if (result == UseBoardResult::DownBoardNotFound) {
list.erase(iter_down);
list.erase(ranges::find(list, down_board));
Log.info("Down board not found! Delete down board:", down_board);
continue;
}
// 正常使用板子，用完删除上板子和下板子
if (result == UseBoardResult::UseBoardResultSuccess) {
list.erase(iter_up);
iter_down = ranges::find(list, down_board);
list.erase(iter_down);
list.erase(ranges::find(list, up_board));
list.erase(ranges::find(list, down_board));
Log.trace("Board pair used, up:", up_board, ", down:", down_board);
break;
}
}
}