diff --git a/CHANGELOG.md b/CHANGELOG.md index f4ae426fa6..bc9d355a1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,55 @@ -## v5.23.0-beta.2 +## v5.23.0 + +### 夏活第二弹 | Highlight + +本次更新带来了大家期盼已久的多项适配，一起来看看吧： + +#### 集成战略 #6「岁的界园志异」 + +本次更新我们对界园肉鸽做了多项适配： + +1. 现在牛牛支持刷开局策略了，博士可以用来自动刷热水壶等等~ +2. 刷等级策略下，牛牛支持进入道中的树洞层，而不是直接跳过。 + +#### 其他方面 + +本次更新，牛牛支持对新的动态主题「梦乡」进行识别，博士们可以尽情享受两年前的那个夏天啦~ + +以及~~虽然不知道有什么作用，但~~支持对设置的各个小节进行手动排序，拖动设置页左侧目录即可。 + +---- + +#### [CN ONLY] Integrated Strategies #6 "Sui's Garden of Grotesqueries" + +In this update, we've made several adaptations for the Garden I.S.: + +1. MAA now supports "Grind to obtain Hot Water Kettle or Elite II Operators" strategies, allowing Doctors to automatically obtain Hot Water Kettle~ +2. Under Gaining Experience Points strategies, MAA can now enter the Wonderland Encounter(误入奇境) during the run instead of skipping them directly. + +#### Other Aspects + +In this update, MAA now supports recognition of the new dynamic theme "Dreamland", allowing Doctors to fully relive that summer from two years ago~ + +Additionally~~though NiuNiu isn’t quite sure what purpose it serves, but~~ manual sorting of various sections in the settings is now supported. Simply drag the directory on the left side of the settings page. + +---- + +以下是详细内容： ### 新增 | New +* 新保全作业 (#13754) @Saratoga-Official +* 界园肉鸽烧水 (#13690) @SherkeyXD @ABA2396 +* 支持 `梦乡` 主题 (#13693) @ABA2396 +* 优化标题栏显示效果 @ABA2396 +* 版本后面也跟个日期 @ABA2396 +* 幸运掉落用家具零件代替显示 @ABA2396 +* `ADB 连接失败时尝试启动模拟器` 勾选框在 `连接设置` 与 `启动设置` 中同时显示 @ABA2396 +* 支持 MuMu 5555 端口使用控制台退出与截图增强 @ABA2396 +* 反转网络桥接提示框的按钮位置，避免误勾选 @ABA2396 +* 自动编队支持指定使用编队 @ABA2396 +* 调整自动战斗页面布局 @ABA2396 +* 调整编队界面翻译 @ABA2396 * 适配界园树洞节点 (#13552) @travellerse * 设置排序 (#13699) @ABA2396 * 调整自动战斗页面布局 @ABA2396 @@ -9,26 +57,85 @@ ### 改进 | Improved -* 不同更新渠道加个描述 (#13734) @status102 @HX3N -* 自动战斗使用编队选择框UI @status102 +* 合并 regex @status102 +* 仓库识别改用二值化后的非 char 模型识别 (#13667) @ABA2396 +* 繁中服基建 + 保全派駐 7 相關更新 (#13643) @momomochi987 +* 更新 nuke 版本与构建 @SherkeyXD +* 更新 MaaBuilder 中使用的过时方法 @SherkeyXD +* 代理倍率、肉鸽难度 使用 `不切换` 代替 `当前`、`不使用` 以符合实际逻辑 (#13612) @status102 @HX3N @Constrat +* wpf 肉鸽难度初始化优化 @status102 +* 不同更新渠道加个描述 (#13734) @status102 @momomochi987 @Constrat @HX3N +* 自动战斗使用编队选择框 UI @status102 * 一键长草任务列表翻转按钮下拉框样式优化 @status102 ### 修复 | Fix +* 萨米肉鸽刷坍缩范式闪退 @ABA2396 +* 修复界园树洞无可用节点时任务失败 (#13741) @travellerse +* 修复萨卡兹肉鸽部分字段无法正确识别的问题 (#13691) @THSLP13 +* 无法区分界园 3/5 层 boss @ABA2396 +* 因招募动画卡预见密文板 (#13680) @ABA2396 +* 修修 ocr bin threshold 被 task info 错误覆盖 @status102 +* 获得排异反应的干员无法选择技能 @ABA2396 +* 移除使用 empty.png 当 JustReturn 屎 (#13652) @status102 +* 识别错误等待 +200ms @status102 +* 肉鸽投资可能由于存款被长期遮挡导致提前退出 @status102 +* 未启用备选关卡也会输出剿灭提醒 @status102 +* 合成密文板未进入合成页面导致卡死 @ABA2396 +* 修复 fody 一直报 warning @SherkeyXD +* 商店因为动画卡在源石锭不足 @ABA2396 +* 理智药背景干扰使用数量识别 @status102 +* 第一层没出商店时会在第三层才退出 @ABA2396 +* 肉鸽任务高级设置界面 xaml 错误修复 @status102 +* 肉鸽种子选择框 visibility 判断更新 @status102 +* 每次截图测试前断开模拟器连接以获取最新的最快截图耗时 @ABA2396 +* 锻冶旧迹 导航识别错误 @ABA2396 +* 追加自定干员职业与最后编入干员职业相同时, 误展开子职业列表 @status102 +* 肉鸽烧水选择当前难度时禁用 0 难烧水切换 @status102 * 移除未使用 @status102 * 肉鸽投资在单次投资达到 999 时可能无法退出 @status102 * 修复掉落上报消息类型没有在 Python 层定义导致外部脚本报错的问题 (#13723) @husy8 * debug version 拿不到活动关卡 @ABA2396 * 干员识别输出遗漏干员持有情况、潜能 @status102 * 剿灭失败不报错 @status102 -* 傀影卡在无法进行初始招募的深入探索欲月度小队 @ABA2396 +* 傀影卡在无法进行初始招募的深入探索月度小队 @ABA2396 +* schema error @ABA2396 +* add slight delay before `InfrastEnteredFlag' in case of stutters in base rendering @Constrat +* EN Phantom IS font change nextlevel fix @Constrat +* start plugin task not enough delay (#13623) @Constrat ### 文档 | Docs -* 日语文档翻译 (#13713) @vcfch843875 +* 修正 `刷理智` 文档表述错误 (#13745) @vcfch843875 +* MuMu 5.0 文档介绍 (#13658) @Rbqwow +* 文档站小修复 (#13659) @Rbqwow +* 文档日语化翻译 (#13713) @vcfch843875 ### 其他 | Other +* 迁移 UpdateStageList @status102 +* _stageManager 迁移 @status102 +* binThreshold, useRaw 直接写入 task @status102 +* 繁中服「出蒼白海」導航入口文字調整 (#13681) @momomochi987 +* 调整 LDExtras 文件位置 @ABA2396 +* 自动战斗存图阈值改为0.75 @ABA2396 +* 刷理智任务指定材料不再使用双属性保存，仅保存物品 id @status102 +* 密文板加一个进入后检查 @ABA2396 +* 繁中服「出蒼白海」活動導航 (#13644) @momomochi987 +* 添加 null 检测 @SherkeyXD +* 合并 ocrBinThreshold (#13635) @status102 +* gitignore 添加 MaaBuilder 相关内容 @SherkeyXD +* TestLinkAndGetImage 不允许同时运行 @ABA2396 +* 模板轮换 (#13625) @status102 +* 基建设施排序初始化 @status102 +* wpf 任务名字段统一 @status102 +* 基建设施种类 @status102 +* CustomTask 存储 @status102 +* 浅调一下初始化顺序 @status102 * KR tweak copilot option translation @HX3N * catch 一下企鹅物流的上报错误请求，避免影响重试逻辑 @ABA2396 -* Revert "ci: bump the github-actions group in /.github/workflows with 2 updates" (#13707) @MistEO +* YostarKR CharsNameOcrReplace ocr edit @HX3N +* rename MinimumFeatureLevel to minimumFeatureLevel @SherkeyXD +* add copyright header @SherkeyXD +* add nullable flags @SherkeyXD +* add missing png suffix to templates @SherkeyXD diff --git a/docs/ja-jp/manual/introduction/combat.md b/docs/ja-jp/manual/introduction/combat.md index f792289051..7dca3b2231 100644 --- a/docs/ja-jp/manual/introduction/combat.md +++ b/docs/ja-jp/manual/introduction/combat.md @@ -111,7 +111,7 @@ MAA は最大で指定回数まで戦闘を実行します。 例：現在の理性が 100、ステージ消費が 6 の場合 -- 周回数指定を 10、連戦回数を 4 に設定：`2（作戦開始回数） × 4（連戦） = 8 回` の作戦を実行（`2 × floor(10 / 4) = 8`）。消費理性は `8 × 6 = 48`。さらに 4 連戦を 1 回行うと合計 12 回となり上限 10 を超えるため実行せず、8 回で終了。 +- 周回数指定を 10、連戦回数を 4 に設定：`2（作戦開始回数） × 4（連戦） = 8 回` の作戦を実行（`floor(10 / 4) × 4 連戦 = 8`）。消費理性は `8 × 6 = 48`。さらに 4 連戦を 1 回行うと合計 12 回となり上限 10 を超えるため実行せず、8 回で終了。 - 周回数指定を 10、連戦回数を AUTO に設定：`6 連戦 × floor(10 / 6) + (10 % 6)` となり、`6 連戦 1 回 + 4 連戦 1 回 = 10 回` を実行。消費理性は `10 × 6 = 60`。 ### スクショ認識 diff --git a/docs/zh-cn/manual/introduction/combat.md b/docs/zh-cn/manual/introduction/combat.md index c5b288f86a..13890b26da 100644 --- a/docs/zh-cn/manual/introduction/combat.md +++ b/docs/zh-cn/manual/introduction/combat.md @@ -111,8 +111,8 @@ MAA 将最多执行指定次数的战斗。 示例: 假设当前 100 理智, 关卡消耗 6 理智 -- 指定次数设为 10, 代理倍率设为 4: 将执行 2 (次开始行动) x 4(倍代理) = 8 次作战(2 x floor(10 / 4) = 8), 消耗 8 x 6 = 48 理智。此时若再进行一次4倍代理则达到 12 次作战, 超过设定的 10 次, 故不再执行, 以 8 次作战结束任务 -- 指定次数设为 10, 代理倍率设为 AUTO: 将执行 一次6倍代理 + 一次4倍代理 = 10 次作战(6 * floor(10 / 6) + (10 % 6) = 10), 消耗 10 x 6 = 60 理智 +- 指定次数设为 10, 代理倍率设为 4: 将执行 2 (次开始行动) x 4(倍代理) = 8 次作战(floor(10 / 4) x 4 = 8), 消耗 8 x 6 = 48 理智。此时若再进行一次4倍代理则达到 12 次作战, 超过设定的 10 次, 故不再执行, 以 8 次作战结束任务 +- 指定次数设为 10, 代理倍率设为 AUTO: 将执行 一次6倍代理 + 一次4倍代理 = 10 次作战(6 x floor(10 / 6) + (10 % 6) = 10), 消耗 10 x 6 = 60 理智 ### 掉落识别 diff --git a/docs/zh-tw/manual/introduction/combat.md b/docs/zh-tw/manual/introduction/combat.md index fc46aac5c6..7aba799700 100644 --- a/docs/zh-tw/manual/introduction/combat.md +++ b/docs/zh-tw/manual/introduction/combat.md @@ -114,8 +114,8 @@ MAA 將最多執行指定次數的戰鬥。 例: 假設當前 100 理智, 關卡消耗 6 理智 -- 指定次數設為 10, 代理倍率設為 4: 將執行 2 (次開始行動) x 4(倍代理) = 8 次作戰(2 x floor(10 / 4) = 8), 消耗 8 x 6 = 48 理智。此時若再進行一次4倍代理則達到 12 次作戰, 超過設定的 10 次, 故不再執行, 以 8 次作戰結束任務 -- 指定次數設為 10, 代理倍率設為 AUTO: 將執行 一次6倍代理 + 一次4倍代理 = 10 次作戰(6 * floor(10 / 6) + (10 % 6) = 10), 消耗 10 x 6 = 60 理智 +- 指定次數設為 10, 代理倍率設為 4: 將執行 2 (次開始行動) x 4(倍代理) = 8 次作戰(floor(10 / 4) × 4 = 8), 消耗 8 x 6 = 48 理智。此時若再進行一次4倍代理則達到 12 次作戰, 超過設定的 10 次, 故不再執行, 以 8 次作戰結束任務 +- 指定次數設為 10, 代理倍率設為 AUTO: 將執行 一次6倍代理 + 一次4倍代理 = 10 次作戰(6 × floor(10 / 6) + (10 % 6) = 10), 消耗 10 x 6 = 60 理智 ### 掉落识别 diff --git a/resource/copilot/SSS_约翰老妈新建地块_维什戴尔_荒芜拉普兰德_自适应补给元件.json b/resource/copilot/SSS_约翰老妈新建地块_维什戴尔_荒芜拉普兰德_自适应补给元件.json new file mode 100644 index 0000000000..ce9600df67 --- /dev/null +++ b/resource/copilot/SSS_约翰老妈新建地块_维什戴尔_荒芜拉普兰德_自适应补给元件.json @@ -0,0 +1,1083 @@ +{ + "minimum_required": "v5.15.2", + "stage_name": "约翰老妈新建地块", + "actions": [], + "doc": { + "title": "保全派驻-约翰老妈新建地块-维什戴尔-荒芜拉普兰德-自适应补给元件", + "details": "应急一命通关视频已上传，求三连\n本作业可完成自适应补给元件的两个任务+招募8次重装医疗任务\n已知问题如下\n①EW容易开了就关，不过应该不影响过，至少我这边不影响\n②MAA可能会在技能界面卡半天，但是到下次放人会退出来，不行自己看见手点一下也行\n③MAA如果在抽卡的时候放人可能会导致放错/放不下去干员，这个我也没办法\n═══════════════════════════════════\n作业代码：maa://65478\n目前只能手动编队，所有工具人请尽量选择费用低的干员，练度最好精二，最低精一满级\n所有工具人技能不要选只能开一次的技能（类似山2技能那种）和接敌才能放的技能（类似锏3技能那种），否则MAA会一直放技能，也不要选攻击范围太奇怪的（类似黑3技能那种）\n请在确认导能原件选择【自适应补给元件】、战术装备术师B其余全选A、手动编队并阵容确认后，再点击开始\n作业作者：萨拉托加\n作业视频：【MAA 保全派驻 约翰老妈新建地块 可完成任务 隐藏章】 https://www.bilibili.com/video/BV191YCzjEHb/?share_source=copy_web&vd_source=3fd5040fe25f6a00e19e6072bcccfa4e\nJSON作者：萨拉托加\n═══════════════════════════════════\n不包括核心选择的额外干员：\n先锋4（选有不需要接敌就能回费的技能，不要选接敌回费的，也不要选档一的先锋，容易漏怪，最好选尖兵）\n重装6（优先选自回血的奶盾，例如塞雷娅黍临光，和其他费用在20费左右的重装，例如星熊余年）\n术士6（尽量选20费左右的术士，如果选群法要带减费模组，推荐带技能大范围或者群攻的干员，例如逻各斯3小羊3澄闪3拉狗3，凑天有四时带夕）\n医疗2（奶羊，流明，或者其他正经奶）\n═══════════════════════════════════\n有问题反馈进群216314927，评论区反馈不一定能及时回复\n部分核心可根据自己需求修改作业文件替换，但不可发上作业站，用此作业默认同意", + "title_color": "dark", + "details_color": "dark" + }, + "groups": [], + "opers": [ + { + "name": "荒芜拉普兰德", + "skill": 3, + "skill_usage": 1 + }, + { + "name": "维什戴尔", + "skill": 3, + "skill_usage": 1 + } + ], + "type": "SSS", + "buff": "自适应补给元件", + "equipment": ["A", "A", "B", "A", "A", "A", "A", "B"], + "strategy": "优选策略", + "tool_men": { + "vanguard": 4, + "guard": 0, + "defender": 6, + "sniper": 0, + "caster": 6, + "medic": 2, + "supporter": 0, + "specialist": 0 + }, + "drops": ["重装", "医疗", "无需增调干员", "定向部署支援系统"], + "blacklist": [ + "黑角", + "卡缇", + "斑点", + "米格鲁", + "芙蓉", + "安赛尔", + "濯尘芙蓉", + "焰影苇草", + "刺玫", + "罗比菈塔", + "掠风", + "白铁", + "伺夜", + "豆苗", + "夜半", + "缪尔赛思", + "森蚺", + "极光", + "迷迭香", + "早露", + "菲亚梅塔", + "承曦格雷伊", + "莫斯提马", + "死芒", + "凯尔希", + "艾拉", + "多萝西", + "引星棘刺", + "锡人", + "阿", + "钼铅", + "裁度", + "琳琅诗怀雅", + "空构", + "老鲤", + "霜华", + "乌有", + "罗宾", + "孑", + "玛露西尔", + "阿罗玛", + "戴菲恩", + "林", + "和弦", + "卡涅利安", + "深靛", + "夕", + "爱丽丝", + "薄绿", + "蜜蜡", + "阿兰娜", + "凯瑟琳", + "PhonoR-0", + "Friston-3", + "THRM-EX", + "异客", + "伊芙利特", + "寒檀", + "莱恩哈特", + "惊蛰", + "蚀清", + "天火", + "星源", + "炎狱炎熔", + "布丁", + "格雷伊", + "远山", + "炎熔", + "假日威龙陈", + "埃拉托", + "奥斯塔", + "截云", + "熔泉", + "慑砂", + "送葬人", + "陨星", + "白雪", + "铅踝", + "松果", + "泰拉大陆调查团", + "正义骑士号", + "黑", + "洋灰", + "火哨", + "号角", + "火神", + "灰毫", + "车尔尼", + "暮落", + "石棉", + "坚雷", + "阿米娅", + "风笛", + "黑键", + "伊内丝", + "晓歌", + "格拉尼", + "苇草", + "野鬃", + "历阵锐枪芬", + "谜图", + "红豆", + "翎羽", + "W", + "U-Official", + "12F", + "Lancet-2" + ], + "stages": [ + { + "stage_name": "知难而进", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [7, 2], + "direction": "Left" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [5, 0], + "direction": "none" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [5, 0], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 0], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 4], + "direction": "Up" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [4, 1], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 5], + "direction": "Up" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [7, 2], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 4], + "direction": "Up" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [7, 2], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [5, 5], + "direction": "Up" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [5, 4], + "direction": "Up" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "medic": 99 + }, + "location": [6, 5], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 5], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [2, 5], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [3, 5], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "荒地的手段", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 3], + "direction": "Up" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [1, 2], + "direction": "none" + }, + { + "tool_men": { + "defender": 1, + "vanguard": 1 + }, + "location": [1, 2], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [4, 1], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [2, 1], + "direction": "Down" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "medic": 99 + }, + "location": [2, 5], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [6, 5], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 5], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [8, 5], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "麻木前行", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [3, 2], + "direction": "Left" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [7, 4], + "direction": "none" + }, + { + "tool_men": { + "defender": 1, + "vanguard": 1 + }, + "location": [7, 4], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Left" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [3, 4], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 2], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 2], + "direction": "Down" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [3, 2], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [5, 2], + "direction": "Down" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [2, 4], + "direction": "Right" + }, + { + "tool_men": { + "medic": 99 + }, + "location": [1, 3], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99 + }, + "location": [1, 4], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [3, 6], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [4, 6], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [5, 6], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "混乱“派对”", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [6, 3], + "direction": "none" + }, + { + "tool_men": { + "defender": 2 + }, + "location": [6, 3], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [4, 3], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "defender": 2 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [1, 3], + "direction": "Right" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 2], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [1, 3], + "direction": "Right" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "medic": 99 + }, + "location": [1, 2], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99 + }, + "location": [2, 3], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [5, 1], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [6, 1], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 1], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "消息传递", + "strategies": [ + { + "tool_men": { + "defender": 1 + }, + "location": [6, 3], + "direction": "Left" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [1, 3], + "direction": "none" + }, + { + "tool_men": { + "defender": 2 + }, + "location": [1, 3], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [2, 3], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 3], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 2 + }, + "location": [6, 3], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "荒芜拉普兰德", + "tool_men": { + "caster": 1, + "vanguard": 1 + }, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [6, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "medic": 99 + }, + "location": [7, 4], + "direction": "Left" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99 + }, + "location": [4, 4], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 2], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 3], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 4], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "力量的炫耀", + "strategies": [ + { + "tool_men": { + "defender": 1 + }, + "location": [3, 6], + "direction": "Right" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [9, 5], + "direction": "none" + }, + { + "tool_men": { + "defender": 2 + }, + "location": [9, 5], + "direction": "none" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 5], + "direction": "Right" + }, + { + "core": "自适应补给元件", + "tool_men": {}, + "location": [5, 5], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 3], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 6], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 5], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [3, 3], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 6], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 5], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 3], + "direction": "Down" + }, + { + "core": "维什戴尔", + "tool_men": { + "caster": 1 + }, + "location": [3, 3], + "direction": "Down" + }, + { + "core": "荒芜拉普兰德", + "tool_men": { + "caster": 1, + "vanguard": 1 + }, + "location": [5, 3], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 6], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 5], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 6], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [2, 5], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "tool_men": { + "medic": 99 + }, + "location": [1, 5], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [1, 6], + "direction": "Right" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [1, 4], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99 + }, + "location": [1, 6], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [6, 2], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 2], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [8, 2], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + } + ] +} diff --git a/resource/copilot/SSS_艺术馆旧址_维什戴尔_斩业星熊_遥_反制装甲套组.json b/resource/copilot/SSS_艺术馆旧址_维什戴尔_斩业星熊_遥_反制装甲套组.json new file mode 100644 index 0000000000..1376c749a8 --- /dev/null +++ b/resource/copilot/SSS_艺术馆旧址_维什戴尔_斩业星熊_遥_反制装甲套组.json @@ -0,0 +1,1277 @@ +{ + "minimum_required": "v5.15.2", + "stage_name": "艺术馆旧址", + "actions": [], + "doc": { + "title": "保全派驻-艺术馆旧址-维什戴尔-斩业星熊-遥-反制装甲套组", + "details": "应急一命通关视频已上传，求三连\n═══════════════════════════════════\n作业代码：maa://65329\n目前只能手动编队，所有工具人请尽量选择费用低的干员，练度最好精二，最低精一满级\n所有工具人技能不要选只能开一次的技能（类似山2技能那种）和接敌才能放的技能（类似锏3技能那种），否则MAA会一直放技能，也不要选攻击范围太奇怪的（类似黑3技能那种）\n请在确认导能原件选择【反制装甲套组】、战术装备全选A、手动编队并阵容确认后，再点击开始\n作业作者：萨拉托加\n作业视频：【MAA保全派驻 艺术馆旧址 维什戴尔 斩业星熊 遥 应急一命通关】 https://www.bilibili.com/video/BV1DTbtzpE1t/?share_source=copy_web&vd_source=3fd5040fe25f6a00e19e6072bcccfa4e\nJSON作者：萨拉托加\n═══════════════════════════════════\n不包括核心选择的额外干员：\n先锋3（选有不需要接敌就能回费的技能，不要选接敌回费的，也不要选档一的先锋，容易漏怪，最好选尖兵）\n重装6（优先选自回血的奶盾，例如塞雷娅黍临光，和其他费用在20费左右的重装，例如星熊余年）\n术士4（尽量选20费左右的术士，如果选群法要带减费模组，推荐带技能群攻的干员，例如逻各斯3小羊3澄闪3拉狗3，凑天有四时带夕）\n狙击4（优先选速狙）\n═══════════════════════════════════\n有问题反馈进群216314927，评论区反馈不一定能及时回复\n部分核心可根据自己需求修改作业文件替换，例如老熊可替新熊，但不可发上作业站，用此作业默认同意", + "title_color": "dark", + "details_color": "dark" + }, + "groups": [], + "opers": [ + { + "name": "维什戴尔", + "skill": 3, + "skill_usage": 1 + }, + { + "name": "斩业星熊", + "skill": 1, + "skill_usage": 0 + }, + { + "name": "遥", + "skill": 2, + "skill_usage": 1 + } + ], + "type": "SSS", + "buff": "反制装甲套组", + "equipment": ["A", "A", "A", "A", "A", "A", "A", "A"], + "strategy": "优选策略", + "tool_men": { + "vanguard": 3, + "guard": 0, + "defender": 6, + "sniper": 4, + "caster": 4, + "medic": 0, + "supporter": 0, + "specialist": 0 + }, + "drops": ["无需增调干员", "辅助", "重装", "医疗", "微型尖刺配件"], + "blacklist": [ + "罗比菈塔", + "掠风", + "白铁", + "伺夜", + "豆苗", + "夜半", + "缪尔赛思", + "森蚺", + "极光", + "迷迭香", + "早露", + "菲亚梅塔", + "承曦格雷伊", + "莫斯提马", + "死芒", + "凯尔希", + "艾拉", + "多萝西", + "引星棘刺", + "锡人", + "阿", + "钼铅", + "裁度", + "琳琅诗怀雅", + "空构", + "老鲤", + "霜华", + "乌有", + "罗宾", + "孑", + "玛露西尔", + "阿罗玛", + "戴菲恩", + "林", + "和弦", + "卡涅利安", + "深靛", + "夕", + "爱丽丝", + "薄绿", + "蜜蜡", + "阿兰娜", + "凯瑟琳", + "PhonoR-0", + "Friston-3", + "THRM-EX", + "异客", + "伊芙利特", + "寒檀", + "莱恩哈特", + "惊蛰", + "蚀清", + "天火", + "星源", + "炎狱炎熔", + "布丁", + "格雷伊", + "远山", + "炎熔", + "假日威龙陈", + "埃拉托", + "奥斯塔", + "截云", + "熔泉", + "慑砂", + "送葬人", + "陨星", + "白雪", + "铅踝", + "松果", + "泰拉大陆调查团", + "正义骑士号", + "黑", + "洋灰", + "火哨", + "斥罪", + "号角", + "火神", + "灰毫", + "泥岩", + "车尔尼", + "暮落", + "石棉", + "坚雷", + "阿米娅", + "风笛", + "黑键", + "伊内丝", + "晓歌", + "格拉尼", + "苇草", + "野鬃", + "历阵锐枪芬", + "谜图", + "红豆", + "翎羽", + "W", + "U-Official", + "12F", + "Lancet-2" + ], + "stages": [ + { + "stage_name": "子弹烈酒", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "core": "反制装甲套组", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [6, 4], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [4, 1], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 2], + "direction": "down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 2], + "direction": "down" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [6, 2], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 2], + "direction": "down" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [6, 2], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 2], + "direction": "down" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [3, 1], + "direction": "Down" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 2], + "direction": "down" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [6, 2], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [4, 1], + "direction": "Left" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [4, 1], + "direction": "Left" + }, + { + "tool_men": { + "supporter": 99 + }, + "location": [7, 2], + "direction": "Left" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "sniper": 99 + }, + "location": [7, 2], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 2], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 3], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 4], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "加工后厨", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [4, 3], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [0, 3], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [4, 4], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 5], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [4, 3], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 5], + "direction": "Left" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 5], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 5], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [4, 5], + "direction": "Left" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [3, 5], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [4, 5], + "direction": "Left" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [4, 3], + "direction": "Left" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [4, 2], + "direction": "Down" + }, + { + "core": "遥", + "tool_men": { + "caster": 2, + "sniper": 2 + }, + "location": [6, 4], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [4, 5], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [4, 4], + "direction": "Left" + }, + { + "core": "战备激活阀", + "tool_men": { + "defender": 99 + }, + "location": [4, 5], + "direction": "Left" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [4, 1], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 3], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [5, 4], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "控温锅炉", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "core": "反制装甲套组", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [2, 3], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 5], + "direction": "Right" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [5, 2], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 5], + "direction": "Right" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [5, 2], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [5, 2], + "direction": "Left" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [4, 5], + "direction": "Up" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [5, 2], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [4, 5], + "direction": "Up" + }, + { + "core": "反制装甲套组", + "tool_men": {}, + "location": [5, 2], + "direction": "Left" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [5, 5], + "direction": "Right" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [3, 5], + "direction": "Up" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 5], + "direction": "Up" + }, + { + "core": "遥", + "tool_men": { + "caster": 1, + "sniper": 1 + }, + "location": [3, 5], + "direction": "Up" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [4, 5], + "direction": "Up" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [3, 3], + "direction": "Right" + }, + { + "tool_men": { + "supporter": 99 + }, + "location": [1, 3], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "sniper": 99 + }, + "location": [1, 3], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 1], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [8, 1], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 1], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "冷鲜货柜", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [1, 1], + "direction": "none" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 1], + "direction": "Down" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [3, 4], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 1], + "direction": "Down" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [3, 4], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [3, 4], + "direction": "Left" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [3, 2], + "direction": "Right" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [3, 4], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 2], + "direction": "Right" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [3, 4], + "direction": "Left" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [3, 5], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [3, 5], + "direction": "Right" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [3, 2], + "direction": "Right" + }, + { + "core": "遥", + "tool_men": { + "caster": 1, + "sniper": 1 + }, + "location": [3, 5], + "direction": "Right" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 1], + "direction": "Down" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [2, 1], + "direction": "Right" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [5, 1], + "direction": "Down" + }, + { + "tool_men": { + "supporter": 99 + }, + "location": [4, 5], + "direction": "Right" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "sniper": 99 + }, + "location": [4, 5], + "direction": "Right" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 1], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [7, 6], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [2, 6], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "滋滋烤架", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [3, 0], + "direction": "none" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 4], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [6, 6], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 4], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [7, 3], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [6, 6], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [7, 3], + "direction": "Left" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [6, 4], + "direction": "Up" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [6, 6], + "direction": "Up" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [4, 5], + "direction": "Right" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [4, 5], + "direction": "Right" + }, + { + "core": "遥", + "tool_men": { + "caster": 1, + "sniper": 1 + }, + "location": [4, 5], + "direction": "Right" + }, + { + "tool_men": { + "vanguard": 1 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "vanguard": 99 + }, + "location": [5, 6], + "direction": "Up" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "supporter": 99 + }, + "location": [4, 6], + "direction": "Up" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "sniper": 99 + }, + "location": [4, 6], + "direction": "Up" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 2], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 3], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [9, 4], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + }, + { + "stage_name": "特别顾客", + "strategies": [ + { + "tool_men": { + "vanguard": 1 + }, + "location": [8, 4], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": { + "sniper": 1, + "vanguard": 1 + }, + "location": [6, 4], + "direction": "none" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [2, 3], + "direction": "Left" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [7, 5], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [2, 3], + "direction": "Left" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [7, 5], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [2, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [8, 4], + "direction": "Up" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [2, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "core": "微型尖刺配件", + "tool_men": {}, + "location": [2, 3], + "direction": "Left" + }, + { + "core": "斩业星熊", + "tool_men": { + "defender": 2 + }, + "location": [8, 4], + "direction": "Up" + }, + { + "core": "遥", + "tool_men": { + "caster": 1, + "sniper": 1 + }, + "location": [7, 5], + "direction": "Up" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "tool_men": { + "sniper": 1 + }, + "location": [7, 6], + "direction": "Up" + }, + { + "tool_men": { + "caster": 1 + }, + "location": [7, 6], + "direction": "Up" + }, + { + "core": "维什戴尔", + "tool_men": { + "sniper": 1, + "caster": 1 + }, + "location": [7, 6], + "direction": "Up" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "defender": 1 + }, + "location": [6, 5], + "direction": "Down" + }, + { + "tool_men": { + "defender": 99 + }, + "location": [5, 3], + "direction": "Left" + }, + { + "tool_men": { + "supporter": 99 + }, + "location": [7, 3], + "direction": "Down" + }, + { + "core": "战备激活阀", + "tool_men": { + "caster": 99, + "sniper": 99 + }, + "location": [7, 3], + "direction": "Down" + } + ], + "draw_as_possible": true, + "actions": [ + { + "type": "二倍速" + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 3], + "direction": "none", + "costs": 48 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 4], + "direction": "none", + "costs": 49 + }, + { + "type": "Deploy", + "name": "超重绝缘水泥", + "location": [1, 5], + "direction": "none", + "costs": 50 + } + ], + "retry_times": 99 + } + ] +} diff --git a/resource/copilot/SSS_任务专用_尚蜀夜市_阿斯卡纶_伊桑_自适应补给元件.json b/resource/copilot/old/SSS_任务专用_尚蜀夜市_阿斯卡纶_伊桑_自适应补给元件.json similarity index 100% rename from resource/copilot/SSS_任务专用_尚蜀夜市_阿斯卡纶_伊桑_自适应补给元件.json rename to resource/copilot/old/SSS_任务专用_尚蜀夜市_阿斯卡纶_伊桑_自适应补给元件.json diff --git a/resource/copilot/SSS_任务专用_阿卡胡拉丛林_维什戴尔+乌尔比安+安哲拉_阿戈尔示波器.json b/resource/copilot/old/SSS_任务专用_阿卡胡拉丛林_维什戴尔+乌尔比安+安哲拉_阿戈尔示波器.json similarity index 100% rename from resource/copilot/SSS_任务专用_阿卡胡拉丛林_维什戴尔+乌尔比安+安哲拉_阿戈尔示波器.json rename to resource/copilot/old/SSS_任务专用_阿卡胡拉丛林_维什戴尔+乌尔比安+安哲拉_阿戈尔示波器.json diff --git a/resource/copilot/SSS_尚蜀夜市_维什戴尔+阿斯卡纶+Mon3tr_天工夜行套装.json b/resource/copilot/old/SSS_尚蜀夜市_维什戴尔+阿斯卡纶+Mon3tr_天工夜行套装.json similarity index 100% rename from resource/copilot/SSS_尚蜀夜市_维什戴尔+阿斯卡纶+Mon3tr_天工夜行套装.json rename to resource/copilot/old/SSS_尚蜀夜市_维什戴尔+阿斯卡纶+Mon3tr_天工夜行套装.json diff --git a/resource/copilot/SSS_尚蜀夜市——澄闪or荒芜拉普兰德+维什戴尔+余or任意盾+Mon3tror闪灵+伊桑or阿斯卡纶_天工夜行套装.json b/resource/copilot/old/SSS_尚蜀夜市——澄闪or荒芜拉普兰德+维什戴尔+余or任意盾+Mon3tror闪灵+伊桑or阿斯卡纶_天工夜行套装.json similarity index 100% rename from resource/copilot/SSS_尚蜀夜市——澄闪or荒芜拉普兰德+维什戴尔+余or任意盾+Mon3tror闪灵+伊桑or阿斯卡纶_天工夜行套装.json rename to resource/copilot/old/SSS_尚蜀夜市——澄闪or荒芜拉普兰德+维什戴尔+余or任意盾+Mon3tror闪灵+伊桑or阿斯卡纶_天工夜行套装.json diff --git a/resource/copilot/SSS_尚蜀夜市——维什戴尔+塞雷娅+伊桑+温蒂_天工夜行套装.json b/resource/copilot/old/SSS_尚蜀夜市——维什戴尔+塞雷娅+伊桑+温蒂_天工夜行套装.json similarity index 100% rename from resource/copilot/SSS_尚蜀夜市——维什戴尔+塞雷娅+伊桑+温蒂_天工夜行套装.json rename to resource/copilot/old/SSS_尚蜀夜市——维什戴尔+塞雷娅+伊桑+温蒂_天工夜行套装.json diff --git a/resource/copilot/SSS_阿卡胡拉丛林_澄闪+荒芜拉普兰德+Mon3tr+逻各斯_丛林用示踪信标.json b/resource/copilot/old/SSS_阿卡胡拉丛林_澄闪+荒芜拉普兰德+Mon3tr+逻各斯_丛林用示踪信标.json similarity index 100% rename from resource/copilot/SSS_阿卡胡拉丛林_澄闪+荒芜拉普兰德+Mon3tr+逻各斯_丛林用示踪信标.json rename to resource/copilot/old/SSS_阿卡胡拉丛林_澄闪+荒芜拉普兰德+Mon3tr+逻各斯_丛林用示踪信标.json diff --git a/resource/copilot/SSS_阿卡胡拉丛林_维什戴尔单核_丛林用示踪信标.json b/resource/copilot/old/SSS_阿卡胡拉丛林_维什戴尔单核_丛林用示踪信标.json similarity index 100% rename from resource/copilot/SSS_阿卡胡拉丛林_维什戴尔单核_丛林用示踪信标.json rename to resource/copilot/old/SSS_阿卡胡拉丛林_维什戴尔单核_丛林用示踪信标.json diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json index f7e920ed38..e57cd85a05 100644 --- a/resource/tasks/Roguelike/JieGarden.json +++ b/resource/tasks/Roguelike/JieGarden.json @@ -453,6 +453,11 @@ "JieGarden@Roguelike@RoutingAction": { "algorithm": "JustReturn" }, + "JieGarden@Roguelike@RoutingAction-ClickRemainingCandleFlame": { + "doc": "用于替换 JieGarden@Roguelike@RoutingAction 的 BaseTask", + "algorithm": "JustReturn", + "next": ["JieGarden@Roguelike@ClickRemainingCandleFlame"] + }, "JieGarden@Roguelike@RoutingAction-ExitThenAbandon": { "doc": "用于替换 JieGarden@Roguelike@RoutingAction 的 BaseTask", "algorithm": "JustReturn", diff --git a/resource/tasks/Roguelike/Sami.json b/resource/tasks/Roguelike/Sami.json index 72b12e0c78..53e5c00d34 100644 --- a/resource/tasks/Roguelike/Sami.json +++ b/resource/tasks/Roguelike/Sami.json @@ -217,14 +217,14 @@ "Sami@Roguelike@StageFerociousPresage" ], "ocrReplace": [ - ["Sami@Roguelike@OnStage_0", "深埋迷境"], - ["Sami@Roguelike@OnStage_1", "初霜湖泽"], - ["Sami@Roguelike@OnStage_2", "密静林地"], - ["Sami@Roguelike@OnStage_3", "昧明冻土"], - ["Sami@Roguelike@OnStage_4", "积冰岩骸"], - ["Sami@Roguelike@OnStage_5", "无瑕花园"], - ["Sami@Roguelike@OnStage_6", "远见之构"], - ["Sami@Roguelike@OnStage_7", "永恒之尘"] + ["Sami@Roguelike@OnStage_0.png", "深埋迷境"], + ["Sami@Roguelike@OnStage_1.png", "初霜湖泽"], + ["Sami@Roguelike@OnStage_2.png", "密静林地"], + ["Sami@Roguelike@OnStage_3.png", "昧明冻土"], + ["Sami@Roguelike@OnStage_4.png", "积冰岩骸"], + ["Sami@Roguelike@OnStage_5.png", "无瑕花园"], + ["Sami@Roguelike@OnStage_6.png", "远见之构"], + ["Sami@Roguelike@OnStage_7.png", "永恒之尘"] ], "text": [] }, diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index 6f1701063f..30849ae4ea 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -2500,8 +2500,7 @@ "Infrast@ReturnButtons#next", "Infrast@CloseAnnos#next", "Infrast@OfflineConfirm" - ], - "postDelay": 1000 + ] }, "Infrast@MainThemes": { "next": ["InfrastBegin#next"] diff --git a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp index 28c8393c1f..d00fbc01f1 100644 --- a/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Map/RoguelikeRoutingTaskPlugin.cpp @@ -326,7 +326,10 @@ void asst::RoguelikeRoutingTaskPlugin::bosky_decide_and_click() } if (!found) { - Log.warn(__FUNCTION__, "| no open unvisited nodes available"); + Log.info(__FUNCTION__, "| no open unvisited nodes available"); + Task.set_task_base( + "JieGarden@Roguelike@RoutingAction", + "JieGarden@Roguelike@RoutingAction-ClickRemainingCandleFlame"); return; } int gx = m_bosky_map.get_node_x(chosen); @@ -358,7 +361,6 @@ void asst::RoguelikeRoutingTaskPlugin::bosky_decide_and_click() // 根据节点类型判断 Task.set_task_base base_task_name switch (m_bosky_map.get_node_type(chosen)) { case RoguelikeNodeType::YiTrader: - Task.set_task_base("JieGarden@Roguelike@RoutingAction", "JieGarden@Roguelike@RoutingAction-StageYiTraderEnter"); break; case RoguelikeNodeType::Disaster: diff --git a/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp index 57be399924..cbf20885ae 100644 --- a/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/Sami/RoguelikeCollapsalParadigmTaskPlugin.cpp @@ -377,7 +377,8 @@ bool asst::RoguelikeCollapsalParadigmTaskPlugin::new_zone() const if (!matcher.analyze()) { return false; } - std::string zone = m_zone_dict.at(matcher.get_result().templ_name); + auto& name = matcher.get_result().templ_name; + std::string zone = m_zone_dict.at(name); if (zone != m_zone) { m_zone = zone; #ifdef ASST_DEBUG