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

perf: 打开自动战斗的minitouch功能，调整战斗时部署干员的滑动参数

Browse Source
This commit is contained in:
MistEO
2022-11-13 23:28:32 +08:00
parent 7a88b12bd4
commit f463a90df6
6 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resource/tasks.json
View File

@@ -6138,9 +6138,15 @@
},
"BattleSwipeOper": {
"algorithm": "JustReturn",
"preDelay": 500,
"postDelay": 300,
"Doc": "pre 是将干员滑动到场上的 duration 系数；rear 是设置干员朝向滑动的 duration"
"preDelay": 200,
"postDelay": 50,
"Doc": "pre 是将干员滑动到场上的 duration 系数；rear 是设置干员朝向滑动的 duration",
"specialParams": [
200
],
"specialParamsDoc": [
"设置朝向时的滑动距离"
]
},
"BattleOpersFlag": {
"templThreshold": 0.85,

29
src/MeoAssistant/Controller.cpp
View File

@@ -607,7 +607,6 @@ bool asst::Controller::call_and_hup_minitouch(const std::string& cmd)
bool asst::Controller::input_to_minitouch(const std::string& cmd, int delay_ms)
{
LogTraceFunction;
Log.info("Input to minitouch with delay", delay_ms, Logger::separator::newline, cmd);
#ifdef _WIN32
@@ -879,7 +878,7 @@ bool asst::Controller::screencap(bool allow_reconnect)
if (m_support_socket && m_server_started &&
screencap(m_adb.screencap_raw_by_nc, decode_raw, allow_reconnect, true)) {
// sock 第一次截图比较长（不知道是不是初始化了什么东西耽误时间，减个额外的的时间）
auto duration = duration_cast<milliseconds>(high_resolution_clock::now() - start_time) + 1000ms;
auto duration = duration_cast<milliseconds>(high_resolution_clock::now() - start_time) - 100ms;
if (duration < min_cost) {
m_adb.screencap_method = AdbProperty::ScreencapMethod::RawByNc;
make_instance_inited(true);
@@ -1111,13 +1110,12 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
const auto& opt = Configer.get_options();
if (m_minitouch_enabled && m_minitouch_avaiable) {
constexpr int MoveInterval = 1;
std::string minitouch_cmd =
MinitouchCmd::down(static_cast<int>(x1 * m_minitouch_props.x_scaling),
static_cast<int>(m_minitouch_props.y_scaling * y1), true, MoveInterval);
input_to_minitouch(MinitouchCmd::down(static_cast<int>(x1 * m_minitouch_props.x_scaling),
static_cast<int>(m_minitouch_props.y_scaling * y1), true, MoveInterval));
if (duration == 0) {
duration = 100;
duration = 200;
}
auto move_cmd = [&](int _x1, int _y1, int _x2, int _y2, int _duration) -> std::string {
auto minitouch_move = [&](int _x1, int _y1, int _x2, int _y2, int _duration) {
_x1 = static_cast<int>(_x1 * m_minitouch_props.x_scaling);
_y1 = static_cast<int>(_y1 * m_minitouch_props.y_scaling);
_x2 = static_cast<int>(_x2 * m_minitouch_props.x_scaling);
@@ -1127,30 +1125,27 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
int x_step = (_x2 - _x1) / move_times;
int y_step = (_y2 - _y1) / move_times;
// TODO: 加点随机因子，或者改成中间快两头慢
std::string minitouch_cmd;
for (int times = 1; times < move_times; ++times) {
int cur_x = _x1 + x_step * times;
int cur_y = _y1 + y_step * times;
if (cur_x < 0 || cur_x > m_minitouch_props.max_x || cur_y < 0 || cur_y > m_minitouch_props.max_y) {
continue;
}
minitouch_cmd += MinitouchCmd::move(cur_x, cur_y, true, MoveInterval);
input_to_minitouch(MinitouchCmd::move(cur_x, cur_y, true, MoveInterval));
}
if (_x2 >= 0 && _x2 <= m_minitouch_props.max_x && _y2 >= 0 && _y2 <= m_minitouch_props.max_y) {
minitouch_cmd += MinitouchCmd::move(_x2, _y2);
input_to_minitouch(MinitouchCmd::move(_x2, _y2));
}
return minitouch_cmd;
};
minitouch_cmd += move_cmd(x1, y1, x2, y2, duration);
minitouch_move(x1, y1, x2, y2, duration);
if (extra_swipe && opt.minitouch_extra_swipe_duration > 0) {
minitouch_cmd +=
move_cmd(x2, y2, x2, y2 - opt.minitouch_extra_swipe_dist, opt.minitouch_extra_swipe_duration);
minitouch_move(x2, y2, x2, y2 - opt.minitouch_extra_swipe_dist, opt.minitouch_extra_swipe_duration);
duration += opt.minitouch_extra_swipe_duration;
}
minitouch_cmd += MinitouchCmd::up();
return input_to_minitouch(minitouch_cmd, duration);
constexpr int ExtraWait = 50;
duration += ExtraWait;
return input_to_minitouch(MinitouchCmd::wait(ExtraWait) + MinitouchCmd::up(), duration);
}
else {
std::string cur_cmd =

6
src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
View File

@@ -53,6 +53,8 @@ bool asst::RoguelikeBattleTaskPlugin::_run()
{
using namespace std::chrono_literals;
MinitouchTempSwitcher switcher(m_ctrler);
bool gotten_info = get_stage_info();
if (!gotten_info) {
return true;
@@ -718,13 +720,13 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
int dist = static_cast<int>(Point::distance(
placed_point, { opt_oper.rect.x + opt_oper.rect.width / 2, opt_oper.rect.y + opt_oper.rect.height / 2 }));
// 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的
int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 800.0 * dist * log10(dist));
int duration = static_cast<int>(dist / 800.0 * swipe_oper_task_ptr->pre_delay);
m_ctrler->swipe(opt_oper.rect, placed_rect, duration);
sleep(use_oper_task_ptr->post_delay);
// 将方向转换为实际的 swipe end 坐标点
if (direction != Point::zero()) {
constexpr int coeff = 500;
static const int coeff = Task.get("BattleSwipeOper")->special_params.at(0);
Point end_point = placed_point + (direction * coeff);
m_ctrler->swipe(placed_point, end_point, swipe_oper_task_ptr->post_delay);
}

10
src/MeoAssistant/Task/Sub/AbstractTask.cpp
View File

@@ -214,3 +214,13 @@ bool asst::AbstractTask::save_img(const std::string& dirname)
Log.trace("Save image", full_path);
return asst::imwrite(full_path, image);
}
asst::MinitouchTempSwitcher::MinitouchTempSwitcher(std::shared_ptr<Controller> ctrler) : m_ctrler(ctrler)
{
m_ctrler->set_minitouch_enabled(true);
}
asst::MinitouchTempSwitcher::~MinitouchTempSwitcher()
{
m_ctrler->set_minitouch_enabled(false);
}

10
src/MeoAssistant/Task/Sub/AbstractTask.h
View File

@@ -83,4 +83,14 @@ namespace asst
std::shared_ptr<Controller> m_ctrler = nullptr;
std::shared_ptr<RuntimeStatus> m_status = nullptr;
};
class MinitouchTempSwitcher
{
public:
MinitouchTempSwitcher(std::shared_ptr<Controller> ctrler);
~MinitouchTempSwitcher() noexcept;
private:
std::shared_ptr<Controller> m_ctrler;
};
} // namespace asst

6
src/MeoAssistant/Task/Sub/BattleProcessTask.cpp
View File

@@ -27,6 +27,8 @@ void asst::BattleProcessTask::set_stage_name(std::string name)
bool asst::BattleProcessTask::_run()
{
MinitouchTempSwitcher minitoucher(m_ctrler);
bool ret = get_stage_info();
if (!ret) {
@@ -519,7 +521,7 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action)
int dist = static_cast<int>(
Point::distance(placed_point, { oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2 }));
// 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的
int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 1000.0 * dist * log10(dist));
int duration = static_cast<int>(dist / 800.0 * swipe_oper_task_ptr->pre_delay);
m_ctrler->swipe(oper_rect, placed_rect, duration);
sleep(use_oper_task_ptr->post_delay);
@@ -536,7 +538,7 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action)
Point direction = DirectionMapping.at(action.direction);
// 将方向转换为实际的 swipe end 坐标点
constexpr int coeff = 500;
static const int coeff = Task.get("BattleSwipeOper")->special_params.at(0);
Point end_point = placed_point + (direction * coeff);
m_ctrler->swipe(placed_point, end_point, swipe_oper_task_ptr->post_delay);