mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 18:47:55 +08:00
fix: 修复接口参数typo
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3370
This commit is contained in:
@@ -130,7 +130,7 @@ AsstTaskId ASSTAPI AsstAppendTask(AsstHandle handle, const char* type, const cha
|
||||
"replenish": bool, // 贸易站“源石碎片”是否自动补货,可选,默认 false
|
||||
|
||||
"dorm_notstationed_enabled": bool, // 是否启用宿舍“未进驻”选项,可选,默认 false
|
||||
"drom_trust_enabled": bool, // 是否将宿舍剩余位置填入信赖未满干员,可选,默认 false
|
||||
"dorm_trust_enabled": bool, // 是否将宿舍剩余位置填入信赖未满干员,可选,默认 false
|
||||
|
||||
/* 以下参数仅在 mode=10000 时生效,否则会被忽略 */
|
||||
"filename": string, // 自定义配置路径,必选。不支持运行中设置
|
||||
|
||||
@@ -406,8 +406,7 @@
|
||||
"template": "Bskill_ctrl_ussg.png"
|
||||
}
|
||||
},
|
||||
"skillsGroup": [
|
||||
]
|
||||
"skillsGroup": []
|
||||
},
|
||||
"Dorm": {
|
||||
"skills": {
|
||||
@@ -1218,7 +1217,7 @@
|
||||
"bskill_man_spd_bd_n1": {
|
||||
"additional": {
|
||||
"思维链环": "[NumOf感知信息]",
|
||||
"感知信息": "[NumOfPeopleInDrom]"
|
||||
"感知信息": "[NumOfPeopleIndorm]"
|
||||
},
|
||||
"desc": [
|
||||
"进驻制造站时,宿舍内每有1名干员则感知信息+1,同时每1点感知信息转化为1点思维链环"
|
||||
@@ -2086,8 +2085,7 @@
|
||||
"template": "Bskill_hire_spd_memento.png"
|
||||
}
|
||||
},
|
||||
"skillsGroup": [
|
||||
]
|
||||
"skillsGroup": []
|
||||
},
|
||||
"Power": {
|
||||
"maxNumOfOpers": 1,
|
||||
@@ -2204,8 +2202,7 @@
|
||||
"template": "Bskill_pow_spd3.png"
|
||||
}
|
||||
},
|
||||
"skillsGroup": [
|
||||
]
|
||||
"skillsGroup": []
|
||||
},
|
||||
"Reception": {
|
||||
"Doc": "会客室",
|
||||
@@ -2538,8 +2535,7 @@
|
||||
"template": "Bskill_meet_ursus2.png"
|
||||
}
|
||||
},
|
||||
"skillsGroup": [
|
||||
]
|
||||
"skillsGroup": []
|
||||
},
|
||||
"Trade": {
|
||||
"maxNumOfOpers": 3,
|
||||
@@ -3194,8 +3190,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"optional": [
|
||||
]
|
||||
"optional": []
|
||||
},
|
||||
{
|
||||
"allowExternal": false,
|
||||
@@ -3389,4 +3384,4 @@
|
||||
"Office",
|
||||
"Mfg"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@ asst::InfrastDormTask& asst::InfrastDormTask::set_notstationed_enabled(bool dorm
|
||||
return *this;
|
||||
}
|
||||
|
||||
asst::InfrastDormTask& asst::InfrastDormTask::set_trust_enabled(bool drom_trust_enabled) noexcept
|
||||
asst::InfrastDormTask& asst::InfrastDormTask::set_trust_enabled(bool dorm_trust_enabled) noexcept
|
||||
{
|
||||
m_drom_trust_enabled = drom_trust_enabled;
|
||||
m_dorm_trust_enabled = dorm_trust_enabled;
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ bool asst::InfrastDormTask::opers_choose()
|
||||
continue;
|
||||
}
|
||||
// 如果所有心情不满的干员已经放入宿舍,就把信赖不满的干员放入宿舍
|
||||
if (m_drom_trust_enabled && m_next_step != NextStep::Rest && oper.selected == false &&
|
||||
if (m_dorm_trust_enabled && m_next_step != NextStep::Rest && oper.selected == false &&
|
||||
oper.doing != infrast::Doing::Working && oper.doing != infrast::Doing::Resting) {
|
||||
// 获得干员信赖值
|
||||
OcrWithPreprocessImageAnalyzer trust_analyzer(oper.name_img);
|
||||
@@ -179,8 +179,8 @@ bool asst::InfrastDormTask::opers_choose()
|
||||
// 如果当前页面休息完成的人数超过5个,说明已经已经把所有心情不满的滑过一遍、没有更多的了
|
||||
else if (++num_of_resting >= 6) {
|
||||
Log.trace("num_of_resting:", num_of_resting, ", dorm finished");
|
||||
if (m_drom_trust_enabled) {
|
||||
Log.trace("m_drom_trust_enabled:", m_drom_trust_enabled);
|
||||
if (m_dorm_trust_enabled) {
|
||||
Log.trace("m_dorm_trust_enabled:", m_dorm_trust_enabled);
|
||||
if (!m_if_filter_notstationed_haspressed) {
|
||||
Log.trace("click_filter_menu_not_stationed_button");
|
||||
click_filter_menu_not_stationed_button();
|
||||
@@ -191,7 +191,7 @@ bool asst::InfrastDormTask::opers_choose()
|
||||
m_next_step = NextStep::RestDone; // 选中未进驻标签并按信赖值排序
|
||||
}
|
||||
else {
|
||||
Log.trace("m_drom_trust_enabled:", m_drom_trust_enabled);
|
||||
Log.trace("m_dorm_trust_enabled:", m_dorm_trust_enabled);
|
||||
m_next_step = NextStep::Fill;
|
||||
// click_filter_menu_cancel_not_stationed_button();
|
||||
// click_order_by_mood();
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace asst
|
||||
virtual size_t max_num_of_opers() const noexcept override { return 5ULL; }
|
||||
|
||||
InfrastDormTask& set_notstationed_enabled(bool dorm_notstationed_enabled) noexcept;
|
||||
InfrastDormTask& set_trust_enabled(bool m_drom_trust_enabled) noexcept;
|
||||
InfrastDormTask& set_trust_enabled(bool m_dorm_trust_enabled) noexcept;
|
||||
|
||||
private:
|
||||
virtual bool _run() override;
|
||||
@@ -22,7 +22,7 @@ namespace asst
|
||||
bool click_order_by_mood();
|
||||
|
||||
bool m_dorm_notstationed_enabled = false; // 设置是否启用未进驻筛选
|
||||
bool m_drom_trust_enabled = true; // 设置是否启用蹭信赖
|
||||
bool m_dorm_trust_enabled = true; // 设置是否启用蹭信赖
|
||||
|
||||
int m_max_num_of_dorm = 4;
|
||||
|
||||
|
||||
@@ -118,8 +118,8 @@ bool asst::InfrastTask::set_params(const json::value& params)
|
||||
bool dorm_notstationed_enabled = params.get("dorm_notstationed_enabled", false);
|
||||
m_dorm_task_ptr->set_notstationed_enabled(dorm_notstationed_enabled);
|
||||
|
||||
bool drom_trust_enabled = params.get("drom_trust_enabled", true);
|
||||
m_dorm_task_ptr->set_trust_enabled(drom_trust_enabled);
|
||||
bool dorm_trust_enabled = params.get("dorm_trust_enabled", true);
|
||||
m_dorm_task_ptr->set_trust_enabled(dorm_trust_enabled);
|
||||
|
||||
bool replenish = params.get("replenish", false);
|
||||
m_replenish_task_ptr->set_enable(replenish);
|
||||
|
||||
@@ -1354,7 +1354,7 @@ namespace MaaWpfGui
|
||||
return id != 0;
|
||||
}
|
||||
|
||||
private JObject SerializeInfrastTaskParams(string[] order, string uses_of_drones, double dorm_threshold, bool dorm_filter_not_stationed_enabled, bool dorm_drom_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
private JObject SerializeInfrastTaskParams(string[] order, string uses_of_drones, double dorm_threshold, bool dorm_filter_not_stationed_enabled, bool dorm_dorm_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
bool is_custom, string filename, int plan_index)
|
||||
{
|
||||
var task_params = new JObject
|
||||
@@ -1363,7 +1363,7 @@ namespace MaaWpfGui
|
||||
["drones"] = uses_of_drones,
|
||||
["threshold"] = dorm_threshold,
|
||||
["dorm_notstationed_enabled"] = dorm_filter_not_stationed_enabled,
|
||||
["drom_trust_enabled"] = dorm_drom_trust_enabled,
|
||||
["dorm_trust_enabled"] = dorm_dorm_trust_enabled,
|
||||
["replenish"] = originium_shard_auto_replenishment,
|
||||
["mode"] = is_custom ? 10000 : 0,
|
||||
["filename"] = filename,
|
||||
@@ -1391,19 +1391,19 @@ namespace MaaWpfGui
|
||||
/// </param>
|
||||
/// <param name="dorm_threshold">宿舍进驻心情阈值。</param>
|
||||
/// <param name="dorm_filter_not_stationed_enabled">宿舍是否使用未进驻筛选标签</param>
|
||||
/// <param name="dorm_drom_trust_enabled">宿舍是否使用蹭信赖功能</param>
|
||||
/// <param name="dorm_dorm_trust_enabled">宿舍是否使用蹭信赖功能</param>
|
||||
/// <param name="originium_shard_auto_replenishment">制造站搓玉是否补货</param>
|
||||
/// <param name="is_custom"></param>
|
||||
/// <param name="filename"></param>
|
||||
/// <param name="plan_index"></param>
|
||||
/// <returns>是否成功。</returns>
|
||||
public bool AsstAppendInfrast(string[] order, string uses_of_drones, double dorm_threshold,
|
||||
bool dorm_filter_not_stationed_enabled, bool dorm_drom_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
bool dorm_filter_not_stationed_enabled, bool dorm_dorm_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
bool is_custom, string filename, int plan_index)
|
||||
{
|
||||
var task_params = SerializeInfrastTaskParams(
|
||||
order, uses_of_drones, dorm_threshold,
|
||||
dorm_filter_not_stationed_enabled, dorm_drom_trust_enabled, originium_shard_auto_replenishment,
|
||||
dorm_filter_not_stationed_enabled, dorm_dorm_trust_enabled, originium_shard_auto_replenishment,
|
||||
is_custom, filename, plan_index);
|
||||
AsstTaskId id = AsstAppendTaskWithEncoding("Infrast", task_params);
|
||||
_latestTaskId[TaskType.Infrast] = id;
|
||||
@@ -1411,7 +1411,7 @@ namespace MaaWpfGui
|
||||
}
|
||||
|
||||
public bool AsstSetInfrastTaskParams(string[] order, string uses_of_drones, double dorm_threshold,
|
||||
bool dorm_filter_not_stationed_enabled, bool dorm_drom_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
bool dorm_filter_not_stationed_enabled, bool dorm_dorm_trust_enabled, bool originium_shard_auto_replenishment,
|
||||
bool is_custom, string filename, int plan_index)
|
||||
{
|
||||
var type = TaskType.Infrast;
|
||||
@@ -1428,7 +1428,7 @@ namespace MaaWpfGui
|
||||
|
||||
var task_params = SerializeInfrastTaskParams(
|
||||
order, uses_of_drones, dorm_threshold,
|
||||
dorm_filter_not_stationed_enabled, dorm_drom_trust_enabled, originium_shard_auto_replenishment,
|
||||
dorm_filter_not_stationed_enabled, dorm_dorm_trust_enabled, originium_shard_auto_replenishment,
|
||||
is_custom, filename, plan_index);
|
||||
return AsstSetTaskParamsWithEncoding(id, task_params);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user