Răsfoiți Sursa

fix(Restart): collect mail rewards before marking read

unknown 1 lună în urmă
părinte
comite
a7a5d07993

+ 3 - 1
tasks/Restart/assets.py

@@ -45,7 +45,9 @@ class RestartAssets:
 	# 有些邮件需要点击一次 
 	I_HARVEST_MAIL_OPEN = RuleImage(roi_front=(163,367,45,48), roi_back=(139,86,100,487), threshold=0.9, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_open.png")
 	# 确认收取邮件 
-	I_HARVEST_MAIL_CONFIRM = RuleImage(roi_front=(687,543,168,64), roi_back=(687,543,168,64), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_confirm.png")
+	I_HARVEST_MAIL_CONFIRM = RuleImage(roi_front=(674,544,178,62), roi_back=(650,520,230,110), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_confirm.png")
+	# 邮件获得奖励,兼容多行奖励时上移的标题
+	I_MAIL_REWARD = RuleImage(roi_front=(514,115,255,70), roi_back=(450,75,390,255), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_mail_reward.png")
 	# description 
 	I_HARVEST_SOUL = RuleImage(roi_front=(241,497,38,36), roi_back=(68,480,930,72), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_soul.png")
 	# description 

BIN
tasks/Restart/harvest/harvest_harvest_mail_confirm.png


BIN
tasks/Restart/harvest/harvest_mail_reward.png


+ 12 - 3
tasks/Restart/harvest/image.json

@@ -65,12 +65,21 @@
   {
     "itemName": "harvest_mail_confirm",
     "imageName": "harvest_harvest_mail_confirm.png",
-    "roiFront": "687,543,168,64",
-    "roiBack": "687,543,168,64",
+    "roiFront": "674,544,178,62",
+    "roiBack": "650,520,230,110",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "确认收取邮件"
   },
+  {
+    "itemName": "mail_reward",
+    "imageName": "harvest_mail_reward.png",
+    "roiFront": "514,115,255,70",
+    "roiBack": "450,75,390,255",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "邮件获得奖励,兼容多行奖励时上移的标题"
+  },
   {
     "itemName": "harvest_soul",
     "imageName": "harvest_harvest_soul.png",
@@ -251,4 +260,4 @@
     "threshold": 0.8,
     "description": "邮件红点"
   }
-]
+]

+ 40 - 10
tasks/Restart/login.py

@@ -304,34 +304,64 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
         self.O_LOGIN_SPECIFIC_SERVE.keyword = character
 
     def harvest_mail(self) -> bool:
-        if not self.appear_multi_scale(self.I_HARVEST_MAIL,scale_range=(0.8, 1.1)) and \
+        mail_screens = (self.I_READ_ALL_MAIL, self.I_HARVEST_MAIL_CONFIRM, self.I_MAIL_REWARD)
+        if not any(self.appear(asset) for asset in mail_screens) and \
+                not self.appear_multi_scale(self.I_HARVEST_MAIL, scale_range=(0.8, 1.1)) and \
                 not self.appear(self.I_HARVEST_MAIL_COPY):
-            if not self.appear(self.I_READ_ALL_MAIL):
-                return False
+            return False
         logger.info('Harvest mail')
+        open_timer = Timer(10).start()
         while 1:
             self.screenshot()
-            if self.appear(self.I_READ_ALL_MAIL):
+            if any(self.appear(asset) for asset in mail_screens):
                 break
+            if open_timer.reached():
+                raise GameStuckError('Open mail timeout')
             if self.appear_then_click_multi_scale(self.I_HARVEST_MAIL, interval=1.5, scale_range=(0.8, 1.1)):
                 continue
             if self.appear_then_click(self.I_HARVEST_MAIL_COPY, interval=1.5):
                 continue
-        timeout_timer = Timer(3).start()
+        timeout_timer = Timer(30).start()
+        idle_timer = Timer(5, count=2).start()
+        read_all_done = False
         logger.info('Exec harvest mail')
         while 1:
             self.screenshot()
             if timeout_timer.reached():
-                break
-            if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=0.8):
-                break
+                raise GameStuckError('Harvest mail timeout')
+
+            # 弹窗后面的按钮仍然能匹配;点击间隔未到时也不能操作背景。
+            if self.appear(self.I_MAIL_REWARD):
+                if self.appear_then_click(self.I_MAIL_REWARD, action=self.C_UI_REWARD, interval=0.8):
+                    logger.info('Collect mail rewards')
+                idle_timer.reset()
+                continue
+            if self.appear(self.I_UI_AWARD):
+                self.appear_then_click(self.I_UI_AWARD, interval=0.8)
+                idle_timer.reset()
+                continue
+            if self.appear(self.I_HARVEST_MAIL_CONFIRM):
+                if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=0.8):
+                    logger.info('Confirm claim all mail')
+                idle_timer.reset()
+                continue
 
-            if self.appear_then_click(self.I_READ_ALL_MAIL, interval=1.5):
+            # 先领取附件,再标记已读;每次操作后重新等待页面和奖励动画。
+            if self.appear(self.I_HARVEST_MAIL_ALL):
+                if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=1.5):
+                    logger.info('Claim all mail')
+                idle_timer.reset()
                 continue
-            if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=1.5):
+            if not read_all_done and self.appear_then_click(self.I_READ_ALL_MAIL, interval=1.5):
+                read_all_done = True
+                idle_timer.reset()
                 continue
             if self.appear_then_click(self.I_MAIL_RED_POINT, interval=4):
+                read_all_done = False
+                idle_timer.reset()
                 continue
+            if idle_timer.reached():
+                break
         self.ui_click_until_disappear(self.I_LOGIN_RED_CLOSE)
         return True
     

BIN
tests/tasks/Restart/fixtures/mail_claim.png


BIN
tests/tasks/Restart/fixtures/mail_reward.png


BIN
tests/tasks/Restart/fixtures/mailbox.png


+ 149 - 0
tests/tasks/Restart/test_mail.py

@@ -0,0 +1,149 @@
+"""Replay mail controls from the screenshots reported on 2026-10-11."""
+from copy import deepcopy
+from pathlib import Path
+from types import SimpleNamespace
+
+import cv2
+import numpy as np
+import pytest
+
+from module.base import timer
+from module.exception import GameStuckError
+from tasks.Restart.login import LoginHandler
+
+
+@pytest.fixture
+def mail_screens():
+    screens = {}
+    for name in ('mailbox', 'mail_claim', 'mail_reward'):
+        path = Path(__file__).with_name('fixtures') / f'{name}.png'
+        screens[name] = cv2.cvtColor(
+            cv2.imdecode(np.fromfile(path, dtype=np.uint8), cv2.IMREAD_COLOR),
+            cv2.COLOR_BGR2RGB,
+        )
+    screens['empty'] = screens['mailbox'].copy()
+    screens['empty'][551:695, 28:170] = 0
+    screens['closed'] = np.zeros_like(screens['mailbox'])
+    return screens
+
+
+class MailReplay(LoginHandler):
+    def __init__(self, monkeypatch, screens, *, screen='mailbox', frame_seconds=0.5,
+                 ignored_confirms=0, reward_delay=0):
+        self.interval_timer = {}
+        self.now = 100.0
+        self.frames = 0
+        self.clicks = []
+        self.screen = screen
+        self.screens = screens
+        self.frame_seconds = frame_seconds
+        self.ignored_confirms = ignored_confirms
+        self.reward_delay = reward_delay
+        self.reward_at = None
+        self.device = SimpleNamespace(image=screens[screen], click=self.record_click)
+        for name in (
+            'I_HARVEST_MAIL', 'I_HARVEST_MAIL_COPY', 'I_READ_ALL_MAIL',
+            'I_HARVEST_MAIL_ALL', 'I_HARVEST_MAIL_CONFIRM', 'I_MAIL_RED_POINT',
+            'I_MAIL_REWARD', 'I_UI_REWARD', 'I_UI_AWARD', 'I_LOGIN_RED_CLOSE',
+        ):
+            if hasattr(self, name):
+                setattr(self, name, deepcopy(getattr(self, name)))
+        monkeypatch.setattr(timer, 'time', SimpleNamespace(time=lambda: self.now))
+
+    def screenshot(self):
+        self.frames += 1
+        assert self.frames <= 160, 'Mail collection did not finish'
+        self.now += self.frame_seconds
+        if self.reward_at is not None and self.now >= self.reward_at:
+            self.screen = 'mail_reward'
+            self.reward_at = None
+        self.device.image = self.screens[self.screen]
+
+    def record_click(self, x, y, control_name):
+        self.clicks.append(control_name)
+        if control_name == self.I_HARVEST_MAIL_ALL.name:
+            assert self.screen == 'mailbox', 'Clicked claim behind a popup'
+            self.screen = 'mail_claim'
+        elif control_name == self.I_HARVEST_MAIL_CONFIRM.name:
+            assert self.screen == 'mail_claim'
+            assert 673 <= x < 854 and 543 <= y < 609
+            if self.ignored_confirms:
+                self.ignored_confirms -= 1
+            elif self.reward_delay:
+                self.screen = 'empty'
+                self.reward_at = self.now + self.reward_delay
+            else:
+                self.screen = 'mail_reward'
+        elif control_name == self.I_READ_ALL_MAIL.name:
+            assert self.screen in ('mailbox', 'empty'), 'Clicked read behind a popup'
+        elif control_name == self.I_LOGIN_RED_CLOSE.name:
+            assert self.screen == 'empty', 'Closed before collecting rewards'
+            assert self.reward_at is None, 'Closed before the reward arrived'
+            self.screen = 'closed'
+        else:
+            assert self.screen == 'mail_reward'
+            assert control_name in (self.I_UI_REWARD.name, self.I_MAIL_REWARD.name)
+            self.screen = 'empty'
+
+
+@pytest.mark.parametrize('frame_seconds', [0.5, 2.0])
+def test_mail_is_claimed_before_reading_even_with_slow_screenshots(
+        monkeypatch, mail_screens, frame_seconds):
+    task = MailReplay(monkeypatch, mail_screens, frame_seconds=frame_seconds)
+
+    assert task.harvest_mail() is True
+    assert task.screen == 'closed'
+    assert task.clicks == [
+        task.I_HARVEST_MAIL_ALL.name, task.I_HARVEST_MAIL_CONFIRM.name,
+        task.I_MAIL_REWARD.name, task.I_READ_ALL_MAIL.name, task.I_LOGIN_RED_CLOSE.name,
+    ]
+
+
+@pytest.mark.parametrize('screen', ['mail_claim', 'mail_reward'])
+def test_existing_mail_popup_is_finished_before_closing(monkeypatch, mail_screens, screen):
+    task = MailReplay(monkeypatch, mail_screens, screen=screen)
+
+    assert task.harvest_mail() is True
+    assert task.screen == 'closed'
+    assert task.I_MAIL_REWARD.name in task.clicks
+    assert task.I_HARVEST_MAIL_ALL.name not in task.clicks
+
+
+def test_ignored_confirmation_is_retried_without_clicking_background(monkeypatch, mail_screens):
+    task = MailReplay(monkeypatch, mail_screens, ignored_confirms=1, frame_seconds=0.25)
+
+    assert task.harvest_mail() is True
+    assert task.screen == 'closed'
+    assert task.clicks.count(task.I_HARVEST_MAIL_CONFIRM.name) == 2
+    assert task.clicks.count(task.I_HARVEST_MAIL_ALL.name) == 1
+
+
+def test_delayed_reward_is_collected_after_confirmation(monkeypatch, mail_screens):
+    task = MailReplay(monkeypatch, mail_screens, reward_delay=4)
+
+    assert task.harvest_mail() is True
+    assert task.screen == 'closed'
+    assert task.I_MAIL_REWARD.name in task.clicks
+
+
+def test_empty_mailbox_is_read_once_and_closed(monkeypatch, mail_screens):
+    task = MailReplay(monkeypatch, mail_screens, screen='empty')
+
+    assert task.harvest_mail() is True
+    assert task.clicks == [task.I_READ_ALL_MAIL.name, task.I_LOGIN_RED_CLOSE.name]
+
+
+def test_stuck_confirmation_times_out_without_closing_behind_it(monkeypatch, mail_screens):
+    task = MailReplay(monkeypatch, mail_screens, ignored_confirms=100)
+
+    with pytest.raises(GameStuckError, match='mail'):
+        task.harvest_mail()
+
+    assert task.I_LOGIN_RED_CLOSE.name not in task.clicks
+
+
+def test_no_mail_does_not_click(monkeypatch, mail_screens):
+    task = MailReplay(monkeypatch, mail_screens, screen='closed')
+
+    assert task.harvest_mail() is False
+    assert task.clicks == []