diff --git a/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json b/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json index 405a8dd6d8..557614cf83 100644 --- a/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json +++ b/resource/custom_infrast/333_layout_for_Orundum_3_times_pre_day.json @@ -1,373 +1,373 @@ { - "plans":[ - { - "rooms":{ - "trading":[ - { - "product":"LMD", - "operators":[ - "巫恋", - "龙舌兰", - "卡夫卡" - ], - "sort":true - }, - { - "product":"LMD", - "operators":[ - "月见夜", - "古米", - "空爆" - ], - "sort":true - }, - { - "product":"Orundum", - "operators":[ - "芬", - "夜刀", - "慕斯" - ], - "sort":true - } - ], - "manufacture":[ - { - "product":"Pure Gold", - "operators":[ - "砾", - "夜烟", - "斑点" - ], - "sort":true - }, - { - "product":"Pure Gold", - "operators":[ - "香草", - "杰西卡", - "至简" - ], - "sort":true - }, - { - "product":"Originium Shard", - "operators":[ - "艾雅法拉", - "炎熔", - "地灵" - ], - "sort":true - } - ], - "hire":[ - { - "autofill":true - } - ], - "dormitory":[ - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "control":[ - { - "operators":[ - "阿米娅", - "凯尔希", - "灵知" - ], - "autofill": true - } - ], - "power":[ - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "meeting":[ - { - "autofill":true - } - ] - }, - "Fiammetta":{ - "enable":true, - "target":"巫恋", - "order":"pre" - }, - "drones":{ - "enable":true, - "index":"3", - "room":"trading", - "order":"post" - }, - "name":"6h-A组", - "description":"中效率组,此组持续6h" - }, - { - "rooms":{ - "trading":[ - { - "product":"LMD", - "operators":[ - "巫恋", - "龙舌兰", - "卡夫卡" - ], - "sort":true - }, - { - "product":"LMD", - "operators":[ - "月见夜", - "古米", - "空爆" - ], - "sort":true - }, - { - "product":"Orundum", - "operators":[ - "芬", - "夜刀", - "慕斯" - ], - "sort":true - } - ], - "manufacture":[ - { - "product":"Pure Gold", - "operators":[ - "清流", - "温蒂", - "森蚺" - ], - "sort":false - }, - { - "product":"Pure Gold", - "operators":[ - "香草", - "杰西卡", - "至简" - ], - "sort":true - }, - { - "product":"Originium Shard", - "operators":[ - "泡泡", - "火神", - "褐果" - ], - "sort":true - } - ], - "hire":[ - { - "autofill":true - } - ], - "dormitory":[ - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "control":[ - { - "operators":[ - "阿米娅", - "灵知", - "凯尔希" - ], - "autofill": true - } - ], - "power":[ - { - "operators":[ - "承曦格雷伊" - ] - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "meeting":[ - { - "autofill":true - } - ] - }, - "Fiammetta":{ - "enable":true, - "target":"龙舌兰", - "order":"pre" - }, - "drones":{ - "enable":true, - "index":"3", - "room":"manufacture", - "order":"post" - }, - "name":"6h-B组", - "description":"中效率组,此组持续6h" - }, - { - "rooms":{ - "trading":[ - { - "product":"LMD", - "operators":[ - "巫恋", - "龙舌兰", - "卡夫卡" - ], - "sort":true - }, - { - "product":"LMD", - "operators":[ - "孑", - "银灰", - "但书" - ], - "sort":true - }, - { - "product":"Orundum", - "operators":[ - "能天使", - "德克萨斯", - "拉普兰德" - ], - "sort":true - } - ], - "manufacture":[ - { - "product":"Pure Gold", - "operators":[ - "清流", - "温蒂", - "森蚺" - ], - "sort":false - }, - { - "product":"Pure Gold", - "operators":[ - "砾", - "夜烟", - "斑点" - ], - "sort":true - }, - { - "product":"Originium Shard", - "operators":[ - "泡泡", - "火神", - "褐果" - ], - "sort":true - } - ], - "hire":[ - { - "autofill":true - } - ], - "dormitory":[ - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "control":[ - { - "operators":[ - "阿米娅", - "灵知", - "凯尔希" - ], - "autofill": true - } - ], - "power":[ - { - "operators":[ - "承曦格雷伊" - ] - }, - { - "autofill":true - }, - { - "autofill":true - } - ], - "meeting":[ - { - "autofill":true - } - ] - }, - "Fiammetta":{ - "enable":true, - "target":"卡夫卡", - "order":"pre" - }, - "drones":{ - "enable":true, - "index":3, - "room":"manufacture", - "order":"post" - }, - "name":"12h组", - "description":"高效率组,此组持续12h" - } - ], - "author":"面包猫南北", - "description":"长期搓玉333排班协议", - "id":1664692636351064, - "title":"333长期搓玉,具体干员配置参考公孙长乐大佬,使用换班时间为6-6-12组,要求有菲亚", - "buildingType":"333" + "plans": [ + { + "rooms": { + "trading": [ + { + "product": "LMD", + "operators": [ + "巫恋", + "龙舌兰", + "卡夫卡" + ], + "sort": true + }, + { + "product": "LMD", + "operators": [ + "月见夜", + "古米", + "空爆" + ], + "sort": true + }, + { + "product": "Orundum", + "operators": [ + "芬", + "夜刀", + "慕斯" + ], + "sort": true + } + ], + "manufacture": [ + { + "product": "Pure Gold", + "operators": [ + "砾", + "夜烟", + "斑点" + ], + "sort": true + }, + { + "product": "Pure Gold", + "operators": [ + "香草", + "杰西卡", + "至简" + ], + "sort": true + }, + { + "product": "Originium Shard", + "operators": [ + "艾雅法拉", + "炎熔", + "地灵" + ], + "sort": true + } + ], + "hire": [ + { + "autofill": true + } + ], + "dormitory": [ + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "control": [ + { + "operators": [ + "阿米娅", + "凯尔希", + "灵知" + ], + "autofill": true + } + ], + "power": [ + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "meeting": [ + { + "autofill": true + } + ] + }, + "Fiammetta": { + "enable": true, + "target": "巫恋", + "order": "pre" + }, + "drones": { + "enable": true, + "index": "3", + "room": "trading", + "order": "post" + }, + "name": "6h-A组", + "description": "中效率组,此组持续6h" + }, + { + "rooms": { + "trading": [ + { + "product": "LMD", + "operators": [ + "巫恋", + "龙舌兰", + "卡夫卡" + ], + "sort": true + }, + { + "product": "LMD", + "operators": [ + "月见夜", + "古米", + "空爆" + ], + "sort": true + }, + { + "product": "Orundum", + "operators": [ + "芬", + "夜刀", + "慕斯" + ], + "sort": true + } + ], + "manufacture": [ + { + "product": "Pure Gold", + "operators": [ + "清流", + "温蒂", + "森蚺" + ], + "sort": false + }, + { + "product": "Pure Gold", + "operators": [ + "香草", + "杰西卡", + "至简" + ], + "sort": true + }, + { + "product": "Originium Shard", + "operators": [ + "泡泡", + "火神", + "褐果" + ], + "sort": true + } + ], + "hire": [ + { + "autofill": true + } + ], + "dormitory": [ + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "control": [ + { + "operators": [ + "阿米娅", + "灵知", + "凯尔希" + ], + "autofill": true + } + ], + "power": [ + { + "operators": [ + "承曦格雷伊" + ] + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "meeting": [ + { + "autofill": true + } + ] + }, + "Fiammetta": { + "enable": true, + "target": "龙舌兰", + "order": "pre" + }, + "drones": { + "enable": true, + "index": "3", + "room": "manufacture", + "order": "post" + }, + "name": "6h-B组", + "description": "中效率组,此组持续6h" + }, + { + "rooms": { + "trading": [ + { + "product": "LMD", + "operators": [ + "巫恋", + "龙舌兰", + "卡夫卡" + ], + "sort": true + }, + { + "product": "LMD", + "operators": [ + "孑", + "银灰", + "但书" + ], + "sort": true + }, + { + "product": "Orundum", + "operators": [ + "能天使", + "德克萨斯", + "拉普兰德" + ], + "sort": true + } + ], + "manufacture": [ + { + "product": "Pure Gold", + "operators": [ + "清流", + "温蒂", + "森蚺" + ], + "sort": false + }, + { + "product": "Pure Gold", + "operators": [ + "砾", + "夜烟", + "斑点" + ], + "sort": true + }, + { + "product": "Originium Shard", + "operators": [ + "泡泡", + "火神", + "褐果" + ], + "sort": true + } + ], + "hire": [ + { + "autofill": true + } + ], + "dormitory": [ + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "control": [ + { + "operators": [ + "阿米娅", + "灵知", + "凯尔希" + ], + "autofill": true + } + ], + "power": [ + { + "operators": [ + "承曦格雷伊" + ] + }, + { + "autofill": true + }, + { + "autofill": true + } + ], + "meeting": [ + { + "autofill": true + } + ] + }, + "Fiammetta": { + "enable": true, + "target": "卡夫卡", + "order": "pre" + }, + "drones": { + "enable": true, + "index": 3, + "room": "manufacture", + "order": "post" + }, + "name": "12h组", + "description": "高效率组,此组持续12h" + } + ], + "author": "面包猫南北", + "description": "长期搓玉333排班协议", + "id": 1664692636351064, + "title": "333长期搓玉,具体干员配置参考公孙长乐大佬,使用换班时间为6-6-12组,要求有菲亚", + "buildingType": "333" } diff --git a/resource/roguelike_recruit.json b/resource/roguelike_recruit.json index b739f914f7..8c21ec23e1 100644 --- a/resource/roguelike_recruit.json +++ b/resource/roguelike_recruit.json @@ -57,7 +57,7 @@ "skill_usage": 2, "recruit_priority": 750, "promote_priority": 550, - "promote_priority_when_team_full":750 + "promote_priority_when_team_full": 750 }, { "name": "玛恩纳", @@ -65,7 +65,7 @@ "alternate_skill": 2, "recruit_priority": 750, "promote_priority": 700, - "promote_priority_when_team_full":750 + "promote_priority_when_team_full": 750 }, { "name": "煌", @@ -73,14 +73,14 @@ "alternate_skill": 1, "recruit_priority": 750, "promote_priority": 640, - "promote_priority_when_team_full":750 + "promote_priority_when_team_full": 750 }, { "name": "拉普兰德", "skill": 2, "recruit_priority": 750, "promote_priority": 750, - "promote_priority_when_team_full":800 + "promote_priority_when_team_full": 800 }, { "name": "银灰", @@ -88,7 +88,7 @@ "alternate_skill": 1, "recruit_priority": 750, "promote_priority": 800, - "promote_priority_when_team_full":800 + "promote_priority_when_team_full": 800 }, { "name": "艾丽妮", @@ -376,7 +376,7 @@ "skill": 2, "recruit_priority": 600, "promote_priority": 700, - "promote_priority_when_team_full":1000 + "promote_priority_when_team_full": 1000 }, { "name": "异客", diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp index d824648c1e..b6cf8a8122 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp @@ -620,7 +620,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle() // 不改变当前index,直接进入下一步 return true; } - + if (wait_melee) { m_wait_melee[m_cur_home_index] = false; m_melee_for_home_index.emplace(placed_loc, m_cur_home_index); diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h index e4350fdc61..f071484136 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h @@ -27,7 +27,12 @@ namespace asst protected: virtual bool _run() override; - enum class BattleRoleType {Melee, Ranged, Other}; + enum class BattleRoleType + { + Melee, + Ranged, + Other + }; BattleRoleType get_role_type(const BattleRole& role); void wait_for_start(); diff --git a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp index a28e003685..85df76b729 100644 --- a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp @@ -176,7 +176,7 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order ProcessTask(*this, { "InfrastOperListTabSkillUnClicked", "Stop" }).run(); } - click_clear_button(); //先排序后清空,加速干员变化不大时的选择速度 + click_clear_button(); // 先排序后清空,加速干员变化不大时的选择速度 std::vector opers_order = room_config.names; opers_order.insert(opers_order.end(), room_config.candidates.cbegin(), room_config.candidates.cend()); diff --git a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp index b44a9ded5d..5193ad8d67 100644 --- a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp @@ -45,7 +45,7 @@ bool asst::InfrastDormTask::_run() swipe_and_select_custom_opers(true); } else { - click_clear_button(); //宿舍若未指定干员,则清空后按照原约定逻辑选择干员 + click_clear_button(); // 宿舍若未指定干员,则清空后按照原约定逻辑选择干员 } Log.trace("m_dorm_notstationed_enabled:", m_dorm_notstationed_enabled);