diff --git a/resource/tasks.json b/resource/tasks.json index 51ea450616..9d90b924a0 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -346,7 +346,9 @@ "next": [ "UsePrts", "StartButton1", - "LastBattle" + "StartButton2", + "PRTS", + "EndOfAction" ] }, "GameStart": { diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index f45012f153..8aadb9d3bf 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -484,7 +484,7 @@ bool Assistant::stop(bool block) decltype(m_tasks_queue) empty; m_tasks_queue.swap(empty); - //clear_cache(); + clear_cache(); return true; } @@ -601,7 +601,7 @@ void asst::Assistant::append_callback(AsstMsg msg, json::value detail) void Assistant::clear_cache() { Resrc.item().clear_drop_count(); - task.clear_cache(); + //task.clear_cache(); } json::value asst::Assistant::organize_stage_drop(const json::value& rec) @@ -624,11 +624,11 @@ json::value asst::Assistant::organize_stage_drop(const json::value& rec) info["count"] = count; statistics_vec.emplace_back(std::move(info)); } - // 排个序,数量多的放前面 - std::sort(statistics_vec.begin(), statistics_vec.end(), - [](const json::value& lhs, const json::value& rhs) -> bool { - return lhs.at("count").as_integer() > rhs.at("count").as_integer(); - }); + //// 排个序,数量多的放前面 + //std::sort(statistics_vec.begin(), statistics_vec.end(), + // [](const json::value& lhs, const json::value& rhs) -> bool { + // return lhs.at("count").as_integer() > rhs.at("count").as_integer(); + // }); dst["statistics"] = json::array(std::move(statistics_vec)); diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index 536a96c6a0..e1991556db 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -144,6 +144,7 @@ bool ProcessTask::_run() default: break; } + m_retry_times = 0; ++exec_times; diff --git a/src/MeoAssistant/Version.h b/src/MeoAssistant/Version.h index d196c2a76f..282326e697 100644 --- a/src/MeoAssistant/Version.h +++ b/src/MeoAssistant/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v2.5.2"; + constexpr static const char* Version = "v2.5.3"; }