diff --git a/docs/en/FAQ.md b/docs/en/FAQ.md index 81d8b4d26e..de2c4c2cbf 100644 --- a/docs/en/FAQ.md +++ b/docs/en/FAQ.md @@ -49,7 +49,7 @@ Try restarting your computer. ## Wrong recognition/program freezes after starting -Tip 1: The `Current Stage` of auto battle that costs Sanity requires you to go to the screen with the `Start` button. Please confirm they are not related. +Tip 1: The auto battle requires you to go to the screen with the `Start` button. Please confirm they are not related. Tip 2: Follow the steps below until the problem is solved. 1. Confirm that your emulator is supported in the [List of the Supported Emulators](EMULATOR_SUPPORTS.md). diff --git a/docs/en/INTEGRATION.md b/docs/en/INTEGRATION.md index 223876969a..bdb4ce8aad 100644 --- a/docs/en/INTEGRATION.md +++ b/docs/en/INTEGRATION.md @@ -51,7 +51,7 @@ Appends a task. // Corresponding task parameters { "enable": bool, // Whether to enable this task, optional, true by default - "stage": string, // Stage name, optional, by default "当前关卡". Editing in run-time is not supported. + "stage": string, // Stage name, optional, by default crrent / last stage. Editing in run-time is not supported. "medicine": int, // Maximum number Sanity Potion used, optional, by default 0 "stone": int, // Maximum number of Originite Prime used, optional, by default 0 "times": int, // Maximum times, optional, by default infinite diff --git a/docs/常见问题.md b/docs/常见问题.md index 7ad00ceaa7..96ca0f699e 100644 --- a/docs/常见问题.md +++ b/docs/常见问题.md @@ -49,7 +49,7 @@ _注意蓝叠安装完后,需要在模拟器设置中打开 `Android 调试桥 ## 识别错误/任务开始后一直不动、没有反应 -提示 1. 自动战斗功能 和 刷理智的 `当前关卡`,都是需要手动点到关卡页有 `开始行动` 按钮的地方再开始任务的。请确认不是这个问题~ +提示 1. 自动战斗功能,是需要手动点到关卡页有 `开始行动` 按钮的地方再开始任务的。请确认不是这个问题~ 提示 2. 依次进行,若问题解决,则无需往下 1. 请根据 [模拟器支持情况](模拟器支持.md) 确定您的模拟器是受支持的 diff --git a/docs/集成文档.md b/docs/集成文档.md index 0106e314d3..61795e331d 100644 --- a/docs/集成文档.md +++ b/docs/集成文档.md @@ -51,7 +51,7 @@ TaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const char* p // 对应的任务参数 { "enable": bool, // 是否启用本任务,可选,默认为 true - "stage": string, // 关卡名,可选,默认“当前关卡”。不支持运行中设置 + "stage": string, // 关卡名,可选,默认为空,识别当前/上次的关卡。不支持运行中设置 "medicine": int, // 最大使用理智药数量,可选,默认 0 "stone": int, // 最大吃石头数量,可选,默认 0 "times": int, // 指定次数,可选,默认无穷大 diff --git a/src/MeoAssistant/FightTask.cpp b/src/MeoAssistant/FightTask.cpp index 0278e3a336..78cc90e4b5 100644 --- a/src/MeoAssistant/FightTask.cpp +++ b/src/MeoAssistant/FightTask.cpp @@ -13,14 +13,13 @@ asst::FightTask::FightTask(AsstCallback callback, void* callback_arg) m_fight_task_ptr(std::make_shared(m_callback, m_callback_arg, TaskType)) { // 进入选关界面(主界面的“终端”点进去) - m_start_up_task_ptr->set_tasks({ "StageBegin" }) - .set_times_limit("GoLastBattle", 0) + m_start_up_task_ptr-> + set_times_limit("GoLastBattle", 0) .set_times_limit("StartButton1", 0) .set_times_limit("StartButton2", 0) .set_times_limit("MedicineConfirm", 0) .set_times_limit("StoneConfirm", 0) .set_times_limit("StageSNReturnFlag", 0) - .set_enable(false) .set_ignore_error(false); // 进入对应的关卡 @@ -29,7 +28,6 @@ asst::FightTask::FightTask(AsstCallback callback, void* callback_arg) .set_times_limit("MedicineConfirm", 0) .set_times_limit("StoneConfirm", 0) .set_times_limit("StageSNReturnFlag", 0) - .set_enable(false) .set_ignore_error(false); // 开始战斗任务 @@ -71,14 +69,13 @@ bool asst::FightTask::set_params(const json::value& params) if (!m_runned) { if (stage.empty()) { - m_start_up_task_ptr->set_enable(false); - m_stage_task_ptr->set_enable(false); + m_start_up_task_ptr->set_tasks({ "UsePrts", "UsePrts-StageSN", "StartButton1", "StageBegin" }); + m_stage_task_ptr->set_tasks({ "UsePrts", "UsePrts-StageSN", "StartButton1", "LastBattle" }); } else { - m_start_up_task_ptr->set_enable(true); - m_stage_task_ptr->set_enable(true); + m_start_up_task_ptr->set_tasks({ "StageBegin" }); + m_stage_task_ptr->set_tasks({ stage }); } - m_stage_task_ptr->set_tasks({ stage }); } m_fight_task_ptr->set_times_limit("MedicineConfirm", medicine) diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index 31cb1c10ff..f46ccabf52 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -51,8 +51,9 @@ Stage Amend - Current Stage - Last Battle + Cur/Last Stage + 1-7 CE-6 AP-5 diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml index e1d418e13a..c30ea3eff1 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -51,8 +51,9 @@ 关卡选择 修改 - 当前关卡 - 上次作战 + + 当前/上次 1-7 龙门币-6/5 红票-5 diff --git a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml index 3475ba5f1a..9afdba271e 100644 --- a/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/TimerSettingsUserControl.xaml @@ -21,7 +21,7 @@ - + diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 1d885efc8f..82aee1bbd3 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -186,8 +186,9 @@ namespace MeoAsstGui AllStageList = new List { - new CombData { Display = Localization.GetString("CurrentStage"), Value = string.Empty }, - new CombData { Display = Localization.GetString("LastBattle"), Value = "LastBattle" }, + new CombData { Display = Localization.GetString("DefaultStage"), Value = string.Empty }, + //new CombData { Display = Localization.GetString("CurrentStage"), Value = string.Empty }, + //new CombData { Display = Localization.GetString("LastBattle"), Value = "LastBattle" }, new CombData { Display = "1-7", Value = "1-7" }, new CombData { Display = Localization.GetString("CE-6"), Value = "CE-6" }, @@ -301,7 +302,7 @@ namespace MeoAsstGui } if (!hasSavedValue) { - Stage = "LastBattle"; + Stage = "DefaultStage"; } } diff --git a/src/Python/sample.py b/src/Python/sample.py index c00b38c5e6..466a1b432d 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -34,7 +34,7 @@ if __name__ == "__main__": asst.append_task('StartUp') asst.append_task('Fight', { - 'stage': 'LastBattle', + 'stage': '', 'report_to_penguin': True, # 'penguin_id': '1234567' }) diff --git a/src/Python/timed_start/timed_sample.py b/src/Python/timed_start/timed_sample.py index 090411a605..d296d0d378 100644 --- a/src/Python/timed_start/timed_sample.py +++ b/src/Python/timed_start/timed_sample.py @@ -31,7 +31,7 @@ def job(): # asst.append_task('StartUp') asst.append_task('Fight', { 'report_to_penguin': True, - 'stage': 'LastBattle', + 'stage': '', # 'penguin_id': '1234567' }) asst.append_task('Recruit', {