diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp index 57daba2fe9..dceedf24d4 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalGainTaskPlugin.cpp @@ -122,7 +122,8 @@ bool asst::RoguelikeFoldartalGainTaskPlugin::gain_stage_award() auto foldartal = analyzer.get_result().front().text; // 深入调查调查装备也使用同一个入口,先分类 - if (foldartal != "雷达" || "留声机" || "景观" || "LUD" || "踢脚" || "自走车") { + if (foldartal != "雷达" && foldartal != "留声机" && foldartal != "景观" && foldartal != "LUD" + && foldartal != "踢脚" && foldartal != "自走车") { gain_foldartal(std::move(foldartal)); } if (m_ocr_after_combat) { diff --git a/src/MaaCore/Vision/VisionHelper.cpp b/src/MaaCore/Vision/VisionHelper.cpp index ac4de8b8d9..5eef2cf337 100644 --- a/src/MaaCore/Vision/VisionHelper.cpp +++ b/src/MaaCore/Vision/VisionHelper.cpp @@ -64,12 +64,12 @@ Rect asst::VisionHelper::correct_rect(const Rect& rect, const Rect& main_roi) res.height = rect.height + rect.y; } if (res.x < main_roi.x) { - res.x = main_roi.x; res.width = res.width - (main_roi.x - res.x); + res.x = main_roi.x; } if (res.y < main_roi.y) { - res.y = main_roi.y; res.height = res.height - (main_roi.y - res.y); + res.y = main_roi.y; } if (res.x + res.width > main_roi.x + main_roi.width) { res.width = main_roi.x + main_roi.width - res.x;