diff --git a/resource/tasks.json b/resource/tasks.json index b6b0dbb33b..c0b27f72f4 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6778,7 +6778,8 @@ ], "next": [ "Roguelike1TraderRandomShoppingConfirm", - "Roguelike1TraderRandomShoppingCancel" + "Roguelike1TraderRandomShoppingCancel", + "Roguelike1TraderRandomShopping" ], "maskRange": [ 1, @@ -6822,7 +6823,22 @@ 221, 136 ], - "rearDelay": 1000 + "rearDelay": 2000, + "Doc": "当网络卡的时候才会发生点了确认,但是还可以点取消的情况", + "next": [ + "Roguelike1TraderShoppingConfirmedFlag" + ] + }, + "Roguelike1TraderShoppingConfirmedFlag": { + "template": "Roguelike1StageTraderLeave.png", + "action": "DoNothing", + "cache": false, + "roi": [ + 1046, + 443, + 234, + 204 + ] }, "Roguelike1TraderShoppingCancel": { "template": "Roguelike1StageTraderInvestCancel.png", @@ -6833,6 +6849,10 @@ 350, 500, 250 + ], + "rearDelay": 2000, + "next": [ + "Roguelike1TraderShoppingConfirmedFlag" ] }, "Roguelike1TraderRandomShoppingConfirm": { diff --git a/src/MeoAssistant/RoguelikeShoppingTaskPlugin.cpp b/src/MeoAssistant/RoguelikeShoppingTaskPlugin.cpp index 752c797245..9984156882 100644 --- a/src/MeoAssistant/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MeoAssistant/RoguelikeShoppingTaskPlugin.cpp @@ -4,6 +4,7 @@ #include "Resource.h" #include "Controller.h" #include "ProcessTask.h" +#include "Logger.hpp" bool asst::RoguelikeShoppingTaskPlugin::verify(AsstMsg msg, const json::value& details) const { @@ -44,6 +45,7 @@ bool asst::RoguelikeShoppingTaskPlugin::_run() if (find_it == result.cend()) { continue; } + Log.info("Ready to buy", goods.name); m_ctrler->click(find_it->rect); bool confirmed = ProcessTask(*this, { "Roguelike1TraderShoppingConfirm" }) .set_retry_times(5)