From ef08f56d6fba136e8fb9cc36d30bd5ab0462f27a Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Tue, 17 Jan 2023 19:04:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index d740b79bb6..c060e5b6e1 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -844,13 +844,7 @@ "text": [ "WB-7" ], - "cache": false, - "roi": [ - 0, - 283, - 1280, - 324 - ] + "cache": false }, "StageWB-8": { "action": "ClickSelf", @@ -858,13 +852,7 @@ "text": [ "WB-8" ], - "cache": false, - "roi": [ - 0, - 283, - 1280, - 324 - ] + "cache": false }, "StageWB-9": { "action": "ClickSelf", @@ -872,13 +860,7 @@ "text": [ "WB-9" ], - "cache": false, - "roi": [ - 0, - 283, - 1280, - 324 - ] + "cache": false }, "IW-6": { "algorithm": "JustReturn", From 2b6c24af1d0b8774709d573f06bf0b84f8de0182 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 17 Jan 2023 22:24:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=85=A8?= =?UTF-8?q?=E6=B4=BE=E9=A9=BB=E5=BA=94=E6=80=A5=E6=A8=A1=E5=BC=8F=E5=8D=A1?= =?UTF-8?q?=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index c060e5b6e1..0d07db6a6f 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -9363,6 +9363,23 @@ 288, 144 ], + "next": [ + "SSSBuffChoose", + "SSSDebuffConfirm" + ] + }, + "SSSDebuffConfirm": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "确认完毕" + ], + "roi": [ + 992, + 576, + 288, + 144 + ], "next": [ "SSSBuffChoose" ] From b0cca1f822408fe93f53c592464cdbb06d13ad00 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 17 Jan 2023 22:35:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BF=9D?= =?UTF-8?q?=E5=85=A8=E6=8A=BD=E5=8D=A1=E5=92=8C=E4=B8=8B=E5=B9=B2=E5=91=98?= =?UTF-8?q?=E7=AD=89=E6=93=8D=E4=BD=9C=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp b/src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp index 0760da873b..80e77cf6f4 100644 --- a/src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp +++ b/src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp @@ -58,21 +58,21 @@ bool asst::SSSBattleProcessTask::do_strategic_action(const cv::Mat& reusable) { LogTraceFunction; cv::Mat image = reusable.empty() ? ctrler()->get_image() : reusable; - - if (check_and_do_strategy(image)) { - return true; - } - + if (check_and_get_drops(image)) { return true; } - - if (use_all_ready_skill(image)) { - return true; - } - + if (m_sss_combat_data.draw_as_possible && draw_card(false, image)) { - return true; + image = ctrler()->get_image(); + } + + if (check_and_do_strategy(image)) { + image = ctrler()->get_image(); + } + + if (use_all_ready_skill(image)) { + //image = ctrler()->get_image(); } return true; From 93978af9744e69a6d9a47c2c0bd25e99a911a38e Mon Sep 17 00:00:00 2001 From: WWPXX <64907423+WWPXX233@users.noreply.github.com> Date: Tue, 17 Jan 2023 22:36:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=82=80?= =?UTF-8?q?=E5=BD=B1=E8=82=89=E9=B8=BD=E5=9C=B0=E5=9B=BE=20(#3403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: MistEO --- resource/roguelike/copilot.json | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/resource/roguelike/copilot.json b/resource/roguelike/copilot.json index ab067bd5d8..7ffd2b5b93 100644 --- a/resource/roguelike/copilot.json +++ b/resource/roguelike/copilot.json @@ -2685,6 +2685,56 @@ "ban_medic": false } }, + { + "stage_name": "酒商运输队", + "replacement_home": [ + { + "location": [ + 9, + 3 + ], + "direction": "left" + } + ], + "blacklist_location": [ + [ + 1, + 4 + ], + [ + 2, + 2 + ], + [ + 3, + 4 + ], + [ + 4, + 2 + ], + [ + 5, + 4 + ], + [ + 6, + 2 + ], + [ + 7, + 4 + ], + [ + 8, + 2 + ], + [ + 9, + 4 + ] + ] + }, { "stage_name": "意外", "replacement_home": [ From 8945c704d2aca63cd5347ae1781ccfb46f600ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E9=9D=88=E8=AA=9E?= Date: Tue, 17 Jan 2023 22:38:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E8=93=9D=E5=8F=A0=E6=A8=A1=E6=8B=9F=E5=99=A8=E4=B8=AD=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E5=9C=B0=20Hyper-V=20=E7=89=88=E6=9C=AC=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=20(#3402)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加有关蓝叠模拟器中国内地 Hyper-V 版本的相关内容 * docs: format markdown Co-authored-by: MistEO --- docs/1.3-模拟器支持.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/1.3-模拟器支持.md b/docs/1.3-模拟器支持.md index 0f1789301a..7c723a6364 100644 --- a/docs/1.3-模拟器支持.md +++ b/docs/1.3-模拟器支持.md @@ -8,14 +8,18 @@ 完美支持。需要在模拟器 `设定` - `进阶` 中打开 `Android调试桥` -## ✅ [蓝叠模拟器国际版 Hyper-V 版本](https://support.bluestacks.com/hc/zh-tw/articles/4415238471053-BlueStacks-5-%E6%94%AF%E6%8F%B4-Hyper-V-%E7%9A%84-Windows-10-%E5%92%8C-11-%E4%B8%8A%E7%9A%84%E9%9B%BB%E8%85%A6%E8%A6%8F%E6%A0%BC%E9%9C%80%E6%B1%82) +## ✅ [蓝叠模拟器 Hyper-V 版本](https://support.bluestacks.com/hc/zh-tw/articles/4415238471053-BlueStacks-5-%E6%94%AF%E6%8F%B4-Hyper-V-%E7%9A%84-Windows-10-%E5%92%8C-11-%E4%B8%8A%E7%9A%84%E9%9B%BB%E8%85%A6%E8%A6%8F%E6%A0%BC%E9%9C%80%E6%B1%82) 支持 - 在模拟器 `设定` - `进阶` 中打开 `Android调试桥` - 由于蓝叠 Hyper-V 的端口号在不断变动，所以留了个专用的小后门： - 1. 在蓝叠模拟器的数据目录下找到 `bluestacks.conf` 这个文件（默认路径为 `C:\ProgramData\BlueStacks_nxt\bluestacks.conf`） + 1. 在蓝叠模拟器的数据目录下找到 `bluestacks.conf` 这个文件 + + - 国际版默认路径为 `C:\ProgramData\BlueStacks_nxt\bluestacks.conf` + - 中国内地版默认路径为 `C:\ProgramData\BlueStacks_nxt_cn\bluestacks.conf` + 2. 如果是第一次使用，请开启一次 MAA，会在 MAA 目录下生成 `gui.json` 3. **先关闭** MAA，**然后** 打开 `gui.json`，新增一个字段 `Bluestacks.Config.Path`，填入 `bluestacks.conf` 的完整路径（注意斜杠要用转义 `\\`） 示例：（以 `C:\ProgramData\BlueStacks_nxt\bluestacks.conf` 为例） From b724dabbdeb4fa82c16c668a16a42bfa33de5356 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 17 Jan 2023 22:51:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?chore:=20=E5=86=85=E7=BD=AE=E4=B8=A4?= =?UTF-8?q?=E4=BB=BD=E4=BF=9D=E5=85=A8=E6=B4=BE=E9=A9=BB=E9=80=9A=E5=85=B3?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/copilot/SSS_Test.json | 157 --- resource/copilot/SSS_多索雷斯在建地块.json | 499 +++++++++ resource/copilot/SSS_阿卡胡拉丛林.json | 1071 ++++++++++++++++++++ 3 files changed, 1570 insertions(+), 157 deletions(-) delete mode 100644 resource/copilot/SSS_Test.json create mode 100644 resource/copilot/SSS_多索雷斯在建地块.json create mode 100644 resource/copilot/SSS_阿卡胡拉丛林.json diff --git a/resource/copilot/SSS_Test.json b/resource/copilot/SSS_Test.json deleted file mode 100644 index ad5ae3d173..0000000000 --- a/resource/copilot/SSS_Test.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "type": "SSS", - "stage_name": "多索雷斯在建地块", - "minimum_required": "v4.9.0", - "doc": { - "title": "保全测试作业" - }, - "buff": "镀膜装置导能阀", - "equipment": [ - "A", - "A", - "A", - "A", - "A", - "A", - "A", - "A" - ], - "strategy": "优选策略", - "opers": [ - { - "name": "泥岩", - "skill": 2 - }, - { - "name": "水月", - "skill": 2, - "skill_usage": 1 - } - ], - "tool_men": { - "先锋": 3, - "近卫": 6, - "医疗": 2 - }, - "drops": [ - "空弦", - "能天使", - "先锋", - "Support", - "无需增调干员", - "重整导能组件", - "反制导能组件", - "战备激活阀", - "改派发讯器" - ], - "stages": [ - { - "stage_name": "蜂拥而上", - "strategies": [ - { - "core": "泥岩", - "tool_men": { - "先锋": 2 - }, - "location": [ - 6, - 2 - ], - "direction": "Left" - }, - { - "core": "水月", - "tool_men": { - "近卫": 2 - }, - "location": [ - 5, - 2 - ], - "direction": "Left" - }, - { - "tool_men": { - "辅助": 100 - }, - "location": [ - 5, - 3 - ], - "direction": "Left" - } - ], - "draw_as_possible": true, - "actions": [ - { - "type": "二倍速" - } - ], - "retry_times": 3 - }, - { - "stage_name": "见者有份", - "strategies": [ - { - "core": "泥岩", - "tool_men": { - "先锋": 3 - }, - "location": [ - 4, - 2 - ], - "direction": "Left" - }, - { - "tool_men": { - "医疗": 100 - }, - "location": [ - 3, - 3 - ], - "direction": "Right" - }, - { - "core": "水月", - "tool_men": { - "近卫": 3 - }, - "location": [ - 4, - 3 - ], - "direction": "Left" - }, - { - "tool_men": { - "辅助": 100 - }, - "location": [ - 5, - 3 - ], - "direction": "Left" - }, - { - "tool_men": { - "近卫": 100 - }, - "location": [ - 4, - 4 - ], - "direction": "Left" - } - ], - "draw_as_possible": true, - "actions": [ - { - "type": "二倍速" - } - ], - "retry_times": 3 - } - ] -} diff --git a/resource/copilot/SSS_多索雷斯在建地块.json b/resource/copilot/SSS_多索雷斯在建地块.json new file mode 100644 index 0000000000..a43bd8fdc3 --- /dev/null +++ b/resource/copilot/SSS_多索雷斯在建地块.json @@ -0,0 +1,499 @@ +{ + "type": "SSS", + "stage_name": "多索雷斯在建地块", + "minimum_required": "v4.9.0", + "doc": { + "title": "多索雷斯保全(应急)", + "title_color": "dark", + "details": "作者:YueShen\n多索雷斯保全(应急)\n选镀膜装置导能阀\n要手动编队\n有问题群里找管理咕咕咕\n\n同时支持标准和应急补给模式", + "details_color": "dark" + }, + "buff": "镀膜装置导能阀", + "equipment": [ + "A", + "A", + "A", + "A", + "A", + "A", + "A", + "A" + ], + "strategy": "优选策略", + "opers": [ + { + "name": "棘刺", + "skill": 3, + "skill_usage": 1 + }, + { + "name": "泥岩", + "skill": 2, + "skill_usage": 0 + }, + { + "name": "桃金娘", + "skill": 1, + "skill_usage": 1 + }, + { + "name": "煌", + "skill": 2, + "skill_usage": 0 + }, + { + "name": "塞雷娅", + "skill": 1, + "skill_usage": 0 + } + ], + "tool_men": { + "先锋": 1, + "近卫": 2, + "辅助": 8, + "重装": 2, + "狙击": 2 + }, + "drops": [ + "近卫", + "无需增调干员", + "辅助", + "重装", + "狙击", + "术士", + "战备激活阀", + "改派发讯器", + "反制导能组件" + ], + "blacklist": [ + "罗比菈塔", + "掠风", + "白铁", + "史尔特尔", + "玛恩纳", + "龙舌兰", + "幽灵鲨", + "耀骑士临光" + ], + "stages": [ + { + "stage_name": "蜂拥而上", + "strategies": [ + { + "core": "棘刺", + "tool_men": { + "近卫": 1 + }, + "location": [ + 5, + 2 + ], + "direction": "Down" + }, + { + "core": "桃金娘", + "tool_men": { + "先锋": 1 + }, + "location": [ + 6, + 2 + ], + "direction": "Down" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 1 + }, + "location": [ + 5, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 5, + 3 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + } + ], + "retry_times": 5 + }, + { + "stage_name": "见者有份", + "strategies": [ + { + "core": "棘刺", + "tool_men": { + "近卫": 2 + }, + "location": [ + 4, + 1 + ], + "direction": "Down" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 2 + }, + "location": [ + 4, + 5 + ], + "direction": "Up" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 5, + 3 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + } + ], + "retry_times": 5 + }, + { + "stage_name": "产业升级", + "strategies": [ + { + "core": "煌", + "tool_men": { + "近卫": 3 + }, + "location": [ + 5, + 3 + ], + "direction": "Left" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 3 + }, + "location": [ + 4, + 3 + ], + "direction": "Left" + }, + { + "core": "桃金娘", + "tool_men": { + "先锋": 1 + }, + "location": [ + 6, + 3 + ], + "direction": "Left" + }, + { + "tool_men": { + "辅助": 100, + "狙击": 100 + }, + "location": [ + 5, + 4 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "部署", + "name": "镀膜装置导能阀", + "location": [ + 4, + 2 + ], + "direction": "Down" + }, + { + "type": "GetDrops", + "kills": 14, + "pre_delay": 2000 + }, + { + "type": "GetDrops", + "kills": 27, + "pre_delay": 2000 + } + ], + "retry_times": 5 + }, + { + "stage_name": "同流合污", + "strategies": [ + { + "core": "煌", + "tool_men": { + "近卫": 3 + }, + "location": [ + 6, + 1 + ], + "direction": "Left" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 4 + }, + "location": [ + 5, + 1 + ], + "direction": "Left" + }, + { + "core": "塞雷娅", + "tool_men": { + "近卫": 3 + }, + "location": [ + 7, + 1 + ], + "direction": "Left" + }, + { + "core": "桃金娘", + "tool_men": { + "先锋": 1 + }, + "location": [ + 8, + 1 + ], + "direction": "Left" + }, + { + "tool_men": { + "辅助": 100, + "狙击": 100 + }, + "location": [ + 6, + 2 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "部署", + "name": "镀膜装置导能阀", + "location": [ + 5, + 2 + ], + "direction": "Up" + } + ], + "retry_times": 5 + }, + { + "stage_name": "酩酊之旅", + "strategies": [ + { + "core": "煌", + "tool_men": { + "近卫": 5 + }, + "location": [ + 8, + 1 + ], + "direction": "Down" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 4 + }, + "location": [ + 8, + 4 + ], + "direction": "Up" + }, + { + "core": "桃金娘", + "tool_men": { + "先锋": 1 + }, + "location": [ + 9, + 5 + ], + "direction": "Left" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 7, + 2 + ], + "direction": "Down" + }, + { + "tool_men": { + "狙击": 100 + }, + "location": [ + 9, + 3 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "部署", + "name": "镀膜装置导能阀", + "location": [ + 7, + 4 + ], + "direction": "Right" + }, + { + "type": "部署", + "name": "塞雷娅", + "location": [ + 8, + 2 + ], + "direction": "Down" + } + ], + "retry_times": 5 + }, + { + "stage_name": "一块肉排", + "strategies": [ + { + "core": "棘刺", + "tool_men": { + "近卫": 4 + }, + "location": [ + 7, + 4 + ], + "direction": "Left" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 4 + }, + "location": [ + 5, + 4 + ], + "direction": "Up" + }, + { + "core": "桃金娘", + "tool_men": { + "先锋": 1 + }, + "location": [ + 9, + 6 + ], + "direction": "Left" + }, + { + "core": "塞雷娅", + "tool_men": { + "近卫": 3, + "先锋": 1 + }, + "location": [ + 7, + 5 + ], + "direction": "Up" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 8, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "狙击": 100 + }, + "location": [ + 8, + 3 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "部署", + "name": "镀膜装置导能阀", + "location": [ + 4, + 4 + ], + "direction": "Right" + } + ], + "retry_times": 5 + } + ] +} diff --git a/resource/copilot/SSS_阿卡胡拉丛林.json b/resource/copilot/SSS_阿卡胡拉丛林.json new file mode 100644 index 0000000000..200a2ee7f2 --- /dev/null +++ b/resource/copilot/SSS_阿卡胡拉丛林.json @@ -0,0 +1,1071 @@ +{ + "type": "SSS", + "stage_name": "阿卡胡拉丛林", + "minimum_required": "v4.9.0", + "doc": { + "title": "保全阿卡胡拉丛林-泥岩水月拉普兰德", + "title_color": "dark", + "details": "基于MAA-v4.10.1制作的保全作业早期版本，配合循环次数可以无限刷\n编队要求：泥岩、水月、拉普兰德、3先锋、5近卫、3重装、2医疗、4辅助，请尽量选择练度高费用低的干员\n不要选投降先锋、阻挡数少的重装和近卫，辅助尽量不要选巫恋、浊蒂、令等会出现召唤物的干员\n\n目前处于自动保全的早期版本，请在确认导能原件选择了第三个、战术装备全选A、阵容确认后，再点击开始\n\n作业来自：萧然q\nBV1KK411z7t9\n搬运自：作业搬运工\n\n同时支持标准和应急补给模式", + "details_color": "dark" + }, + "buff": "丛林用示踪信标", + "equipment": [ + "A", + "A", + "A", + "A", + "A", + "A", + "A", + "A" + ], + "strategy": "优选策略", + "opers": [ + { + "name": "泥岩", + "skill": 2, + "skill_usage": 0 + }, + { + "name": "水月", + "skill": 1, + "skill_usage": 0 + }, + { + "name": "拉普兰德", + "skill": 2, + "skill_usage": 0 + } + ], + "tool_men": { + "先锋": 3, + "近卫": 5, + "重装": 3, + "医疗": 2, + "辅助": 4 + }, + "drops": [ + "无需增调干员", + "先锋", + "辅助", + "重装", + "阻断波长", + "战备激活阀", + "紧急召回情报箱", + "医疗", + "狙击", + "近卫" + ], + "blacklist": [ + "罗比菈塔", + "掠风", + "白铁", + "桃金娘", + "极境", + "琴柳", + "伺夜", + "豆苗", + "夜半", + "森蚺", + "极光" + ], + "stages": [ + { + "stage_name": "丛林式寒暄", + "strategies": [ + { + "core": "水月", + "tool_men": { + "近卫": 3, + "先锋": 1 + }, + "location": [ + 4, + 2 + ], + "direction": "Down" + }, + { + "core": "泥岩", + "tool_men": { + "先锋": 1 + }, + "location": [ + 5, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "近卫": 2, + "重装": 1 + }, + "location": [ + 4, + 1 + ], + "direction": "Down" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 5, + 2 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "location": [ + 3, + 2 + ], + "direction": "None" + } + ], + "retry_times": 3 + }, + { + "stage_name": "生物多样性", + "strategies": [ + { + "tool_men": { + "近卫": 1, + "重装": 1 + }, + "location": [ + 3, + 2 + ], + "direction": "Right" + }, + { + "tool_men": { + "先锋": 1 + }, + "location": [ + 4, + 2 + ], + "direction": "Right" + }, + { + "core": "水月", + "tool_men": { + "近卫": 3, + "先锋": 1 + }, + "location": [ + 5, + 2 + ], + "direction": "Down" + }, + { + "core": "泥岩", + "tool_men": { + "先锋": 1 + }, + "location": [ + 4, + 2 + ], + "direction": "Right" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 3, + 3 + ], + "direction": "Right" + }, + { + "tool_men": { + "医疗": 100 + }, + "location": [ + 3, + 3 + ], + "direction": "Right" + }, + { + "tool_men": { + "重装": 100 + }, + "location": [ + 2, + 2 + ], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "location": [ + 5, + 1 + ], + "direction": "None" + } + ], + "retry_times": 3 + }, + { + "stage_name": "习以为常", + "strategies": [ + { + "tool_men": { + "先锋": 1, + "重装": 1 + }, + "location": [ + 4, + 5 + ], + "direction": "Up" + }, + { + "tool_men": { + "先锋": 1, + "重装": 1 + }, + "location": [ + 6, + 5 + ], + "direction": "Up" + }, + { + "core": "水月", + "tool_men": { + "近卫": 4, + "先锋": 1 + }, + "location": [ + 5, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "重装": 2 + }, + "location": [ + 4, + 5 + ], + "direction": "Up" + }, + { + "core": "泥岩", + "tool_men": { + "先锋": 1, + "近卫": 1 + }, + "location": [ + 6, + 5 + ], + "direction": "Up" + }, + { + "core": "拉普兰德", + "tool_men": { + "先锋": 1 + }, + "location": [ + 5, + 5 + ], + "direction": "Up" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 3, + 4 + ], + "direction": "Right" + }, + { + "tool_men": { + "医疗": 100 + }, + "location": [ + 3, + 4 + ], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "location": [ + 6, + 4 + ], + "direction": "None" + }, + { + "type": "GetDrops", + "kills": 20, + "pre_delay": 2000 + }, + { + "type": "GetDrops", + "kills": 44, + "pre_delay": 2000 + } + ], + "retry_times": 3 + }, + { + "stage_name": "林间空地", + "strategies": [ + { + "tool_men": { + "先锋": 1 + }, + "location": [ + 4, + 5 + ], + "direction": "Up" + }, + { + "tool_men": { + "先锋": 1 + }, + "location": [ + 5, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "重装": 1 + }, + "location": [ + 4, + 6 + ], + "direction": "Up" + }, + { + "core": "水月", + "tool_men": { + "近卫": 3 + }, + "location": [ + 5, + 4 + ], + "direction": "Right" + }, + { + "core": "泥岩", + "tool_men": { + "先锋": 1, + "重装": 1 + }, + "location": [ + 6, + 6 + ], + "direction": "Up" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 7, + 6 + ], + "direction": "Up" + }, + { + "tool_men": { + "医疗": 100 + }, + "location": [ + 5, + 5 + ], + "direction": "Down" + }, + { + "tool_men": { + "重装": 100 + }, + "location": [ + 4, + 6 + ], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "location": [ + 6, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "战备激活阀", + "kills": 19, + "location": [ + 5, + 3 + ], + "direction": "Down" + }, + { + "type": "Deploy", + "name": "阻断波长", + "location": [ + 6, + 5 + ], + "direction": "Down" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 30, + "location": [ + 7, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 40, + "location": [ + 6, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 50, + "location": [ + 5, + 1 + ], + "direction": "None" + } + ], + "retry_times": 5 + }, + { + "stage_name": "纠缠不休", + "strategies": [ + { + "tool_men": { + "先锋": 2 + }, + "location": [ + 7, + 5 + ], + "direction": "Left" + }, + { + "core": "水月", + "tool_men": { + "近卫": 5 + }, + "location": [ + 6, + 5 + ], + "direction": "Left" + }, + { + "core": "泥岩", + "tool_men": { + "先锋": 1, + "重装": 1 + }, + "location": [ + 7, + 5 + ], + "direction": "Left" + }, + { + "tool_men": { + "近卫": 2, + "重装": 2 + }, + "location": [ + 7, + 4 + ], + "direction": "Down" + }, + { + "tool_men": { + "先锋": 2 + }, + "location": [ + 8, + 4 + ], + "direction": "Left" + }, + { + "tool_men": { + "医疗": 100 + }, + "location": [ + 7, + 3 + ], + "direction": "Down" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 6, + 4 + ], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "location": [ + 4, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "战备激活阀", + "location": [ + 8, + 5 + ], + "direction": "Left" + }, + { + "type": "Deploy", + "name": "阻断波长", + "location": [ + 3, + 5 + ], + "direction": "Down" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 20, + "location": [ + 1, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 30, + "location": [ + 2, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "kills": 40, + "location": [ + 3, + 4 + ], + "direction": "None" + } + ], + "retry_times": 3 + }, + { + "stage_name": "人与自然", + "strategies": [ + { + "tool_men": { + "先锋": 1 + }, + "location": [ + 3, + 6 + ], + "direction": "Up" + }, + { + "tool_men": { + "先锋": 1 + }, + "location": [ + 3, + 5 + ], + "direction": "Right" + }, + { + "core": "泥岩", + "tool_men": { + "重装": 2 + }, + "location": [ + 5, + 5 + ], + "direction": "Right" + }, + { + "core": "拉普兰德", + "tool_men": { + "先锋": 1 + }, + "location": [ + 3, + 5 + ], + "direction": "Right" + }, + { + "tool_men": { + "重装": 2 + }, + "location": [ + 4, + 5 + ], + "direction": "Right" + }, + { + "core": "水月", + "tool_men": { + "近卫": 4 + }, + "location": [ + 5, + 4 + ], + "direction": "Right" + }, + { + "tool_men": { + "医疗": 100 + }, + "location": [ + 4, + 6 + ], + "direction": "Up" + }, + { + "tool_men": { + "近卫": 100, + "先锋": 100 + }, + "location": [ + 3, + 6 + ], + "direction": "Up" + }, + { + "tool_men": { + "重装": 100 + }, + "location": [ + 5, + 5 + ], + "direction": "Right" + }, + { + "tool_men": { + "辅助": 100 + }, + "location": [ + 3, + 4 + ], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "丛林用示踪信标", + "kills": 15, + "location": [ + 6, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "战备激活阀", + "location": [ + 5, + 3 + ], + "direction": "Down" + }, + { + "type": "Deploy", + "name": "阻断波长", + "location": [ + 4, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 11, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 10, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 10, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 10, + 4 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 10, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 9, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 9, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 9, + 2 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 8, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 6, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 5, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 4, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 3, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 2, + 1 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 1, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 2, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 3, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 4, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 5, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 6, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 8, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 9, + 3 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 9, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 8, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 5 + ], + "direction": "None" + }, + { + "type": "Deploy", + "name": "改性植物激素", + "location": [ + 7, + 5 + ], + "direction": "None" + } + ], + "retry_times": 3 + } + ] +} From 6de8c85cf04a82f0ef4a1a2e95da0b340826d117 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 17 Jan 2023 23:00:21 +0800 Subject: [PATCH 7/7] docs: update changelog --- CHANGELOG.md | 10 ++++++++++ resource/copilot/SSS_阿卡胡拉丛林.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62730fe503..03b1510cd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## v4.10.2 + +- 新增 `保全派驻` 内置通关作业 @HMZyueshen @AnnoyingFlowers + 均同时兼容标准和应急模式，请选择 `resource/copilot/` 下对应文件，并参考说明使用 +- 修复 `登临意` 活动关卡导航错误 @ABA2396 +- 修复 `保全派驻` 应急模式卡住的问题 @MistEO +- 优化 `保全派驻` 调配干员按钮的优先级 @MistEO +- 优化 傀影肉鸽 部分地图策略 @WWPXX233 +- 更新 蓝叠模拟器 相关文档 @wordlesswind + ## v4.10.1 - 更新 `登临意` 活动关卡资源 @MistEO diff --git a/resource/copilot/SSS_阿卡胡拉丛林.json b/resource/copilot/SSS_阿卡胡拉丛林.json index 200a2ee7f2..082c5b98ae 100644 --- a/resource/copilot/SSS_阿卡胡拉丛林.json +++ b/resource/copilot/SSS_阿卡胡拉丛林.json @@ -5,7 +5,7 @@ "doc": { "title": "保全阿卡胡拉丛林-泥岩水月拉普兰德", "title_color": "dark", - "details": "基于MAA-v4.10.1制作的保全作业早期版本，配合循环次数可以无限刷\n编队要求：泥岩、水月、拉普兰德、3先锋、5近卫、3重装、2医疗、4辅助，请尽量选择练度高费用低的干员\n不要选投降先锋、阻挡数少的重装和近卫，辅助尽量不要选巫恋、浊蒂、令等会出现召唤物的干员\n\n目前处于自动保全的早期版本，请在确认导能原件选择了第三个、战术装备全选A、阵容确认后，再点击开始\n\n作业来自：萧然q\nBV1KK411z7t9\n搬运自：作业搬运工\n\n同时支持标准和应急补给模式", + "details": "目前只能手动编队，请尽量选择练度高费用低的干员\n请选择能回费的挡二先锋（推王除外）、阻挡数高的重装和近卫，梅尔不要默认二技能\n\n请在确认导能原件选择了第三个、战术装备全选A、手动编队并阵容确认后，再点击开始\n\n作业：萧然q\nBV1KK411z7t9\n搬运自：作业搬运工\n\n同时支持标准和应急补给模式", "details_color": "dark" }, "buff": "丛林用示踪信标",