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

refactor.删除实例化的TaskData

Browse Source
This commit is contained in:
MistEO
2022-03-09 23:40:28 +08:00
parent 50ccafdf44
commit e3b2401ca6
39 changed files with 144 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAssistant/CreditShoppingTask.cpp
View File

@@ -27,8 +27,7 @@ bool asst::CreditShoppingTask::_run()
{
const cv::Mat image = m_ctrler->get_image();
CreditShopImageAnalyzer shop_analyzer(image, m_task_data);
shop_analyzer.set_task_data(m_task_data);
CreditShopImageAnalyzer shop_analyzer(image);
if (!shop_analyzer.analyze()) {
return false;
}
@@ -48,11 +47,11 @@ bool asst::CreditShoppingTask::_run()
// “购买商品”按钮
static Rect buy_it_rect;
if (buy_it_rect.empty()) {
const auto buy_it_task_ptr = m_task_data->get("CreditShop-BuyIt");
const auto buy_it_task_ptr = Task.get("CreditShop-BuyIt");
const cv::Mat buy_image = m_ctrler->get_image();
MatchImageAnalyzer buy_it_analyzer(buy_image);
buy_it_analyzer.set_task_data(m_task_data);
buy_it_analyzer.set_task_info(buy_it_task_ptr);
if (!buy_it_analyzer.analyze()) {
// 没识别到“购买商品”按钮，不应该出现这种情况，TODO 报错
@@ -73,8 +72,8 @@ bool asst::CreditShoppingTask::_run()
const cv::Mat prompt_image = m_ctrler->get_image();
OcrImageAnalyzer prompt_analyzer(prompt_image);
prompt_analyzer.set_task_data(m_task_data);
prompt_analyzer.set_task_info(m_task_data->get("CreditShop-NoMoney"));
prompt_analyzer.set_task_info(Task.get("CreditShop-NoMoney"));
if (prompt_analyzer.analyze()) {
click_return_button();
return true;