فهرست منبع

fix(Restart): recheck login screen before retrying entry

unknown 2 ماه پیش
والد
کامیت
487df9f542
3فایلهای تغییر یافته به همراه153 افزوده شده و 2 حذف شده
  1. 2 0
      .gitignore
  2. 15 2
      tasks/Restart/login.py
  3. 136 0
      tests/tasks/Restart/test_login.py

+ 2 - 0
.gitignore

@@ -48,6 +48,8 @@ CLAUDE.md
 .codex/
 .claude/
 openspec/
+/dev/
+/memory/
 
 
 # Created by .ignore support plugin (hsz.mobi)

+ 15 - 2
tasks/Restart/login.py

@@ -30,6 +30,9 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
 
         confirm_timer = Timer(1.5, count=2).start()
         orientation_timer = Timer(10)
+        # 两种“进入游戏”OCR 共用点击间隔;等待期间继续截图处理页面变化。
+        enter_game_timer = Timer(3)
+        enter_game_attempts = 0
         login_success = False
 
         while 1:
@@ -130,6 +133,7 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
                 logger.info('误入区服设置')
                 # https://github.com/runhey/OnmyojiAutoScript/issues/585
                 self.device.click(x=106, y=535)
+                continue
                 
             # 点击’进入游戏‘
             if not self.appear(self.I_LOGIN_8):
@@ -140,8 +144,17 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
                 if self.appear_then_click(self.I_EARLY_SERVER_CANCEL):
                     logger.info('Cancel switch from early server to normal server')
                     continue
-            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME_ORIGIN, interval=3) or self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
-                self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, True, wait_time=5)
+            if not enter_game_timer.reached():
+                continue
+            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME_ORIGIN) \
+                    or self.ocr_appear_click(self.O_LOGIN_ENTER_GAME):
+                enter_game_attempts += 1
+                enter_game_timer.reset()
+                if enter_game_attempts > 1:
+                    logger.warning(f'Still on login screen, retry enter game (attempt {enter_game_attempts})')
+                else:
+                    logger.info('Click enter game; checking the next screenshot')
+                # 回到主循环检查新截图:仍在登录页则重试,角色选择、庭院或弹窗由对应分支处理。
                 continue
 
         return login_success

+ 136 - 0
tests/tasks/Restart/test_login.py

@@ -0,0 +1,136 @@
+from types import SimpleNamespace
+
+import pytest
+
+from module.atom.image import RuleImage
+from module.atom.ocr import RuleOcr
+from module.base import timer
+from tasks.Restart.login import LoginHandler
+
+
+class LoginReplay(LoginHandler):
+    """Run the real login loop with deterministic screenshots and a fake clock."""
+
+    def __init__(self, monkeypatch, next_screen):
+        self.interval_timer = {}
+        self.now = 100.0
+        self.frames = 0
+        self.clicks = []
+        self.next_screen = next_screen
+        self.device = SimpleNamespace(
+            image=set(),
+            screenshot=self.take_screenshot,
+            click=self.record_click,
+            stuck_record_add=lambda name: None,
+            get_orientation=lambda: None,
+            check_screen_size_sample=lambda: True,
+        )
+        monkeypatch.setattr(timer, 'time', SimpleNamespace(time=lambda: self.now))
+        monkeypatch.setattr(
+            RuleImage, 'match', lambda asset, image, **kwargs: asset.name in image
+        )
+
+        def ocr(asset, image, **kwargs):
+            if asset.name not in image:
+                return (0, 0, 0, 0) if asset is self.O_LOGIN_SPECIFIC_SERVE else ''
+            if asset is self.O_LOGIN_SPECIFIC_SERVE:
+                return (110, 120, 100, 30)
+            return asset.keyword
+
+        monkeypatch.setattr(RuleOcr, 'ocr', ocr)
+
+    def take_screenshot(self):
+        self.frames += 1
+        assert self.frames <= 80, 'Login did not reach the courtyard'
+        self.now += 0.5
+        self.device.image = {asset.name for asset in self.next_screen(self)}
+
+    def record_click(self, x, y, control_name=None):
+        self.clicks.append((control_name, self.frames, self.now))
+
+    def courtyard(self):
+        return [self.I_BUFF_1, self.I_MAIN_GOTO_SHIKIGAMI_RECORDS]
+
+    def login_screen(self, alternate=False):
+        button = self.O_LOGIN_ENTER_GAME if alternate else self.O_LOGIN_ENTER_GAME_ORIGIN
+        return [self.I_LOGIN_8, button]
+
+
+@pytest.mark.parametrize('alternate_on_retry', [False, True])
+def test_ignored_enter_game_click_is_retried_on_a_new_frame(monkeypatch, alternate_on_retry):
+    def next_screen(task):
+        if len(task.clicks) >= 2:
+            return task.courtyard()
+        return task.login_screen(alternate=bool(task.clicks) and alternate_on_retry)
+
+    task = LoginReplay(monkeypatch, next_screen)
+
+    assert task._app_handle_login() is True
+    assert len(task.clicks) == 2
+    first, second = task.clicks
+    assert first[0] == task.O_LOGIN_ENTER_GAME_ORIGIN.name
+    expected_retry = task.O_LOGIN_ENTER_GAME if alternate_on_retry else task.O_LOGIN_ENTER_GAME_ORIGIN
+    assert second[0] == expected_retry.name
+    assert second[1] > first[1]
+    assert second[2] - first[2] >= 3
+
+
+def test_direct_courtyard_entry_does_not_wait_for_character_selection(monkeypatch):
+    task = LoginReplay(
+        monkeypatch,
+        lambda task: task.courtyard() if task.clicks else task.login_screen(),
+    )
+
+    assert task._app_handle_login() is True
+    assert len(task.clicks) == 1
+    # The courtyard is immediately available; only its stability check is needed.
+    assert task.now - task.clicks[0][2] < 3
+
+
+def test_character_selection_is_handled_after_enter_game(monkeypatch):
+    def next_screen(task):
+        clicked = [click[0] for click in task.clicks]
+        if task.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR.name in clicked:
+            return task.courtyard()
+        if task.O_LOGIN_ENTER_GAME_ORIGIN.name in clicked:
+            return [task.I_LOGIN_SPECIFIC_SERVE, task.O_LOGIN_SPECIFIC_SERVE]
+        return task.login_screen()
+
+    task = LoginReplay(monkeypatch, next_screen)
+
+    assert task._app_handle_login() is True
+    assert [click[0] for click in task.clicks] == [
+        task.O_LOGIN_ENTER_GAME_ORIGIN.name,
+        task.O_LOGIN_SPECIFIC_SERVE.name,
+        task.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR.name,
+    ]
+
+
+def test_server_selection_is_left_before_processing_a_new_login_frame(monkeypatch):
+    def next_screen(task):
+        if not task.clicks:
+            return [task.I_CHARACTARS, *task.login_screen()]
+        if len(task.clicks) == 1:
+            return task.login_screen()
+        return task.courtyard()
+
+    task = LoginReplay(monkeypatch, next_screen)
+
+    assert task._app_handle_login() is True
+    assert len(task.clicks) == 2
+    assert task.clicks[1][0] == task.O_LOGIN_ENTER_GAME_ORIGIN.name
+    assert task.clicks[1][1] > task.clicks[0][1]
+
+
+def test_loading_frames_do_not_trigger_another_enter_game_click(monkeypatch):
+    def next_screen(task):
+        if not task.clicks:
+            return task.login_screen()
+        if task.now - task.clicks[0][2] < 6:
+            return []
+        return task.courtyard()
+
+    task = LoginReplay(monkeypatch, next_screen)
+
+    assert task._app_handle_login() is True
+    assert len(task.clicks) == 1