diff --git a/scripts/auto_cycle.py b/scripts/auto_cycle.py index cdcdca4..5de49c2 100644 --- a/scripts/auto_cycle.py +++ b/scripts/auto_cycle.py @@ -75,7 +75,15 @@ def goto_identities(): def on_teams_screen(txt): - return ('SIN COST' in txt) or ('All Idensities' in txt) or ('All E.6.0' in txt) + """TEAMS 界面的判定。 + + 实测 OCR 会把 "SIN COST" 输出成 "SINICOST"(无空格), 直接匹配 'SIN COST' + 会漏判 —— 于是 ensure_team1() 以为不在 TEAMS 页, 去点 Sinners 按钮空转, + 最后报 "未能确认选中 TEAMS #1"。所以先去空格再比。 + """ + t = txt.replace(' ', '').upper() + return ('SINCOST' in t or 'SINICOST' in t + or 'ALLIDENTITIES' in t or 'ALLE.G.0' in t or 'ALLE.G.O' in t) def on_grid(txt): @@ -164,24 +172,32 @@ def report_grid(): return out.strip() -def read_lunacy(): - """从主界面读狂气余额(LUNACY 标签右下方的数字)。读不到返回 None。""" - its = items() - lab = None - for it in its: - if 'LUNACY' in it.get('text', '').upper(): - lab = it - break - if not lab: - return None +def read_lunacy(retries=2, pause=2.0): + """从当前画面读狂气余额(LUNACY 标签右下方的数字)。读不到返回 None。 + + OCR 偶尔会漏掉 LUNACY 这个标签(实测同一画面一次抓到、一次没抓到), 而狂气 + 校验是"不许消费"的唯一防线 —— 静默跳过等于没校验, 所以这里重试几次。 + """ best = None - for it in its: - t = it.get('text', '').strip() - if t.isdigit() and len(t) >= 3: - dy = it.get('y', 0) - lab.get('y', 0) - dx = abs(it.get('x', 0) - lab.get('x', 0)) - if 0 < dy < 70 and dx < 130: - best = int(t) + for attempt in range(retries + 1): + its = items() + lab = None + for it in its: + if 'LUNACY' in it.get('text', '').upper(): + lab = it + break + if lab: + for it in its: + t = it.get('text', '').strip() + if t.isdigit() and len(t) >= 3: + dy = it.get('y', 0) - lab.get('y', 0) + dx = abs(it.get('x', 0) - lab.get('x', 0)) + if 0 < dy < 70 and dx < 130: + best = int(t) + if best is not None: + return best + if attempt < retries: + time.sleep(pause) return best diff --git a/scripts/install_logon_task.ps1 b/scripts/install_logon_task.ps1 index 2749fff..3ac41e7 100644 --- a/scripts/install_logon_task.ps1 +++ b/scripts/install_logon_task.ps1 @@ -1,4 +1,4 @@ -# 注册登录时启动的 lc-mcp 常驻服务 (交互会话, 能看到游戏窗口)。 +# 注册登录时启动的 lc-mcp 常驻服务 (交互会话, 能看到游戏窗口)。 # 用法 (在要跑游戏的那个账号下, 普通 PowerShell 即可): # powershell -ExecutionPolicy Bypass -File scripts\install_logon_task.ps1 # 可选: -Python 默认用 vendor\aalc\.venv (uv sync 生成) diff --git a/scripts/install_unattended.ps1 b/scripts/install_unattended.ps1 index 834bd46..883923b 100644 --- a/scripts/install_unattended.ps1 +++ b/scripts/install_unattended.ps1 @@ -1,10 +1,11 @@ -# 注册无人值守用的两个计划任务 (在跑游戏的那个账号下, 普通 PowerShell 即可): -# LcMCPKeepDisplay 每 5 分钟跑 keep_display.ps1: 会话掉到 Disc 时重挂 console, 防止截图全黑 -# LcMCPDailyCycle 每天定时跑 auto_cycle.py: 刷材料 -> 镜牢 -> 升级/同步, 报告写到 ~\lc_mcp\cycles +# 注册无人值守用的两个计划任务 (在跑游戏的那个账号下, 普通 PowerShell 即可): +# LcMCPKeepDisplay 每 1 分钟跑 keep_display.ps1: 会话掉到 Disc 时重挂 console, 防止截图全黑 +# LcMCPDailyCycle 定时跑 auto_cycle.py: 刷材料 -> 镜牢 -> 升级/同步, 报告写到 ~\lc_mcp\cycles # # 用法: # powershell -ExecutionPolicy Bypass -File scripts\install_unattended.ps1 # 可选: -At 05:30 每日运行时间。游戏每日重置为 06:00 (KST), 即北京时间 05:00 +# -EveryHours 2 改成"每 N 小时重复一轮"以持续刷取; 0 = 只按 -At 每天一次 # -Mirror 1 每轮镜牢局数, 0 = 不打镜牢 # -Target 34 把队内人格升到的等级 # -Python <路径> 默认 vendor\aalc\.venv\Scripts\pythonw.exe (无窗口, 不抢游戏焦点) @@ -15,6 +16,7 @@ # 先手动跑一轮确认无误再装: python scripts\auto_cycle.py --mirror 1 param( [string]$At = "05:30", + [int]$EveryHours = 0, [int]$Mirror = 1, [int]$Target = 34, [string]$Python = "", @@ -57,18 +59,31 @@ if (-not $NoWatchdog) { -ExecutionTimeLimit (New-TimeSpan -Minutes 3) -MultipleInstances IgnoreNew Register-ScheduledTask -TaskName $Watchdog -Action $action -Trigger $trigger -Principal $principal ` -Settings $settings -Force | Out-Null - Write-Output "registered $Watchdog (every 5 min) -> $script" + Write-Output "registered $Watchdog (every 1 min) -> $script" } $cycle = Join-Path $PSScriptRoot "auto_cycle.py" $action = New-ScheduledTaskAction -Execute $Python -WorkingDirectory $Repo ` -Argument "-X utf8 `"$cycle`" --mirror $Mirror --target $Target" -$trigger = New-ScheduledTaskTrigger -Daily -At $At # 一轮 daily 约 20 分钟, 每局镜牢约 40 分钟; 超过上限由计划任务强杀 $limit = New-TimeSpan -Minutes (60 + 75 * [Math]::Max($Mirror, 0)) +if ($EveryHours -gt 0) { + # 持续刷取: 每 N 小时重复一轮。开始时间取"现在", 装完即进入节奏。 + $trigger = New-ScheduledTaskTrigger -Once -At (Get-Date).AddMinutes(1) ` + -RepetitionInterval (New-TimeSpan -Hours $EveryHours) ` + -RepetitionDuration (New-TimeSpan -Days 3650) + $desc = "every $EveryHours h" + # 重复周期必须大于单轮上限, 否则会在上一轮还没结束时又起一轮 + if ((New-TimeSpan -Hours $EveryHours) -lt $limit) { + Write-Warning "EveryHours=$EveryHours 短于单轮上限 $limit, 可能重叠; MultipleInstances=IgnoreNew 会跳过, 但建议调大" + } +} else { + $trigger = New-ScheduledTaskTrigger -Daily -At $At + $desc = "daily at $At" +} $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries ` -StartWhenAvailable -ExecutionTimeLimit $limit -MultipleInstances IgnoreNew Register-ScheduledTask -TaskName $Daily -Action $action -Trigger $trigger -Principal $principal ` -Settings $settings -Force | Out-Null -Write-Output "registered $Daily (daily at $At, mirror=$Mirror, target=Lv.$Target, limit=$limit)" +Write-Output "registered $Daily ($desc, mirror=$Mirror, target=Lv.$Target, limit=$limit)" Write-Output "reports -> $env:USERPROFILE\lc_mcp\cycles\cycle_*.json" diff --git a/tests/test_auto_cycle.py b/tests/test_auto_cycle.py index a2cc014..fcf5a72 100644 --- a/tests/test_auto_cycle.py +++ b/tests/test_auto_cycle.py @@ -80,5 +80,57 @@ class RunAalcTest(unittest.TestCase): self.assertEqual(mcp.calls[0], ('run_task', {'count': 2, 'task': 'mirror'})) +class ScreenDetectTest(unittest.TestCase): + """TEAMS / 网格的界面判定。 + + 2026-10-13 实机: OCR 把 "SIN COST" 输出成 "SINICOST"(无空格), 而判定写死了 + 带空格的 'SIN COST', 于是 ensure_team1() 以为不在 TEAMS 页, 去点 Sinners + 按钮空转, 每轮都报 "未能确认选中 TEAMS #1"。判定必须容忍空格。 + """ + + def test_teams_screen_without_space_is_recognised(self): + # 这是本机 OCR 的真实输出 + self.assertTrue(auto_cycle.on_teams_screen( + 'TEAMS#1 | Details | SINICOST | 000 | Dante | All Idensities')) + + def test_teams_screen_with_space_still_recognised(self): + self.assertTrue(auto_cycle.on_teams_screen( + 'TEAMS #1 | Details | SIN COST | 000 | Dante | All E.G.O')) + + def test_grid_is_not_teams_screen(self): + t = 'TEAMS#1 | IDENTITIES | E.G.O | Facades | Details' + self.assertFalse(auto_cycle.on_teams_screen(t)) + self.assertTrue(auto_cycle.on_grid(t)) + + def test_main_menu_is_neither(self): + t = 'Inferno | MIRROROF | Window | Sinners | Drive | Extract' + self.assertFalse(auto_cycle.on_teams_screen(t)) + self.assertFalse(auto_cycle.on_grid(t)) + + +class LunacyReadTest(unittest.TestCase): + """狂气校验是"不许消费"的唯一防线, 读不到就是没校验, 所以要重试。""" + + def test_retries_until_the_label_shows_up(self): + calls = [] + + def fake_items(): + calls.append(1) + if len(calls) < 3: + return [{'text': 'LV 042', 'x': 60, 'y': 800}] # 这一帧没有 LUNACY + return [{'text': 'LUNACY', 'x': 668, 'y': 795}, + {'text': '5864', 'x': 664, 'y': 823}] + + with mock.patch.object(auto_cycle, 'items', fake_items), \ + mock.patch.object(auto_cycle.time, 'sleep', lambda s: None): + self.assertEqual(auto_cycle.read_lunacy(), 5864) + self.assertEqual(len(calls), 3) + + def test_gives_up_after_retries(self): + with mock.patch.object(auto_cycle, 'items', lambda: [{'text': 'LV 042', 'x': 60, 'y': 800}]), \ + mock.patch.object(auto_cycle.time, 'sleep', lambda s: None): + self.assertIsNone(auto_cycle.read_lunacy()) + + if __name__ == '__main__': unittest.main()