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

Revert "feat:实现自适应调整连战次数 (#12555)"

Browse Source 
This reverts commit 5c9ae13811.

Revert "chore: 新增 AUTO 选项"

This reverts commit 416ce337a2.

Revert "chore: Auto update by pre-commit hooks [skip changelog]"

This reverts commit 0eff8fd57e.

Revert "chore: 连战新增 -1 表示禁用切换"

This reverts commit 58760e9421.
This commit is contained in:
status102
2025-05-06 16:54:49 +08:00
parent 54e2dee6a8
commit d10516c3c2
13 changed files with 132 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MaaCore/Task/Interface/FightTask.cpp
View File

@@ -4,7 +4,6 @@
#include "Config/TaskData.h"
#include "Task/Fight/DrGrandetTaskPlugin.h"
#include "Task/Fight/FightSeriesAdjustPlugin.h"
#include "Task/Fight/FightTimesTaskPlugin.h"
#include "Task/Fight/MedicineCounterTaskPlugin.h"
#include "Task/Fight/SanityBeforeStageTaskPlugin.h"
@@ -55,8 +54,6 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst) :
m_fight_times_task_plugin_prt = m_fight_task_ptr->register_plugin<FightTimesTaskPlugin>();
m_fight_times_task_plugin_prt->set_retry_times(3);
m_medicine_plugin = m_fight_task_ptr->register_plugin<MedicineCounterTaskPlugin>();
m_fight_series_adjust_plugin_ptr = m_fight_task_ptr->register_plugin<FightSeriesAdjustPlugin>();
m_fight_series_adjust_plugin_ptr->set_retry_times(3);
m_subtasks.emplace_back(m_start_up_task_ptr);
m_subtasks.emplace_back(m_stage_navigation_task_ptr);
@@ -73,23 +70,11 @@ bool asst::FightTask::set_params(const json::value& params)
const int expiring_medicine = params.get("expiring_medicine", 0);
const int stone = params.get("stone", 0);
const int times = params.get("times", INT_MAX);
int series = params.get("series", 1);
// 重置插件状态 1000 表示自动连战，-1 表示禁用连战切换
m_fight_times_task_plugin_prt->set_enable(series != -1);
m_fight_series_adjust_plugin_ptr->set_close_stone_page_next(false);
m_fight_series_adjust_plugin_ptr->set_enable(series == 1000);
if (series == 1000) {
series = 6;
}
else if (series == -1) {
series = 1;
}
else if (series < 1 || series > 6) {
const int series = params.get("series", 1);
if (series < 1 || series > 6) {
Log.error("Invalid series");
return false;
}
bool enable_penguin = params.get("report_to_penguin", false);
bool enable_yituliu = params.get("report_to_yituliu", false);
std::string penguin_id = params.get("penguin_id", "");