diff --git a/resource/tasks.json b/resource/tasks.json index 415a1d38c4..a453d2bd90 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -671,10 +671,10 @@ "OfflineConfirm": { "action": "clickSelf", "roi": [ - 0, - 400, - 1280, - 200 + 310, + 409, + 648, + 165 ], "reduceOtherTimes": [ "StartButton1", @@ -3489,6 +3489,21 @@ "preDelay": 1000, "rearDelay": 0 }, + "StartToWakeUpToRoguelike1": { + "template": "StartToWakeUp.png", + "action": "clickSelf", + "roi": [ + 520, + 460, + 240, + 100 + ], + "next": [ + "TerminalToRoguelike1", + "CloseAnnoToRoguelike1", + "TodaysSuppliesToRoguelike1" + ] + }, "TodaysSuppliesToRoguelike1": { "algorithm": "OcrDetect", "text": [ @@ -3591,6 +3606,21 @@ "CloseAnnoToRoguelike1" ] }, + "OfflineConfirmToRoguelike1": { + "template": "OfflineConfirm.png", + "action": "clickSelf", + "roi": [ + 310, + 409, + 648, + 165 + ], + "next": [ + "CloseAnnoToRoguelike1", + "StartToWakeUpToRoguelike1", + "OfflineConfirmToRoguelike1" + ] + }, "Roguelike1Begin": { "algorithm": "justReturn", "next": [ @@ -3602,7 +3632,9 @@ "Roguelike1TodoEnter", "Roguelike1Continue", "ReturnToRoguelike1", - "ReturnToRoguelike1Confirm" + "ReturnToRoguelike1Confirm", + "OfflineConfirmToRoguelike1", + "StartToWakeUpToRoguelike1" ] }, "Roguelike1Continue": { diff --git a/resource/template/OfflineConfirm.png b/resource/template/OfflineConfirm.png index d0e3c3d201..3e716f89cc 100644 Binary files a/resource/template/OfflineConfirm.png and b/resource/template/OfflineConfirm.png differ diff --git a/src/MeoAssistant/HashImageAnalyzer.cpp b/src/MeoAssistant/HashImageAnalyzer.cpp index 1a06ad1239..c61aee7b4c 100644 --- a/src/MeoAssistant/HashImageAnalyzer.cpp +++ b/src/MeoAssistant/HashImageAnalyzer.cpp @@ -1,4 +1,4 @@ -#include "HashImageAnalyzer.h" +#include "HashImageAnalyzer.h" #include "AsstUtils.hpp" #include "Logger.hpp" @@ -32,7 +32,7 @@ bool asst::HashImageAnalyzer::analyze() to_hash = bound_bin(to_hash); } std::string hash_result = shash(to_hash); - Log.trace(hash_result); + //Log.debug(hash_result); int min_dist = INT_MAX; std::string cur_min_dist_name; diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index ad8088cedf..14ec064d63 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -1,4 +1,4 @@ -#include "ProcessTask.h" +#include "ProcessTask.h" #include #include @@ -78,7 +78,9 @@ bool ProcessTask::_run() } json::value info = basic_info(); info["details"] = json::object{ - {"to_be_recognized", json::array(m_cur_tasks_name)} + {"to_be_recognized", json::array(m_cur_tasks_name)}, + {"cur_retry", m_cur_retry}, + {"retry_times", m_retry_times} }; Log.info(info.to_string()); diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp index ea051fe8ff..8d8e14e6d8 100644 --- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp @@ -1,4 +1,4 @@ -#include "RoguelikeBattleTaskPlugin.h" +#include "RoguelikeBattleTaskPlugin.h" #include "BattleImageAnalyzer.h" #include "BattlePerspectiveImageAnalyzer.h" @@ -273,6 +273,8 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle() bool asst::RoguelikeBattleTaskPlugin::speed_up() { + LogTraceFunction; + ProcessTask task(*this, { "BattleSpeedUp" }); return task.run(); }