Skip to content

Commit 3dc678d

Browse files
EeeMaoYclaude1bananachicken
authored
feat(ocr):更新ocr模型到v5，并且检查了所有pipeline节点中的roi，以确保对国际服的的适配 (#257)
* feat: 一咖舍新增自动根据风向标替换商品功能 - 新增 WithdrawMoneyEnterItemList / WithdrawMoneyItemsList 流水线节点， 通过 OCR 识别进入商品列表界面并触发自定义动作 - 新增 withdraw_money_choose_item.py：按收益从高到低自动选择前五个商品， 支持上下滑动切换视图后的坐标适配 - WithdrawMoney.json 拆分为独立目录，识别/动作辅助节点放入 Status.json - 新增"替换商品"任务选项（默认开启），可控制是否启用产品选择 - 更新任务描述及五语言 i18n：现已支持风向标自动替换商品 - 新增 task-config skill，更新 python-action-guide skill 的 RecognitionDetail 章节 Co-Authored-By: DeepSeek v4 pro <noreply@anthropic.com> * chore: 标注替换商品选项仅前台模式可用 五语言同步更新 task_withdraw_money_option_choose_product label。 Co-Authored-By: Claude Code <noreply@anthropic.com> * 缩小点击空白处关闭的roi，修改点击商品列表退出按钮为模板匹配方式（原先颜色匹配不稳定） * ocr: update v5 ocr model config in WithdrawMoney pipeline * 更改为v5试验模型 * 扩展fishnew部分的roi以确保外语能识别（以一般文本最长的英语为基准） * 由于渔具商店和海上钓客英文为滚动形式，改为模板匹配 * 补充扩展商店界面万能鱼饵的roi * fishscene中ocr的roi修改 * 喷泉打卡 * 做咖啡（锤人 * 粉爪 * 更新scene以适配国际服左上滚动标题（也包括国服斯卡布罗集市） * core2 * tools * skipstory+teleport * Rhythm * scenelogin * tetris * withdrawmoney --------- Co-authored-by: DeepSeek v4 pro <noreply@anthropic.com> Co-authored-by: 比并交 <116740703+1bananachicken@users.noreply.github.com>
1 parent e86e23e commit 3dc678d

23 files changed

Lines changed: 198 additions & 324 deletions

‎assets/resource/base/image/Common/Scene/EscMenu/EscMenuSign.png‎

-2.01 KB
Binary file not shown.

‎assets/resource/base/image/Common/Scene/SceneBattlePass.png‎

2.86 KB
Loading

‎assets/resource/base/image/Common/Scene/SceneCityTycoon.png‎

1.99 KB
Loading

‎assets/resource/base/image/Common/Scene/SceneExplorationGuide.png‎

2.95 KB
Loading

‎assets/resource/base/image/Common/Scene/SceneScarboroughFair.png‎

2.33 KB
Loading

‎assets/resource/base/image/Fish/FishFishingTackleShop.png‎

1.79 KB
Loading

‎assets/resource/base/image/Fish/FishSeaAngler.png‎

2.56 KB
Loading

‎assets/resource/base/pipeline/Fish/FishNew.json‎

Lines changed: 71 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121
"type": "OCR",
122122
"param": {
123123
"roi": [
124-
520,
125-
340,
126-
240,
127-
40
124+
355,
125+
286,
126+
545,
127+
159
128128
],
129129
"expected": [
130130
"需要装备鱼饵才可以钓鱼",
@@ -136,7 +136,6 @@
136136
"釣り餌を装着する必要",
137137
"미끼를 장착해야 낚시할 수 있습니다"
138138
],
139-
"threshold": 0.5,
140139
"roi_offset": [
141140
0,
142141
0,
@@ -159,19 +158,19 @@
159158
"type": "OCR",
160159
"param": {
161160
"roi": [
162-
520,
163-
340,
164-
240,
165-
40
161+
355,
162+
286,
163+
545,
164+
159
166165
],
167166
"expected": [
167+
"鱼舱中渔获已满，请出售一些鱼获再尝试",
168168
"渔获已满",
169169
"漁獲已滿",
170170
"Your fish hold is full",
171171
"生け簀が一杯です", //生け簀が一杯です、魚を売却後に再度お試しください
172172
"저장고가 가득 찼습니다. 일부 어획물을 판매한 뒤 다시 시도해 주세요"
173-
],
174-
"threshold": 0.8
173+
]
175174
}
176175
},
177176
"focus": {
@@ -274,8 +273,7 @@
274273
"(?i)Purchase",
275274
"購入",
276275
"구매"
277-
],
278-
"threshold": 0.8
276+
]
279277
}
280278
},
281279
"action": "ClickKey",
@@ -307,8 +305,7 @@
307305
"(?i)Switch\\s*Bait",
308306
"釣り餌交換",
309307
"미끼 교체"
310-
],
311-
"threshold": 0.8
308+
]
312309
}
313310
},
314311
"pre_delay": 500,
@@ -338,8 +335,7 @@
338335
"(?i)Purchase",
339336
"購入",
340337
"구매"
341-
],
342-
"threshold": 0.8
338+
]
343339
}
344340
},
345341
"action": "Click",
@@ -358,22 +354,18 @@
358354
]
359355
},
360356
"FishNewOnStore": {
361-
"desc": "到达商店界面商店界面",
357+
"desc": "到达商店界面",
362358
"recognition": {
363-
"type": "OCR",
359+
"type": "TemplateMatch",
364360
"param": {
365361
"roi": [
366-
60,
367-
16,
368-
120,
369-
48
362+
0,
363+
0,
364+
80,
365+
80
370366
],
371-
"expected": [
372-
"渔具商店",
373-
"漁具商店",
374-
"(?i)Fishing\\s*Tackle\\s*Shop",
375-
"釣具店",
376-
"낚시용품 상점"
367+
"template": [
368+
"Fish/FishFishingTackleShop.png"
377369
],
378370
"threshold": 0.8
379371
}
@@ -430,7 +422,6 @@
430422
"Fish/FishStoreGeneralBait.png"
431423
],
432424
"green_mask": true,
433-
"threshold": 0.5,
434425
// "threshold": 0.8, // 0.8 有点高了
435426
"order_by": "Score", // 默认似乎不是按置信度排的，需要显式声明
436427
"action": "Click",
@@ -442,22 +433,11 @@
442433
"FishNewStoreScrollMouse": {
443434
"desc": "滚动商店界面",
444435
"recognition": {
445-
"type": "OCR",
436+
"type": "And",
446437
"param": {
447-
"roi": [
448-
60,
449-
16,
450-
120,
451-
48
452-
],
453-
"expected": [
454-
"渔具商店",
455-
"漁具商店",
456-
"(?i)Fishing\\s*Tackle\\s*Shop",
457-
"釣具店",
458-
"낚시용품 상점"
459-
],
460-
"threshold": 0.8
438+
"all_of": [
439+
"FishNewOnStore"
440+
]
461441
}
462442
},
463443
"pre_delay": 500,
@@ -511,15 +491,15 @@
511491
{
512492
"recognition": "OCR",
513493
"roi": [
514-
1031,
515-
119,
516-
94,
517-
48
494+
1029,
495+
115,
496+
164,
497+
60
518498
],
519499
"expected": [
520500
"万能鱼饵",
521501
"萬能魚餌",
522-
"Universal Bait",
502+
"(?i)Universal\\s*Bait",
523503
"万能釣り餌",
524504
"만능 미끼"
525505
]
@@ -546,8 +526,7 @@
546526
"(?i)Purchase",
547527
"購入",
548528
"구매"
549-
],
550-
"threshold": 0.8
529+
]
551530
}
552531
},
553532
"action": "Click",
@@ -580,7 +559,6 @@
580559
"CONFIRN",
581560
"확인"
582561
],
583-
"threshold": 0.8,
584562
"roi_offset": [
585563
0,
586564
0,
@@ -599,22 +577,11 @@
599577
"FishNewExitStore": {
600578
"desc": "退出渔具商店重新开始钓鱼",
601579
"recognition": {
602-
"type": "OCR",
580+
"type": "And",
603581
"param": {
604-
"roi": [
605-
10,
606-
13,
607-
198,
608-
57
609-
],
610-
"expected": [
611-
"渔具商店",
612-
"漁具商店",
613-
"(?i)Fishing\\s*Tackle\\s*Shop",
614-
"釣具店",
615-
"낚시용품 상점"
616-
],
617-
"threshold": 0.8
582+
"all_of": [
583+
"FishNewOnStore"
584+
]
618585
}
619586
},
620587
"action": {
@@ -633,10 +600,10 @@
633600
"desc": "卖鱼流程入口：识别到鱼鳞币不足，前往卖鱼流程",
634601
"recognition": "OCR",
635602
"roi": [
636-
553,
637-
340,
638-
172,
639-
38
603+
489,
604+
299,
605+
294,
606+
119
640607
],
641608
"expected": [
642609
"货币不足无法购买",
@@ -659,22 +626,11 @@
659626
"FishNewExitStoreSellFish": {
660627
"desc": "退出渔具商店前往卖鱼",
661628
"recognition": {
662-
"type": "OCR",
629+
"type": "And",
663630
"param": {
664-
"roi": [
665-
10,
666-
13,
667-
198,
668-
57
669-
],
670-
"expected": [
671-
"渔具商店",
672-
"漁具商店",
673-
"(?i)Fishing\\s*Tackle\\s*Shop",
674-
"釣具店",
675-
"낚시용품 상점"
676-
],
677-
"threshold": 0.8
631+
"all_of": [
632+
"FishNewOnStore"
633+
]
678634
}
679635
},
680636
"action": {
@@ -722,7 +678,7 @@
722678
"roi": [
723679
155,
724680
154,
725-
136,
681+
175,
726682
55
727683
],
728684
"expected": [
@@ -762,10 +718,10 @@
762718
"desc": "渔获市场提交1",
763719
"recognition": "OCR",
764720
"roi": [
765-
969,
766-
622,
767-
107,
768-
37
721+
861,
722+
616,
723+
327,
724+
45
769725
],
770726
"expected": [
771727
"快捷提交",
@@ -805,10 +761,10 @@
805761
"desc": "渔获市场提交2",
806762
"recognition": "OCR",
807763
"roi": [
808-
969,
809-
622,
810-
107,
811-
37
764+
861,
765+
616,
766+
327,
767+
45
812768
],
813769
"expected": [
814770
"快捷提交",
@@ -848,10 +804,10 @@
848804
"desc": "渔获市场提交3",
849805
"recognition": "OCR",
850806
"roi": [
851-
969,
852-
622,
853-
107,
854-
37
807+
861,
808+
616,
809+
327,
810+
45
855811
],
856812
"expected": [
857813
"快捷提交",
@@ -912,10 +868,10 @@
912868
"type": "OCR",
913869
"param": {
914870
"roi": [
915-
700,
916-
455,
917-
150,
918-
40
871+
665,
872+
448,
873+
230,
874+
48
919875
],
920876
"expected": [
921877
"确认记录",
@@ -927,10 +883,8 @@
927883
"確定",
928884
"确定",
929885
"OK",
930-
"CONFIRN",
931886
"확인"
932887
],
933-
"threshold": 0.8,
934888
"roi_offset": [
935889
0,
936890
0,
@@ -949,10 +903,10 @@
949903
"desc": "无鱼可卖",
950904
"recognition": "OCR",
951905
"roi": [
952-
398,
953-
404,
954-
136,
955-
36
906+
264,
907+
336,
908+
406,
909+
191
956910
],
957911
"expected": [
958912
"暂未获得鱼",
@@ -970,19 +924,15 @@
970924
},
971925
"FishNewFishingMasterExit": {
972926
"desc": "从海上钓客退回钓鱼游戏界面",
973-
"recognition": "OCR",
927+
"recognition": "TemplateMatch",
974928
"roi": [
975-
61,
976-
16,
977-
120,
978-
48
929+
0,
930+
0,
931+
80,
932+
80
979933
],
980-
"expected": [
981-
"海上钓客",
982-
"海上釣客",
983-
"(?i)Sea\\s*Angler",
984-
"海釣り",
985-
"바다 낚시꾼"
934+
"template": [
935+
"Fish/FishSeaAngler.png"
986936
],
987937
"action": "ClickKey",
988938
"key": [

‎assets/resource/base/pipeline/Fish/FishScene.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
"roi": [
143143
821,
144144
39,
145-
124,
145+
252,
146146
51
147147
],
148148
"expected": [

0 commit comments

Comments
 (0)