diff --git a/assets/interface.json b/assets/interface.json index 24f54c26..ff7f8cef 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -59,14 +59,14 @@ "狩猎场", "圣石洞穴属性" ], - "description": "消耗每日免费米饭与火把,依次扫荡冒险航线·狩猎场、圣石洞穴。
注意:请确认目标狩猎场已通关,且冒险航线「哥布林遗迹」已完成。" + "description": "消耗每日免费米饭与火把,依次扫荡冒险航线·狩猎场、圣石洞穴。
注意:请确认目标狩猎场已通关,且冒险航线<哥布林遗迹>已完成。" }, { "name": "[执行]地图采集[单章]", "entry": "Collect_StartGame_HomePage_OnlyOnce", "controller": ["Adb"], "default_check": true, - "description": "「地图采集[完整]」的单卡带模式,满足日常任务所需即停止。", + "description": "<地图采集[完整]>的单卡带模式,满足日常任务所需即停止。", "option": [ "采集卡带屏蔽", "第三图采集额外等待" @@ -77,7 +77,7 @@ "entry": "Equip_HomePage", "controller": ["Adb"], "default_check": true, - "description": "依次执行:N稀有短剑打造强化分解精炼
精炼仅以 SR 或 UR 稀有度装备为对象;首次运行无需提前锁定装备,非正常锁定的装备可能导致流程失败。
组合技:同时启用「精炼等级上限过滤」与「精炼排序」,可构造低等级优先强化队列——当前首位装备超出等级限制后,自动推进到下一优先装备。", + "description": "依次执行:N稀有短剑打造强化分解精炼
精炼仅以 SR 或 UR 稀有度装备为对象;首次运行无需提前锁定装备,非正常锁定的装备可能导致流程失败。
组合技:同时启用<精炼等级上限过滤>与<精炼排序>,可构造低等级优先强化队列——当前首位装备超出等级限制后,自动推进到下一优先装备。", "option": [ "精炼装备阶级", "仅精炼<17 或 <10", @@ -93,7 +93,7 @@ "option": [ "一键速抽" ], - "description": "白嫖抽卡:每日免费一次的角色专属装备抽取。

关闭「一键速抽」后,可启用保底留存、90钻付费抽等高级功能。

付费钻是危险功能
务必仔细确认,平时常闭。脚本协议不承担其使用责任!
打开此总开关,则是你知晓并自行承担相关风险的意思表示!


" + "description": "白嫖抽卡:每日免费一次的角色专属装备抽取。

关闭<一键速抽>后,可启用保底留存、90钻付费抽等高级功能。

付费钻是危险功能
务必仔细确认,平时常闭。脚本协议不承担其使用责任!
打开此总开关,则是你知晓并自行承担相关风险的意思表示!


" }, { "name": "[执行]竞技场", @@ -349,7 +349,7 @@ ] }, "狩猎场": { - "description": "是否扫荡狩猎场。
关闭时跳过;若同时选了「优先双倍」但当日无双倍图,仍会补打狩猎场。", + "description": "是否扫荡狩猎场。
关闭时跳过;若同时选了<优先双倍>但当日无双倍图,仍会补打狩猎场。", "type": "switch", "cases": [ { @@ -757,7 +757,7 @@ }, "仅精炼<17 或 <10": { "label": "精炼等级上限过滤", - "description": "仅对精炼等级低于阈值的装备执行精炼,等级达标的跳过。
配合「精炼排序」可实现按优先级逐步推进的强化队列。", + "description": "仅对精炼等级低于阈值的装备执行精炼,等级达标的跳过。
配合<精炼排序>可实现按优先级逐步推进的强化队列。", "cases": [ { "name": "关闭" @@ -853,7 +853,7 @@ "一键速抽": { "type": "switch", "label": "一键速抽(启用将禁用高级功能)", - "description": "利用「所有免费抽抽乐」一键完成全部免费抽。
开:快捷但禁用保底留存与90钻付费抽。
关:启用高级抽卡流程,子项可见。", + "description": "利用<所有免费抽抽乐>一键完成全部免费抽。
开:快捷但禁用保底留存与90钻付费抽。
关:启用高级抽卡流程,子项可见。", "cases": [ { "name": "Yes", @@ -881,7 +881,7 @@ ] }, "高级抽卡-按需|强制": { - "description": "关:默认流程检测到问题时自动启用。
开:从头调用高级抽卡流程,可配合「5星必出保留」使用。", + "description": "关:默认流程检测到问题时自动启用。
开:从头调用高级抽卡流程,可配合<5星必出保留>使用。", "type": "switch", "cases": [ { diff --git a/assets/resource/base/pipeline/Arbitrage.json b/assets/resource/base/pipeline/Arbitrage.json index 4731d107..442b4136 100644 --- a/assets/resource/base/pipeline/Arbitrage.json +++ b/assets/resource/base/pipeline/Arbitrage.json @@ -2588,14 +2588,14 @@ "desc": "确认出售子菜单已弹出", "recognition": "Or", "any_of": [ - "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01", - "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "next": [ "Arbitrage_Sell_Item_Number" ] }, - "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01": { + "Rec__Ocr_01": { "recognition": "OCR", "roi": [ 810, @@ -2607,7 +2607,7 @@ "出售" ] }, - "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02": { + "Rec__Ocr_02": { "recognition": "OCR", "roi": [ 264, @@ -2823,7 +2823,7 @@ "Shop/cook_Sparkling Griddle Shrimp.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -2851,7 +2851,7 @@ "Shop/cook_Transparent Salad.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -2879,7 +2879,7 @@ "Shop/cook_Hellfire Gimbap.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -2938,7 +2938,7 @@ "Shop/cook_Lugas Ginseng Skewer.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -2966,7 +2966,7 @@ "Shop/cook_Coal Cookies.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -2993,7 +2993,7 @@ "Shop/cook_Honey Butter Almonds.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3020,7 +3020,7 @@ "Shop/cook_Mayo Triangle Rice Ball.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3047,7 +3047,7 @@ "Shop/cook_Caviar Omurice.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3074,7 +3074,7 @@ "Shop/cook_Fried Salmon Bento.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3101,7 +3101,7 @@ "Shop/cook_Sangria.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3128,7 +3128,7 @@ "Shop/cook_Honey Baked Apple.png" ] }, - "Sub_「Arbitrage_Cooking」_Clr" + "Sub__Clr" ], "action": "Click", "post_delay": 1000, @@ -3137,7 +3137,7 @@ ], "focus": "Arb.料理制作:[1级]烤蜂蜜苹果" }, - "Sub_「Arbitrage_Cooking」_Clr": { + "Sub__Clr": { "recognition": "ColorMatch", "roi": "Templateroi", "method": 40, diff --git a/assets/resource/base/pipeline/AutoBattle.json b/assets/resource/base/pipeline/AutoBattle.json index 8bdf1e92..ad021930 100644 --- a/assets/resource/base/pipeline/AutoBattle.json +++ b/assets/resource/base/pipeline/AutoBattle.json @@ -14,8 +14,8 @@ "AutoBattle_Is_Auto": { "recognition": "Or", "any_of": [ - "Rec_「AutoBattle_Is_Auto」_Ocr_01", - "Rec_「AutoBattle_Is_Auto」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "post_delay": 5000, "next": [ @@ -24,7 +24,7 @@ "AutoBattle_Is_Auto" ] }, - "Rec_「AutoBattle_Is_Auto」_Ocr_01": { + "Rec__Ocr_01": { "desc": "[识别]自动战斗判定,位置1-右下", "recognition": "OCR", "roi": [ @@ -36,7 +36,7 @@ "expected": ["自动战斗中"], "only_rec": true }, - "Rec_「AutoBattle_Is_Auto」_Ocr_02": { + "Rec__Ocr_02": { "desc": "[识别]自动战斗判定,位置2-左下", "recognition": "OCR", "roi": [ @@ -51,12 +51,12 @@ "desc": "当前在非自动战斗界面", "recognition": "Or", "any_of": [ - "Rec_「AutoBattle_TabTo_Auto」_Ocr_01", - "Rec_「AutoBattle_TabTo_Auto」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "next": ["AutoBattle_ClickAutoButt"] }, - "Rec_「AutoBattle_TabTo_Auto」_Ocr_01": { + "Rec__Ocr_01": { "desc": "[识别]手动战斗界面,位置01", "recognition": "OCR", "roi": [ @@ -68,7 +68,7 @@ "expected": ["BATTLE"], "only_rec": true }, - "Rec_「AutoBattle_TabTo_Auto」_Ocr_02": { + "Rec__Ocr_02": { "desc": "[识别]手动战斗界面,位置02", "recognition": "OCR", "roi": [ diff --git a/assets/resource/base/pipeline/Collect_TeleportRecall.json b/assets/resource/base/pipeline/Collect_TeleportRecall.json index 637889af..5afea159 100644 --- a/assets/resource/base/pipeline/Collect_TeleportRecall.json +++ b/assets/resource/base/pipeline/Collect_TeleportRecall.json @@ -112,7 +112,7 @@ ] } }, - "Rec_「Collect_TeleportRecall_Skill」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -122,7 +122,7 @@ ], "focus": "CRT.传送阵技能已放置" }, - "Rec_「Collect_TeleportRecall_Skill」_Tpl": { + "Rec__Tpl": { "desc": "[识别]'传送'技能存在", "recognition": "TemplateMatch", "roi": [ diff --git a/assets/resource/base/pipeline/Daily.json b/assets/resource/base/pipeline/Daily.json index 3bf2d04d..e13d5860 100644 --- a/assets/resource/base/pipeline/Daily.json +++ b/assets/resource/base/pipeline/Daily.json @@ -179,8 +179,8 @@ "max_hit": 10, "recognition": "Or", "any_of": [ - "Rec_「Daily_Busin_Claim」_Ocr", - "Rec_「Daily_Busin_Claim」_Tpl" + "Rec__Ocr", + "Rec__Tpl" ], "action": "Click", "target_offset": [ @@ -197,7 +197,7 @@ ], "focus": "GOM.餐馆结算(COR)-主界面" }, - "Rec_「Daily_Busin_Claim」_Ocr": { + "Rec__Ocr": { "desc": "主页,左侧按钮群-经管1", "recognition": "OCR", "roi": [ @@ -210,7 +210,7 @@ "经营管理" ] }, - "Rec_「Daily_Busin_Claim」_Tpl": { + "Rec__Tpl": { "desc": "主页,左侧按钮群-经管2", "recognition": "TemplateMatch", "roi": [ @@ -451,9 +451,9 @@ "Daily_Busin_DecorCoin_PickUp": { "recognition": "Or", "any_of": [ - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01", - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02", - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03" + "Rec__Tpl_01", + "Rec__Tpl_02", + "Rec__Tpl_03" ], "action": "Click", "post_delay": 1500, @@ -468,7 +468,7 @@ ], "focus": "拾取装饰币" }, - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01": { + "Rec__Tpl_01": { "desc": "装饰币探查区域01-中央", "recognition": "TemplateMatch", "roi": [ @@ -480,7 +480,7 @@ "template": "UI_BusinCoin.png", "green_mask": true }, - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02": { + "Rec__Tpl_02": { "desc": "装饰币探查区域02-下方", "recognition": "TemplateMatch", "roi": [ @@ -492,7 +492,7 @@ "template": "UI_BusinCoin.png", "green_mask": true }, - "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03": { + "Rec__Tpl_03": { "desc": "装饰币探查区域03-左侧", "recognition": "TemplateMatch", "roi": [ diff --git a/assets/resource/base/pipeline/Equip.json b/assets/resource/base/pipeline/Equip.json index d1ba3c89..761e1db6 100644 --- a/assets/resource/base/pipeline/Equip.json +++ b/assets/resource/base/pipeline/Equip.json @@ -1102,15 +1102,15 @@ "desc": "看看专武是不是已经点过了? ,强制<17| 说明在正确筛选情况下仍有无法精炼装备,系+24的制作&专武", "recognition": "Or", "any_of": [ - "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_01", - "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_02" + "Rec__Clr_01", + "Rec__Clr_02" ], "next": [ "Equip_Overdrive_RefLvMax_Forwarding" ], "focus": "EBO.神人发现,佬你好( • ̀ω•́ )✧" }, - "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_01": { + "Rec__Clr_01": { "desc": "装备筛选sub,分类:'专用'", "recognition": "ColorMatch", "roi": [ @@ -1132,7 +1132,7 @@ ], "count": 10 }, - "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_02": { + "Rec__Clr_02": { "desc": "装备筛选sub,分类:'制作'", "recognition": "ColorMatch", "roi": [ @@ -1290,8 +1290,8 @@ "desc": "发现背包满了,点击进入背包", "recognition": "Or", "any_of": [ - "Rec_「Equip_Backpack_Full」_Ocr_01", - "Rec_「Equip_Backpack_Full」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "action": "Click", "target_offset": [ @@ -1307,7 +1307,7 @@ "Equip_Backpack_Full" ] }, - "Rec_「Equip_Backpack_Full」_Ocr_01": { + "Rec__Ocr_01": { "desc": "箱庭右上显示背包满", "recognition": "OCR", "roi": [ @@ -1321,7 +1321,7 @@ ], "only_rec": true }, - "Rec_「Equip_Backpack_Full」_Ocr_02": { + "Rec__Ocr_02": { "desc": "主页左下显示背包满", "recognition": "OCR", "roi": [ diff --git a/assets/resource/base/pipeline/EventBattle.json b/assets/resource/base/pipeline/EventBattle.json index e4bc81f4..2ce323fe 100644 --- a/assets/resource/base/pipeline/EventBattle.json +++ b/assets/resource/base/pipeline/EventBattle.json @@ -27,8 +27,8 @@ "desc": "在赛季活动页面.兼做任务选择器", "recognition": "Or", "any_of": [ - "Rec_「Event_Event_Main」_Ocr_01", - "Rec_「Event_Event_Main」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "timeout": 1000, "next": [ @@ -40,7 +40,7 @@ ], "focus": "EM.赛季活动进入确认." }, - "Rec_「Event_Event_Main」_Ocr_01": { + "Rec__Ocr_01": { "desc": "赛季主页判定,右上代币加成服装", "recognition": "OCR", "roi": [ @@ -53,7 +53,7 @@ "活动服装" ] }, - "Rec_「Event_Event_Main」_Ocr_02": { + "Rec__Ocr_02": { "desc": "赛季主页判定,特殊按钮", "recognition": "OCR", "roi": [ @@ -711,8 +711,8 @@ "desc": "演习魔兽,结束", "recognition": "Or", "any_of": [ - "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_01", - "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_02" + "Rec__Ocr_01", + "Rec__Ocr_02" ], "next": [ "SeasonEvent_Main_Return", @@ -720,7 +720,7 @@ ], "focus": "E.当前魔兽为演习,退出" }, - "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_01": { + "Rec__Ocr_01": { "desc": "魔兽尚未开放判定,位置1", "recognition": "OCR", "roi": [ @@ -732,7 +732,7 @@ "expected": ["距离开始还"], "only_rec": true }, - "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_02": { + "Rec__Ocr_02": { "desc": "魔兽尚未开放判定,位置2", "recognition": "OCR", "roi": [ @@ -868,7 +868,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Sub_Ocr", "recognition": "OCR", "roi": [ 842, @@ -897,7 +896,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Sub_Ocr", "recognition": "OCR", "roi": [ 842, @@ -1053,10 +1051,19 @@ "action": "Click", "post_delay": 2000, "next": [ - "Even_MamonoFollowUp_onSubMain", + "Even_MamonoFollowUp_QuickBattle_PostVerify", "Even_MamonoFollowUp_QuickBattle_ck" ] }, + "Even_MamonoFollowUp_QuickBattle_PostVerify": { + "recognition": "And", + "all_of": ["Even_MamonoFollowUp_onSubMain"], + "next": [ + "SeasonEvent_MamonoFollow_HP_Hunting", + "[JumpBack]SeasonEvent_MamonoFollow_HP_Hunted", + "[JumpBack]SeasonEvent_MamonoFollow_HP_NoMeetHunt" + ] + }, "Even_MamonoFollowUp_onSubMain": { "desc": "结束,判定处于子菜单", "recognition": "OCR", @@ -1195,21 +1202,22 @@ "count": 20 }, "SeasonEvent_MiniGame_Start": { - "desc": "小活动入口,先寻找赛季内的'战场探索'.", + "desc": "小活动入口,先寻找赛季内的'战场探索'.| JB会返回,需要插入中断维持环境,否则可能超时", "recognition": "And", "all_of": ["Event_Event_Main"], "anchor": {"MiniGame_Return": "Event_MiniGame_SubToMain"}, "next": [ "Event_MiniGame", "SeasonEvent_MiniGame_BackToMain", - "[JumpBack]Global_BackPageHub_Once" + "[JumpBack]Global_BackPageHub_Once", + "[JumpBack]Global_WaitingForLoading" ] }, "SeasonEvent_MiniGame_BackToMain": { "desc": "小活动入口,其次返回主界面,查找主页的'小活动'入口", "recognition": "And", "all_of": ["Event_GoinEvent"], - "timeout": 4000, + "timeout": 2000, "next": [ "Event_Goin_MiniGame", "[JumpBack]Global_WaitingForLoading" @@ -1218,7 +1226,8 @@ "Global_ToHomePage", "Global_Null_Exception", "Global_Null_Panic" - ] + ], + "focus": "尝试查找小活动" }, "Event_Goin_MiniGame": { "recognition": "OCR", @@ -1242,7 +1251,8 @@ "post_delay": 2000, "next": [ "Event_MiniGame" - ] + ], + "focus": "发现小活动,进入" }, "Event_MiniGame": { "desc": "战场探索", diff --git a/assets/resource/base/pipeline/GACHA.json b/assets/resource/base/pipeline/GACHA.json index 72797c28..05ff767a 100644 --- a/assets/resource/base/pipeline/GACHA.json +++ b/assets/resource/base/pipeline/GACHA.json @@ -196,15 +196,15 @@ "desc": "抽卡结果页,大概", "recognition": "Or", "any_of": [ - "Rec_「Gacha_Quick_Briefing」_Tmp", - "Rec_「Gacha_Quick_Briefing」_Ocr" + "Rec__Tmp", + "Rec__Ocr" ], "next": [ "Gacha_Quick_End", "[JumpBack]Global_BackPageHub_Once" ] }, - "Rec_「Gacha_Quick_Briefing」_Tmp": { + "Rec__Tmp": { "desc": "[识别]抽卡结果页,位置01-图案", "recognition": "TemplateMatch", "roi": [ @@ -215,7 +215,7 @@ ], "template": ["Gacha_Briefing.png"] }, - "Rec_「Gacha_Quick_Briefing」_Ocr": { + "Rec__Ocr": { "desc": "[识别]抽卡结果页,位置02-正则", "recognition": "OCR", "roi": [ @@ -268,8 +268,8 @@ "Gacha_FindFreeGacha_GotoADV": { "recognition": "Or", "any_of": [ - "Rec_「GachaADV_Special_ReservedRights」_Ocr", - "Rec_「GachaADV_Special_ReservedRights」_Tpl" + "Rec__Ocr", + "Rec__Tpl" ], "next": [ "GachaADV_Start" diff --git a/assets/resource/base/pipeline/GACHA_ADV.json b/assets/resource/base/pipeline/GACHA_ADV.json index 1daa4729..f45b7e8c 100644 --- a/assets/resource/base/pipeline/GACHA_ADV.json +++ b/assets/resource/base/pipeline/GACHA_ADV.json @@ -1108,15 +1108,15 @@ "desc": "中断发现点数超过200但用户决定保留的情况", "recognition": "Or", "any_of": [ - "Rec_「GachaADV_Special_ReservedRights」_Ocr", - "Rec_「GachaADV_Special_ReservedRights」_Tpl" + "Rec__Ocr", + "Rec__Tpl" ], "next": [ "[Anchor]GachaADV_NextPool" ], "focus": "GAB.[INT]卡池内存在可兑换Up角色机会" }, - "Rec_「GachaADV_Special_ReservedRights」_Ocr": { + "Rec__Ocr": { "desc": "将要触发抽抽乐200保底识别器01,", "recognition": "OCR", "roi": [ @@ -1130,7 +1130,7 @@ ], "only_rec": true }, - "Rec_「GachaADV_Special_ReservedRights」_Tpl": { + "Rec__Tpl": { "desc": "将要触发抽抽乐200保底识别器02,", "recognition": "TemplateMatch", "roi": [ diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index dd5954fa..f9a78b5b 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -409,17 +409,17 @@ "desc": "循环等待转场页面", "recognition": "Or", "any_of": [ - "Rec_「Global_WaitingForLoading」_01", - "Rec_「Global_WaitingForLoading」_02", - "Rec_「Global_WaitingForLoading」_03", - "Rec_「Global_WaitingForLoading」_04", - "Rec_「Global_WaitingForLoading」_05", - "Rec_「Global_WaitingForLoading」_06" + "Rec__01", + "Rec__02", + "Rec__03", + "Rec__04", + "Rec__05", + "Rec__06" ], "post_delay": 5000, "focus": "GO.等待卡带or转场载入" }, - "Rec_「Global_WaitingForLoading」_01": { + "Rec__01": { "desc": "[识别]转场等待01,右下的UT", "recognition": "TemplateMatch", "roi": [ @@ -431,7 +431,7 @@ "template": "UI_loading_Tr.png", "green_mask": true }, - "Rec_「Global_WaitingForLoading」_02": { + "Rec__02": { "desc": "[识别]转场等待02,右下的进度圈", "recognition": "TemplateMatch", "roi": [ @@ -447,7 +447,7 @@ ], "green_mask": true }, - "Rec_「Global_WaitingForLoading」_03": { + "Rec__03": { "desc": "[识别]转场等待03,中央名称", "recognition": "TemplateMatch", "roi": [ @@ -458,7 +458,7 @@ ], "template": "UI_loading_black.png" }, - "Rec_「Global_WaitingForLoading」_04": { + "Rec__04": { "desc": "[识别]转场等待03,右下0%", "recognition": "OCR", "roi": [ @@ -470,7 +470,7 @@ "expected": "0%", "only_rec": true }, - "Rec_「Global_WaitingForLoading」_05": { + "Rec__05": { "desc": "[识别]转场等待03,大色块-黑", "recognition": "ColorMatch", "roi": [ @@ -493,7 +493,7 @@ "connected": true, "count": 102200 }, - "Rec_「Global_WaitingForLoading」_06": { + "Rec__06": { "desc": "[识别]转场等待03,大色块-白", "recognition": "ColorMatch", "roi": [ @@ -786,10 +786,10 @@ "desc": "[识别]箱庭,pin按钮的UI", "recognition": "TemplateMatch", "roi": [ - 1122, - 646, - 40, - 38 + 1117, + 639, + 53, + 51 ], "template": [ "pin.png" diff --git a/assets/resource/base/pipeline/Pass.json b/assets/resource/base/pipeline/Pass.json index c7cbc195..6232888c 100644 --- a/assets/resource/base/pipeline/Pass.json +++ b/assets/resource/base/pipeline/Pass.json @@ -80,8 +80,8 @@ "desc": "确认通行证页面,选择通行证任务", "recognition": "Or", "any_of": [ - "Rec_「Pass_SelectPassTask」_Ocr01", - "Rec_「Pass_SelectPassTask」_Ocr02" + "Rec__Ocr01", + "Rec__Ocr02" ], "action": "Click", "target": [ @@ -91,7 +91,7 @@ "post_delay": 1500, "focus": "任务子项页色核检查" }, - "Rec_「Pass_SelectPassTask」_Ocr01": { + "Rec__Ocr01": { "desc": "[识别]通行证页面,位置01", "recognition": "OCR", "roi": [ @@ -105,7 +105,7 @@ ], "only_rec": true }, - "Rec_「Pass_SelectPassTask」_Ocr02": { + "Rec__Ocr02": { "desc": "[识别]通行证页面,位置02", "recognition": "OCR", "roi": [ diff --git a/assets/resource/base/pipeline/Setup.json b/assets/resource/base/pipeline/Setup.json index 47981ca6..10eca6c9 100644 --- a/assets/resource/base/pipeline/Setup.json +++ b/assets/resource/base/pipeline/Setup.json @@ -51,7 +51,7 @@ ] } }, - "Rec_「Setup_Entry1_Swich」_Tpl" + "Rec__Tpl" ], "timeout": 3000, "next": [ @@ -59,7 +59,7 @@ ], "focus": "SMSP.触发设置按需调整,原因:移动方式不应为方向键" }, - "Rec_「Setup_Entry1_Swich」_Tpl": { + "Rec__Tpl": { "desc": "[识别]方向键存在", "recognition": "TemplateMatch", "roi": [ @@ -306,7 +306,7 @@ ] } }, - "Rec_「Setup_SkillScan_Skill1」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -319,7 +319,7 @@ ], "focus": "Set.检测技能1,通过" }, - "Rec_「Setup_SkillScan_Skill1」_Tpl": { + "Rec__Tpl": { "desc": "[识别]探查技能存在", "recognition": "TemplateMatch", "roi": [ @@ -387,7 +387,7 @@ ] } }, - "Rec_「Setup_SkillScan_Skill2」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -402,7 +402,7 @@ ], "focus": "Set.检测技能2,通过" }, - "Rec_「Setup_SkillScan_Skill2」_Tpl": { + "Rec__Tpl": { "desc": "[识别]'吸取'技能存在", "recognition": "TemplateMatch", "roi": [ @@ -470,7 +470,7 @@ ] } }, - "Rec_「Setup_SkillScan_Skill3」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -485,7 +485,7 @@ ], "focus": "Set.检测技能3,通过" }, - "Rec_「Setup_SkillScan_Skill3」_Tpl": { + "Rec__Tpl": { "desc": "[识别]'召集'技能存在", "recognition": "TemplateMatch", "roi": [ @@ -553,7 +553,7 @@ ] } }, - "Rec_「Setup_SkillScan_Skill5」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -568,7 +568,7 @@ ], "focus": "Set.检测技能5,通过" }, - "Rec_「Setup_SkillScan_Skill5」_Tpl": { + "Rec__Tpl": { "desc": "[识别]'锻造'技能存在", "recognition": "TemplateMatch", "roi": [ @@ -636,7 +636,7 @@ ] } }, - "Rec_「Collect_TeleportRecall_Skill」_Tpl" + "Rec__Tpl" ], "timeout": 8000, "rate_limit": 2000, diff --git a/assets/resource/base/pipeline/Weekly.json b/assets/resource/base/pipeline/Weekly.json index d255eb3b..a01d14c2 100644 --- a/assets/resource/base/pipeline/Weekly.json +++ b/assets/resource/base/pipeline/Weekly.json @@ -440,8 +440,8 @@ "Weekly_VisitCabin_GoIn": { "recognition": "Or", "any_of": [ - "Rec_「Weekly_VisitCabin_GoIn」_Tpl", - "Rec_「Weekly_VisitCabin_GoIn」_Ocr" + "Rec__Tpl", + "Rec__Ocr" ], "action": "Click", "target_offset": [ @@ -458,7 +458,7 @@ ], "focus": "WVM.点击我的小屋" }, - "Rec_「Weekly_VisitCabin_GoIn」_Tpl": { + "Rec__Tpl": { "desc": "[识别]主页,我的小屋", "recognition": "TemplateMatch", "roi": [ @@ -472,7 +472,7 @@ ], "green_mask": true }, - "Rec_「Weekly_VisitCabin_GoIn」_Ocr": { + "Rec__Ocr": { "desc": "[识别]主页,我的小屋", "recognition": "OCR", "roi": [