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

chore: 为信用商店的购物添加一些日志

Browse Source 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3385
This commit is contained in:
MistEO
2023-01-23 23:56:39 +08:00
parent 24efb32b47
commit 448e2a0a64
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp
View File

@@ -80,7 +80,7 @@ bool asst::CreditShoppingTask::credit_shopping(bool white_list_enabled, bool cre
ProcessTask(*this, { "CreditShop-BuyIt" }).run();
if (ProcessTask(*this, { "CreditShop-NoMoney" }).set_retry_times(0).run()) {
if (ProcessTask(*this, { "CreditShop-NoMoney" }).set_task_delay(0).set_retry_times(0).run()) {
break;
}
if (need_exit()) {

14
src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp
View File

@@ -8,15 +8,20 @@
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/MultiMatchImageAnalyzer.h"
#include "Vision/OcrImageAnalyzer.h"
#include "Utils/Logger.hpp"
void asst::CreditShopImageAnalyzer::set_black_list(std::vector<std::string> black_list)
{
Log.info(__FUNCTION__, black_list);
m_shopping_list = std::move(black_list);
m_is_white_list = false;
}
void asst::CreditShopImageAnalyzer::set_white_list(std::vector<std::string> black_list)
{
Log.info(__FUNCTION__, black_list);
m_shopping_list = std::move(black_list);
m_is_white_list = true;
}
@@ -61,6 +66,8 @@ bool asst::CreditShopImageAnalyzer::commodities_analyze()
bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze()
{
Log.info(__FUNCTION__, m_shopping_list, "mode", m_is_white_list);
const auto product_name_task_ptr = Task.get<OcrTaskInfo>("CreditShop-ProductName");
for (const Rect& commodity : m_commodities) {
@@ -87,15 +94,16 @@ bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze()
#ifdef ASST_DEBUG
cv::rectangle(m_image_draw, make_rect<cv::Rect>(commodity), cv::Scalar(0, 0, 255), 2);
#endif
m_need_to_buy.emplace_back(
commodity, ocr_analyzer.get_result().empty() ? std::string() : ocr_analyzer.get_result().front().text);
const std::string& name = ocr_analyzer.get_result().front().text;
Log.info("need to buy", name);
m_need_to_buy.emplace_back(commodity, name);
}
if (m_is_white_list) {
ranges::sort(m_need_to_buy, std::less {},
[&](const auto& pair) { return ranges::find(m_shopping_list, pair.second); });
}
return !m_need_to_buy.empty();
}