diff --git a/arknights_mower/solvers/recruit.py b/arknights_mower/solvers/recruit.py index 30c02680..2e468902 100644 --- a/arknights_mower/solvers/recruit.py +++ b/arknights_mower/solvers/recruit.py @@ -2,7 +2,9 @@ import pickle import traceback from itertools import combinations + import cv2 + from arknights_mower import __rootdir__ from arknights_mower.data import ( agent_with_tags, diff --git a/arknights_mower/utils/recognize.py b/arknights_mower/utils/recognize.py index f108f9a8..e7bca743 100644 --- a/arknights_mower/utils/recognize.py +++ b/arknights_mower/utils/recognize.py @@ -764,26 +764,26 @@ def find( "recruit/agent_token": ((1740, 765), (1920, 805)), "recruit/agent_token_first": ((1700, 760), (1920, 810)), "recruit/available_level": (1294, 234), - "recruit/begin_recruit":scope, + "recruit/begin_recruit": scope, "recruit/career_needs": (350, 593), "recruit/lmb": (945, 27), - "recruit/recruit_done":scope, - "recruit/recruit_lock":scope, - 'recruit/job_requirements':scope, - "recruit/ticket": ((900, 0),(1920, 120)), + "recruit/recruit_done": scope, + "recruit/recruit_lock": scope, + "recruit/job_requirements": scope, + "recruit/ticket": ((900, 0), (1920, 120)), "recruit/time": (1304, 112), "recruit/refresh": (1366, 560), "recruit/refresh_comfirm": (1237, 714), - "recruit/riic_res/CASTER":((750, 730), (1920, 860)), - "recruit/riic_res/MEDIC":((750, 730), (1920, 860)), - "recruit/riic_res/PIONEER":((750, 730), (1920, 860)), - "recruit/riic_res/SPECIAL":((750, 730), (1920, 860)), - "recruit/riic_res/SNIPER":((750, 730), (1920, 860)), - "recruit/riic_res/SUPPORT":((750, 730), (1920, 860)), - "recruit/riic_res/TANK":((750, 730), (1920, 860)), - "recruit/riic_res/WARRIOR":((750, 730), (1920, 860)), + "recruit/riic_res/CASTER": ((750, 730), (1920, 860)), + "recruit/riic_res/MEDIC": ((750, 730), (1920, 860)), + "recruit/riic_res/PIONEER": ((750, 730), (1920, 860)), + "recruit/riic_res/SPECIAL": ((750, 730), (1920, 860)), + "recruit/riic_res/SNIPER": ((750, 730), (1920, 860)), + "recruit/riic_res/SUPPORT": ((750, 730), (1920, 860)), + "recruit/riic_res/TANK": ((750, 730), (1920, 860)), + "recruit/riic_res/WARRIOR": ((750, 730), (1920, 860)), "recruit/start_recruit": (1438, 849), - "recruit/stone": ((900, 0),(1920, 120)), + "recruit/stone": ((900, 0), (1920, 120)), "riic/assistants": ((1320, 400), (1600, 650)), "riic/iron": ((1570, 230), (1630, 340)), "riic/orundum": ((1500, 320), (1800, 550)), @@ -796,20 +796,19 @@ def find( "navigation/ope_hard_small": 0.7, "navigation/ope_normal": 0.7, "navigation/ope_normal_small": 0.7, - "recruit/agent_token":0.8, - "recruit/agent_token_first":0.8, - "recruit/lmb":0.7, - "recruit/riic_res/CASTER":0.7, - "recruit/riic_res/MEDIC":0.7, - "recruit/riic_res/PIONEER":0.7, - "recruit/riic_res/SPECIAL":0.7, - "recruit/riic_res/SNIPER":0.7, - "recruit/riic_res/SUPPORT":0.7, - "recruit/riic_res/TANK":0.7, - "recruit/riic_res/WARRIOR":0.7, - "recruit/time":0.8, - "recruit/stone":0.7 - + "recruit/agent_token": 0.8, + "recruit/agent_token_first": 0.8, + "recruit/lmb": 0.7, + "recruit/riic_res/CASTER": 0.7, + "recruit/riic_res/MEDIC": 0.7, + "recruit/riic_res/PIONEER": 0.7, + "recruit/riic_res/SPECIAL": 0.7, + "recruit/riic_res/SNIPER": 0.7, + "recruit/riic_res/SUPPORT": 0.7, + "recruit/riic_res/TANK": 0.7, + "recruit/riic_res/WARRIOR": 0.7, + "recruit/time": 0.8, + "recruit/stone": 0.7, } if res in template_matching: