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

Merge pull request #2743 from MaaAssistantArknights/feat/swipe_acce

Browse Source 
feat: 优化 minitouch 滑动操作
This commit is contained in:
MistEO
2022-11-14 21:11:29 +08:00
committed by GitHub
parent eb36beb6c9 4d4b76aa7c
commit 85a0cf2d74
6 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
resource/tasks.json
View File

@@ -2,6 +2,7 @@
"SlowlySwipeToTheLeft": {
"algorithm": "JustReturn",
"action": "Swipe",
"postDelay": 200,
"specificRect": [
300,
310,
@@ -18,7 +19,8 @@
"rectMove_Doc": "滑动终点",
"specialParams": [
200,
1
1,
-1
],
"specialParams_Doc": [
"滑动 duration",
@@ -32,6 +34,7 @@
"SlowlySwipeToTheRight": {
"algorithm": "JustReturn",
"action": "Swipe",
"postDelay": 200,
"specificRect": [
880,
310,
@@ -46,7 +49,8 @@
],
"specialParams": [
200,
1
1,
-1
],
"next": [
"#next"
@@ -69,6 +73,11 @@
100,
100
],
"specialParams": [
150,
0,
0.5
],
"next": [
"#next"
],
@@ -90,6 +99,11 @@
200,
100
],
"specialParams": [
150,
0,
0.5
],
"next": [
"#next"
],
@@ -6140,13 +6154,13 @@
"algorithm": "JustReturn",
"preDelay": 200,
"postDelay": 100,
"Doc": "pre 是从点击干员，到干员信息弹出来等待的时间；rear 是干员上场，到设置朝向之间等待的时间"
"Doc": "pre 是从点击干员，到干员信息弹出来等待的时间；post 是干员上场，到设置朝向之间等待的时间"
},
"BattleSwipeOper": {
"algorithm": "JustReturn",
"preDelay": 200,
"postDelay": 50,
"Doc": "pre 是将干员滑动到场上的 duration 系数；rear 是设置干员朝向滑动的 duration",
"Doc": "pre 是将干员滑动到场上的 duration 系数；post 是设置干员朝向滑动的 duration",
"specialParams": [
200
],

53
src/MeoAssistant/Controller.cpp
View File

@@ -53,8 +53,8 @@ struct MinitouchCmd
sprintf(buff, "d %d %d %d %d\n", contact, x, y, pressure);
std::string str = buff;
if (with_commit) str += commit();
if (wait_ms) str += wait(wait_ms);
if (with_commit) str += commit();
return str;
}
inline static std::string move(int x, int y, bool with_commit = true, int wait_ms = 0, int contact = 0,
@@ -64,16 +64,17 @@ struct MinitouchCmd
sprintf(buff, "m %d %d %d %d\n", contact, x, y, pressure);
std::string str = buff;
if (with_commit) str += commit();
if (wait_ms) str += wait(wait_ms);
if (with_commit) str += commit();
return str;
}
inline static std::string up(bool with_commit = true, int contact = 0)
inline static std::string up(bool with_commit = true, int wait_ms = 0, int contact = 0)
{
char buff[16] = { 0 };
sprintf(buff, "u %d\n", contact);
std::string str = buff;
if (wait_ms) str += wait(wait_ms);
if (with_commit) str += commit();
return str;
}
@@ -1063,9 +1064,11 @@ bool asst::Controller::click_without_scale(const Point& p)
if (m_minitouch_enabled && m_minitouch_avaiable) {
int x = static_cast<int>(p.x * m_minitouch_props.x_scaling);
int y = static_cast<int>(p.y * m_minitouch_props.y_scaling);
constexpr int WaitMs = 50;
std::string minitouch_cmd = MinitouchCmd::down(x, y, true, WaitMs) + MinitouchCmd::up();
return input_to_minitouch(minitouch_cmd, WaitMs);
constexpr int duration = 50; // 点击从按下到抬起之间的持续时间，以毫秒计
constexpr int wait_ms = 50; // 触点抬起后等待的时间，以毫秒计
std::string minitouch_cmd =
MinitouchCmd::down(x, y, true, duration) + MinitouchCmd::up(wait_ms);
return input_to_minitouch(minitouch_cmd, duration + wait_ms);
}
else {
std::string cur_cmd =
@@ -1079,7 +1082,7 @@ bool asst::Controller::click_without_scale(const Rect& rect)
return click_without_scale(rand_point_in_rect(rect));
}
bool asst::Controller::swipe(const Point& p1, const Point& p2, int duration, bool extra_swipe)
bool asst::Controller::swipe(const Point& p1, const Point& p2, int duration, bool extra_swipe, double acceleration_coef)
{
int x1 = static_cast<int>(p1.x * m_control_scale);
int y1 = static_cast<int>(p1.y * m_control_scale);
@@ -1087,15 +1090,16 @@ bool asst::Controller::swipe(const Point& p1, const Point& p2, int duration, boo
int y2 = static_cast<int>(p2.y * m_control_scale);
// log.trace("Swipe, raw:", p1.x, p1.y, p2.x, p2.y, "corr:", x1, y1, x2, y2);
return swipe_without_scale(Point(x1, y1), Point(x2, y2), duration, extra_swipe);
return swipe_without_scale(Point(x1, y1), Point(x2, y2), duration, extra_swipe, acceleration_coef);
}
bool asst::Controller::swipe(const Rect& r1, const Rect& r2, int duration, bool extra_swipe)
bool asst::Controller::swipe(const Rect& r1, const Rect& r2, int duration, bool extra_swipe, double acceleration_coef)
{
return swipe(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, extra_swipe);
return swipe(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, extra_swipe, acceleration_coef);
}
bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int duration, bool extra_swipe)
bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int duration, bool extra_swipe,
double acceleration_coef)
{
int x1 = p1.x, y1 = p1.y;
int x2 = p2.x, y2 = p2.y;
@@ -1109,7 +1113,7 @@ 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;
constexpr int MoveInterval = 5;
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) {
@@ -1121,13 +1125,13 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
_x2 = static_cast<int>(_x2 * m_minitouch_props.x_scaling);
_y2 = static_cast<int>(_y2 * m_minitouch_props.y_scaling);
double move_times = static_cast<double>(_duration) / MoveInterval;
double x_step = (_x2 - _x1) / move_times;
double y_step = (_y2 - _y1) / move_times;
// TODO: 加点随机因子，或者改成中间快两头慢
for (int times = 1; times < move_times; ++times) {
int cur_x = _x1 + static_cast<int>(x_step * times);
int cur_y = _y1 + static_cast<int>(y_step * times);
double acceleration = acceleration_coef * static_cast<double>(_x2 - _x1) / (_duration * _duration);
double v0x = static_cast<double>(_x2 - _x1) / _duration - acceleration * _duration;
double v0y = static_cast<double>(_y2 - _y1) / _duration - acceleration * _duration;
for (int cur_time = MoveInterval; cur_time < _duration; cur_time += MoveInterval) {
int cur_x = _x1 + static_cast<int>(v0x * cur_time + acceleration * cur_time * cur_time);
int cur_y = _y1 + static_cast<int>(v0y * cur_time + acceleration * cur_time * cur_time);
if (cur_x < 0 || cur_x > m_minitouch_props.max_x || cur_y < 0 || cur_y > m_minitouch_props.max_y) {
continue;
}
@@ -1144,8 +1148,9 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
duration += opt.minitouch_extra_swipe_duration;
}
constexpr int ExtraWait = 50;
duration += ExtraWait;
return input_to_minitouch(MinitouchCmd::wait(ExtraWait) + MinitouchCmd::up(), duration);
duration += 2 * ExtraWait;
return input_to_minitouch(
MinitouchCmd::wait(ExtraWait /* 停留终点 */) + MinitouchCmd::up(ExtraWait /* 抬起后等待 */), duration);
}
else {
std::string cur_cmd =
@@ -1174,9 +1179,11 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
}
}
bool asst::Controller::swipe_without_scale(const Rect& r1, const Rect& r2, int duration, bool extra_swipe)
bool asst::Controller::swipe_without_scale(const Rect& r1, const Rect& r2, int duration, bool extra_swipe,
double acceleration_coef)
{
return swipe_without_scale(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, extra_swipe);
return swipe_without_scale(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, extra_swipe,
acceleration_coef);
}
bool asst::Controller::connect(const std::string& adb_path, const std::string& address, const std::string& config)

12
src/MeoAssistant/Controller.h
View File

@@ -57,10 +57,14 @@ namespace asst
bool click_without_scale(const Point& p);
bool click_without_scale(const Rect& rect);
bool swipe(const Point& p1, const Point& p2, int duration = 0, bool extra_swipe = false);
bool swipe(const Rect& r1, const Rect& r2, int duration = 0, bool extra_swipe = false);
bool swipe_without_scale(const Point& p1, const Point& p2, int duration = 0, bool extra_swipe = false);
bool swipe_without_scale(const Rect& r1, const Rect& r2, int duration = 0, bool extra_swipe = false);
bool swipe(const Point& p1, const Point& p2, int duration = 0, bool extra_swipe = false,
double acceleration_coef = 0);
bool swipe(const Rect& r1, const Rect& r2, int duration = 0, bool extra_swipe = false,
double acceleration_coef = 0);
bool swipe_without_scale(const Point& p1, const Point& p2, int duration = 0, bool extra_swipe = false,
double acceleration_coef = 0);
bool swipe_without_scale(const Rect& r1, const Rect& r2, int duration = 0, bool extra_swipe = false,
double acceleration_coef = 0);
std::pair<int, int> get_scale_size() const noexcept;

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

@@ -726,11 +726,11 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
// 将方向转换为实际的 swipe end 坐标点
if (direction != Point::zero()) {
static const int coeff = Task.get("BattleSwipeOper")->special_params.at(0);
static const int coeff = swipe_oper_task_ptr->special_params.at(0);
Point end_point = placed_point + (direction * coeff);
m_ctrler->swipe(placed_point, end_point, swipe_oper_task_ptr->post_delay);
sleep(use_oper_task_ptr->post_delay);
}
sleep(Task.get("BattleUseOper")->post_delay);
if (opt_oper.role == BattleRole::Drone) {
cancel_oper_selection();

8
src/MeoAssistant/Task/Sub/ProcessTask.cpp
View File

@@ -186,7 +186,8 @@ bool ProcessTask::_run()
case ProcessTaskAction::Swipe:
exec_swipe_task(m_cur_task_ptr->specific_rect, m_cur_task_ptr->rect_move,
m_cur_task_ptr->special_params.empty() ? 0 : m_cur_task_ptr->special_params.at(0),
(m_cur_task_ptr->special_params.size() < 2) ? false : m_cur_task_ptr->special_params.at(1));
(m_cur_task_ptr->special_params.size() < 2) ? false : m_cur_task_ptr->special_params.at(1),
(m_cur_task_ptr->special_params.size() < 3) ? 0 : m_cur_task_ptr->special_params.at(2));
break;
case ProcessTaskAction::DoNothing:
break;
@@ -305,8 +306,9 @@ void ProcessTask::exec_click_task(const Rect& matched_rect)
m_ctrler->click(matched_rect);
}
void asst::ProcessTask::exec_swipe_task(const Rect& r1, const Rect& r2, int duration, bool extra_swipe)
void asst::ProcessTask::exec_swipe_task(const Rect& r1, const Rect& r2, int duration, bool extra_swipe,
double acceleration_coef)
{
MinitouchTempSwitcher switcher(m_ctrler);
m_ctrler->swipe(r1, r2, duration, extra_swipe);
m_ctrler->swipe(r1, r2, duration, extra_swipe, acceleration_coef);
}

2
src/MeoAssistant/Task/Sub/ProcessTask.h
View File

@@ -42,7 +42,7 @@ namespace asst
std::pair<int, TimesLimitType> calc_time_limit() const;
void exec_click_task(const Rect& matched_rect);
void exec_swipe_task(const Rect& r1, const Rect& r2, int duration, bool extra_swipe);
void exec_swipe_task(const Rect& r1, const Rect& r2, int duration, bool extra_swipe, double acceleration_coef);
std::shared_ptr<TaskInfo> m_cur_task_ptr = nullptr;
std::vector<std::string> m_raw_tasks_name;