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

perf: 基建使用切换职业栏返回列表最左侧 (#12594)

Browse Source 
肉鸽用不了，没有对应职业的话是灰的，除非全部匹配一遍，反正不长，还是慢慢划吧

fix #11782
This commit is contained in:
uye
2025-05-10 19:58:38 +08:00
committed by GitHub
parent b5a6d44ce6
commit 44b712b8e2
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp
View File

@@ -113,7 +113,7 @@ bool asst::InfrastAbstractTask::match_operator_groups()
Log.error("already retried");
break;
}
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_to_the_left_of_operlist();
swipe_times = 0;
retried = true;
}
@@ -130,7 +130,7 @@ bool asst::InfrastAbstractTask::match_operator_groups()
swipe_times++;
}
}
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_to_the_left_of_operlist();
swipe_times = 0;
Log.info(__FUNCTION__, "available operators for group size:", opers.size());
// 筛选第一个满足要求的干员组
@@ -292,7 +292,7 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
Log.error("already retring");
break;
}
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_to_the_left_of_operlist();
swipe_times = 0;
retried = true;
}
@@ -320,7 +320,7 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
}
if (swipe_times) {
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_to_the_left_of_operlist();
swipe_times = 0;
}
// 如果只选了一个人没必要排序
@@ -690,8 +690,9 @@ void asst::InfrastAbstractTask::swipe_of_operlist()
ProcessTask(*this, { "InfrastOperListSlowlySwipeToTheRight" }).run();
}
void asst::InfrastAbstractTask::swipe_to_the_left_of_operlist(int loop_times)
void asst::InfrastAbstractTask::swipe_to_the_left_of_operlist()
{
/*
if (loop_times < 0) {
loop_times = operlist_swipe_times();
}
@@ -699,6 +700,15 @@ void asst::InfrastAbstractTask::swipe_to_the_left_of_operlist(int loop_times)
ProcessTask(*this, { "InfrastOperListSwipeToTheLeft" }).run();
}
ProcessTask(*this, { "SleepAfterOperListQuickSwipe" }).run();
*/
// 通过切换职业栏来实现回正
ProcessTask(*this, { "BattleQuickFormationExpandRole", "BattleQuickFormationRole-All-OCR" }).run();
ProcessTask(*this, { "BattleQuickFormationRole-Caster" }).run();
ProcessTask(*this, { "BattleQuickFormationRole-All" }).run();
// 基建默认收起
ProcessTask(*this, { "InfrastCloseQuickFormationExpandRole" }).run();
sleep(500);
}
void asst::InfrastAbstractTask::swipe_to_the_left_of_main_ui()

2
src/MaaCore/Task/Infrast/InfrastAbstractTask.h
View File

@@ -38,7 +38,7 @@ protected:
virtual int operlist_swipe_times() const noexcept { return 2; }
// 滑动到干员列表的最左侧
void swipe_to_the_left_of_operlist(int loop_times = -1);
void swipe_to_the_left_of_operlist();
// 滑动基建的主界面到最左侧
void swipe_to_the_left_of_main_ui();
// 滑动基建的主界面到最右侧

2
src/MaaCore/Task/Infrast/InfrastProductionTask.cpp
View File

@@ -708,7 +708,7 @@ bool asst::InfrastProductionTask::opers_choose()
}
if (swipe_times) {
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_to_the_left_of_operlist();
}
// 点两次排序，让已选干员排到最前面
ProcessTask(*this, { "InfrastOperListTabSkillUnClicked" }).run();