Jelajahi Sumber

Merge upstream dev through d8677dc0 and complete overflow metadata

Integrate 13 upstream commits (four merges) from 4c688865 to d8677dc0.
Adopt soul-overflow dismissal in the battle hooks and legacy Orochi loops,
exclude the cleanup button from reward clicks, bound delegation entry/back/
start waits and prioritize jade cancellation, use the WantedQuests selection
marker, allow scheduled task names to differ from reused task classes, and
start preparation after closing the buff panel. Include the upstream weekly
PR workflow schedule correction; this is separate from the daily sync job.
The EvoZone preparation change and its upstream revert have no net effect.

Normal merge preserves local context-isolated battle strategies, bounded
completion handling and exit-confirmation priority. Chapter scrolling,
exploration retry guards, treasure recognition, mail collection, cropped UI
templates and raid fixes remain unchanged. No upstream patch was dropped.

Complete the omitted overflow exclusion entry in gb/click.json so resource
regeneration retains it. Remove an unreachable duplicate overflow branch;
the success hook yields to the interrupt handler for dismissal. Extend the
existing replay to model the new detection, and add 13 regression cases for
overflow interruption/exclusions/metadata, delegation cancellation/timeouts,
friend selection, reused task names and buff/preparation ordering.

Validation: 319 tests pass (tests plus both FrogBoss unit suites), seven
production modules import, 13 changed Python files parse, and git diff
checks pass. Seven local AST checks are unchanged. Verify 102 existing PNG
references and affected image/JSON definitions. Broader inventory finds 11
pre-existing missing image references: six unused buff definitions and five
WantedQuests friend areas used only for coordinate clicks. None is newly
introduced or needed for the changed image detection. No emulator run.
unknown 1 bulan lalu
induk
melakukan
bf914ce052

+ 2 - 2
.github/workflows/auto-merge-pr.yaml

@@ -2,8 +2,8 @@ name: Auto Merge Sync PR
 
 on:
   schedule:
-    # 每周五北京时间12点触发(UTC时间4点)
-    - cron: '0 4 * * 5'
+    # 每周五北京时间2点07分触发(UTC时间周四18点07分)
+    - cron: '7 18 * * 4'
   workflow_dispatch:
 
 permissions:

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -209,6 +209,8 @@ class GeneralBattleAssets:
 	C_END_FRIENDS_32 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_friends_32")
 	# description 
 	C_END_FRIENDS_23 = RuleClick(roi_front=(0,0,100,100), roi_back=(0,0,100,100), name="end_friends_23")
+	# 御魂过多的【去清理】按钮
+	C_OVERFLOW_GHOST = RuleClick(roi_front=(456, 381, 160, 82), roi_back=(456, 381, 160, 82), name="overflow_ghost")
 
 
 	# Click Rule Assets

+ 9 - 1
tasks/Component/GeneralBattle/battle_wait.py

@@ -158,7 +158,7 @@ class OptionSuccessDefault:
         'C_END_MESSAGE_RIGHT_TOP', 'C_END_BUFF_AREA_1',
         'C_END_BUFF_AREA_2', 'C_END_SOUL_RECORD', 'C_END_SOUL_DETAILS',
         'C_END_1_1', 'C_END_1_2', 'C_END_1_3', 'C_END_1_4',
-        'C_END_1_5', 'C_END_1_6',
+        'C_END_1_5', 'C_END_1_6', "C_OVERFLOW_GHOST",
     ])
 
 
@@ -1118,6 +1118,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
 
     def _bw_interrupt_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
         # 比如 御魂溢出
+
+        # 结算的时候御魂溢出提示,点击【知道了】
+        self.appear_then_click(self.I_OVER_GHOST)
+
         return HookSignal.CONTINUE
 
     def _bw_success_default(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
@@ -1146,6 +1150,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         while 1:
             self.screenshot()
 
+            # 发现御魂溢出,直接跳出,在interupt里面处理
+            if self.appear(self.I_OVER_GHOST):
+                return HookSignal.CONTINUE
+
             # 不小心点到了具体的奖励,他会弹出这个物品的详细描述 里面必定包含有“获取途径”
             if self.appear(self.I_END_FIX_1) or self.appear(self.I_END_FIX_2):
                 self.click(self.C_REWARD_2, interval=1.5)

+ 7 - 1
tasks/Component/GeneralBattle/gb/click.json

@@ -1,4 +1,10 @@
 [
+  {
+    "itemName": "overflow_ghost",
+    "roiFront": "456,381,160,82",
+    "roiBack": "456,381,160,82",
+    "description": "御魂过多的【去清理】按钮,结算随机点击时排除"
+  },
   {
     "itemName": "preset_team_1",
     "roiFront": "195,235,465,110",
@@ -137,4 +143,4 @@
     "roiBack": "462,599,492,78",
     "description": "下边随机点击"
   }
-]
+]

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

@@ -641,6 +641,7 @@ class GeneralBattle(BattleWait, GeneralBuff):
                 break
             if self.appear_then_click(self.I_BUFF, interval=1):
                 continue
+        self.ui_click_until_disappear(self.I_PREPARE_HIGHLIGHT, interval=0.8)
 
     def boss_mark(self, enable=True) -> bool:
         if not enable or self._boss_mark_flag:

+ 29 - 3
tasks/Delegation/script_task.py

@@ -56,22 +56,44 @@ class ScriptTask(GameUi, DelegationAssets):
         if not self.ocr_appear(self.O_D_NAME):
             logger.warning(f'Delegation: {name} not found')
             return False
+        enter_timer = Timer(15).start()
         while 1:
             self.screenshot()
             if self.appear(self.I_D_START):
                 break
+            if enter_timer.reached():
+                logger.warning(f'Delegation: {name} enter timeout')
+                return False
+
+            # 检测到弹出的勾玉确认框,优先点击取消保护勾玉
+            if self.appear_then_click(self.I_UI_CANCEL, interval=1):
+                continue
+
             # 如果出现’召回‘ ’返回‘ 说明这个是现在委派中
             # 需要退出
             if self.appear(self.I_D_BACK):
                 logger.warning(f'Delegation: {name} is in delegation')
-                self.ui_click_until_disappear(self.I_D_BACK)
-                self.wait_until_appear(self.I_REWARDS_MIN)
+                back_timer = Timer(6).start()
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_D_BACK):
+                        break
+                    if back_timer.reached():
+                        logger.warning('Exit delegation detail timeout')
+                        break
+                    # 若此时被取消弹窗遮挡返回,优先点取消
+                    if self.appear_then_click(self.I_UI_CANCEL, interval=1):
+                        continue
+                    if self.appear_then_click(self.I_D_BACK, interval=1.2):
+                        continue
+                self.wait_until_appear(self.I_REWARDS_MIN, wait_time=3)
                 return False
             if self.appear_then_click(self.I_D_SKIP, interval=0.8):
                 continue
             if self.appear_then_click(self.I_D_CONFIRM, interval=0.8):
                 continue
-            if self.ocr_appear_click(self.O_D_NAME, interval=1):
+            # 点击委派任务名:防抖由 1s 提升至 3s,杜绝跨页面过渡时误触右上角"完成(30勾玉)"
+            if self.ocr_appear_click(self.O_D_NAME, interval=3):
                 continue
         # 进入委派  fefe e  fe
         logger.info(f'Enter Delegation: {name}')
@@ -81,10 +103,14 @@ class ScriptTask(GameUi, DelegationAssets):
         ui_click(self.C_D_4, self.I_D_SELECT_4)
         # 委派开始
         logger.info(f'Delegation: {name} start')
+        start_timer = Timer(10).start()
         while 1:
             self.screenshot()
             if not self.appear(self.I_D_START):
                 break
+            if start_timer.reached():
+                logger.warning(f'Delegation: {name} start timeout')
+                break
             if self.click(self.C_D_5, interval=0.8):
                 continue
             if self.appear_then_click(self.I_D_START, interval=1.8):

+ 8 - 0
tasks/Orochi/script_task.py

@@ -433,6 +433,10 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                     continue
                 while 1:
                     self.screenshot()
+                    # 处理御魂溢出
+                    if self.appear_then_click(self.I_OVER_GHOST):
+                        continue
+
                     action_click = random.choice([self.C_REWARD_1, self.C_REWARD_2, self.C_REWARD_3])
                     if not self.appear(self.I_GREED_GHOST):
                         break
@@ -445,6 +449,10 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
                 appear_greed_ghost = self.appear(self.I_GREED_GHOST)
                 while 1:
                     self.screenshot()
+                    # 处理御魂溢出
+                    if self.appear_then_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):
                         continue

+ 1 - 1
tasks/WantedQuests/script_task.py

@@ -405,7 +405,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
         self.click(self.I_WQ_FRIEND_5)
         sleep(0.2)
         self.screenshot()
-        if not self.appear(self.I_SELECTED):
+        if not self.appear(self.I_WQ_INVITE_SELECTED):
             logger.warning('No friend selected')
             return False
         self.ui_click_until_disappear(self.I_INVITE_ENSURE)

+ 4 - 4
tasks/base_task.py

@@ -80,10 +80,10 @@ class BaseTask(GlobalGame, CostumeBase):
             uppercase_first_letter=True,
         )
 
-        if model_task_name and model_task_name != path_task_name:
-            raise ScriptError(
-                f'Task name mismatch: model={model_task_name}, path={path_task_name}'
-            )
+        # if model_task_name and model_task_name != path_task_name:
+        #     raise ScriptError(
+        #         f'Task name mismatch: model={model_task_name}, path={path_task_name}'
+        #     )
         return model_task_name or path_task_name
 
     def _burst(self) -> bool:

+ 3 - 0
tests/tasks/Component/GeneralBattle/test_battle_wait.py

@@ -251,6 +251,9 @@ class ReplayBattle(BattleWait):
         self.events = []
         self.frames = 0
 
+    def appear(self, asset, **kwargs):
+        return False
+
     def screenshot(self):
         self.frames += 1
         assert self.frames < 5, 'battle did not complete'

+ 28 - 0
tests/tasks/Component/GeneralBattle/test_general_battle.py

@@ -14,6 +14,34 @@ from tasks.Component.GeneralBattle.config_general_battle import (
 from tasks.OtherWorldTwilight.config import OtherWorldTwilight, OWTBattleConfig
 
 
+def test_buff_panel_closes_before_preparation_starts(monkeypatch):
+    monkeypatch.setattr(battle_module.time, 'sleep', lambda duration: None)
+    task = object.__new__(battle_module.GeneralBattle)
+    events = []
+    panel = [True]
+    task.screenshot = lambda: None
+    task.ui_click = lambda *args, **kwargs: events.append('open')
+    task.appear = lambda asset, **kwargs: asset is task.I_CLOUD and panel[0]
+    task.soul = lambda enable: events.append(('soul', enable))
+
+    def close(asset, **kwargs):
+        assert asset is task.I_BUFF
+        events.append('close')
+        panel[0] = False
+        return True
+
+    def prepare(asset, interval):
+        assert not panel[0]
+        assert asset is task.I_PREPARE_HIGHLIGHT
+        assert interval == 0.8
+        events.append('prepare')
+
+    task.appear_then_click = close
+    task.ui_click_until_disappear = prepare
+    task.check_and_open_buff(battle_module.BuffClass.SOUL)
+    assert events == ['open', ('soul', True), 'close', 'prepare']
+
+
 def test_general_battle_forwards_name_mark_configuration():
     config = OWTBattleConfig(green_enable=True, green_mark_name='缘结神')
     calls = []

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

@@ -0,0 +1,73 @@
+import json
+from pathlib import Path
+from types import SimpleNamespace
+
+import pytest
+
+from tasks.Component.GeneralBattle.battle_wait import (
+    BattleResult, BattleWait, BattleWaitPlan, HookSignal, OptionSuccessDefault,
+    PerBattleSuccess, runtime,
+)
+
+
+@pytest.mark.parametrize('overflow_on_entry', [False, True])
+def test_overflow_is_dismissed_before_settlement_completes(monkeypatch, overflow_on_entry):
+    monkeypatch.setattr(runtime, 'task_owner', None)
+    monkeypatch.setattr(runtime, 'pub_ctx', None)
+    monkeypatch.setattr(runtime, 'pri_ctx', {})
+
+    class Replay(BattleWait):
+        def __init__(self):
+            self.overflow = overflow_on_entry
+            self.inject_overflow = not overflow_on_entry
+            self.reward = True
+            self.clicks = []
+            self.device = SimpleNamespace(click=self.device_click)
+
+        def device_click(self, x, y, control_name):
+            assert control_name == self.I_OVER_GHOST.name
+            return self.click(self.I_OVER_GHOST)
+
+        def screenshot(self):
+            if self.inject_overflow:
+                self.overflow = True
+                self.inject_overflow = False
+
+        def appear(self, asset, **kwargs):
+            if asset is self.I_OVER_GHOST:
+                return self.overflow
+            return asset is self.I_REWARD and self.reward
+
+        def click(self, asset, **kwargs):
+            self.clicks.append(asset)
+            assert asset is self.I_OVER_GHOST, 'unexpected click behind overflow dialog'
+            self.overflow = False
+            self.reward = False
+            return True
+
+    battle = Replay()
+    runtime.update_options({}, plan=BattleWaitPlan())
+    if not overflow_on_entry:
+        assert battle._bw_success_default() == HookSignal.CONTINUE
+        assert battle.clicks == []
+        assert runtime.pub_ctx.per_battle.success != BattleResult.SUCCESS
+    assert battle._bw_interrupt_default() == HookSignal.CONTINUE
+    assert battle.clicks == [battle.I_OVER_GHOST]
+    assert runtime.pub_ctx.per_battle.success != BattleResult.SUCCESS
+    # A later reward frame can now complete through the usual success path.
+    battle.reward = True
+    battle.screenshot = lambda: setattr(battle, 'reward', False)
+    battle._bw_success_default()
+    assert runtime.pub_ctx.per_battle.success == BattleResult.SUCCESS
+
+
+def test_overflow_cleanup_button_is_excluded_and_has_persistent_metadata():
+    owner = object.__new__(BattleWait)
+    rule = PerBattleSuccess.reward_exclude_click(owner, OptionSuccessDefault().excludes_2)
+    x, y = owner.C_OVERFLOW_GHOST.center
+    assert rule._is_excluded(x, y)
+    rows = json.loads(Path('tasks/Component/GeneralBattle/gb/click.json').read_text(encoding='utf-8'))
+    row, = [row for row in rows if row['itemName'] == 'overflow_ghost']
+    for field, roi in [('roiFront', owner.C_OVERFLOW_GHOST.roi_front),
+                       ('roiBack', owner.C_OVERFLOW_GHOST.roi_back)]:
+        assert tuple(map(int, row[field].split(','))) == roi

+ 66 - 0
tests/tasks/Delegation/test_entry.py

@@ -0,0 +1,66 @@
+from types import SimpleNamespace
+
+import pytest
+
+from module.base import timer
+from tasks.Delegation.script_task import ScriptTask
+
+
+@pytest.mark.parametrize('mode', ['cancel', 'back', 'entry'])
+def test_entry_and_back_waits_are_bounded_and_cancel_has_priority(monkeypatch, mode):
+    now = [100.0]
+    monkeypatch.setattr(timer, 'time', SimpleNamespace(time=lambda: now[0]))
+    task = object.__new__(ScriptTask)
+    task.O_D_NAME = SimpleNamespace(keyword='')
+    clicks, waits, name_intervals = [], [], []
+
+    def screenshot():
+        now[0] += 1
+        assert now[0] < 125, 'delegation entry/back loop did not terminate'
+
+    def appear(asset, **kwargs):
+        return ((asset is task.I_UI_CANCEL and mode == 'cancel')
+                or (asset is task.I_D_BACK and mode in ('cancel', 'back')))
+
+    def click(asset, **kwargs):
+        clicks.append(asset)
+        return True
+
+    task.screenshot = screenshot
+    task.appear = appear
+    task.click = click
+    assets = [task.I_UI_CANCEL, task.I_D_BACK]
+    task.device = SimpleNamespace(click=lambda x, y, control_name: click(
+        next(asset for asset in assets if asset.name == control_name)))
+    task.interval_timer = {}
+    task.ocr_appear = lambda *args: True
+    task.ocr_appear_click = lambda asset, interval: name_intervals.append(interval) or True
+    task.wait_until_appear = lambda asset, wait_time: waits.append((asset, wait_time))
+    assert task.delegate_one('画') is False
+    if mode == 'cancel':
+        assert clicks and all(asset is task.I_UI_CANCEL for asset in clicks)
+        assert not name_intervals
+    elif mode == 'back':
+        assert clicks and all(asset is task.I_D_BACK for asset in clicks)
+        assert waits == [(task.I_REWARDS_MIN, 3)]
+    else:
+        assert not clicks
+        assert name_intervals and all(value == 3 for value in name_intervals)
+
+
+def test_start_wait_is_bounded_when_prepare_never_disappears(monkeypatch):
+    now = [100.0]
+    monkeypatch.setattr(timer, 'time', SimpleNamespace(time=lambda: now[0]))
+    task = object.__new__(ScriptTask)
+    task.O_D_NAME = SimpleNamespace(keyword='')
+
+    def screenshot():
+        now[0] += 1
+        assert now[0] < 125, 'delegation start loop did not terminate'
+
+    task.screenshot = screenshot
+    task.ocr_appear = lambda *args: True
+    task.appear = lambda *args, **kwargs: True
+    task.click = lambda *args, **kwargs: True
+    task.delegate_one('画')
+    assert 115 <= now[0] < 125

+ 24 - 0
tests/tasks/WantedQuests/test_invite_selection.py

@@ -0,0 +1,24 @@
+import pytest
+
+from tasks.WantedQuests import script_task as wanted
+
+
+@pytest.mark.parametrize('selected', [False, True])
+def test_invite_uses_the_wanted_quest_selection_marker(monkeypatch, selected):
+    monkeypatch.setattr(wanted, 'sleep', lambda duration: None)
+    task = object.__new__(wanted.ScriptTask)
+    add_button = object()
+    checked, confirmed = [], []
+
+    def appear(asset, **kwargs):
+        checked.append(asset)
+        return asset is add_button or (asset is task.I_WQ_INVITE_SELECTED and selected)
+
+    task.appear = appear
+    task.screenshot = lambda: None
+    task.ui_click = lambda *args, **kwargs: None
+    task.click = lambda *args, **kwargs: True
+    task.ui_click_until_disappear = lambda asset: confirmed.append(asset)
+    task.invite_random(add_button)
+    assert task.I_WQ_INVITE_SELECTED in checked
+    assert bool(confirmed) is selected

+ 16 - 0
tests/test_task_name.py

@@ -0,0 +1,16 @@
+from types import SimpleNamespace
+
+import pytest
+
+from tasks import base_task
+from tasks.base_task import BaseTask
+
+
+@pytest.mark.parametrize('running,expected', [
+    ('WantedQuests', 'WantedQuests'), ('wanted_quests', 'WantedQuests'), ('', 'Orochi'),
+])
+def test_reused_task_implementation_keeps_the_scheduled_task_name(monkeypatch, running, expected):
+    monkeypatch.setattr(base_task.inspect, 'getfile', lambda cls: 'tasks/Orochi/script_task.py')
+    task = object.__new__(BaseTask)
+    task.config = SimpleNamespace(model=SimpleNamespace(running_task=running))
+    assert task.get_task_name() == expected