From 1f5081b5f50b8e081b144a0ea11523c0f29cd67c Mon Sep 17 00:00:00 2001 From: sunyink Date: Mon, 11 May 2026 17:53:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?chore:=20ignore=E6=94=AF=E6=8F=B4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0MaaOWM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 91614228..793109d6 100644 --- a/.gitignore +++ b/.gitignore @@ -478,3 +478,7 @@ package.json prettier.config.mjs .claude/* + +# MaaOWM +**/.maaowm +**/__mod_extras__.json \ No newline at end of file From 48cf55c0c9078f65fb14b24beec7bb9ea0d122c0 Mon Sep 17 00:00:00 2001 From: KalimiaChen <531341547@qq.com> Date: Sun, 10 May 2026 17:31:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?chore:=E6=B7=BB=E5=8A=A0macOS=20.DS=5FSto?= =?UTF-8?q?re=E5=88=B0gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 (cherry picked from commit 38f058cc2e254c7af7ae9f016aa3b554c36ebde9) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 793109d6..1def42b3 100644 --- a/.gitignore +++ b/.gitignore @@ -477,6 +477,10 @@ package-lock.json package.json prettier.config.mjs +# macOS +.DS_Store +**/.DS_Store + .claude/* # MaaOWM From 52e02ea83b8edcd652b40413a27ae2bc59a3f704 Mon Sep 17 00:00:00 2001 From: sunyink Date: Tue, 12 May 2026 19:57:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?refactor:=E5=B0=86=E5=8F=AF=E9=87=8D?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=86=85=E5=B5=8CSub=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8B=86=E5=88=86=E4=B8=BA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 命名规则: - Rec,可单独使用的识别. - Anc,需要先设定锚点.多用于二步走. - Sub,不能纯Sub使用,必须搭配Rec. --- assets/resource/base/pipeline/Activities.json | 35 +- assets/resource/base/pipeline/Arbitrage.json | 16 +- assets/resource/base/pipeline/AutoBattle.json | 3 +- .../base/pipeline/Collect_TeleportRecall.json | 81 +---- assets/resource/base/pipeline/Daily.json | 32 +- assets/resource/base/pipeline/Equip.json | 32 +- .../resource/base/pipeline/EventBattle.json | 29 +- assets/resource/base/pipeline/GACHA.json | 16 +- assets/resource/base/pipeline/GACHA_ADV.json | 48 +-- assets/resource/base/pipeline/Global.json | 340 ++++++++---------- assets/resource/base/pipeline/Mail.json | 16 +- assets/resource/base/pipeline/PVP.json | 20 +- assets/resource/base/pipeline/Pass.json | 16 +- assets/resource/base/pipeline/QuestList.json | 3 +- assets/resource/base/pipeline/Redemption.json | 27 +- assets/resource/base/pipeline/SemiAuto.json | 16 +- assets/resource/base/pipeline/Setup.json | 32 +- assets/resource/base/pipeline/Weekly.json | 48 +-- 18 files changed, 218 insertions(+), 592 deletions(-) diff --git a/assets/resource/base/pipeline/Activities.json b/assets/resource/base/pipeline/Activities.json index 829a0e64..40a097d4 100644 --- a/assets/resource/base/pipeline/Activities.json +++ b/assets/resource/base/pipeline/Activities.json @@ -10,20 +10,8 @@ "desc": "[通用复位]复位到主界面模块,开始,中继调用", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "Activities_InIndex", @@ -372,7 +360,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Sub_Ocr", "recognition": "OCR", "roi": [ 966, @@ -384,7 +371,7 @@ "旋转" ] }, - "Global_Ocr_Clr_Enable_Sub" + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 4000, @@ -561,20 +548,8 @@ "desc": "返回主页", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "Activities_InIndex", diff --git a/assets/resource/base/pipeline/Arbitrage.json b/assets/resource/base/pipeline/Arbitrage.json index 1212b337..dfc71034 100644 --- a/assets/resource/base/pipeline/Arbitrage.json +++ b/assets/resource/base/pipeline/Arbitrage.json @@ -15,20 +15,8 @@ "desc": "进入卡带界面", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/AutoBattle.json b/assets/resource/base/pipeline/AutoBattle.json index 87bdc4f8..e075fc6f 100644 --- a/assets/resource/base/pipeline/AutoBattle.json +++ b/assets/resource/base/pipeline/AutoBattle.json @@ -124,7 +124,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Sub_Ocr", "recognition": "OCR", "roi": [ 778, @@ -137,7 +136,7 @@ "挑战下一级" ] }, - "Global_Ocr_Clr_Enable_Sub" + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 2000, diff --git a/assets/resource/base/pipeline/Collect_TeleportRecall.json b/assets/resource/base/pipeline/Collect_TeleportRecall.json index 3f05e060..2d358b96 100644 --- a/assets/resource/base/pipeline/Collect_TeleportRecall.json +++ b/assets/resource/base/pipeline/Collect_TeleportRecall.json @@ -338,31 +338,8 @@ "desc": "点击左上地图", "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "action": "Click", "target": [ @@ -607,31 +584,8 @@ "desc": "[情况2]离得太近,识别失败.返回到箱庭,直接点击箱庭地图图标.", "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "next": [ "Collect_NviMap_SpeciaEveMap1#_Field1#" @@ -717,31 +671,8 @@ "Collect_NviMap_SpeciaEveMap2#_Sandplay": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "next": [ "Collect_NviMap_SpeciaEveMap1#_Field1#2#" diff --git a/assets/resource/base/pipeline/Daily.json b/assets/resource/base/pipeline/Daily.json index 9348e1f7..fab0b9a6 100644 --- a/assets/resource/base/pipeline/Daily.json +++ b/assets/resource/base/pipeline/Daily.json @@ -20,20 +20,8 @@ "desc": "识别左下抽抽乐", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "timeout": 5000, "next": [ @@ -178,20 +166,8 @@ "desc": "左下抽抽乐高亮存在", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "Daily_Busin_Claim" diff --git a/assets/resource/base/pipeline/Equip.json b/assets/resource/base/pipeline/Equip.json index 2a8435ec..2a64c981 100644 --- a/assets/resource/base/pipeline/Equip.json +++ b/assets/resource/base/pipeline/Equip.json @@ -34,34 +34,8 @@ "desc": "技能页3，色核识别.next遍历是防止放置其他技能;次节点每轮next判定", "recognition": "And", "all_of": [ - { - "sub_name": "Tap3_Temp", - "recognition": "TemplateMatch", - "roi": [ - 1179, - 639, - 50, - 52 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "ColorMatch", - "roi": "Tap3_Temp", - "lower": [ - 192, - 141, - 23 - ], - "upper": [ - 223, - 194, - 129 - ], - "count": 200 - } + "Rec_SandBox_Pin3_Tpl", + "Sub_SandBox_Pin3_Bright_Clr" ], "next": [ "[JumpBack]Setup_Entry5", @@ -407,7 +381,7 @@ ], "anchor": "SliderSwitchColor", "next": [ - "Global_SliderSwitch_To_On", + "Anc_SliderSwitch_Gry_TurnOn_Clr", "Equip_EquipUp_Action", "Equip_EquipUpSelect_Err" ] diff --git a/assets/resource/base/pipeline/EventBattle.json b/assets/resource/base/pipeline/EventBattle.json index 8344089e..f910242f 100644 --- a/assets/resource/base/pipeline/EventBattle.json +++ b/assets/resource/base/pipeline/EventBattle.json @@ -12,7 +12,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Main_OCR", "recognition": "OCR", "roi": [ 98, @@ -24,7 +23,7 @@ "抽抽乐" ] }, - "Global_Main_Clr" + "Rec_HomePage_GA_Clr" ], "action": "Click", "target": [ @@ -250,7 +249,7 @@ }, "Event_Battle_BattleStatus_Enable": { "recognition": "And", - "all_of": ["Global_Ocr_Clr_Enable"], + "all_of": ["Anc_Ocr_Enable_Clr"], "action": "Click", "post_delay": 1000, "next": [ @@ -318,13 +317,13 @@ }, "SeasonEvent_NormlBattle_Enable": { "recognition": "And", - "all_of": ["Global_Ocr_Clr_Enable"], + "all_of": ["Anc_Ocr_Enable_Clr"], "next": ["Event_Battle_TabAutoBattle"], "focus": "E.常规战斗-可用" }, "SeasonEvent_NormlBattle_Unable": { "recognition": "And", - "all_of": ["Global_Ocr_Clr_Unable"], + "all_of": ["Anc_Ocr_Unable_Clr"], "next": [ "SeasonEvent_BackedToSubMain", "[JumpBack]Global_BackPageHub_Once" @@ -399,7 +398,7 @@ ], "anchor": "SliderSwitchColor", "next": [ - "[JumpBack]Global_SliderSwitch_To_On", + "[JumpBack]Anc_SliderSwitch_Gry_TurnOn_Clr", "SeasonEvent_FreeAP_Verdict_Ispass", "SeasonEvent_FreeAP_Verdict_NOpass" ], @@ -414,7 +413,7 @@ "SeasonEvent_FreeAP_Verdict_Ispass": { "desc": "确保免费AP选中。现场为，如果无AP会无法点开二级确认菜单。似乎不用进一步适配滑块无法变黄情况？", "recognition": "And", - "all_of": ["Global_SliderSwitch_StateOn"], + "all_of": ["Anc_SliderSwitch_YewOn_Clr"], "next": [ "Event_NormalBattleMAX" ], @@ -422,7 +421,7 @@ }, "SeasonEvent_FreeAP_Verdict_NOpass": { "recognition": "And", - "all_of": ["Global_SliderSwitch_StateOff"], + "all_of": ["Anc_SliderSwitch_GryOff_Clr"], "next": [ "SeasonEvent_Main_Return", "[JumpBack]SeasonEvent_FreeAP_Err", @@ -882,7 +881,7 @@ ], "expected": ["快速战斗"] }, - "Global_Ocr_Clr_Enable_Sub" + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 2000, @@ -911,7 +910,7 @@ ], "expected": ["快速战斗"] }, - "Global_Ocr_Clr_Unable_Sub" + "Sub_Ocr_Unable_Clr" ], "timeout": 10000, "next": [ @@ -950,7 +949,7 @@ "SeasonEvent_MamonoFollow_NormalBattle_Enable": { "desc": "战斗亮色.(待增强:转场等待失效!用的是赛季标题的黑色页面)", "recognition": "And", - "all_of": ["Global_Ocr_Clr_Enable"], + "all_of": ["Anc_Ocr_Enable_Clr"], "action": "Click", "post_delay": 2000, "timeout": 40000, @@ -964,7 +963,7 @@ "SeasonEvent_MamonoFollow_NormalBattle_Unable": { "desc": "战斗灰色", "recognition": "And", - "all_of": ["Global_Ocr_Clr_Unable"], + "all_of": ["Anc_Ocr_Unable_Clr"], "next": ["SeasonEvent_MamonoFollow_Team_Troubleshoot"], "focus": "EM.MF.常规战斗-不可用" }, @@ -1289,7 +1288,7 @@ }, "Event_MiniGame_CLR_Enable": { "recognition": "And", - "all_of": ["Global_Ocr_Clr_Enable"], + "all_of": ["Anc_Ocr_Enable_Clr"], "action": "Click", "post_delay": 2000, "next": [ @@ -1300,7 +1299,7 @@ }, "Event_MiniGame_CLR_Unable": { "recognition": "And", - "all_of": ["Global_Ocr_Clr_Unable"], + "all_of": ["Anc_Ocr_Unable_Clr"], "timeout": 4000, "next": [ "[Anchor]MiniGame_Return" @@ -1367,7 +1366,7 @@ "Event_Battle_BattleStatus_Unable": { "recognition": "Or", "any_of": [ - "Global_Ocr_Clr_Unable" + "Anc_Ocr_Unable_Clr" ], "next": ["Event_Battle_TabAutoBattle"], "focus": "快速战斗不可用" diff --git a/assets/resource/base/pipeline/GACHA.json b/assets/resource/base/pipeline/GACHA.json index 90d163ba..b734a2ba 100644 --- a/assets/resource/base/pipeline/GACHA.json +++ b/assets/resource/base/pipeline/GACHA.json @@ -9,20 +9,8 @@ "desc": "识别左下抽抽乐-点击抽卡", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/GACHA_ADV.json b/assets/resource/base/pipeline/GACHA_ADV.json index f9a56722..678f6c3f 100644 --- a/assets/resource/base/pipeline/GACHA_ADV.json +++ b/assets/resource/base/pipeline/GACHA_ADV.json @@ -9,20 +9,8 @@ "desc": "[通用复位]复位到主界面模块,结束,中继调用", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "GachaADV_PageEnter_1#", @@ -193,20 +181,8 @@ "GachaADV_AREA1#_Post": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "GachaADV_PageEnter_2#", @@ -309,20 +285,8 @@ "GachaADV_AREA2#_Post": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "Global_ToSandBox" diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index e5a90999..b0356d86 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -84,40 +84,8 @@ "desc": "[通用复位]复位到主界面模块,开始,中继调用", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - { - "recognition": "ColorMatch", - "roi": [ - 104, - 664, - 51, - 17 - ], - "method": 40, - "lower": [ - 0, - 0, - 200 - ], - "upper": [ - 149, - 5, - 255 - ], - "count": 150 - } + "Rec_HomePage_GA_Ocr", + "Rec_HomePage_GA_Clr" ], "inverse": true, "timeout": 8000, @@ -141,31 +109,8 @@ "desc": "找到run-点击返回主页", "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "action": "Click", "target": [ @@ -209,20 +154,8 @@ "desc": "[通用复位]复位到主界面模块,结束,中继调用", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Rec_HomePage_GA_Clr" ] }, "Global_ToSandBox": { @@ -271,31 +204,8 @@ "Global_ToSandBox_Enter": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "focus": "G.已复位到箱庭" }, @@ -311,20 +221,8 @@ "desc": "识别左下抽抽乐-主页-点击选择章节", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Rec_HomePage_GA_Clr" ], "action": "Click", "target": [ @@ -643,51 +541,7 @@ "post_delay": 5000, "focus": "GO.等待卡带or转场载入" }, - "Global_SliderSwitch_To_On": { - "desc": "【必须用万能识色生成box后锚点引用】，识别灰色，变成黄色", - "recognition": "ColorMatch", - "roi": "[Anchor]SliderSwitchColor", - "method": 40, - "lower": [ - 101, - 59, - 36 - ], - "upper": [ - 110, - 68, - 44 - ], - "count": 25, - "timeout": 3000, - "next": [ - "Global_SliderSwitch_StateOn", - "[JumpBack]Global_SliderSwitch_ToggleActive" - ] - }, - "Global_SliderSwitch_To_Off": { - "desc": "【必须用万能识色生成box后锚点引用】，识别黄色，变成灰色", - "recognition": "ColorMatch", - "roi": "[Anchor]SliderSwitchColor", - "method": 40, - "lower": [ - 17, - 180, - 152 - ], - "upper": [ - 23, - 200, - 185 - ], - "count": 25, - "timeout": 3000, - "next": [ - "Global_SliderSwitch_StateOff", - "[JumpBack]Global_SliderSwitch_ToggleActive" - ] - }, - "Global_SliderSwitch_StateOn": { + "Anc_SliderSwitch_YewOn_Clr": { "desc": "滑块识别,黄色,已enable", "recognition": "ColorMatch", "roi": "[Anchor]SliderSwitchColor", @@ -707,7 +561,7 @@ "Global_SliderSwitch_End" ] }, - "Global_SliderSwitch_StateOff": { + "Anc_SliderSwitch_GryOff_Clr": { "desc": "滑块识别,灰色,已disable", "recognition": "ColorMatch", "roi": "[Anchor]SliderSwitchColor", @@ -727,7 +581,27 @@ "Global_SliderSwitch_End" ] }, - "Global_SliderSwitch_ToggleActive": { + "Anc_SliderSwitch_Gry_TurnOn_Clr": { + "desc": "【必须用万能识色生成box后锚点引用】，识别灰色，变成黄色", + "recognition": "And", + "all_of": ["Anc_SliderSwitch_GryOff_Clr"], + "timeout": 3000, + "next": [ + "Anc_SliderSwitch_YewOn_Clr", + "[JumpBack]Anc_SliderSwitch_Act_Turn" + ] + }, + "Anc_SliderSwitch_Yew_TurnOff_Clr": { + "desc": "【必须用万能识色生成box后锚点引用】，识别黄色，变成灰色", + "recognition": "And", + "all_of": ["Anc_SliderSwitch_YewOn_Clr"], + "timeout": 3000, + "next": [ + "Anc_SliderSwitch_GryOff_Clr", + "[JumpBack]Anc_SliderSwitch_Act_Turn" + ] + }, + "Anc_SliderSwitch_Act_Turn": { "desc": "点击滑块,改变颜色", "max_hit": 10, "action": "Click", @@ -791,30 +665,7 @@ "post_delay": 2000, "next": ["[JumpBack]Global_WaitingForLoading"] }, - "Global_Main_Clr": { - "desc": "【被引用节点】主界面是否无二级浮窗遮蔽", - "recognition": "ColorMatch", - "roi": "Main_OCR", - "roi_offset": [ - -5, - -5, - 10, - 10 - ], - "method": 40, - "lower": [ - 0, - 0, - 180 - ], - "upper": [ - 180, - 225, - 255 - ], - "count": 50 - }, - "Global_Ocr_Clr_Enable": { + "Anc_Ocr_Enable_Clr": { "desc": "【被引用节点】对Ocr节点再次色核,亮色", "recognition": "ColorMatch", "roi": "[Anchor]Ocr_clr", @@ -838,7 +689,7 @@ "connected": true, "count": 40 }, - "Global_Ocr_Clr_Unable": { + "Anc_Ocr_Unable_Clr": { "desc": "【被引用节点】对Ocr节点再次色核,灰色", "recognition": "ColorMatch", "roi": "[Anchor]Ocr_clr", @@ -856,10 +707,10 @@ "connected": true, "count": 25 }, - "Global_Ocr_Clr_Enable_Sub": { + "Sub_Ocr_Enable_Clr": { "desc": "【被引用节点】对Ocr节点再次色核,亮色", "recognition": "ColorMatch", - "roi": "Sub_Ocr", + "roi": "OCR", "method": 40, "lower": [ 0, @@ -874,10 +725,10 @@ "connected": true, "count": 40 }, - "Global_Ocr_Clr_Unable_Sub": { + "Sub_Ocr_Unable_Clr": { "desc": "【被引用节点】对Ocr节点再次色核,灰色", "recognition": "ColorMatch", - "roi": "Sub_Ocr", + "roi": "OCR", "roi_offset": [ -5, -5, @@ -897,5 +748,118 @@ ], "connected": true, "count": 25 + }, + "Rec_HomePage_GA_Ocr": { + "desc": "[识别]主页,抽卡文字", + "recognition": "OCR", + "roi": [ + 98, + 656, + 66, + 32 + ], + "expected": [ + "抽抽乐" + ] + }, + "Rec_HomePage_GA_Clr": { + "desc": "[识别]主页,抽卡文字背后颜色.roi硬编码", + "recognition": "ColorMatch", + "roi": [ + 104, + 664, + 51, + 17 + ], + "method": 40, + "lower": [ + 0, + 0, + 200 + ], + "upper": [ + 149, + 5, + 255 + ], + "count": 150 + }, + "Sub_HomePage_GA_Bright_Clr": { + "desc": "[检测]主页,抽卡文字；是否高亮", + "recognition": "ColorMatch", + "roi": "Rec_HomePage_GA_Ocr", + "roi_offset": [ + -5, + -5, + 10, + 10 + ], + "method": 40, + "lower": [ + 0, + 0, + 180 + ], + "upper": [ + 180, + 225, + 255 + ], + "count": 50 + }, + "Rec_SandBox_Pin_Tpl": { + "desc": "[识别]箱庭,pin按钮的UI", + "recognition": "TemplateMatch", + "roi": [ + 1122, + 646, + 40, + 38 + ], + "template": [ + "pin.png" + ] + }, + "Rec_SandBox_Run_Tpl": { + "desc": "[识别]箱庭,'冲刺'按钮的UI", + "recognition": "TemplateMatch", + "roi": [ + 1047, + 516, + 107, + 110 + ], + "template": [ + "Run.png" + ], + "green_mask": true + }, + "Rec_SandBox_Pin3_Tpl": { + "desc": "[识别]箱庭,'pin 第3组'按钮的UI", + "recognition": "TemplateMatch", + "roi": [ + 1179, + 639, + 50, + 52 + ], + "template": [ + "pin.png" + ] + }, + "Sub_SandBox_Pin3_Bright_Clr": { + "recognition": "ColorMatch", + "roi": "Rec_SandBox_Pin3_Tpl", + "lower": [ + 192, + 141, + 23 + ], + "upper": [ + 223, + 194, + 129 + ], + "count": 200 } } diff --git a/assets/resource/base/pipeline/Mail.json b/assets/resource/base/pipeline/Mail.json index 2e92e32f..0290fdf0 100644 --- a/assets/resource/base/pipeline/Mail.json +++ b/assets/resource/base/pipeline/Mail.json @@ -9,20 +9,8 @@ "desc": "识别左下抽抽乐-点击邮件", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "target": [ 1030, diff --git a/assets/resource/base/pipeline/PVP.json b/assets/resource/base/pipeline/PVP.json index c49e25c9..3b5087e9 100644 --- a/assets/resource/base/pipeline/PVP.json +++ b/assets/resource/base/pipeline/PVP.json @@ -354,14 +354,14 @@ "desc": "修改freeap滑块", "max_hit": 2, "recognition": "And", - "all_of": ["Global_SliderSwitch_StateOff"], + "all_of": ["Anc_SliderSwitch_GryOff_Clr"], "action": "Click", "post_delay": 2000 }, "PVP_JustUseFreeOK": { "desc": "识别是否仅用免费鸡尾酒", "recognition": "And", - "all_of": ["Global_SliderSwitch_StateOn"], + "all_of": ["Anc_SliderSwitch_YewOn_Clr"], "timeout": 5000, "next": [ "PVP_Multiplier_Verify" @@ -928,20 +928,8 @@ "desc": "识别左下抽抽乐-点击通行证", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/Pass.json b/assets/resource/base/pipeline/Pass.json index 772b6820..a77e4ff7 100644 --- a/assets/resource/base/pipeline/Pass.json +++ b/assets/resource/base/pipeline/Pass.json @@ -9,20 +9,8 @@ "desc": "识别左下抽抽乐-点击通行证", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/QuestList.json b/assets/resource/base/pipeline/QuestList.json index 0a2f7c59..f2a4985e 100644 --- a/assets/resource/base/pipeline/QuestList.json +++ b/assets/resource/base/pipeline/QuestList.json @@ -10,7 +10,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "Main_OCR", "recognition": "OCR", "roi": [ 520, @@ -22,7 +21,7 @@ "任务" ] }, - "Global_Main_Clr" + "Sub_Ocr_Enable_Clr" ], "timeout": 2000, "next": [ diff --git a/assets/resource/base/pipeline/Redemption.json b/assets/resource/base/pipeline/Redemption.json index 0cdbe706..14c23be2 100644 --- a/assets/resource/base/pipeline/Redemption.json +++ b/assets/resource/base/pipeline/Redemption.json @@ -118,31 +118,8 @@ "Redemption_Mapck": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1047, - 516, - 107, - 110 - ], - "template": [ - "Run.png" - ], - "green_mask": true - } + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "next": [ "Redemption_Evil_Move" diff --git a/assets/resource/base/pipeline/SemiAuto.json b/assets/resource/base/pipeline/SemiAuto.json index 5dcf0793..5696e014 100644 --- a/assets/resource/base/pipeline/SemiAuto.json +++ b/assets/resource/base/pipeline/SemiAuto.json @@ -74,20 +74,8 @@ "desc": "识别左下抽抽乐-主页-点击选择章节", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/Setup.json b/assets/resource/base/pipeline/Setup.json index 4cc5f64e..c22e6a3f 100644 --- a/assets/resource/base/pipeline/Setup.json +++ b/assets/resource/base/pipeline/Setup.json @@ -959,20 +959,8 @@ "Setup_Main_Into": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ @@ -1618,20 +1606,8 @@ "Setup_Equip_Into": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ diff --git a/assets/resource/base/pipeline/Weekly.json b/assets/resource/base/pipeline/Weekly.json index 7ec0e2bc..6e14a5a5 100644 --- a/assets/resource/base/pipeline/Weekly.json +++ b/assets/resource/base/pipeline/Weekly.json @@ -156,20 +156,8 @@ "desc": "识别左下抽抽乐-主页-点击选择章节", "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "action": "Click", "target": [ @@ -440,20 +428,8 @@ "Weekly_VisitCabin_HomePage": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "next": [ "Weekly_VisitCabin_GoIn", @@ -730,20 +706,8 @@ "Weekly_Arcade_HomePage": { "recognition": "And", "all_of": [ - { - "sub_name": "Main_OCR", - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, - "Global_Main_Clr" + "Rec_HomePage_GA_Ocr", + "Sub_HomePage_GA_Bright_Clr" ], "post_delay": 3000, "next": [ From fc19f1903ecbcfc45152c2e9520be29ccd9558d4 Mon Sep 17 00:00:00 2001 From: sunyink Date: Tue, 12 May 2026 22:02:27 +0800 Subject: [PATCH 04/11] =?UTF-8?q?refactor:=E5=AF=B9=E9=9D=9E=E9=87=8D?= =?UTF-8?q?=E7=94=A8=E7=9A=84And-Sub=E8=AF=86=E5=88=AB=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8E=98=E5=AE=9A=E3=80=81=E5=88=86=E7=A6=BB|=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E5=B8=B8=E7=94=A8=E7=9A=84=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=9B=B4=E9=80=9A=E7=94=A8=E7=9A=84Sub?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Arbitrage.json | 229 +++--------------- .../base/pipeline/Collect_skills.json | 34 +-- assets/resource/base/pipeline/Daily.json | 64 +---- .../resource/base/pipeline/EventBattle.json | 13 +- assets/resource/base/pipeline/Global.json | 27 ++- assets/resource/base/pipeline/QuestList.json | 25 +- assets/resource/base/pipeline/Setup.json | 34 +-- 7 files changed, 64 insertions(+), 362 deletions(-) diff --git a/assets/resource/base/pipeline/Arbitrage.json b/assets/resource/base/pipeline/Arbitrage.json index dfc71034..1cbb6e8d 100644 --- a/assets/resource/base/pipeline/Arbitrage.json +++ b/assets/resource/base/pipeline/Arbitrage.json @@ -2068,7 +2068,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "template", "recognition": "OCR", "roi": [ 745, @@ -2080,23 +2079,7 @@ "从高到低" ] }, - { - "recognition": "ColorMatch", - "roi": "template", - "method": 40, - "lower": [ - 18, - 98, - 110 - ], - "upper": [ - 23, - 230, - 255 - ], - "connected": true, - "count": 10 - } + "Sub_SieveExpand_Yew_Clr" ], "next": ["Arbitrage_Sell_PackShopListSwich_Close"] }, @@ -2490,7 +2473,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "template", "recognition": "OCR", "roi": [ 895, @@ -2502,23 +2484,7 @@ "从高到低" ] }, - { - "recognition": "ColorMatch", - "roi": "template", - "method": 40, - "lower": [ - 18, - 98, - 110 - ], - "upper": [ - 23, - 230, - 255 - ], - "connected": true, - "count": 10 - } + "Sub_SieveExpand_Yew_Clr" ], "next": [ "[JumpBack]Arbitrage_ItemList_Sorting_Remove", @@ -2855,21 +2821,7 @@ "Shop/cook_Sparkling Griddle Shrimp.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -2897,21 +2849,7 @@ "Shop/cook_Transparent Salad.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -2939,21 +2877,7 @@ "Shop/cook_Hellfire Gimbap.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3012,21 +2936,7 @@ "Shop/cook_Lugas Ginseng Skewer.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3054,21 +2964,7 @@ "Shop/cook_Coal Cookies.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3095,21 +2991,7 @@ "Shop/cook_Honey Butter Almonds.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3136,21 +3018,7 @@ "Shop/cook_Mayo Triangle Rice Ball.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3177,21 +3045,7 @@ "Shop/cook_Caviar Omurice.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3218,21 +3072,7 @@ "Shop/cook_Fried Salmon Bento.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3259,21 +3099,7 @@ "Shop/cook_Sangria.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3300,21 +3126,7 @@ "Shop/cook_Honey Baked Apple.png" ] }, - { - "recognition": "ColorMatch", - "roi": "Templateroi", - "method": 40, - "lower": [ - 16, - 46, - 142 - ], - "upper": [ - 20, - 68, - 168 - ] - } + "Sub_「Arbitrage_Cooking」_Clr" ], "action": "Click", "post_delay": 1000, @@ -3323,6 +3135,21 @@ ], "focus": "Arb.料理制作:[1级]烤蜂蜜苹果" }, + "Sub_「Arbitrage_Cooking」_Clr": { + "recognition": "ColorMatch", + "roi": "Templateroi", + "method": 40, + "lower": [ + 16, + 46, + 142 + ], + "upper": [ + 20, + 68, + 168 + ] + }, "Arbitrage_Cooking_Menu_Reset": { "desc": "使用Anchor复用.将菜单复位。通过随机点一个菜品后返回，利用系统机制复位最顶。", "max_hit": 50, diff --git a/assets/resource/base/pipeline/Collect_skills.json b/assets/resource/base/pipeline/Collect_skills.json index 8f990ce7..549fb4c7 100644 --- a/assets/resource/base/pipeline/Collect_skills.json +++ b/assets/resource/base/pipeline/Collect_skills.json @@ -42,38 +42,8 @@ "desc": "色核识别完成.开始施放技能组", "recognition": "And", "all_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1174, - 633, - 58, - 59 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "ColorMatch", - "roi": [ - 1187, - 651, - 32, - 29 - ], - "lower": [ - 192, - 141, - 23 - ], - "upper": [ - 223, - 194, - 129 - ], - "count": 200 - } + "Rec_SandBox_Pin3_Tpl", + "Sub_SandBox_Pin3_Bright_Clr" ], "next": [ "[JumpBack]Setup_Entry5", diff --git a/assets/resource/base/pipeline/Daily.json b/assets/resource/base/pipeline/Daily.json index fab0b9a6..97f73962 100644 --- a/assets/resource/base/pipeline/Daily.json +++ b/assets/resource/base/pipeline/Daily.json @@ -251,7 +251,6 @@ "recognition": "And", "all_of": [ { - "sub_name": "ButtonOCR", "recognition": "OCR", "roi": [ 640, @@ -265,22 +264,7 @@ "回收" ] }, - { - "recognition": "ColorMatch", - "roi": "ButtonOCR", - "method": 40, - "lower": [ - 17, - 10, - 210 - ], - "upper": [ - 23, - 18, - 232 - ], - "count": 10 - } + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 2000 @@ -570,6 +554,7 @@ "focus": "GBM.无圣石情况" }, "Daily_Busin_StageUp": { + "desc": "存在亮色按钮,餐厅星星阶段升级", "recognition": "And", "all_of": [ { @@ -582,32 +567,13 @@ ], "expected": "^(?=.*[下])(?=.*[一])(?=.*[阶段]).{2,5}$" }, - { - "recognition": "ColorMatch", - "roi": [ - 1155, - 937, - 158, - 81 - ], - "method": 40, - "lower": [ - 21, - 14, - 127 - ], - "upper": [ - 24, - 11, - 241 - ], - "count": 50 - } + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 5000 }, "Daily_Busin_LevelUp": { + "desc": "存在亮色按钮,餐厅等级阶段升级", "recognition": "And", "all_of": [ { @@ -620,27 +586,7 @@ ], "expected": "升级" }, - { - "recognition": "ColorMatch", - "roi": [ - 1155, - 937, - 158, - 81 - ], - "method": 40, - "lower": [ - 21, - 14, - 127 - ], - "upper": [ - 24, - 11, - 241 - ], - "count": 50 - } + "Sub_Ocr_Enable_Clr" ], "action": "Click", "post_delay": 5000, diff --git a/assets/resource/base/pipeline/EventBattle.json b/assets/resource/base/pipeline/EventBattle.json index f910242f..f4ff4658 100644 --- a/assets/resource/base/pipeline/EventBattle.json +++ b/assets/resource/base/pipeline/EventBattle.json @@ -11,18 +11,7 @@ "desc": "识别左下抽抽乐-点击活动", "recognition": "And", "all_of": [ - { - "recognition": "OCR", - "roi": [ - 98, - 656, - 66, - 32 - ], - "expected": [ - "抽抽乐" - ] - }, + "Rec_HomePage_GA_Ocr", "Rec_HomePage_GA_Clr" ], "action": "Click", diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index b0356d86..f6a107aa 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -666,7 +666,7 @@ "next": ["[JumpBack]Global_WaitingForLoading"] }, "Anc_Ocr_Enable_Clr": { - "desc": "【被引用节点】对Ocr节点再次色核,亮色", + "desc": "[识别]]对Ocr节点按钮再次色核,亮色", "recognition": "ColorMatch", "roi": "[Anchor]Ocr_clr", "roi_offset": [ @@ -690,7 +690,7 @@ "count": 40 }, "Anc_Ocr_Unable_Clr": { - "desc": "【被引用节点】对Ocr节点再次色核,灰色", + "desc": "[识别]]对Ocr节点按钮再次色核,灰色", "recognition": "ColorMatch", "roi": "[Anchor]Ocr_clr", "method": 40, @@ -708,7 +708,7 @@ "count": 25 }, "Sub_Ocr_Enable_Clr": { - "desc": "【被引用节点】对Ocr节点再次色核,亮色", + "desc": "[检测]Ocr按钮背景,亮色", "recognition": "ColorMatch", "roi": "OCR", "method": 40, @@ -726,7 +726,7 @@ "count": 40 }, "Sub_Ocr_Unable_Clr": { - "desc": "【被引用节点】对Ocr节点再次色核,灰色", + "desc": "[检测]Ocr按钮背景,灰色", "recognition": "ColorMatch", "roi": "OCR", "roi_offset": [ @@ -848,6 +848,7 @@ ] }, "Sub_SandBox_Pin3_Bright_Clr": { + "desc": "[检测]Rec_SandBox_Pin3_Tpl,是否为黄色选中", "recognition": "ColorMatch", "roi": "Rec_SandBox_Pin3_Tpl", "lower": [ @@ -861,5 +862,23 @@ 129 ], "count": 200 + }, + "Sub_SieveExpand_Yew_Clr": { + "desc": "[检测]下拉筛选菜单的OCR,是否为选中黄色.Mod=4", + "recognition": "ColorMatch", + "roi": "OCR", + "method": 40, + "lower": [ + 18, + 98, + 110 + ], + "upper": [ + 23, + 230, + 255 + ], + "connected": true, + "count": 10 } } diff --git a/assets/resource/base/pipeline/QuestList.json b/assets/resource/base/pipeline/QuestList.json index f2a4985e..bbe8cbe9 100644 --- a/assets/resource/base/pipeline/QuestList.json +++ b/assets/resource/base/pipeline/QuestList.json @@ -6,7 +6,7 @@ ] }, "RewardsDaily_DailyReward": { - "desc": "界面确认", + "desc": "界面确认.使用了按钮的检查色,S:255→40,也能通过", "recognition": "And", "all_of": [ { @@ -85,26 +85,6 @@ "RewardsDaily_Get": { "recognition": "And", "all_of": [ - { - "recognition": "ColorMatch", - "roi": [ - 1022, - 640, - 138, - 38 - ], - "lower": [ - 222, - 218, - 208 - ], - "upper": [ - 222, - 220, - 211 - ], - "count": 200 - }, { "recognition": "OCR", "roi": [ @@ -116,7 +96,8 @@ "expected": [ "全部获得" ] - } + }, + "Sub_Ocr_Enable_Clr" ], "box_index": 1, "action": "Click", diff --git a/assets/resource/base/pipeline/Setup.json b/assets/resource/base/pipeline/Setup.json index c22e6a3f..57593bcf 100644 --- a/assets/resource/base/pipeline/Setup.json +++ b/assets/resource/base/pipeline/Setup.json @@ -254,38 +254,8 @@ "Setup_SkillScan_Check": { "recognition": "And", "all_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1174, - 633, - 58, - 59 - ], - "template": [ - "pin.png" - ] - }, - { - "recognition": "ColorMatch", - "roi": [ - 1187, - 651, - 32, - 29 - ], - "lower": [ - 192, - 141, - 23 - ], - "upper": [ - 223, - 194, - 129 - ], - "count": 200 - } + "Rec_SandBox_Pin3_Tpl", + "Sub_SandBox_Pin3_Bright_Clr" ], "timeout": 5000, "next": [ From f0a4423494b37ad31634388a32aa07374fad5ba6 Mon Sep 17 00:00:00 2001 From: sunyink Date: Tue, 12 May 2026 23:20:37 +0800 Subject: [PATCH 05/11] =?UTF-8?q?refactor:=E5=AF=B9=E9=9D=9E=E9=87=8D?= =?UTF-8?q?=E7=94=A8=E7=9A=84Or-Sub=E8=AF=86=E5=88=AB=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8E=98=E5=AE=9A=E3=80=81=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Arbitrage.json | 52 ++--- assets/resource/base/pipeline/AutoBattle.json | 95 +++++---- .../base/pipeline/Collect_TeleportRecall.json | 30 +-- assets/resource/base/pipeline/Daily.json | 153 +++++++------- assets/resource/base/pipeline/Equip.json | 144 +++++++------ .../resource/base/pipeline/EventBattle.json | 100 ++++----- assets/resource/base/pipeline/GACHA.json | 76 +++---- assets/resource/base/pipeline/GACHA_ADV.json | 58 +++--- assets/resource/base/pipeline/Global.json | 194 ++++++++++-------- assets/resource/base/pipeline/Pass.json | 62 +++--- assets/resource/base/pipeline/Setup.json | 165 ++++++++------- assets/resource/base/pipeline/Weekly.json | 54 ++--- 12 files changed, 599 insertions(+), 584 deletions(-) diff --git a/assets/resource/base/pipeline/Arbitrage.json b/assets/resource/base/pipeline/Arbitrage.json index 1cbb6e8d..4731d107 100644 --- a/assets/resource/base/pipeline/Arbitrage.json +++ b/assets/resource/base/pipeline/Arbitrage.json @@ -2588,36 +2588,38 @@ "desc": "确认出售子菜单已弹出", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 810, - 450, - 222, - 102 - ], - "expected": [ - "出售" - ] - }, - { - "recognition": "OCR", - "roi": [ - 264, - 445, - 398, - 111 - ], - "expected": [ - "MIX", - "MAX" - ] - } + "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01", + "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02" ], "next": [ "Arbitrage_Sell_Item_Number" ] }, + "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_01": { + "recognition": "OCR", + "roi": [ + 810, + 450, + 222, + 102 + ], + "expected": [ + "出售" + ] + }, + "Rec_「Arbitrage_Sell_Item_SellMenu」_Ocr_02": { + "recognition": "OCR", + "roi": [ + 264, + 445, + 398, + 111 + ], + "expected": [ + "MIX", + "MAX" + ] + }, "Arbitrage_Sell_Item_Number": { "desc": "决定出售个数,未添加验证控制。Intface控制，默认Mix，操作后覆盖成Max", "action": "Click", diff --git a/assets/resource/base/pipeline/AutoBattle.json b/assets/resource/base/pipeline/AutoBattle.json index e075fc6f..8bdf1e92 100644 --- a/assets/resource/base/pipeline/AutoBattle.json +++ b/assets/resource/base/pipeline/AutoBattle.json @@ -14,27 +14,8 @@ "AutoBattle_Is_Auto": { "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 1102, - 639, - 109, - 31 - ], - "expected": ["自动战斗中"], - "only_rec": true - }, - { - "recognition": "OCR", - "roi": [ - 28, - 576, - 182, - 96 - ], - "expected": ["自动战斗中"] - } + "Rec_「AutoBattle_Is_Auto」_Ocr_01", + "Rec_「AutoBattle_Is_Auto」_Ocr_02" ], "post_delay": 5000, "next": [ @@ -43,34 +24,62 @@ "AutoBattle_Is_Auto" ] }, + "Rec_「AutoBattle_Is_Auto」_Ocr_01": { + "desc": "[识别]自动战斗判定,位置1-右下", + "recognition": "OCR", + "roi": [ + 1102, + 639, + 109, + 31 + ], + "expected": ["自动战斗中"], + "only_rec": true + }, + "Rec_「AutoBattle_Is_Auto」_Ocr_02": { + "desc": "[识别]自动战斗判定,位置2-左下", + "recognition": "OCR", + "roi": [ + 28, + 576, + 182, + 96 + ], + "expected": ["自动战斗中"] + }, "AutoBattle_TabTo_Auto": { + "desc": "当前在非自动战斗界面", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 1126, - 629, - 73, - 29 - ], - "expected": ["BATTLE"], - "only_rec": true - }, - { - "recognition": "OCR", - "roi": [ - 1034, - 629, - 60, - 29 - ], - "expected": ["TURN"], - "only_rec": true - } + "Rec_「AutoBattle_TabTo_Auto」_Ocr_01", + "Rec_「AutoBattle_TabTo_Auto」_Ocr_02" ], "next": ["AutoBattle_ClickAutoButt"] }, + "Rec_「AutoBattle_TabTo_Auto」_Ocr_01": { + "desc": "[识别]手动战斗界面,位置01", + "recognition": "OCR", + "roi": [ + 1126, + 629, + 73, + 29 + ], + "expected": ["BATTLE"], + "only_rec": true + }, + "Rec_「AutoBattle_TabTo_Auto」_Ocr_02": { + "desc": "[识别]手动战斗界面,位置02", + "recognition": "OCR", + "roi": [ + 1034, + 629, + 60, + 29 + ], + "expected": ["TURN"], + "only_rec": true + }, "AutoBattle_ClickAutoButt": { "desc": "模板点击自动战斗图标", "recognition": "TemplateMatch", diff --git a/assets/resource/base/pipeline/Collect_TeleportRecall.json b/assets/resource/base/pipeline/Collect_TeleportRecall.json index 2d358b96..637889af 100644 --- a/assets/resource/base/pipeline/Collect_TeleportRecall.json +++ b/assets/resource/base/pipeline/Collect_TeleportRecall.json @@ -112,20 +112,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 1051, - 400, - 81, - 86 - ], - "template": [ - "Skill3-4GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Collect_TeleportRecall_Skill」_Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -135,6 +122,21 @@ ], "focus": "CRT.传送阵技能已放置" }, + "Rec_「Collect_TeleportRecall_Skill」_Tpl": { + "desc": "[识别]'传送'技能存在", + "recognition": "TemplateMatch", + "roi": [ + 1051, + 400, + 81, + 86 + ], + "template": [ + "Skill3-4GE.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Collect_TeleportRecall_Skill_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", diff --git a/assets/resource/base/pipeline/Daily.json b/assets/resource/base/pipeline/Daily.json index 97f73962..3bf2d04d 100644 --- a/assets/resource/base/pipeline/Daily.json +++ b/assets/resource/base/pipeline/Daily.json @@ -179,31 +179,8 @@ "max_hit": 10, "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 85, - 228, - 91, - 29 - ], - "expected": [ - "经营管理" - ] - }, - { - "recognition": "TemplateMatch", - "roi": [ - 87, - 174, - 98, - 81 - ], - "template": [ - "MainBotmBusinGE.png", - "MainBotmBusin_F_GE.png" - ] - } + "Rec_「Daily_Busin_Claim」_Ocr", + "Rec_「Daily_Busin_Claim」_Tpl" ], "action": "Click", "target_offset": [ @@ -220,6 +197,33 @@ ], "focus": "GOM.餐馆结算(COR)-主界面" }, + "Rec_「Daily_Busin_Claim」_Ocr": { + "desc": "主页,左侧按钮群-经管1", + "recognition": "OCR", + "roi": [ + 85, + 228, + 91, + 29 + ], + "expected": [ + "经营管理" + ] + }, + "Rec_「Daily_Busin_Claim」_Tpl": { + "desc": "主页,左侧按钮群-经管2", + "recognition": "TemplateMatch", + "roi": [ + 87, + 174, + 98, + 81 + ], + "template": [ + "MainBotmBusinGE.png", + "MainBotmBusin_F_GE.png" + ] + }, "Daily_Busin_SubMenu": { "desc": "确认餐馆子菜单已弹出", "recognition": "OCR", @@ -447,39 +451,9 @@ "Daily_Busin_DecorCoin_PickUp": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 353, - 98, - 911, - 449 - ], - "template": "UI_BusinCoin.png", - "green_mask": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 273, - 509, - 683, - 200 - ], - "template": "UI_BusinCoin.png", - "green_mask": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 88, - 360, - 266, - 230 - ], - "template": "UI_BusinCoin.png", - "green_mask": true - } + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01", + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02", + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03" ], "action": "Click", "post_delay": 1500, @@ -494,6 +468,42 @@ ], "focus": "拾取装饰币" }, + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_01": { + "desc": "装饰币探查区域01-中央", + "recognition": "TemplateMatch", + "roi": [ + 353, + 84, + 925, + 479 + ], + "template": "UI_BusinCoin.png", + "green_mask": true + }, + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_02": { + "desc": "装饰币探查区域02-下方", + "recognition": "TemplateMatch", + "roi": [ + 273, + 347, + 683, + 362 + ], + "template": "UI_BusinCoin.png", + "green_mask": true + }, + "Rec_「Daily_Busin_DecorCoin_PickUp」_Tpl_03": { + "desc": "装饰币探查区域03-左侧", + "recognition": "TemplateMatch", + "roi": [ + 27, + 360, + 347, + 230 + ], + "template": "UI_BusinCoin.png", + "green_mask": true + }, "Daily_Busin_DecorCoin_Move_1": { "max_hit": 2, "action": "Click", @@ -655,32 +665,7 @@ "Daily_Square_Str": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 294, - 562, - 343, - 158 - ], - "template": [ - "BusinQuickIcoGE.png" - ], - "green_mask": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 74, - 81, - 285, - 197 - ], - "template": [ - "BusinQuickIcoGE.png" - ], - "green_mask": true - } + "Global_BackToQC1" ], "action": "Click", "post_delay": 2000, diff --git a/assets/resource/base/pipeline/Equip.json b/assets/resource/base/pipeline/Equip.json index 2a64c981..d1ba3c89 100644 --- a/assets/resource/base/pipeline/Equip.json +++ b/assets/resource/base/pipeline/Equip.json @@ -1102,54 +1102,58 @@ "desc": "看看专武是不是已经点过了? ，强制<17| 说明在正确筛选情况下仍有无法精炼装备,系+24的制作&专武", "recognition": "Or", "any_of": [ - { - "recognition": "ColorMatch", - "roi": [ - 287, - 306, - 53, - 31 - ], - "method": 40, - "lower": [ - 0, - 0, - 90 - ], - "upper": [ - 120, - 120, - 165 - ], - "count": 10 - }, - { - "recognition": "ColorMatch", - "roi": [ - 497, - 296, - 127, - 57 - ], - "method": 40, - "lower": [ - 0, - 0, - 90 - ], - "upper": [ - 120, - 120, - 165 - ], - "count": 10 - } + "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_01", + "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_02" ], "next": [ "Equip_Overdrive_RefLvMax_Forwarding" ], "focus": "EBO.神人发现，佬你好( • ̀ω•́ )✧" }, + "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_01": { + "desc": "装备筛选sub,分类:'专用'", + "recognition": "ColorMatch", + "roi": [ + 287, + 306, + 53, + 31 + ], + "method": 40, + "lower": [ + 0, + 0, + 90 + ], + "upper": [ + 120, + 120, + 165 + ], + "count": 10 + }, + "Rec_「Equip_Overdrive_RefLvMax_Second_Clr」_Clr_02": { + "desc": "装备筛选sub,分类:'制作'", + "recognition": "ColorMatch", + "roi": [ + 497, + 296, + 127, + 57 + ], + "method": 40, + "lower": [ + 0, + 0, + 90 + ], + "upper": [ + 120, + 120, + 165 + ], + "count": 10 + }, "Equip_Overdrive_RefLvMax_Forwarding": { "action": "Custom", "custom_action": "PatchNode", @@ -1286,32 +1290,8 @@ "desc": "发现背包满了,点击进入背包", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 1082, - 20, - 32, - 13 - ], - "expected": [ - "100%" - ], - "only_rec": true - }, - { - "recognition": "OCR", - "roi": [ - 279, - 611, - 36, - 16 - ], - "expected": [ - "100%" - ], - "only_rec": true - } + "Rec_「Equip_Backpack_Full」_Ocr_01", + "Rec_「Equip_Backpack_Full」_Ocr_02" ], "action": "Click", "target_offset": [ @@ -1327,6 +1307,34 @@ "Equip_Backpack_Full" ] }, + "Rec_「Equip_Backpack_Full」_Ocr_01": { + "desc": "箱庭右上显示背包满", + "recognition": "OCR", + "roi": [ + 1082, + 20, + 32, + 13 + ], + "expected": [ + "100%" + ], + "only_rec": true + }, + "Rec_「Equip_Backpack_Full」_Ocr_02": { + "desc": "主页左下显示背包满", + "recognition": "OCR", + "roi": [ + 279, + 611, + 36, + 16 + ], + "expected": [ + "100%" + ], + "only_rec": true + }, "Equip_Backpack_Full_Enter": { "recognition": "TemplateMatch", "roi": [ diff --git a/assets/resource/base/pipeline/EventBattle.json b/assets/resource/base/pipeline/EventBattle.json index f4ff4658..e4bc81f4 100644 --- a/assets/resource/base/pipeline/EventBattle.json +++ b/assets/resource/base/pipeline/EventBattle.json @@ -27,31 +27,8 @@ "desc": "在赛季活动页面.兼做任务选择器", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 802, - 16, - 109, - 47 - ], - "expected": [ - "活动服装" - ] - }, - { - "recognition": "OCR", - "roi": [ - 175, - 574, - 729, - 134 - ], - "expected": [ - "普通战斗", - "魔兽追踪者" - ] - } + "Rec_「Event_Event_Main」_Ocr_01", + "Rec_「Event_Event_Main」_Ocr_02" ], "timeout": 1000, "next": [ @@ -63,6 +40,33 @@ ], "focus": "EM.赛季活动进入确认." }, + "Rec_「Event_Event_Main」_Ocr_01": { + "desc": "赛季主页判定,右上代币加成服装", + "recognition": "OCR", + "roi": [ + 802, + 16, + 109, + 47 + ], + "expected": [ + "活动服装" + ] + }, + "Rec_「Event_Event_Main」_Ocr_02": { + "desc": "赛季主页判定,特殊按钮", + "recognition": "OCR", + "roi": [ + 175, + 574, + 729, + 134 + ], + "expected": [ + "普通战斗", + "魔兽追踪者" + ] + }, "Event_Battle_Hub": { "max_hit": 1, "next": [ @@ -707,27 +711,8 @@ "desc": "演习魔兽,结束", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 933, - 27, - 141, - 30 - ], - "expected": ["距离开始还"], - "only_rec": true - }, - { - "recognition": "OCR", - "roi": [ - 826, - 215, - 211, - 72 - ], - "expected": ["狩猎期间开始解除"] - } + "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_01", + "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_02" ], "next": [ "SeasonEvent_Main_Return", @@ -735,6 +720,29 @@ ], "focus": "E.当前魔兽为演习,退出" }, + "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_01": { + "desc": "魔兽尚未开放判定,位置1", + "recognition": "OCR", + "roi": [ + 933, + 27, + 141, + 30 + ], + "expected": ["距离开始还"], + "only_rec": true + }, + "Rec_「SeasonEvent_MamonoFollow_Practice」_Ocr_02": { + "desc": "魔兽尚未开放判定,位置2", + "recognition": "OCR", + "roi": [ + 826, + 215, + 211, + 72 + ], + "expected": ["狩猎期间开始解除"] + }, "Even_MamonoFollow_lv1_Ck": { "desc": "Lv1的复杂正则匹配", "recognition": "OCR", diff --git a/assets/resource/base/pipeline/GACHA.json b/assets/resource/base/pipeline/GACHA.json index b734a2ba..72797c28 100644 --- a/assets/resource/base/pipeline/GACHA.json +++ b/assets/resource/base/pipeline/GACHA.json @@ -193,35 +193,40 @@ "post_delay": 1500 }, "Gacha_Quick_Briefing": { + "desc": "抽卡结果页,大概", "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 119, - 587, - 159, - 68 - ], - "template": ["Gacha_Briefing.png"] - }, - { - "recognition": "OCR", - "roi": [ - 163, - 603, - 80, - 36 - ], - "expected": "^\\d+/\\d+$", - "only_rec": true - } + "Rec_「Gacha_Quick_Briefing」_Tmp", + "Rec_「Gacha_Quick_Briefing」_Ocr" ], "next": [ "Gacha_Quick_End", "[JumpBack]Global_BackPageHub_Once" ] }, + "Rec_「Gacha_Quick_Briefing」_Tmp": { + "desc": "[识别]抽卡结果页,位置01-图案", + "recognition": "TemplateMatch", + "roi": [ + 119, + 587, + 159, + 68 + ], + "template": ["Gacha_Briefing.png"] + }, + "Rec_「Gacha_Quick_Briefing」_Ocr": { + "desc": "[识别]抽卡结果页,位置02-正则", + "recognition": "OCR", + "roi": [ + 163, + 603, + 80, + 36 + ], + "expected": "^\\d+/\\d+$", + "only_rec": true + }, "Gacha_Quick_End": { "desc": "一键抽卡结束后瞻", "recognition": "And", @@ -263,33 +268,8 @@ "Gacha_FindFreeGacha_GotoADV": { "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 857, - 461, - 53, - 26 - ], - "expected": [ - "^([2-9]\\d{2}|[1-9]\\d{3,})$" - ], - "only_rec": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 721, - 210, - 462, - 297 - ], - "template": [ - "GACHA_Special.ReservedRights_Red_GE.png" - ], - "green_mask": true, - "threshold": 0.7 - } + "Rec_「GachaADV_Special_ReservedRights」_Ocr", + "Rec_「GachaADV_Special_ReservedRights」_Tpl" ], "next": [ "GachaADV_Start" diff --git a/assets/resource/base/pipeline/GACHA_ADV.json b/assets/resource/base/pipeline/GACHA_ADV.json index 678f6c3f..1daa4729 100644 --- a/assets/resource/base/pipeline/GACHA_ADV.json +++ b/assets/resource/base/pipeline/GACHA_ADV.json @@ -1108,39 +1108,43 @@ "desc": "中断发现点数超过200但用户决定保留的情况", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 857, - 461, - 53, - 26 - ], - "expected": [ - "^([2-9]\\d{2}|[1-9]\\d{3,})$" - ], - "only_rec": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 721, - 210, - 462, - 297 - ], - "template": [ - "GACHA_Special.ReservedRights_Red_GE.png" - ], - "green_mask": true, - "threshold": 0.7 - } + "Rec_「GachaADV_Special_ReservedRights」_Ocr", + "Rec_「GachaADV_Special_ReservedRights」_Tpl" ], "next": [ "[Anchor]GachaADV_NextPool" ], "focus": "GAB.[INT]卡池内存在可兑换Up角色机会" }, + "Rec_「GachaADV_Special_ReservedRights」_Ocr": { + "desc": "将要触发抽抽乐200保底识别器01,", + "recognition": "OCR", + "roi": [ + 857, + 461, + 53, + 26 + ], + "expected": [ + "^([2-9]\\d{2}|[1-9]\\d{3,})$" + ], + "only_rec": true + }, + "Rec_「GachaADV_Special_ReservedRights」_Tpl": { + "desc": "将要触发抽抽乐200保底识别器02,", + "recognition": "TemplateMatch", + "roi": [ + 721, + 210, + 462, + 297 + ], + "template": [ + "GACHA_Special.ReservedRights_Red_GE.png" + ], + "green_mask": true, + "threshold": 0.7 + }, "GachaADV_Special_SaveGuaranteed": { "enabled": false, "recognition": "OCR", diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index f6a107aa..0a552304 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -446,101 +446,113 @@ "desc": "循环等待转场页面", "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 1049, - 578, - 194, - 124 - ], - "template": "UI_loading_Tr.png", - "green_mask": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 1190, - 623, - 76, - 89 - ], - "template": [ - "UI_loading_FS0%.png", - "UI_loading_FS95%.png", - "UI_loading_White%.png" - ], - "green_mask": true - }, - { - "recognition": "TemplateMatch", - "roi": [ - 501, - 290, - 266, - 119 - ], - "template": "UI_loading_black.png" - }, - { - "recognition": "OCR", - "roi": [ - 1213, - 658, - 30, - 20 - ], - "expected": "0%", - "only_rec": true - }, - { - "recognition": "ColorMatch", - "roi": [ - 203, - 476, - 930, - 110 - ], - "method": 40, - "lower": [ - 0, - 0, - 0 - ], - "upper": [ - 180, - 5, - 5 - ], - "connected": true, - "count": 102200 - }, - { - "recognition": "ColorMatch", - "roi": [ - 203, - 476, - 930, - 110 - ], - "method": 40, - "lower": [ - 0, - 0, - 230 - ], - "upper": [ - 180, - 5, - 255 - ], - "connected": true, - "count": 102200 - } + "Rec_「Global_WaitingForLoading」_01", + "Rec_「Global_WaitingForLoading」_02", + "Rec_「Global_WaitingForLoading」_03", + "Rec_「Global_WaitingForLoading」_04", + "Rec_「Global_WaitingForLoading」_05", + "Rec_「Global_WaitingForLoading」_06" ], "post_delay": 5000, "focus": "GO.等待卡带or转场载入" }, + "Rec_「Global_WaitingForLoading」_01": { + "desc": "[识别]转场等待01,右下的UT", + "recognition": "TemplateMatch", + "roi": [ + 1049, + 578, + 194, + 124 + ], + "template": "UI_loading_Tr.png", + "green_mask": true + }, + "Rec_「Global_WaitingForLoading」_02": { + "desc": "[识别]转场等待02,右下的进度圈", + "recognition": "TemplateMatch", + "roi": [ + 1190, + 623, + 76, + 89 + ], + "template": [ + "UI_loading_FS0%.png", + "UI_loading_FS95%.png", + "UI_loading_White%.png" + ], + "green_mask": true + }, + "Rec_「Global_WaitingForLoading」_03": { + "desc": "[识别]转场等待03,中央名称", + "recognition": "TemplateMatch", + "roi": [ + 501, + 290, + 266, + 119 + ], + "template": "UI_loading_black.png" + }, + "Rec_「Global_WaitingForLoading」_04": { + "desc": "[识别]转场等待03,右下0%", + "recognition": "OCR", + "roi": [ + 1213, + 658, + 30, + 20 + ], + "expected": "0%", + "only_rec": true + }, + "Rec_「Global_WaitingForLoading」_05": { + "desc": "[识别]转场等待03,大色块-黑", + "recognition": "ColorMatch", + "roi": [ + 203, + 476, + 930, + 110 + ], + "method": 40, + "lower": [ + 0, + 0, + 0 + ], + "upper": [ + 180, + 5, + 5 + ], + "connected": true, + "count": 102200 + }, + "Rec_「Global_WaitingForLoading」_06": { + "desc": "[识别]转场等待03,大色块-白", + "recognition": "ColorMatch", + "roi": [ + 203, + 476, + 930, + 110 + ], + "method": 40, + "lower": [ + 0, + 0, + 230 + ], + "upper": [ + 180, + 5, + 255 + ], + "connected": true, + "count": 102200 + }, "Anc_SliderSwitch_YewOn_Clr": { "desc": "滑块识别,黄色,已enable", "recognition": "ColorMatch", diff --git a/assets/resource/base/pipeline/Pass.json b/assets/resource/base/pipeline/Pass.json index a77e4ff7..c7cbc195 100644 --- a/assets/resource/base/pipeline/Pass.json +++ b/assets/resource/base/pipeline/Pass.json @@ -72,40 +72,16 @@ "action": "Click", "post_delay": 1000, "next": [ - "[JumpBack]Pass_SelectPassTask1", + "[JumpBack]Pass_SelectPassTask", "Pass_GetAll" ] }, - "Pass_SelectPassTask1": { - "desc": "选择通行证任务", + "Pass_SelectPassTask": { + "desc": "确认通行证页面,选择通行证任务", "recognition": "Or", "any_of": [ - { - "recognition": "OCR", - "roi": [ - 620, - 167, - 53, - 32 - ], - "expected": [ - "LEVEL" - ], - "only_rec": true - }, - { - "recognition": "OCR", - "roi": [ - 760, - 169, - 45, - 26 - ], - "expected": [ - "基础" - ], - "only_rec": true - } + "Rec_「Pass_SelectPassTask」_Ocr01", + "Rec_「Pass_SelectPassTask」_Ocr02" ], "action": "Click", "target": [ @@ -115,6 +91,34 @@ "post_delay": 1500, "focus": "任务子项页色核检查" }, + "Rec_「Pass_SelectPassTask」_Ocr01": { + "desc": "[识别]通行证页面,位置01", + "recognition": "OCR", + "roi": [ + 620, + 167, + 53, + 32 + ], + "expected": [ + "LEVEL" + ], + "only_rec": true + }, + "Rec_「Pass_SelectPassTask」_Ocr02": { + "desc": "[识别]通行证页面,位置02", + "recognition": "OCR", + "roi": [ + 760, + 169, + 45, + 26 + ], + "expected": [ + "基础" + ], + "only_rec": true + }, "Pass_GetAll": { "desc": "全部获得", "recognition": "OCR", diff --git a/assets/resource/base/pipeline/Setup.json b/assets/resource/base/pipeline/Setup.json index 57593bcf..47981ca6 100644 --- a/assets/resource/base/pipeline/Setup.json +++ b/assets/resource/base/pipeline/Setup.json @@ -51,20 +51,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 134, - 465, - 202, - 188 - ], - "template": [ - "UI_Arrowkeys.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Setup_Entry1_Swich」_Tpl" ], "timeout": 3000, "next": [ @@ -72,6 +59,21 @@ ], "focus": "SMSP.触发设置按需调整,原因:移动方式不应为方向键" }, + "Rec_「Setup_Entry1_Swich」_Tpl": { + "desc": "[识别]方向键存在", + "recognition": "TemplateMatch", + "roi": [ + 134, + 465, + 202, + 188 + ], + "template": [ + "UI_Arrowkeys.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Setup_SkillScan_wasd_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", @@ -304,20 +306,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 970, - 620, - 66, - 67 - ], - "template": [ - "Skill3-1GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Setup_SkillScan_Skill1」_Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -330,6 +319,21 @@ ], "focus": "Set.检测技能1,通过" }, + "Rec_「Setup_SkillScan_Skill1」_Tpl": { + "desc": "[识别]探查技能存在", + "recognition": "TemplateMatch", + "roi": [ + 970, + 620, + 66, + 67 + ], + "template": [ + "Skill3-1GE.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Setup_SkillScan_Skill1_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", @@ -383,20 +387,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 933, - 526, - 75, - 73 - ], - "template": [ - "Skill3-2GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Setup_SkillScan_Skill2」_Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -411,6 +402,21 @@ ], "focus": "Set.检测技能2,通过" }, + "Rec_「Setup_SkillScan_Skill2」_Tpl": { + "desc": "[识别]'吸取'技能存在", + "recognition": "TemplateMatch", + "roi": [ + 933, + 526, + 75, + 73 + ], + "template": [ + "Skill3-2GE.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Setup_SkillScan_Skill2_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", @@ -464,20 +470,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 966, - 437, - 80, - 86 - ], - "template": [ - "Skill3-3GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Setup_SkillScan_Skill3」_Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -492,6 +485,21 @@ ], "focus": "Set.检测技能3,通过" }, + "Rec_「Setup_SkillScan_Skill3」_Tpl": { + "desc": "[识别]'召集'技能存在", + "recognition": "TemplateMatch", + "roi": [ + 966, + 437, + 80, + 86 + ], + "template": [ + "Skill3-3GE.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Setup_SkillScan_Skill3_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", @@ -545,20 +553,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 1140, - 447, - 83, - 83 - ], - "template": [ - "Skill3-5 GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Setup_SkillScan_Skill5」_Tpl" ], "timeout": 8000, "rate_limit": 2000, @@ -573,6 +568,21 @@ ], "focus": "Set.检测技能5,通过" }, + "Rec_「Setup_SkillScan_Skill5」_Tpl": { + "desc": "[识别]'锻造'技能存在", + "recognition": "TemplateMatch", + "roi": [ + 1140, + 447, + 83, + 83 + ], + "template": [ + "Skill3-5 GE.png" + ], + "green_mask": true, + "threshold": 0.6 + }, "Setup_SkillScan_Skill5_Bin": { "desc": "【不要删不要改后挪用】custom需要调用此节点的识别", "recognition": "TemplateMatch", @@ -626,20 +636,7 @@ ] } }, - { - "recognition": "TemplateMatch", - "roi": [ - 1051, - 400, - 81, - 86 - ], - "template": [ - "Skill3-4GE.png" - ], - "green_mask": true, - "threshold": 0.6 - } + "Rec_「Collect_TeleportRecall_Skill」_Tpl" ], "timeout": 8000, "rate_limit": 2000, diff --git a/assets/resource/base/pipeline/Weekly.json b/assets/resource/base/pipeline/Weekly.json index 6e14a5a5..d255eb3b 100644 --- a/assets/resource/base/pipeline/Weekly.json +++ b/assets/resource/base/pipeline/Weekly.json @@ -440,31 +440,8 @@ "Weekly_VisitCabin_GoIn": { "recognition": "Or", "any_of": [ - { - "recognition": "TemplateMatch", - "roi": [ - 16, - 84, - 455, - 275 - ], - "template": [ - "MainHomeRIceGE.png" - ], - "green_mask": true - }, - { - "recognition": "OCR", - "roi": [ - 16, - 84, - 455, - 275 - ], - "expected": [ - "我的小屋" - ] - } + "Rec_「Weekly_VisitCabin_GoIn」_Tpl", + "Rec_「Weekly_VisitCabin_GoIn」_Ocr" ], "action": "Click", "target_offset": [ @@ -481,6 +458,33 @@ ], "focus": "WVM.点击我的小屋" }, + "Rec_「Weekly_VisitCabin_GoIn」_Tpl": { + "desc": "[识别]主页,我的小屋", + "recognition": "TemplateMatch", + "roi": [ + 16, + 84, + 455, + 275 + ], + "template": [ + "MainHomeRIceGE.png" + ], + "green_mask": true + }, + "Rec_「Weekly_VisitCabin_GoIn」_Ocr": { + "desc": "[识别]主页,我的小屋", + "recognition": "OCR", + "roi": [ + 16, + 84, + 455, + 275 + ], + "expected": [ + "我的小屋" + ] + }, "Weekly_VisitCabin_TabChg": { "recognition": "OCR", "roi": [ From df085447e296f101320684208ebf90d57325dc06 Mon Sep 17 00:00:00 2001 From: sunyink Date: Mon, 11 May 2026 17:53:15 +0800 Subject: [PATCH 06/11] =?UTF-8?q?chore:=20ignore=E6=94=AF=E6=8F=B4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0MaaOWM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1f5081b5f50b8e081b144a0ea11523c0f29cd67c) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 91614228..793109d6 100644 --- a/.gitignore +++ b/.gitignore @@ -478,3 +478,7 @@ package.json prettier.config.mjs .claude/* + +# MaaOWM +**/.maaowm +**/__mod_extras__.json \ No newline at end of file From 213b67259db1223babcbca33ca6d59421e6cd8a1 Mon Sep 17 00:00:00 2001 From: sunyink Date: Wed, 13 May 2026 18:39:12 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=E5=90=AF=E5=8A=A8.=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BC=B9=E7=AA=97=E5=90=8E=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/StartGame.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/resource/base/pipeline/StartGame.json b/assets/resource/base/pipeline/StartGame.json index eafe0e6f..0da30633 100644 --- a/assets/resource/base/pipeline/StartGame.json +++ b/assets/resource/base/pipeline/StartGame.json @@ -302,7 +302,7 @@ "StartGame_Update_PGM", "StartGame_Update_Data", "[JumpBack]StartGame_PayFailed", - "StartGame_LinkDown", + "[JumpBack]StartGame_LinkDown", "StartGame_TouchStart", "StartGame_LoadingPage", "StartGame_Loading" @@ -740,8 +740,7 @@ 443 ], "next": [ - "StartGame_LinkDown_TouchCk", - "StartGame_Logo" + "StartGame_LinkDown_TouchCk" ] }, "StartGame_LinkDown_TouchCk": { From 05ea6814be0e153ae6efbb6b495cc2bfb1637331 Mon Sep 17 00:00:00 2001 From: sunyink Date: Thu, 14 May 2026 10:14:02 +0800 Subject: [PATCH 08/11] =?UTF-8?q?chore:=E5=85=AC=E7=94=A8=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=BA=93.=E5=B0=86=E5=8D=95=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=A4=8D=E7=94=A8?= =?UTF-8?q?rec=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Global.json | 62 +++++------------------ 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index 0a552304..0d4edfb1 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -43,7 +43,8 @@ ], "template": [ "BackButGe.png", - "BackButGe2.png" + "BackButGe2.png", + "UI_qsback.png" ], "green_mask": true, "action": "Click", @@ -127,18 +128,8 @@ }, "Global_ToHomePage_Reset": { "desc": "其他页面，返回按钮", - "recognition": "TemplateMatch", - "roi": [ - 1, - 1, - 231, - 124 - ], - "template": [ - "BackButGe.png", - "BackButGe2.png" - ], - "green_mask": true, + "recognition": "And", + "all_of": ["Global_BackPageHub_Once"], "action": "Click", "post_delay": 3000, "next": [ @@ -179,19 +170,8 @@ }, "Global_ToSandBox_Reset": { "desc": "其他页面，返回按钮", - "recognition": "TemplateMatch", - "roi": [ - 1, - 1, - 231, - 124 - ], - "template": [ - "BackButGe.png", - "BackButGe2.png", - "UI_qsback.png" - ], - "green_mask": true, + "recognition": "And", + "all_of": ["Global_BackPageHub_Once"], "action": "Click", "post_delay": 4000, "next": [ @@ -327,15 +307,10 @@ }, "Global_BackToPve2#_FinBackMapPage": { "desc": "识别右下图钉-章节主页", - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" + "recognition": "Or", + "any_of": [ + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "focus": "G.Global复位完成，结束~" }, @@ -425,19 +400,10 @@ }, "Global_BackToQC1_Fin": { "desc": "找到图钉-点击返回主页", - "recognition": "TemplateMatch", - "roi": [ - 1122, - 646, - 40, - 38 - ], - "template": [ - "pin.png" - ], - "target": [ - 1186, - 46 + "recognition": "Or", + "any_of": [ + "Rec_SandBox_Pin_Tpl", + "Rec_SandBox_Run_Tpl" ], "post_delay": 1000, "focus": "GO.卡带复位成功" From b35d3734820b3083b1c092fc4b0da04f9a948548 Mon Sep 17 00:00:00 2001 From: sunyink Date: Thu, 14 May 2026 14:22:35 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=E7=8B=A9=E7=8C=8E.=E5=9C=A3=E7=9F=B3?= =?UTF-8?q?=E5=9D=87=E8=A1=A1=E6=A8=A1=E5=BC=8F,=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E4=BD=8D=E7=BD=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/image/SubBattle_+1.png | Bin 0 -> 276 bytes assets/resource/base/pipeline/Battle.json | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 assets/resource/base/image/SubBattle_+1.png diff --git a/assets/resource/base/image/SubBattle_+1.png b/assets/resource/base/image/SubBattle_+1.png new file mode 100644 index 0000000000000000000000000000000000000000..8296413d412147c54716e9948745efcdf91c485e GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gx!3HG%?c?k%n>e>}*F6u(e=pC^7aC~6_kDpt z4~LtK^s8Sj;Y&FTCk3VPCpL#aEtB05%f3gen$wL%xk>O~M{?kG^*vhI`vU8Jxqq8{KMs7S T_ok`>y~*I|>gTe~DWM4f1zv3= literal 0 HcmV?d00001 diff --git a/assets/resource/base/pipeline/Battle.json b/assets/resource/base/pipeline/Battle.json index 330d640b..43c07821 100644 --- a/assets/resource/base/pipeline/Battle.json +++ b/assets/resource/base/pipeline/Battle.json @@ -1147,11 +1147,15 @@ "focus": "BTM.次数=2次" }, "QuickHunt_TurnCharact_TurnDuo_Int": { - "action": "Click", - "target": [ - 848, - 451 + "recognition": "TemplateMatch", + "roi": [ + 802, + 322, + 84, + 150 ], + "template": ["SubBattle_+1.png"], + "action": "Click", "post_delay": 500, "focus": "BTM.刷取次数调整" }, From 977c0c43a61a5ec8a47236ad15dade1ef76d8ef5 Mon Sep 17 00:00:00 2001 From: sunyink Date: Thu, 14 May 2026 20:41:51 +0800 Subject: [PATCH 10/11] =?UTF-8?q?chore:=E5=85=AC=E7=94=A8=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=BA=93.=E7=BB=A7=E7=BB=AD=E5=B0=86=E7=B1=BB?= =?UTF-8?q?=E4=BC=BC=E5=8F=82=E6=95=B0=E5=A4=8D=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Global.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index 0d4edfb1..2373e6b8 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -317,11 +317,8 @@ "Global_BackToQC1": { "desc": "50次多半是卡死了,死死透别截图了", "max_hit": 50, - "recognition": "TemplateMatch", - "template": [ - "BusinQuickIcoGE.png" - ], - "green_mask": true, + "recognition": "And", + "all_of": ["Global_QuickCart_MenuReset"], "action": "Click", "post_delay": 2000, "next": [ From b75d10ff1e7c1d643c9582b65e1f80086f5e6b05 Mon Sep 17 00:00:00 2001 From: sunyink Date: Thu, 14 May 2026 20:55:06 +0800 Subject: [PATCH 11/11] =?UTF-8?q?chore=EF=BC=9A=E8=B0=83=E6=95=B4OCR?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=BAV5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/PC/model/.gitignore | 1 + configure.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 assets/resource/PC/model/.gitignore diff --git a/assets/resource/PC/model/.gitignore b/assets/resource/PC/model/.gitignore new file mode 100644 index 00000000..37faf485 --- /dev/null +++ b/assets/resource/PC/model/.gitignore @@ -0,0 +1 @@ +ocr \ No newline at end of file diff --git a/configure.py b/configure.py index 3b17dc31..2df8fbe4 100644 --- a/configure.py +++ b/configure.py @@ -13,7 +13,7 @@ def configure_ocr_model(): ocr_dir = assets_dir / "resource" / "base" / "model" / "ocr" ocr_dir.mkdir(parents=True, exist_ok=True) - ppocr_dir = assets_ocr_dir / "ppocr_v4" + ppocr_dir = assets_ocr_dir / "ppocr_v5" # det: 移动版 (zh_cn，无后缀文件夹) det_src = ppocr_dir / "zh_cn" / "det.onnx"