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

fix: 修复临期理智药无法使用

Browse Source
This commit is contained in:
status102
2023-10-21 15:35:20 +08:00
parent 03c4aff3ae
commit cdce07cb08
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp
View File

@@ -43,8 +43,7 @@ bool asst::MedicineCounterPlugin::_run()
auto refresh_medicine_count = [&]() {
image = ctrler()->get_image();
auto count = initial_count(image);
if (!count || count->using_count + m_using_count > m_max_count) [[unlikely]] {
Log.error(__FUNCTION__, "use medicine over limit:", count ? count->using_count : -1);
if (!count) [[unlikely]] {
return false;
}
initialCount = count;
@@ -57,15 +56,17 @@ bool asst::MedicineCounterPlugin::_run()
}
}
else if (m_using_count >= m_max_count && m_use_expiring) {
bool changed = false;
for (auto& [use, inventory, rect, is_expiring] : initialCount->medicines | std::ranges::views::reverse) {
while (use > 0 && is_expiring == ExpiringStatus::Expiring) {
while (use > 0 && is_expiring != ExpiringStatus::Expiring) {
ctrler()->click(rect);
sleep(Config.get_options().task_delay);
use--;
changed = true;
}
}
if (!refresh_medicine_count()) {
if (changed && !refresh_medicine_count()) {
return false;
}
}