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

fix: 修正CopilotTask参数名is_adverse -->> is_raid

Browse Source
This commit is contained in:
status102
2024-02-01 19:13:24 +08:00
parent 0ca408e942
commit 7ad445fb4e
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MaaCore/Task/Interface/CopilotTask.cpp
View File

@@ -70,12 +70,20 @@ bool asst::CopilotTask::set_params(const json::value& params)
bool need_navigate = params.get("need_navigate", false); // 是否在当前页面左右滑动寻找关卡，启用战斗列表则为true
std::string navigate_name = params.get("navigate_name", std::string()); // 导航的关卡名
bool is_adverse = params.get("is_adverse", false); // 是否为突袭关卡
bool use_sanity_potion = params.get("use_sanity_potion", false); // 是否吃理智药
bool with_formation = params.get("formation", false); // 是否使用自动编队
int select_formation = params.get("select_formation", 0); // 选择第几个编队，0为不选择
bool add_trust = params.get("add_trust", false); // 是否自动补信赖
bool add_user_additional = params.get("add_user_additional", false); // 是否自动补用户自定义干员
bool is_raid = params.get("is_raid", false); // 是否为突袭关卡
if (params.contains("is_adverse")) {
Log.warn("================ DEPRECATED ================");
Log.warn("`is_adverse` has been deprecated since v5.0.0-beta.3; Please use 'is_raid'");
Log.warn("================ DEPRECATED ================");
if (!params.contains("is_raid")) {
is_raid = params.get("is_adverse", false); // 兼容旧版本，在v6.0改为存在此参数时直接return false
}
}
bool use_sanity_potion = params.get("use_sanity_potion", false); // 是否吃理智药
bool with_formation = params.get("formation", false); // 是否使用自动编队
int select_formation = params.get("select_formation", 0); // 选择第几个编队，0为不选择
bool add_trust = params.get("add_trust", false); // 是否自动补信赖
bool add_user_additional = params.get("add_user_additional", false); // 是否自动补用户自定义干员
std::string support_unit_name = params.get("support_unit_name", std::string());
auto filename_opt = params.find<std::string>("filename");
@@ -119,7 +127,7 @@ bool asst::CopilotTask::set_params(const json::value& params)
}
m_navigate_task_ptr->set_enable(need_navigate);
m_change_difficulty_task_ptr->set_enable(need_navigate && is_adverse);
m_change_difficulty_task_ptr->set_enable(need_navigate && is_raid);
m_not_use_prts_task_ptr->set_enable(need_navigate); // 不使用代理指挥
m_medicine_task_ptr->set_enable(use_sanity_potion);

6
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -2123,13 +2123,13 @@ namespace MaaWpfGui.Main
/// <param name="userAdditional">自定干员列表</param>
/// <param name="needNavigate">是否导航至关卡（启用自动战斗序列）</param>
/// <param name="navigateName">关卡名</param>
/// <param name="isAdverse">是不是突袭</param>
/// <param name="isRaid">是不是突袭</param>
/// <param name="type">任务类型</param>
/// <param name="loopTimes">任务重复执行次数</param>
/// <param name="useSanityPotion">是否使用理智药</param>
/// <param name="asstStart">是否启动战斗</param>
/// <returns>是否成功。</returns>
public bool AsstStartCopilot(string filename, bool formation, bool addTrust, bool addUserAdditional, JArray userAdditional, bool needNavigate, string navigateName, bool isAdverse, string type, int loopTimes, bool useSanityPotion, bool asstStart = true)
public bool AsstStartCopilot(string filename, bool formation, bool addTrust, bool addUserAdditional, JArray userAdditional, bool needNavigate, string navigateName, bool isRaid, string type, int loopTimes, bool useSanityPotion, bool asstStart = true)
{
var taskParams = new JObject
{
@@ -2140,7 +2140,7 @@ namespace MaaWpfGui.Main
["user_additional"] = userAdditional,
["need_navigate"] = needNavigate,
["navigate_name"] = navigateName,
["is_adverse"] = isAdverse,
["is_raid"] = isRaid,
["loop_times"] = loopTimes,
["use_sanity_potion"] = useSanityPotion,
};