diff --git a/assets/interface.json b/assets/interface.json index 389493d..a5f4e5d 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -181,50 +181,6 @@ ] } } - }, - { - "name": "活动地峡之岚", - "entry": "进入活动", - "check": false, - "repeatable": true, - "doc": "[color:red]活动不支持自动导航,活动模式选择活动出征须在出击准备界面点开始,其余设置沿用自动出征,活动答题须在答题界面点开始,选择答题后下面设置将无效[/color]", - "repeat_count": 1, - "option": [ - "活动模式", - "战斗编队", - "战斗阵型", - "活动无限次数", - "战斗大破/中破舰船处理", - "门口SL目标1", - "门口SL目标2", - "夜战追击", - "战斗点位", - "战斗使用军阶buff" - ], - "pipeline_override": { - "回到关卡了": { - "expected": "出击准备", - "roi": [ - 980, - 581, - 254, - 75 - ], - "next": [ - "无限战斗", - "无动作结束" - ] - }, - "进入关卡": { - "expected": "出击准备", - "roi": [ - 980, - 581, - 254, - 75 - ] - } - } } ], "option": { @@ -830,7 +786,18 @@ "name": "第二编队", "pipeline_override": { "战斗编队": { - "template": "2队.png" + "roi": [ + 227, + 94, + 153, + 44 + ], + "target": [ + 227, + 94, + 153, + 44 + ] } } }, @@ -838,7 +805,18 @@ "name": "第三编队", "pipeline_override": { "战斗编队": { - "template": "3队.png" + "roi": [ + 384, + 94, + 152, + 44 + ], + "target": [ + 384, + 94, + 152, + 44 + ] } } }, @@ -846,7 +824,18 @@ "name": "第四编队", "pipeline_override": { "战斗编队": { - "template": "4队.png" + "roi": [ + 544, + 94, + 150, + 44 + ], + "target": [ + 544, + 94, + 150, + 44 + ] } } } @@ -1057,6 +1046,15 @@ "expected": "潜艇" } } + }, + { + "name": "无补给", + "pipeline_override": { + "战斗识别SL目标1": { + "expected": "补给", + "inverse": true + } + } } ] }, @@ -1117,6 +1115,15 @@ "expected": "潜艇" } } + }, + { + "name": "无补给", + "pipeline_override": { + "战斗识别SL目标2": { + "expected": "补给", + "inverse": true + } + } } ] }, @@ -1250,6 +1257,7 @@ "pipeline_override": { "战斗船舱满退出": { "next": [ + "拆船前领奖", "战斗船舱满尝试拆船" ], "interrupt": [ @@ -1265,12 +1273,16 @@ "cases": [ { "name": "不使用", - "pipeline_override": {} + "pipeline_override": { + "启用军阶buff": { + "enabled": false + } + } }, { "name": "战利品加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1285,7 +1297,7 @@ { "name": "经验加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1314,7 +1326,7 @@ { "name": "打捞加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1343,7 +1355,7 @@ { "name": "好感度加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1372,7 +1384,7 @@ { "name": "伤害加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1401,7 +1413,7 @@ { "name": "学院加成", "pipeline_override": { - "进入关卡": { + "确认进入关卡": { "next": [ "启用军阶buff", "战斗编队", @@ -1482,6 +1494,7 @@ "pipeline_override": { "退出狗粮": { "next": [ + "拆船前领奖", "战斗船舱满尝试拆船" ], "interrupt": [ @@ -2300,40 +2313,6 @@ } } ] - }, - "活动无限次数": { - "cases": [ - { - "name": "关闭", - "pipeline_override": { - "无限战斗": { - "enabled": false - } - } - }, - { - "name": "无限次数", - "pipeline_override": {} - } - ] - }, - "活动模式": { - "cases": [ - { - "name": "活动出征", - "pipeline_override": {} - }, - { - "name": "活动答题(测试功能)", - "pipeline_override": { - "进入活动": { - "next": [ - "检查题目" - ] - } - } - } - ] } } } \ No newline at end of file diff --git "a/assets/resource/base/pipeline/\345\205\263\345\215\241\345\257\274\350\210\252.json" "b/assets/resource/base/pipeline/\345\205\263\345\215\241\345\257\274\350\210\252.json" index b397719..31532b9 100644 --- "a/assets/resource/base/pipeline/\345\205\263\345\215\241\345\257\274\350\210\252.json" +++ "b/assets/resource/base/pipeline/\345\205\263\345\215\241\345\257\274\350\210\252.json" @@ -2,6 +2,7 @@ "开始出征": { "next": [ "进入关卡", + "出征领取奖励", "点击出征", "导航前" ], @@ -10,6 +11,14 @@ "退出" ] }, + "出征领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "点击出征" + ] + }, "点击出征": { "recognition": "TemplateMatch", "template": "出征2.png", diff --git "a/assets/resource/base/pipeline/\345\206\263\346\210\230.json" "b/assets/resource/base/pipeline/\345\206\263\346\210\230.json" index db10d50..8fd7bac 100644 --- "a/assets/resource/base/pipeline/\345\206\263\346\210\230.json" +++ "b/assets/resource/base/pipeline/\345\206\263\346\210\230.json" @@ -1,6 +1,7 @@ { "开始自动决战": { "next": [ + "决战领取奖励", "自动决战", "点击决战", "决战沉默战士", @@ -8,6 +9,14 @@ "退出决战" ] }, + "决战领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "开始自动决战" + ] + }, "自动决战": { "recognition": "TemplateMatch", "template": "出征2.png", diff --git "a/assets/resource/base/pipeline/\347\273\223\346\235\237\345\211\215\344\273\273\345\212\241.json" "b/assets/resource/base/pipeline/\347\273\223\346\235\237\345\211\215\344\273\273\345\212\241.json" index cf0b1aa..053d837 100644 --- "a/assets/resource/base/pipeline/\347\273\223\346\235\237\345\211\215\344\273\273\345\212\241.json" +++ "b/assets/resource/base/pipeline/\347\273\223\346\235\237\345\211\215\344\273\273\345\212\241.json" @@ -1,6 +1,7 @@ { "收尾工作": { "next": [ + "结束领取奖励", "点击任务", "点击船坞" ], @@ -9,6 +10,23 @@ "退出" ] }, + "结束领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "收尾工作" + ] + }, + "结束领取奖励2": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "点击船坞", + "任务结束" + ] + }, "点击任务": { "recognition": "TemplateMatch", "template": "任务.png", @@ -32,6 +50,7 @@ "action": "Click", "green_mask": true, "next": [ + "结束领取奖励2", "点击船坞", "任务结束" ] diff --git "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\345\275\271.json" "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\345\275\271.json" index e6a643f..d39d910 100644 --- "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\345\275\271.json" +++ "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\345\275\271.json" @@ -1,6 +1,7 @@ { "开始自动战役": { "next": [ + "战役领取奖励", "自动战役", "点击战役", "战役次数", @@ -9,6 +10,14 @@ "退出战役" ] }, + "战役领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "开始自动战役" + ] + }, "自动战役": { "recognition": "TemplateMatch", "template": "出征2.png", diff --git "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\346\226\227.json" "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\346\226\227.json" index 3b95108..f9a15ac 100644 --- "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\346\226\227.json" +++ "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\210\230\346\226\227.json" @@ -30,6 +30,14 @@ 63 ], "action": "Click", + "next": [ + "确认进入关卡", + "进入关卡" + ] + }, + "确认进入关卡": { + "recognition": "TemplateMatch", + "template": "开始出征.png", "next": [ "战斗编队", "战斗自动补给", @@ -162,11 +170,31 @@ ] }, "战斗编队": { - "recognition": "TemplateMatch", - "template": "队.png", - "order_by": "Score", - "threshold": 0.95, + "recognition": "ColorMatch", + "roi": [ + 70, + 92, + 150, + 46 + ], + "lower": [ + 16, + 133, + 228 + ], + "upper": [ + 16, + 133, + 228 + ], "action": "Click", + "inverse": true, + "target": [ + 70, + 92, + 150, + 46 + ], "next": [ "战斗自动补给", "战斗修理检测大破", @@ -188,14 +216,11 @@ 22 ], "next": [ + "战斗自动补给", "战斗修理检测大破", "战斗修理检测中破", "战斗开始出征" ], - "on_error": [ - "进入关卡", - "任务出错" - ], "focus": true, "focus_tip": "切换自动补给" }, @@ -330,7 +355,7 @@ "战斗追击", "重新连接" ], - "timeout": 60000, + "timeout": 300000, "focus": true, "focus_tip": "开始出征" }, @@ -436,7 +461,7 @@ 89 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗阵型", @@ -461,7 +486,7 @@ 612 ], "action": "Click", - "timeout": 120000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗点击继续" @@ -497,6 +522,19 @@ "战斗大破回港", "回到关卡了", "战斗再点继续" + ], + "on_error": [ + "战斗继续退出", + "任务出错" + ] + }, + "战斗继续退出": { + "recognition": "TemplateMatch", + "template": "退出.png", + "action": "Click", + "green_mask": true, + "next": [ + "回到关卡了" ] }, "战斗舰队补给": { @@ -512,7 +550,8 @@ "template": "回港.png", "action": "Click", "next": [ - "回到关卡了" + "回到关卡了", + "战斗回港" ], "focus": true, "focus_tip": "回港" @@ -522,7 +561,8 @@ "template": "大破回港.png", "action": "Click", "next": [ - "回到关卡了" + "回到关卡了", + "战斗大破回港" ], "focus": true, "focus_tip": "大破回港", @@ -542,7 +582,7 @@ "recognition": "TemplateMatch", "template": "前进.png", "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗开始2", @@ -569,7 +609,7 @@ 89 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗阵型2", @@ -594,7 +634,7 @@ 612 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗点击继续2" @@ -644,7 +684,7 @@ "recognition": "TemplateMatch", "template": "前进.png", "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗开始3", @@ -671,7 +711,7 @@ 89 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗阵型3", @@ -696,7 +736,7 @@ 612 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗点击继续3" @@ -746,7 +786,7 @@ "recognition": "TemplateMatch", "template": "前进.png", "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗开始4", @@ -773,7 +813,7 @@ 89 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗阵型4", @@ -798,7 +838,7 @@ 612 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗点击继续4" @@ -848,7 +888,7 @@ "recognition": "TemplateMatch", "template": "前进.png", "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗开始5", @@ -875,7 +915,7 @@ 89 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗阵型5", @@ -900,7 +940,7 @@ 612 ], "action": "Click", - "timeout": 90000, + "timeout": 300000, "post_wait_freezes": 0, "next": [ "战斗点击继续5" @@ -946,6 +986,14 @@ "战斗前进4" ] }, + "拆船前领奖": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "战斗船舱满尝试拆船" + ] + }, "战斗船舱满尝试拆船": { "recognition": "TemplateMatch", "template": "出征2.png", @@ -958,6 +1006,7 @@ 28 ], "next": [ + "拆船前领奖", "拆船点击建造" ] }, diff --git "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\274\224\344\271\240.json" "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\274\224\344\271\240.json" index 5556eb0..f410d99 100644 --- "a/assets/resource/base/pipeline/\350\207\252\345\212\250\346\274\224\344\271\240.json" +++ "b/assets/resource/base/pipeline/\350\207\252\345\212\250\346\274\224\344\271\240.json" @@ -1,12 +1,21 @@ { "开始自动演习": { "next": [ + "演习领取奖励", "自动演习", "点击演习", "处于演习界面", "退出演习" ] }, + "演习领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "开始自动演习" + ] + }, "处于演习界面": { "recognition": "TemplateMatch", "template": "演习挑战.png", @@ -133,7 +142,6 @@ "recognition": "TemplateMatch", "template": "演习刷新.png", "action": "Click", - "post_wait_freezes": 1000, "next": [ "演习识别舰船", "演习开始挑战" @@ -149,7 +157,7 @@ 59 ], "action": "Click", - "post_wait_freezes": 1000, + "post_wait_freezes": 2000, "next": [ "演习编队", "演习自动补给", @@ -160,7 +168,6 @@ "recognition": "TemplateMatch", "template": "对号.png", "inverse": true, - "post_wait_freezes": 1000, "action": "Click", "target": [ 56, @@ -175,7 +182,6 @@ "演习编队": { "recognition": "TemplateMatch", "template": "队.png", - "post_wait_freezes": 1000, "order_by": "Score", "threshold": 0.95, "action": "Click", @@ -248,7 +254,6 @@ 24, 482 ], - "post_wait_freezes": 1000, "next": [ "演习再点继续" ] @@ -277,7 +282,6 @@ "recognition": "TemplateMatch", "template": "关闭演习.png", "action": "Click", - "post_wait_freezes": 1000, "next": [ "演习刷新失败1", "演习向上滑" @@ -298,7 +302,6 @@ 600 ], "index": 1, - "post_wait_freezes": 1000, "next": [ "演习识别舰船1", "演习开始挑战1" @@ -329,7 +332,6 @@ "recognition": "TemplateMatch", "template": "关闭演习.png", "action": "Click", - "post_wait_freezes": 1000, "next": [ "演习刷新失败2", "演习向上滑" @@ -350,7 +352,6 @@ 600 ], "index": 2, - "post_wait_freezes": 1000, "next": [ "演习识别舰船2", "演习开始挑战2" @@ -381,7 +382,6 @@ "recognition": "TemplateMatch", "template": "关闭演习.png", "action": "Click", - "post_wait_freezes": 1000, "next": [ "演习刷新失败3", "演习向上滑" @@ -402,7 +402,6 @@ 600 ], "index": 3, - "post_wait_freezes": 1000, "next": [ "演习识别舰船3", "演习开始挑战3" @@ -433,7 +432,6 @@ "recognition": "TemplateMatch", "template": "关闭演习.png", "action": "Click", - "post_wait_freezes": 1000, "next": [ "演习向上滑" ], @@ -451,7 +449,7 @@ 59 ], "action": "Click", - "post_wait_freezes": 1000, + "post_wait_freezes": 2000, "next": [ "演习编队1", "演习自动补给1", @@ -462,7 +460,6 @@ "recognition": "TemplateMatch", "template": "对号.png", "inverse": true, - "post_wait_freezes": 1000, "action": "Click", "target": [ 56, @@ -477,7 +474,6 @@ "演习编队1": { "recognition": "TemplateMatch", "template": "队.png", - "post_wait_freezes": 1000, "order_by": "Score", "threshold": 0.95, "action": "Click", @@ -550,7 +546,6 @@ 24, 482 ], - "post_wait_freezes": 1000, "next": [ "演习再点继续1" ] @@ -604,7 +599,7 @@ 59 ], "action": "Click", - "post_wait_freezes": 1000, + "post_wait_freezes": 2000, "next": [ "演习编队2", "演习自动补给2", @@ -615,7 +610,6 @@ "recognition": "TemplateMatch", "template": "对号.png", "inverse": true, - "post_wait_freezes": 1000, "action": "Click", "target": [ 56, @@ -630,7 +624,6 @@ "演习编队2": { "recognition": "TemplateMatch", "template": "队.png", - "post_wait_freezes": 1000, "order_by": "Score", "threshold": 0.95, "action": "Click", @@ -703,7 +696,6 @@ 24, 482 ], - "post_wait_freezes": 1000, "next": [ "演习再点继续2" ] @@ -757,7 +749,7 @@ 59 ], "action": "Click", - "post_wait_freezes": 1000, + "post_wait_freezes": 2000, "next": [ "演习编队3", "演习自动补给3", @@ -768,7 +760,6 @@ "recognition": "TemplateMatch", "template": "对号.png", "inverse": true, - "post_wait_freezes": 1000, "action": "Click", "target": [ 56, @@ -783,7 +774,6 @@ "演习编队3": { "recognition": "TemplateMatch", "template": "队.png", - "post_wait_freezes": 1000, "order_by": "Score", "threshold": 0.95, "action": "Click", @@ -856,7 +846,6 @@ 24, 482 ], - "post_wait_freezes": 1000, "next": [ "演习再点继续3" ] @@ -912,7 +901,6 @@ 109 ], "index": 0, - "post_wait_freezes": 1000, "next": [ "演习开始挑战4" ] @@ -927,7 +915,7 @@ 59 ], "action": "Click", - "post_wait_freezes": 1000, + "post_wait_freezes": 2000, "next": [ "演习编队4", "演习自动补给4", @@ -938,7 +926,6 @@ "recognition": "TemplateMatch", "template": "对号.png", "inverse": true, - "post_wait_freezes": 1000, "action": "Click", "target": [ 56, @@ -953,7 +940,6 @@ "演习编队4": { "recognition": "TemplateMatch", "template": "队.png", - "post_wait_freezes": 1000, "order_by": "Score", "threshold": 0.95, "action": "Click", @@ -1026,7 +1012,6 @@ 24, 482 ], - "post_wait_freezes": 1000, "next": [ "演习再点继续4" ] diff --git "a/assets/resource/base/pipeline/\350\207\252\345\212\250\350\277\234\345\276\201.json" "b/assets/resource/base/pipeline/\350\207\252\345\212\250\350\277\234\345\276\201.json" index 53009e6..a747553 100644 --- "a/assets/resource/base/pipeline/\350\207\252\345\212\250\350\277\234\345\276\201.json" +++ "b/assets/resource/base/pipeline/\350\207\252\345\212\250\350\277\234\345\276\201.json" @@ -5,6 +5,22 @@ "自动收远征" ] }, + "远征领取奖励": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "无动作结束" + ] + }, + "远征领取奖励2": { + "recognition": "TemplateMatch", + "template": "领取奖励.png", + "action": "Click", + "next": [ + "点击出征2" + ] + }, "点击出征2": { "recognition": "TemplateMatch", "template": "出征.png", @@ -104,6 +120,7 @@ "post_wait_freezes": 1000, "next": [ "退出远征", + "远征领取奖励", "无动作结束" ] }, @@ -114,6 +131,7 @@ "green_mask": true, "next": [ "退出远征2", + "远征领取奖励2", "点击出征2" ] },