diff --git a/assets/interface.json b/assets/interface.json index fab42df..b3cd7b1 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -336,7 +336,15 @@ "cases": [ { "name": "3副本加两轮鬼", - "pipeline_override": {} + "pipeline_override": { + "抓鬼一轮完成": { + "next": [ + "[JumpBack]抓鬼一轮完成-再次点击确定", + "抓鬼轮次计算-max", + "捉鬼-结束" + ] + } + } }, { "name": "3副本", @@ -356,6 +364,13 @@ "打开小地图_百晓仙子-50普通-1", "[JumpBack]打开大地图_69副本" ] + }, + "抓鬼一轮完成": { + "next": [ + "[JumpBack]抓鬼一轮完成-再次点击确定", + "抓鬼轮次计算-max", + "捉鬼-结束" + ] } } } @@ -376,7 +391,7 @@ "抓鬼-关闭组队界面": { "next": [ "抓鬼轮次计算-max", - "抓鬼轮次计算-max-结束" + "捉鬼-结束" ] } }, @@ -391,7 +406,7 @@ "next": [ "[JumpBack]抓鬼一轮完成-再次点击确定", "抓鬼轮次计算-max", - "抓鬼轮次计算-max-结束" + "捉鬼-结束" ] } }, @@ -457,6 +472,13 @@ "next": [ "115打开小地图_百晓仙子" ] + }, + "抓鬼一轮完成": { + "next": [ + "[JumpBack]抓鬼一轮完成-再次点击确定", + "抓鬼轮次计算-max", + "捉鬼-结束" + ] } } }, @@ -467,6 +489,13 @@ "next": [ "115返回长安城" ] + }, + "抓鬼一轮完成": { + "next": [ + "[JumpBack]抓鬼一轮完成-再次点击确定", + "抓鬼轮次计算-max", + "捉鬼-结束" + ] } } }, @@ -477,6 +506,13 @@ "next": [ "115打开小地图-百晓仙子-50普通-1" ] + }, + "抓鬼一轮完成": { + "next": [ + "[JumpBack]抓鬼一轮完成-再次点击确定", + "抓鬼轮次计算-max", + "捉鬼-结束" + ] } } } @@ -765,6 +801,11 @@ "expected": [ "第25关" ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "expected": [ + "第25关" + ] } } }, @@ -775,6 +816,11 @@ "expected": [ "第24关" ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "expected": [ + "第24关" + ] } } }, @@ -785,6 +831,11 @@ "expected": [ "第21关" ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "expected": [ + "第21关" + ] } } }, @@ -796,6 +847,11 @@ "expected": [ "第18关" ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "expected": [ + "第18关" + ] } } }, @@ -806,6 +862,11 @@ "expected": [ "第60关" ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "expected": [ + "第60关" + ] } } } diff --git a/assets/resource/base/image/zhanghao/require_update.png b/assets/resource/base/image/zhanghao/require_update.png new file mode 100644 index 0000000..06c3430 Binary files /dev/null and b/assets/resource/base/image/zhanghao/require_update.png differ diff --git a/assets/resource/base/image/zonghe/exit_confirm.png b/assets/resource/base/image/zonghe/exit_confirm.png new file mode 100644 index 0000000..acc5d18 Binary files /dev/null and b/assets/resource/base/image/zonghe/exit_confirm.png differ diff --git a/assets/resource/base/pipeline/fuben115.json b/assets/resource/base/pipeline/fuben115.json index 1356a7e..4bdca75 100644 --- a/assets/resource/base/pipeline/fuben115.json +++ b/assets/resource/base/pipeline/fuben115.json @@ -20,6 +20,7 @@ "post_delay": 1000, "next": [ "115识别位置-长安城-副本", + "[JumpBack]panduan_zhujiemian_ks", "[JumpBack]打开大地图_69副本" ] }, @@ -931,8 +932,8 @@ "action": "Click", "post_delay": 1500, "next": [ - "日常抓鬼-第一轮", - "[JumpBack]打开大地图_69副本" + "[JumpBack]捉鬼-fuben桥接", + "panduan_zhujiemian" ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/fuben69.json b/assets/resource/base/pipeline/fuben69.json index 724531e..423677c 100644 --- a/assets/resource/base/pipeline/fuben69.json +++ b/assets/resource/base/pipeline/fuben69.json @@ -20,6 +20,7 @@ "post_delay": 3000, "next": [ "识别位置-长安城-副本", + "[JumpBack]panduan_zhujiemian_ks", "[JumpBack]打开大地图_69副本" ] }, @@ -735,7 +736,8 @@ "action": "Click", "post_delay": 1500, "next": [ - "日常抓鬼-第一轮" + "[JumpBack]捉鬼-fuben桥接", + "panduan_zhujiemian" ] }, "退出队伍": { @@ -800,365 +802,5 @@ "next": [ "panduan_zhujiemian" ] - }, - "日常抓鬼-第一轮": { - "recognition": "OCR", - "expected": [ - "长安城" - ], - "roi": [ - 108, - 22, - 117, - 31 - ], - "pre_delay": 1000, - "action": "ClickKey", - "key": [ - 61 - ], - "post_delay": 1000, - "next": [ - "日常抓鬼-点击钟馗", - "[JumpBack]小地图-按键打开失败-点击小地图图标" - ] - }, - "日常抓鬼-点击钟馗": { - "recognition": "Or", - "any_of": [ - { - "recognition": "TemplateMatch", - "template": [ - "zonghe/xiaoditu_CA.png" - ], - "roi": [ - 114, - 69, - 1040, - 630 - ] - }, - { - "recognition": "OCR", - "expected": [ - "钟馗", - "钟道", - "钟", - "道" - ], - "roi": [ - 357, - 391, - 72, - 43 - ] - } - ], - "pre_delay": 1000, - "action": "Click", - "post_delay": 3000, - "target": [ - 377, - 403, - 38, - 19 - ], - "next": [ - "日常抓鬼-钟馗-捉鬼任务" - ] - }, - "日常抓鬼-钟馗-捉鬼任务": { - "recognition": "OCR", - "expected": [ - "捉鬼任务" - ], - "roi": [ - 925, - 73, - 312, - 482 - ], - "action": "Click", - "post_delay": 2000, - "next": [ - "日常抓鬼-钟馗-捉鬼任务-开始", - "[JumpBack]捉鬼-没有辅助提示-点击取消", - "[JumpBack]抓鬼不足五人-图片识别", - "[JumpBack]抓鬼领取双倍弹窗" - ] - }, - "抓鬼不足五人-图片识别": { - "recognition": "TemplateMatch", - "template": [ - "zhuagui/buzu5ren.png" - ], - "roi": [ - 384, - 224, - 502, - 280 - ], - "next": [ - "抓鬼不足五人-点击取消" - ] - }, - "抓鬼不足五人-点击取消": { - "recognition": "OCR", - "expected": [ - "取消" - ], - "roi": "抓鬼不足五人-图片识别", - "pre_delay": 1000, - "action": "Click", - "post_delay": 1500, - "next": [ - "抓鬼不足五人-点击钟馗" - ] - }, - "抓鬼不足五人-点击钟馗": { - "recognition": "Or", - "any_of": [ - { - "recognition": "TemplateMatch", - "template": [ - "zhuagui/zhongkui.png" - ], - "roi": [ - 294, - 102, - 583, - 386 - ] - }, - { - "recognition": "OCR", - "expected": [ - "钟馗", - "钟道", - "钟", - "道" - ], - "roi": [ - 186, - 157, - 853, - 426 - ] - } - ], - "pre_delay": 1000, - "action": "Click", - "post_delay": 1500, - "target_offset": [ - 0, - 0, - -4, - -8 - ], - "next": [ - "抓鬼不足五人-捉鬼任务" - ] - }, - "抓鬼不足五人-捉鬼任务": { - "recognition": "OCR", - "expected": [ - "捉鬼任务" - ], - "roi": [ - 925, - 73, - 312, - 482 - ], - "action": "Click", - "post_delay": 2000 - }, - "抓鬼领取双倍弹窗": { - "recognition": "TemplateMatch", - "template": [ - "zhuagui/zhuagui_shuangbei.png" - ], - "roi": [ - 402, - 263, - 475, - 196 - ], - "pre_delay": 1000, - "next": [ - "抓鬼关闭领取双倍弹窗-点击确定" - ] - }, - "抓鬼关闭领取双倍弹窗-点击确定": { - "recognition": "OCR", - "expected": [ - "确定" - ], - "roi": "抓鬼领取双倍弹窗", - "pre_delay": 500, - "action": "Click", - "post_delay": 1500 - }, - "日常抓鬼-钟馗-捉鬼任务-开始": { - "focus": { - "Node.Recognition.Succeeded": "日常抓鬼任务第一轮-开始" - }, - "recognition": "OCR", - "expected": [ - "捉鬼[(（]\\d*/\\d*[)）]", - "捉拿.*鬼", - "千年厉鬼" - ], - "roi": [ - 1032, - 165, - 247, - 300 - ], - "pre_delay": 1000, - "action": "Click", - "post_delay": 200, - "next": [ - "日常抓鬼-第一轮结束-图片识别", - "日常抓鬼-第一轮结束-文字识别", - "[JumpBack]自动寻路中-图片识别", - "[JumpBack]战斗中-等待100秒", - "[JumpBack]抓鬼-点击任务栏-通用" - ] - }, - "抓鬼-点击任务栏-通用": { - "recognition": "OCR", - "expected": [ - "捉鬼[(（]\\d*/\\d*[)）]", - "捉拿.*鬼", - "千年厉鬼" - ], - "roi": [ - 1032, - 165, - 247, - 300 - ], - "pre_delay": 1000, - "action": "Click" - }, - "日常抓鬼-第一轮结束-图片识别": { - "focus": { - "Node.Recognition.Succeeded": "日常抓鬼第一轮结束-图片识别" - }, - "recognition": "TemplateMatch", - "template": [ - "zhuagui/zhuaguijiesu.png", - "zhuagui/zhuaguijiesu2.png" - ], - "roi": [ - 401, - 254, - 475, - 214 - ], - "threshold": 0.7, - "next": [ - "日常抓鬼-第二轮" - ] - }, - "日常抓鬼-第一轮结束-文字识别": { - "focus": { - "Node.Recognition.Succeeded": "日常抓鬼第一轮结束-文字识别" - }, - "recognition": "OCR", - "expected": [ - "少侠已经捉完1轮鬼，是否继续捉鬼？" - ], - "roi": [ - 401, - 254, - 475, - 214 - ], - "next": [ - "日常抓鬼-第二轮" - ] - }, - "日常抓鬼-第二轮": { - "recognition": "OCR", - "expected": [ - "确定" - ], - "roi": [ - 401, - 254, - 475, - 214 - ], - "pre_delay": 500, - "action": "Click", - "post_delay": 4000, - "next": [ - "日常抓鬼-第二轮-抓鬼任务", - "[JumpBack]队伍-退出组队界面" - ] - }, - "日常抓鬼-第二轮-抓鬼任务": { - "recognition": "OCR", - "expected": [ - "捉鬼任务" - ], - "roi": [ - 925, - 73, - 312, - 482 - ], - "action": "Click", - "post_delay": 1000, - "next": [ - "日常抓鬼-第二轮-抓鬼任务-开始" - ] - }, - "日常抓鬼-第二轮-抓鬼任务-开始": { - "focus": { - "Node.Recognition.Succeeded": "日常抓鬼任务第二轮-开始" - }, - "recognition": "OCR", - "expected": [ - "捉鬼[(（]\\d*.\\d*[)）]", - "捉鬼(1/10)", - "捉鬼（1/10）", - "千年厉鬼" - ], - "roi": [ - 1032, - 165, - 247, - 300 - ], - "action": "Click", - "post_delay": 200, - "next": [ - "日常抓鬼-第二轮-抓鬼任务-结束", - "[JumpBack]自动寻路中-图片识别", - "[JumpBack]战斗中-等待100秒", - "[JumpBack]抓鬼-点击任务栏-通用" - ] - }, - "日常抓鬼-第二轮-抓鬼任务-结束": { - "focus": { - "Node.Recognition.Succeeded": "日常抓鬼任务第二轮-结束" - }, - "recognition": "TemplateMatch", - "template": [ - "zhuagui/zhuaguijiesu.png", - "zhuagui/zhuaguijiesu2.png" - ], - "roi": [ - 401, - 254, - 475, - 214 - ], - "next": [ - "panduan_zhujiemian" - ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/huoli.json b/assets/resource/base/pipeline/huoli.json index b41bb12..7339359 100644 --- a/assets/resource/base/pipeline/huoli.json +++ b/assets/resource/base/pipeline/huoli.json @@ -30,25 +30,7 @@ ] }, "人物界面-按键打开失败-点击图标": { - "recognition": "ColorMatch", - "upper": [ - 141, - 93, - 44 - ], - "lower": [ - 136, - 88, - 41 - ], - "roi": [ - 1181, - 3, - 99, - 99 - ], - "count": 400, - "pre_delay": 500, + "max_hit": 1, "action": "Click", "target": [ 1185, diff --git a/assets/resource/base/pipeline/mijing_renwu.json b/assets/resource/base/pipeline/mijing_renwu.json index 4e61025..b5b385a 100644 --- a/assets/resource/base/pipeline/mijing_renwu.json +++ b/assets/resource/base/pipeline/mijing_renwu.json @@ -210,21 +210,14 @@ "[JumpBack]战斗中-等待20秒" ] }, - "kk": { - "next": [ - "[JumpBack]秘境-点击进入战斗", - "[JumpBack]海底秘境-点击关卡", - "mijing_tongguan", - "mijing_shibai", - "[JumpBack]战斗中-等待20秒" - ] - }, "海底秘境-指定关卡结束任务": { "focus": { "Node.Recognition.Succeeded": "{name}" }, "recognition": "OCR", - "expected": [], + "expected": [ + "第25关" + ], "roi": [ 1014, 209, @@ -255,6 +248,60 @@ ] }, "秘境-点击进入战斗": { + "recognition": "OCR", + "expected": [ + "进入战斗" + ], + "roi": [ + 939, + 366, + 285, + 63 + ], + "action": "Click", + "target": [ + 1039, + 235, + 79, + 35 + ], + "next": [ + "秘境-点击进入战斗前重新确认关卡数", + "秘境-实际点击进入战斗1" + ] + }, + "秘境-点击进入战斗前重新确认关卡数": { + "focus": { + "Node.Recognition.Succeeded": "{name}" + }, + "recognition": "OCR", + "expected": [ + "第25关" + ], + "roi": [ + 1014, + 209, + 101, + 109 + ] + }, + "秘境-实际点击进入战斗1": { + "recognition": "OCR", + "expected": [ + "第\\d*关" + ], + "roi": [ + 1014, + 209, + 101, + 109 + ], + "action": "Click", + "next": [ + "秘境-实际点击进入战斗2" + ] + }, + "秘境-实际点击进入战斗2": { "recognition": "OCR", "expected": [ "进入战斗" diff --git a/assets/resource/base/pipeline/my_task.json b/assets/resource/base/pipeline/my_task.json index 73eb00b..f040370 100644 --- a/assets/resource/base/pipeline/my_task.json +++ b/assets/resource/base/pipeline/my_task.json @@ -87,9 +87,29 @@ "next": [ "[JumpBack]amazing_discount", "[JumpBack]panduan_zhujiemian_ks", + "[JumpBack]close_exit_confirm", "zai_zhujiemian" ] }, + "close_exit_confirm": { + "recognition": "TemplateMatch", + "template": [ + "zonghe/exit_confirm.png" + ], + "roi": [ + 246, + 398, + 791, + 200 + ], + "green_mask": true, + "action": "ClickKey", + "post_wait_freezes": 200, + "key": [ + 4 + ], + "post_delay": 500 + }, "amazing_discount": { "recognition": "TemplateMatch", "template": [ @@ -138,7 +158,7 @@ ], "pre_delay": 1000, "action": "ClickKey", - "post_wait_freezes": 100, + "post_wait_freezes": 200, "key": [ 4 ], diff --git a/assets/resource/base/pipeline/start.json b/assets/resource/base/pipeline/start.json index d038010..4a0ae7d 100644 --- a/assets/resource/base/pipeline/start.json +++ b/assets/resource/base/pipeline/start.json @@ -11,10 +11,47 @@ "next": [ "主界面", "点击登录游戏", + "[JumpBack]更新客户端", "[JumpBack]正在下载本周更新", "[JumpBack]登录等待10秒" ] }, + "更新客户端": { + "recognition": "Or", + "any_of": [ + { + "recognition": "TemplateMatch", + "template": [ + "zhanghao/require_update.png" + ], + "roi": [ + 188, + 69, + 899, + 343 + ] + }, + { + "recognition": "OCR", + "expected": [ + "关闭" + ], + "roi": [ + 431, + 485, + 200, + 79 + ] + } + ], + "action": "Click", + "target": [ + 494, + 512, + 75, + 30 + ] + }, "正在下载本周更新": { "recognition": "OCR", "expected": [ diff --git a/assets/resource/base/pipeline/zhuoguirenwu.json b/assets/resource/base/pipeline/zhuoguirenwu.json index 2ef5c54..296798b 100644 --- a/assets/resource/base/pipeline/zhuoguirenwu.json +++ b/assets/resource/base/pipeline/zhuoguirenwu.json @@ -470,15 +470,14 @@ } }, "抓鬼轮次计算-max": { - "max_hit": 2, + "max_hit": 1, "next": [ "钟馗-捉鬼任务-循环", "[JumpBack]任务栏切换为任务", "[JumpBack]抓鬼-关闭组队后打开小地图" ] }, - "抓鬼轮次计算-max-结束": { - "max_hit": 1, + "捉鬼-结束": { "next": [ "panduan_zhujiemian" ] @@ -683,5 +682,139 @@ -4, -8 ] + }, + "捉鬼-fuben桥接": { + "max_hit": 1, + "next": [ + "识别位置-长安城-抓鬼-过渡" + ] + }, + "抓鬼不足五人-图片识别": { + "recognition": "TemplateMatch", + "template": [ + "zhuagui/buzu5ren.png" + ], + "roi": [ + 384, + 224, + 502, + 280 + ], + "next": [ + "抓鬼不足五人-点击取消" + ] + }, + "抓鬼不足五人-点击取消": { + "recognition": "OCR", + "expected": [ + "取消" + ], + "roi": "抓鬼不足五人-图片识别", + "pre_delay": 1000, + "action": "Click", + "post_delay": 1500, + "next": [ + "抓鬼不足五人-点击钟馗" + ] + }, + "抓鬼不足五人-点击钟馗": { + "recognition": "Or", + "any_of": [ + { + "recognition": "TemplateMatch", + "template": [ + "zhuagui/zhongkui.png" + ], + "roi": [ + 294, + 102, + 583, + 386 + ] + }, + { + "recognition": "OCR", + "expected": [ + "钟馗", + "钟道", + "钟", + "道" + ], + "roi": [ + 186, + 157, + 853, + 426 + ] + } + ], + "pre_delay": 1000, + "action": "Click", + "post_delay": 1500, + "target_offset": [ + 0, + 0, + -4, + -8 + ], + "next": [ + "抓鬼不足五人-捉鬼任务" + ] + }, + "抓鬼不足五人-捉鬼任务": { + "recognition": "OCR", + "expected": [ + "捉鬼任务" + ], + "roi": [ + 925, + 73, + 312, + 482 + ], + "action": "Click", + "post_delay": 2000 + }, + "抓鬼领取双倍弹窗": { + "recognition": "TemplateMatch", + "template": [ + "zhuagui/zhuagui_shuangbei.png" + ], + "roi": [ + 402, + 263, + 475, + 196 + ], + "pre_delay": 1000, + "next": [ + "抓鬼关闭领取双倍弹窗-点击确定" + ] + }, + "抓鬼关闭领取双倍弹窗-点击确定": { + "recognition": "OCR", + "expected": [ + "确定" + ], + "roi": "抓鬼领取双倍弹窗", + "pre_delay": 500, + "action": "Click", + "post_delay": 1500 + }, + "抓鬼-点击任务栏-通用": { + "recognition": "OCR", + "expected": [ + "捉鬼[(（]\\d*/\\d*[)）]", + "捉拿.*鬼", + "千年厉鬼" + ], + "roi": [ + 1032, + 165, + 247, + 300 + ], + "pre_delay": 1000, + "action": "Click" } } \ No newline at end of file diff --git a/assets/resource/mac/pipeline/ClickkeyChangeClick.json b/assets/resource/mac/pipeline/ClickkeyChangeClick.json index eb38452..943fc01 100644 --- a/assets/resource/mac/pipeline/ClickkeyChangeClick.json +++ b/assets/resource/mac/pipeline/ClickkeyChangeClick.json @@ -313,29 +313,6 @@ "[JumpBack]队伍界面-按键打开失败-点击队伍图标" ] }, - "日常抓鬼-第一轮": { - "recognition": "TemplateMatch", - "template": [ - "zonghe/xiaoditu_taiyang.png", - "zonghe/xiaoditu_yueliang.png" - ], - "roi": [ - 58, - 1, - 75, - 79 - ], - "threshold": [ - 0.9 - ], - "pre_delay": 500, - "action": "Click", - "post_delay": 1000, - "next": [ - "日常抓鬼-点击钟馗", - "[JumpBack]小地图-按键打开失败-点击小地图图标" - ] - }, "115打开小地图_百晓仙子": { "recognition": "TemplateMatch", "template": [