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/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` 为例） 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..082c5b98ae --- /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": "目前只能手动编队，请尽量选择练度高费用低的干员\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 + } + ] +} 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": [ diff --git a/resource/tasks.json b/resource/tasks.json index d740b79bb6..0d07db6a6f 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", @@ -9381,6 +9363,23 @@ 288, 144 ], + "next": [ + "SSSBuffChoose", + "SSSDebuffConfirm" + ] + }, + "SSSDebuffConfirm": { + "action": "ClickSelf", + "algorithm": "OcrDetect", + "text": [ + "确认完毕" + ], + "roi": [ + 992, + 576, + 288, + 144 + ], "next": [ "SSSBuffChoose" ] 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;