复查 V1.6.2 与 11-16~11-22 补丁: 返回按钮 TypeError、事件兜底连点、截图熔断线程
- 返回按钮(I-15): V1.6.2 在首次引导页拿 click_element 的返回值当坐标再点, 它返回 True → TypeError, 镜牢任务退出。install_back_button_result 只在 `x := auto.click_element(返回)` 这种调用时只找不点, 由上游点一次; 只看真假的调用照常点; 上游源码里没有这种写法就不装 - 事件兜底(I-16): LCP_EVENT_FALLBACK=1 时每轮都抢先点第 1 项, 上游走不到判定/继续/开始战斗; runs 里 1014 条 fallback_first, 73 段同屏连点 10~11 次, 最长 110 次。改成每屏只点一次、与按表共用 5 次上限 - 事件点击点只在这一项自己那行 OCR 字里取(原来整屏找子串, 叙述或别的选项是它的子串时会点错) - 截图熔断(I-17): 只在任务主线程计数和中止(retry_monitor 线程里抛只会打死那条线程, 两次熔断都记了两条); 要求连续出错满 30 秒、至少 20 次, 一闪而过的坏帧不再停掉任务 - 卡包: 优选阈值默认 1 与注释/提交说明/实机一致(LCP_THEME_PACK_THRESHOLD=0 不动上游); 「刷新」OCR 范围按 set_win_size/1440 缩放 - .gitignore 放行 docs/feedback/runs/**/logs/*.log(INDEX 说的过滤日志此前被 *.log 挡掉, 没进仓库) - README 补 LCP_EVENT_FALLBACK / LCP_THEME_PACK_THRESHOLD; BACKLOG 记 V1.6.2 影响; ISSUES 加 I-15~I-17 单测: 769 passed(新增上游真实 select_battle_team 端到端: 不装补丁 TypeError, 装了点一次)。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+6
-6
@@ -11,15 +11,14 @@ import sys
|
|||||||
|
|
||||||
from . import killswitch, preflight
|
from . import killswitch, preflight
|
||||||
from .aalc_engine import bootstrap
|
from .aalc_engine import bootstrap
|
||||||
from .aalc_patches import (TaskAbort, WindowGuard, driver_click_tasks, headless_hdr_warning, install_rabbit_hole,
|
from .aalc_patches import (TaskAbort, WindowGuard, driver_click_tasks, headless_hdr_warning,
|
||||||
load_rabbit_hole,
|
install_back_button_result, install_default_battle_team, install_event_choices,
|
||||||
install_default_battle_team, install_event_choices, install_exact_team_match,
|
install_exact_team_match, install_gift_confirm_guard, install_gift_preference,
|
||||||
install_gift_confirm_guard, install_gift_preference, install_image_error_guard, install_key_hold,
|
install_image_error_guard, install_key_hold, install_rabbit_hole,
|
||||||
install_robust_set_foreground, install_shop_audit, install_shop_by_name,
|
install_robust_set_foreground, install_shop_audit, install_shop_by_name,
|
||||||
install_system_team_selection, install_team_screen_guard,
|
install_system_team_selection, install_team_screen_guard,
|
||||||
install_theme_pack_audit, install_theme_pack_refresh_click, install_theme_pack_systems,
|
install_theme_pack_audit, install_theme_pack_refresh_click, install_theme_pack_systems,
|
||||||
install_typed_keyboard_road,
|
install_typed_keyboard_road, load_rabbit_hole, mirror_progress, stop_driver_click)
|
||||||
mirror_progress, stop_driver_click)
|
|
||||||
from .decisions import decisions
|
from .decisions import decisions
|
||||||
from .game_lock import GameBusyError, exclusive_game
|
from .game_lock import GameBusyError, exclusive_game
|
||||||
|
|
||||||
@@ -155,6 +154,7 @@ def _run(task, params):
|
|||||||
install_default_battle_team(scheme, log=log)
|
install_default_battle_team(scheme, log=log)
|
||||||
# 镜牢: 编队是自定义名字(体系名), AALC 只会找 "编队#N"; 改成按体系名点选。
|
# 镜牢: 编队是自定义名字(体系名), AALC 只会找 "编队#N"; 改成按体系名点选。
|
||||||
if task in ('mirror', 'all'):
|
if task in ('mirror', 'all'):
|
||||||
|
install_back_button_result(log=log) # 上游 V1.6.2 拿 click_element 返回的 True 当坐标, 首次引导页 TypeError
|
||||||
install_system_team_selection(log=log, names=rabbit['team_names'] if rabbit else None)
|
install_system_team_selection(log=log, names=rabbit['team_names'] if rabbit else None)
|
||||||
install_team_screen_guard(log=log)
|
install_team_screen_guard(log=log)
|
||||||
install_gift_confirm_guard(log=log) # 「获得E.G.O饰品」点不关时换落点/结束任务(ISSUES I-06)
|
install_gift_confirm_guard(log=log) # 「获得E.G.O饰品」点不关时换落点/结束任务(ISSUES I-06)
|
||||||
|
|||||||
Reference in New Issue
Block a user