Przeglądaj źródła

Fix AreaBoss post-battle navigation stalls

Recover boss detail overlays during battle return, filter navigation and return home. Handle transitional frames, honor close cooldowns and bound each stage with a timeout.

Add 24 navigation regression cases and update battle return tests. Validation: 30 AreaBoss tests passed; reported screenshots replayed offline; git diff --check passed.
unknown 3 tygodni temu
rodzic
commit
084bae212e

+ 39 - 11
tasks/AreaBoss/script_task.py

@@ -8,6 +8,7 @@ import numpy as np
 import random
 import re
 from module.atom.click import RuleClick
+from module.base.timer import Timer
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.battle import Battle
@@ -18,7 +19,7 @@ from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.AreaBoss.config_boss import AreaBossFloor
 from module.logger import logger
-from module.exception import TaskEnd
+from module.exception import GameStuckError, TaskEnd
 from module.atom.image import RuleImage
 from typing import List
 
@@ -94,17 +95,30 @@ class ScriptTask(Battle, GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
     def go_back(self) -> None:
         """
-        返回, 要求这个时候是出现在地域鬼王的主界面
+        从地域鬼王返回主页,处理战后可能重新出现的详情页。
         :return:
         """
         # 点击返回
         logger.info("Script back home")
+        timeout = Timer(20).start()
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_UI_BACK_YELLOW, threshold=0.6, interval=2):
+            if timeout.reached():
+                raise GameStuckError("Area boss return home timed out")
+            if self._handle_boss_detail():
                 continue
             if self.appear(self.I_CHECK_MAIN, threshold=0.6):
-                break
+                return
+            self.appear_then_click(self.I_UI_BACK_YELLOW, threshold=0.6, interval=2)
+
+    def _handle_boss_detail(self) -> bool:
+        """True 表示详情页仍遮挡当前帧,包括关闭按钮处于点击冷却时。"""
+        if not self.appear(self.I_AB_CLOSE_RED):
+            return False
+        # 入场动画中红叉可能先出现,等挑战按钮就绪后再关闭。
+        if self.appear(self.I_FIRE):
+            self.appear_then_click(self.I_AB_CLOSE_RED, interval=1)
+        return True
 
     def boss(self, battle: RuleImage, collect: bool = False):
 
@@ -184,12 +198,17 @@ class ScriptTask(Battle, GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         if not self.start_fight():
             result = False
             logger.warning("Area Boss Fight Failed ")
-        self.screenshot()
-        if not self.appear(self.I_AB_CLOSE_RED) and self.appear(self.I_FILTER):
-            return result
-        self.wait_until_appear(self.I_AB_CLOSE_RED)
-        self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
-        return result
+        timeout = Timer(20).start()
+        while 1:
+            self.screenshot()
+            if timeout.reached():
+                raise GameStuckError("Area boss battle return timed out")
+            if self._handle_boss_detail():
+                continue
+            # 结算和关闭动画后可能直接回地图,不固定等待红叉出现。
+            # 若地图只是过渡帧,后续 open_filter/go_back 会继续处理详情页。
+            if self.appear(self.I_FILTER) or self.appear(self.I_AB_FILTER_OPENED):
+                return result
 
     def start_fight(self) -> bool:
         while 1:
@@ -460,7 +479,16 @@ class ScriptTask(Battle, GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
     def open_filter(self):
         """打开筛选界面"""
         logger.info("openFilter")
-        self.ui_click(self.I_FILTER, self.I_AB_FILTER_OPENED, interval=3)
+        timeout = Timer(20).start()
+        while 1:
+            self.screenshot()
+            if timeout.reached():
+                raise GameStuckError("Area boss filter did not open")
+            if self._handle_boss_detail():
+                continue
+            if self.appear(self.I_AB_FILTER_OPENED):
+                return
+            self.appear_then_click(self.I_FILTER, interval=3)
 
     def switch_to_collect(self):
         while 1:

+ 14 - 7
tests/tasks/AreaBoss/test_area_battle.py

@@ -39,16 +39,23 @@ def test_start_fight_applies_configured_strategies_and_return_markers(win):
 def test_boss_fight_accepts_either_supported_return_screen(returned_to_filter, win):
     task = object.__new__(ScriptTask)
     task.config = SimpleNamespace(area_boss=SimpleNamespace(boss=SimpleNamespace(reward_floor=AreaBossFloor.DEFAULT)))
-    task.appear = lambda asset: asset is task.I_FILTER and returned_to_filter
+    screen = ['map' if returned_to_filter else 'detail']
+    def appear(asset, **kwargs):
+        if screen[0] == 'map':
+            return asset is task.I_FILTER
+        return asset is task.I_AB_CLOSE_RED or asset is task.I_FIRE
+    task.appear = appear
     task.open_boss_detail = lambda *args: True
     task.is_group_ranked = lambda: False
     task.start_fight = lambda: win
     task.screenshot = lambda: None
     calls = []
-    def wait(asset):
-        assert not returned_to_filter, 'Already back at filter: red close will never appear'
-        calls.append('wait')
-    task.wait_until_appear = wait
-    task.ui_click_until_disappear = lambda *args, **kwargs: calls.append('close')
+    def close(asset, **kwargs):
+        assert asset is task.I_AB_CLOSE_RED and screen[0] == 'detail'
+        calls.append('close')
+        screen[0] = 'map'
+        return True
+    task.appear_then_click = close
     assert task.boss_fight(None, fileter_open=False) is win
-    assert calls == ([] if returned_to_filter else ['wait', 'close'])
+    assert screen[0] == 'map'
+    assert calls == ([] if returned_to_filter else ['close'])

+ 200 - 0
tests/tasks/AreaBoss/test_area_navigation.py

@@ -0,0 +1,200 @@
+"""Replay battle return transitions without a running game or screenshot fixtures."""
+from copy import deepcopy
+from types import SimpleNamespace
+
+import pytest
+
+from module.base import timer
+from module.exception import GameStuckError
+from tasks.AreaBoss.config_boss import AreaBossFloor
+from tasks.AreaBoss.script_task import ScriptTask
+
+
+class AreaNavigationReplay(ScriptTask):
+    def __init__(self, monkeypatch, *, screen='map', rebound=False,
+                 ignored_closes=0, background_visible=False, win=True,
+                 transitions=None, close_delay=0):
+        # Keep the real navigation, recognition dispatch and click cooldowns.
+        self.screen = screen
+        self.rebound = rebound
+        self.ignored_closes = ignored_closes
+        self.background_visible = background_visible
+        self.transitions = dict(transitions or {})
+        self.close_delay = close_delay
+        self.frames = 0
+        self.now = 100.0
+        self.interval_timer = {}
+        self.clicks = []
+        self.config = SimpleNamespace(area_boss=SimpleNamespace(
+            boss=SimpleNamespace(reward_floor=AreaBossFloor.DEFAULT)))
+        self.device = SimpleNamespace(image=frozenset(), click=self.record_click)
+        self.open_boss_detail = lambda *args: True
+        self.start_fight = lambda: win
+        for name in (
+            'I_AB_CLOSE_RED', 'I_FIRE', 'I_FILTER', 'I_AB_FILTER_OPENED',
+            'I_UI_BACK_YELLOW', 'I_CHECK_MAIN',
+        ):
+            asset = deepcopy(getattr(self, name))
+            asset.match = lambda image, threshold=None, name=name: name in image
+            setattr(self, name, asset)
+        monkeypatch.setattr(timer, 'time', SimpleNamespace(time=lambda: self.now))
+
+    def screenshot(self):
+        self.frames += 1
+        assert self.frames <= 200, 'Navigation did not finish or respect its timeout'
+        self.now += 0.25
+        if self.frames in self.transitions:
+            self.screen = self.transitions.pop(self.frames)
+        if self.rebound and self.frames == 3:
+            self.screen = 'detail'
+            self.rebound = False
+        visible = {
+            'map': {'I_FILTER', 'I_UI_BACK_YELLOW'},
+            'detail': {'I_AB_CLOSE_RED', 'I_FIRE'},
+            'detail_loading': {'I_AB_CLOSE_RED'},
+            'filter': {'I_AB_FILTER_OPENED'},
+            'main': {'I_CHECK_MAIN'},
+            'unknown': set(),
+        }[self.screen].copy()
+        if self.screen in ('detail', 'detail_loading') and self.background_visible:
+            visible.update({'I_FILTER', 'I_UI_BACK_YELLOW'})
+        self.device.image = frozenset(visible)
+
+    def record_click(self, x, y, control_name):
+        self.clicks.append((control_name, self.now))
+        if control_name == self.I_AB_CLOSE_RED.name:
+            assert self.screen == 'detail'
+            if self.ignored_closes:
+                self.ignored_closes -= 1
+            elif self.close_delay:
+                self.screen = 'unknown'
+                self.transitions[self.frames + self.close_delay] = 'map'
+            else:
+                self.screen = 'map'
+        elif control_name == self.I_FILTER.name:
+            assert self.screen == 'map', 'Clicked filter behind the boss detail'
+            if not self.rebound:
+                self.screen = 'filter'
+        elif control_name == self.I_UI_BACK_YELLOW.name:
+            assert self.screen == 'map', 'Clicked back behind the boss detail'
+            if not self.rebound:
+                self.screen = 'main'
+        else:
+            pytest.fail(f'Unexpected click: {control_name}')
+
+    @property
+    def clicked_names(self):
+        return [name for name, _ in self.clicks]
+
+
+@pytest.mark.parametrize('navigate, destination, navigation_asset', [
+    ('open_filter', 'filter', 'I_FILTER'),
+    ('go_back', 'main', 'I_UI_BACK_YELLOW'),
+])
+@pytest.mark.parametrize('win', [True, False])
+def test_battle_return_recovers_detail_reappearing_after_map(
+        monkeypatch, navigate, destination, navigation_asset, win):
+    task = AreaNavigationReplay(monkeypatch, rebound=True, win=win,
+                                ignored_closes=3, background_visible=True)
+
+    assert task.boss_fight(task.I_BATTLE_1, fileter_open=False) is win
+    getattr(task, navigate)()
+
+    assert task.screen == destination
+    button = getattr(task, navigation_asset).name
+    # Stay over the detail long enough for the background button's cooldown
+    # to expire, so a failed close attempt cannot fall through to that button.
+    assert task.clicked_names == [button] + [task.I_AB_CLOSE_RED.name] * 4 + [button]
+    close_times = [at for name, at in task.clicks if name == task.I_AB_CLOSE_RED.name]
+    assert all(later - earlier >= 1 for earlier, later in zip(close_times, close_times[1:]))
+
+
+@pytest.mark.parametrize('navigate, destination', [
+    ('open_filter', 'filter'), ('go_back', 'main'),
+])
+@pytest.mark.parametrize('screen', ['map', 'detail'])
+def test_battle_return_still_accepts_direct_map_and_normal_detail(
+        monkeypatch, navigate, destination, screen):
+    task = AreaNavigationReplay(monkeypatch, screen=screen)
+
+    assert task.boss_fight(task.I_BATTLE_1, fileter_open=False) is True
+    getattr(task, navigate)()
+
+    assert task.screen == destination
+    assert task.clicked_names.count(task.I_AB_CLOSE_RED.name) == (screen == 'detail')
+
+
+@pytest.mark.parametrize('navigate, screen', [
+    ('open_filter', 'filter'), ('go_back', 'main'),
+])
+def test_arrived_navigation_target_needs_no_click(monkeypatch, navigate, screen):
+    task = AreaNavigationReplay(monkeypatch, screen=screen)
+
+    getattr(task, navigate)()
+
+    assert task.screen == screen
+    assert task.clicks == []
+
+
+@pytest.mark.parametrize('navigate', ['open_filter', 'go_back'])
+@pytest.mark.parametrize('screen', ['unknown', 'detail'])
+def test_navigation_times_out_when_page_never_changes(monkeypatch, navigate, screen):
+    task = AreaNavigationReplay(monkeypatch, screen=screen, ignored_closes=100)
+
+    with pytest.raises(GameStuckError):
+        getattr(task, navigate)()
+
+    assert task.now <= 125
+    assert task.screen == screen
+    assert all(name == task.I_AB_CLOSE_RED.name for name in task.clicked_names)
+
+
+@pytest.mark.parametrize('screen', ['map', 'filter'])
+@pytest.mark.parametrize('win', [True, False])
+def test_battle_return_waits_through_unknown_frames(monkeypatch, screen, win):
+    task = AreaNavigationReplay(monkeypatch, screen='unknown', win=win,
+                                transitions={3: screen})
+
+    assert task.boss_fight(task.I_BATTLE_1, fileter_open=False) is win
+
+    assert task.screen == screen
+    assert task.clicks == []
+
+
+def test_battle_return_waits_for_map_after_detail_close_animation(monkeypatch):
+    task = AreaNavigationReplay(monkeypatch, screen='detail', close_delay=3)
+
+    assert task.boss_fight(task.I_BATTLE_1, fileter_open=False) is True
+
+    assert task.screen == 'map'
+    assert task.clicked_names == [task.I_AB_CLOSE_RED.name]
+
+
+@pytest.mark.parametrize('screen', ['unknown', 'detail'])
+def test_battle_return_times_out_without_a_confirmed_page(monkeypatch, screen):
+    task = AreaNavigationReplay(monkeypatch, screen=screen, ignored_closes=100)
+
+    with pytest.raises(GameStuckError):
+        task.boss_fight(task.I_BATTLE_1, fileter_open=False)
+
+    assert task.now <= 125
+    assert task.screen == screen
+    assert all(name == task.I_AB_CLOSE_RED.name for name in task.clicked_names)
+
+
+@pytest.mark.parametrize('navigate, destination', [
+    ('boss_fight', 'map'), ('open_filter', 'filter'), ('go_back', 'main'),
+])
+def test_detail_loading_blocks_background_controls_until_ready(
+        monkeypatch, navigate, destination):
+    task = AreaNavigationReplay(monkeypatch, screen='detail_loading',
+                                transitions={5: 'detail'}, background_visible=True)
+
+    if navigate == 'boss_fight':
+        assert task.boss_fight(task.I_BATTLE_1, fileter_open=False) is True
+    else:
+        getattr(task, navigate)()
+
+    assert task.screen == destination
+    assert task.clicked_names[0] == task.I_AB_CLOSE_RED.name
+    assert task.clicks[0][1] >= 101.25