diff --git a/scripts/convert_modules.py b/scripts/convert_modules.py index 69657b3..0d5598e 100644 --- a/scripts/convert_modules.py +++ b/scripts/convert_modules.py @@ -484,9 +484,23 @@ def main(argv=None): time.sleep(3) log('合成前狂气(OCR, 作相对比对用): %s' % lunacy_before) - enk = read_enkephalin() + # 体力读数也要重试。单次读成 None 的话, 下面"体力不足就收工"这层判断会被 + # 整个跳过, 于是明明只是体力不够, 却要去点合成、最后报成 FAIL(退出码 1) —— + # 给值守留下一条误导性的失败记录。 + enk = None + for _ in range(4): + enk = read_enkephalin() + if enk is not None: + break + time.sleep(3) log('当前体力: %s/126 (合成 1 个模块需要 %d)' % (enk, ENKEPHALIN_PER_MODULE)) - if enk is not None and enk < ENKEPHALIN_PER_MODULE: + if enk is None: + log('[warn] 体力读数没拿到, 这轮按"不确定"处理, 不主动点合成') + close_panel() + if not args.keep_game: + close_game() + return done(0, '读不到体力读数, 本轮跳过(下一轮再试)') + if enk < ENKEPHALIN_PER_MODULE: # 体力不够换一个模块 —— 这是正常情况(挂机等恢复), 不是失败。 # 直接收工, 免得每轮都在计划任务里报错。 close_panel() diff --git a/tests/test_convert_modules.py b/tests/test_convert_modules.py index 94598dc..0617530 100644 --- a/tests/test_convert_modules.py +++ b/tests/test_convert_modules.py @@ -112,6 +112,55 @@ class LunacyReadTest(QuietLogMixin, unittest.TestCase): self.assertIsNone(cm.read_lunacy()) +class EnkephalinGateTest(QuietLogMixin, unittest.TestCase): + """体力读数是"要不要合成"的闸门, 读不到时不能贸然去点合成。 + + 单次读成 None 的话, 原来那层"体力不足就收工"的判断会被整个跳过 —— 于是明明 + 只是体力不够, 却要去点合成、最后报成 FAIL(退出码 1), 给值守留下一条误导性 + 的失败记录。底栏淡入时读不到是实测发生过的(2026-10-16 11:01 的狂气读数)。 + """ + + def _main(self, enk_seq): + seq = list(enk_seq) + called = [] + with mock.patch.object(cm, 'read_enkephalin', lambda: seq.pop(0) if seq else None), \ + mock.patch.object(cm, 'read_lunacy', lambda **k: 9699), \ + mock.patch.object(cm, 'ensure_server', lambda *a: True), \ + mock.patch.object(cm, 'ensure_display', lambda *a: True), \ + mock.patch.object(cm, 'launch_game', lambda *a: True), \ + mock.patch.object(cm, 'wait_main_menu', lambda *a: True), \ + mock.patch.object(cm, 'ensure_window_size', lambda *a: (1600, 900)), \ + mock.patch.object(cm, 'close_panel', lambda: True), \ + mock.patch.object(cm, 'close_game', lambda: None), \ + mock.patch.object(cm, 'convert_once', + lambda tries=2: (called.append(1), + (True, '模组 29 -> 30 (+1)', 1))[1]), \ + mock.patch.object(cm.time, 'sleep', lambda s: None): + code = cm.main([]) + return code, bool(called) + + def test_enough_enkephalin_goes_ahead(self): + code, called = self._main([25]) + self.assertEqual(code, 0) + self.assertTrue(called) + + def test_not_enough_skips_without_touching_confirm(self): + code, called = self._main([4]) + self.assertEqual(code, 0, '体力不足是正常情况, 不该报失败') + self.assertFalse(called, '体力不足时绝不该去点合成') + + def test_unreadable_enkephalin_skips_instead_of_failing(self): + code, called = self._main([None, None, None, None]) + self.assertEqual(code, 0, '读不到就跳过, 不要报成 FAIL') + self.assertFalse(called) + + def test_read_is_retried(self): + """前几次读不到要接着读, 不能一次读不到就放弃。""" + code, called = self._main([None, None, 25]) + self.assertEqual(code, 0) + self.assertTrue(called, '重试后读到了就该正常合成') + + class ConvertRetryTest(QuietLogMixin, unittest.TestCase): """"点了确认但模组没变"有两种原因, 该有不同的处置。