diff --git a/mower/resources/sign_in/banner.png b/mower/resources/sign_in/banner.png index 3109a44..c9dfb1f 100644 --- a/mower/resources/sign_in/banner.png +++ b/mower/resources/sign_in/banner.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b779c2c571d68798e8b60ebb373c3bff960f096de321e756eaa6fbde2de1c0a -size 29509 +oid sha256:ce56f377b0613da1497e8f022fb258b317d2fa34f3ea92871ff3bdb1308c64f5 +size 172448 diff --git a/mower/resources/sign_in/entry.png b/mower/resources/sign_in/entry.png index 5e169a0..c0dc2a4 100644 --- a/mower/resources/sign_in/entry.png +++ b/mower/resources/sign_in/entry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ade4e044087f048dc0263e967d5357351d49360d786899d9b9634ce7f644b855 -size 12738 +oid sha256:2d8d922beec36e2c06ebd3f854085b5c377e7e5c4fd9e618a791455f812b0623 +size 20486 diff --git a/mower/solvers/sign_in/__init__.py b/mower/solvers/sign_in/__init__.py index 75689d7..91d31ad 100644 --- a/mower/solvers/sign_in/__init__.py +++ b/mower/solvers/sign_in/__init__.py @@ -8,6 +8,6 @@ from .sign_in import SignIn class SignInSolver(SceneGraphSolver): def run(self): success = True - if datetime.now() < datetime(2024, 10, 8): + if datetime.now() < datetime(2024, 11, 5): success = success and SignIn().run() return success diff --git a/mower/solvers/sign_in/sign_in.py b/mower/solvers/sign_in/sign_in.py index 06a6644..a5f8af5 100644 --- a/mower/solvers/sign_in/sign_in.py +++ b/mower/solvers/sign_in/sign_in.py @@ -11,7 +11,7 @@ from mower.utils.vector import sa from .utils import notify -activity_name = "构想试炼" +activity_name = "感谢庆典前瞻" class SignIn(SceneGraphSolver): @@ -29,7 +29,7 @@ class SignIn(SceneGraphSolver): return True elif (scene := self.scene()) == Scene.MATERIEL: self.sleep() - notify(f"{activity_name}奖励领取") + notify(f"{activity_name}签到奖励领取") self.tap((960, 960)) elif scene == Scene.INDEX: score, scope = config.recog.match("sign_in/entry") @@ -42,7 +42,7 @@ class SignIn(SceneGraphSolver): elif scene == Scene.SIGN_IN_DAILY: top_left = 680, 500 img = cropimg(config.recog.hsv, (top_left, (1800, 540))) - img = cv2.inRange(img, (120, 120, 230), (140, 255, 255)) + img = cv2.inRange(img, (165, 200, 100), (180, 255, 255)) contours, _ = cv2.findContours( img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE ) diff --git a/mower/utils/recognize/data.py b/mower/utils/recognize/data.py index 351e12b..e51e969 100644 --- a/mower/utils/recognize/data.py +++ b/mower/utils/recognize/data.py @@ -100,7 +100,7 @@ color = { "shop/token": (1097, 120), "shop/trade_token_button": (15, 998), "shop/trade_token_dialog": (717, 694), - "sign_in/banner": (205, 700), + "sign_in/banner": (52, 728), "sign_in/moon_festival/moon_cake": (1216, 503), "skip": (1803, 32), "sss/accomplished": (634, 381), diff --git a/mower/utils/typealias/res.py b/mower/utils/typealias/res.py index 8e54f15..8891a2b 100644 --- a/mower/utils/typealias/res.py +++ b/mower/utils/typealias/res.py @@ -30,15 +30,15 @@ Res = Literal[ "choose_agent/perfer_choosed", "choose_agent/profession/ALL", "choose_agent/profession/CASTER", - "choose_agent/profession/choose_arrow", "choose_agent/profession/MEDIC", "choose_agent/profession/PIONEER", - "choose_agent/profession/skill", "choose_agent/profession/SNIPER", "choose_agent/profession/SPECIAL", "choose_agent/profession/SUPPORT", "choose_agent/profession/TANK", "choose_agent/profession/WARRIOR", + "choose_agent/profession/choose_arrow", + "choose_agent/profession/skill", "choose_agent/rect", "choose_agent/riic_empty", "choose_agent/support_agent", @@ -310,6 +310,13 @@ Res = Literal[ "ope_start", "open_recruitment", "operator/CASTER", + "operator/MEDIC", + "operator/PIONEER", + "operator/SNIPER", + "operator/SPECIAL", + "operator/SUPPORT", + "operator/TANK", + "operator/WARRIOR", "operator/elite0", "operator/elite1", "operator/elite2", @@ -319,9 +326,7 @@ Res = Literal[ "operator/mastery1", "operator/mastery2", "operator/mastery3", - "operator/MEDIC", "operator/no_skill", - "operator/PIONEER", "operator/potential0", "operator/potential1", "operator/potential2", @@ -329,12 +334,7 @@ Res = Literal[ "operator/potential4", "operator/potential5", "operator/skill_locked", - "operator/SNIPER", - "operator/SPECIAL", - "operator/SUPPORT", - "operator/TANK", "operator/trust", - "operator/WARRIOR", "order_label", "order_ready", "order_switching_notice", @@ -547,8 +547,8 @@ Res = Literal[ "sss/drop/近卫", "sss/drop/重装", "sss/drop", - "sss/drop_check", "sss/drop_EC", + "sss/drop_check", "sss/ec", "sss/loading", "sss/loading_ex",