Explorar o código

Merge upstream dev through 62957654 with legacy overflow coverage

Integrate cc65d55d..62957654 (4 commits including two merges).
Adopt the legacy battle reward-loop soul overflow dismissal and Dokan's
server=False on the first-attack retry, so the requested failure interval
is not overridden by server-time scheduling.

Resolve the modern battle_wait.py conflict by retaining local interrupt-based
overflow handling. The existing interrupt safely dismisses the popup and
returns to a fresh frame before settling; upstream's inline handling is an
equivalent fix for its different code path. Keep the entire local module
AST unchanged, including cleanup-button exclusion, bounded completion and
context-local strategies/options.

Complete gaps demonstrated by four failing overflow replays: dismiss the
popup on entry to the old runner, during its reward wait (before treating
missing rewards as completion), and on entry/settlement in battle_wait_v2.
Keep the upstream old reward-loop fix. All earlier local mail, raid,
exploration, cropped UI, activity, purchase, AreaBoss, desktop and anti-ban
cleanup fixes are retained.

Validation: 442 pytest cases passed (tests/ and both FrogBoss test modules).
Seven new cases cover five overflow stages and two real Dokan scheduling
paths through set_next_run/task_delay (09:00 and 19:00 server times).
Four Python syntax checks, three production imports, unchanged modern battle
AST and git diff --check passed. No PNG, asset-rule or metadata changes.
Warnings: two existing Pydantic deprecations and dependency imp deprecation.
No live emulator or desktop game test was performed.
unknown hai 3 semanas
pai
achega
affce19e6e

+ 20 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -181,6 +181,9 @@ class GeneralBattle(BattleWait, GeneralBuff):
         win: bool = False
         while 1:
             self.screenshot()
+            if self.appear(self.I_OVER_GHOST):
+                self.click(self.I_OVER_GHOST)
+                continue
             # 如果出现赢 就点击, 第二个是针对封魔的图片
             if self.appear(self.I_WIN, threshold=0.8) or self.appear(self.I_DE_WIN):
                 logger.info("Battle result is win")
@@ -226,14 +229,23 @@ class GeneralBattle(BattleWait, GeneralBuff):
                 if not self.appear(self.I_FALSE, threshold=0.6):
                     return False
         # 最后保证能点击 获得奖励
-        if not self.wait_until_appear(self.I_REWARD, wait_time=10):
+        while not self.wait_until_appear(self.I_REWARD, wait_time=10):
+            if self.appear(self.I_OVER_GHOST):
+                self.click(self.I_OVER_GHOST)
+                continue
             if not self.appear(self.I_STATISTICS):
                 # 有些的战斗没有下面的奖励,所以直接返回
                 logger.info("There is no reward, Exit battle")
                 return win
+            break
         logger.info("Get reward")
         while 1:
             self.screenshot()
+
+            if self.appear(self.I_OVER_GHOST):
+                self.click(self.I_OVER_GHOST)
+                continue
+
             # 如果出现领奖励
             action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
             if (self.appear_then_click(self.I_REWARD, action=action_click, interval=1.5) or
@@ -274,6 +286,9 @@ class GeneralBattle(BattleWait, GeneralBuff):
         logger.info("Start battle process")
         while 1:
             self.screenshot()
+            if self.appear(self.I_OVER_GHOST):
+                self.click(self.I_OVER_GHOST)
+                continue
             # 出现赢的鼓,点击直到消失
             if self.appear_then_click(self.I_WIN, interval=0.8):
                 continue
@@ -296,6 +311,10 @@ class GeneralBattle(BattleWait, GeneralBuff):
                 while 1:
                     self.screenshot()
 
+                    if self.appear(self.I_OVER_GHOST):
+                        self.click(self.I_OVER_GHOST)
+                        continue
+
                     _appear_ghost, _appear_reward, _appear_gold = (
                         self.appear(self.I_GREED_GHOST, threshold=0.6),
                         self.appear(self.I_REWARD),

+ 1 - 1
tasks/Dokan/script_task.py

@@ -950,7 +950,7 @@ class ScriptTask(ExtendGreenMark, GameUi, SwitchSoul, DokanSceneDetector):
             #   # 本来以为server为False(finish=True,success=False,server=False)就不会变成明天,谁知道还是变成明天
             #   # 逻辑太复杂,不如直接target,简单点
             if self.config.dokan.attack_count_config.remain_attack_count == 1 and self.config.dokan.attack_count_config.daily_attack_count == 2:
-                self.set_next_run(task="Dokan", target=now + self.config.dokan.scheduler.failure_interval)
+                self.set_next_run(task="Dokan", target=now + self.config.dokan.scheduler.failure_interval, server=False)
                 return
             # 其余情况当作成功
             self.set_next_run(task="Dokan", finish=False, success=True, server=True)

+ 56 - 0
tests/tasks/Component/GeneralBattle/test_overflow.py

@@ -8,6 +8,62 @@ from tasks.Component.GeneralBattle.battle_wait import (
     BattleResult, BattleWait, BattleWaitPlan, HookSignal, OptionSuccessDefault,
     PerBattleSuccess, runtime,
 )
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+
+
+@pytest.mark.parametrize('version,phase', [
+    ('legacy', 'entry'), ('legacy', 'wait'), ('legacy', 'settlement'),
+    ('v2', 'entry'), ('v2', 'settlement'),
+])
+def test_legacy_runners_dismiss_overflow_before_finishing(version, phase):
+    class Replay(GeneralBattle):
+        def __init__(self):
+            self.state = 'overflow' if phase == 'entry' else 'reward'
+            self.inject = phase != 'entry'
+            self.frames = 0
+            self.events = []
+            self.device = SimpleNamespace(stuck_record_add=lambda name: None,
+                                          click_record_clear=lambda: None)
+
+        def screenshot(self):
+            self.frames += 1
+            assert self.frames < 20, 'Overflow stalled the battle runner'
+            if version == 'v2' and self.inject and self.frames == 2:
+                self.state = 'overflow'
+                self.inject = False
+
+        def appear(self, asset, **kwargs):
+            return ((asset is self.I_OVER_GHOST and self.state == 'overflow') or
+                    (asset is self.I_REWARD and self.state == 'reward'))
+
+        def wait_until_appear(self, asset, **kwargs):
+            if self.inject:
+                self.state = 'overflow'
+                self.inject = False
+                return phase == 'settlement'
+            return self.state == 'reward'
+
+        def click(self, asset, **kwargs):
+            if asset is self.I_OVER_GHOST:
+                assert self.state == 'overflow'
+                self.events.append('dismiss')
+                self.state = 'reward'
+            else:
+                assert self.state == 'reward', 'Clicked behind overflow popup'
+                self.events.append('reward')
+                self.state = 'done'
+            return True
+
+        def appear_then_click(self, asset, **kwargs):
+            if not self.appear(asset):
+                return False
+            return self.click(asset)
+
+    task = Replay()
+    run = task.battle_wait if version == 'legacy' else task.battle_wait_v2
+    assert run(False) is True
+    assert task.state == 'done'
+    assert task.events == ['dismiss', 'reward']
 
 
 @pytest.mark.parametrize('overflow_on_entry', [False, True])

+ 37 - 0
tests/tasks/Dokan/test_dokan_schedule.py

@@ -0,0 +1,37 @@
+from datetime import datetime, time, timedelta
+from threading import RLock
+from types import SimpleNamespace
+
+import pytest
+
+from module.config.config import Config
+from tasks.Dokan import script_task as dokan_module
+from tasks.Dokan.script_task import ScriptTask
+
+
+@pytest.mark.parametrize('server_hour', [9, 19])
+def test_first_attack_retries_at_interval_without_server_rescheduling(monkeypatch, server_hour):
+    now = datetime(2026, 10, 26, 19, 30)
+    class Clock(datetime):
+        @classmethod
+        def now(cls):
+            return now
+    monkeypatch.setattr(dokan_module, 'datetime', Clock)
+    scheduler = SimpleNamespace(
+        failure_interval=timedelta(minutes=3), server_update=time(server_hour),
+        float_time=time(0, 0, 30), delay_date=1, next_run=None,
+    )
+    config = object.__new__(Config)
+    config.model = SimpleNamespace(dokan=SimpleNamespace(
+        scheduler=scheduler,
+        attack_count_config=SimpleNamespace(remain_attack_count=1, daily_attack_count=2),
+    ))
+    config.reload = lambda: None
+    config.save = lambda: None
+    config.lock_config = RLock()
+    task = object.__new__(ScriptTask)
+    task.config = config
+    task.start_time = now
+    # Keep the real set_next_run -> task_delay path to catch server-time override.
+    task.next_run(is_dokan_activated=True)
+    assert scheduler.next_run == now + timedelta(minutes=3)