合成: 清掉同类"假成功"路径(读不到读数时不能报成功)

Browse Source
上一轮查明狂气防线是因为"读不到就静默跳过"而哑掉。顺着这个模式把代码过了一遍,
在 _convert_attempt 里找到同一类毛病的两个分支:

    if now is not None and before is None:  return True, "模组现为 %d"
    return True, "模组 %s -> %s" % (before, after)     # 两边都可能读到 None

读不到起点就无从判断有没有换到, 却报了成功 —— 看起来一切正常, 实际什么都没验证。

改法: 每条返回路径都必须有确认。
  * 读不到起点(before is None) -> 直接不合成, 报"无法确认结果"
  * 合成后读不到(after is None) -> 报"无法确认结果", 不再报成功
  * 只有"读到 after 且 after != before"才报成功
另外 read_owned() 也加上重试(3 次, 每次隔 2 秒) —— 面板刚打开时数字还在刷新。

mock 逐条验证: 读不到起点 / 起点29->30 / 一直不变 / 合成后读不到 / 不在Modules页签,
五条路径的结论都正确。新增 5 个用例, 全套 277/277 通过。
This commit is contained in:
Codex Agent
2026-10-16 11:22:43 +08:00
parent c4c499c48e
commit 21f84473ba
2 changed files with 88 additions and 14 deletions
+32 -14
View File
@@ -224,16 +224,30 @@ def read_lunacy(reads=5, pause=1.0):
return None return None
def read_owned(): def read_owned(retries=3, pause=2.0):
"""从合成面板上读 'Owned NN'(当前模组数量)。读不到返回 None。""" """从合成面板上读 'Owned NN'(当前模组数量)。读不到返回 None。
这个读数是判断"到底换到没有"的依据, 所以第一次没读到要再试几次 ——
面板刚打开时数字还在刷新, 单次读容易拿到 None。
"""
for i in range(retries):
v = _read_owned_once()
if v is not None:
return v
if i < retries - 1:
time.sleep(pause)
return None
def _read_owned_once():
import re import re
for it in items(): its = items()
t = it.get('text', '') for it in its:
m = re.search(r'Owned\s*(\d+)', t, re.I) m = re.search(r'Owned\s*(\d+)', it.get('text', ''), re.I)
if m: if m:
return int(m.group(1)) return int(m.group(1))
# OCR 有可能会把 'Owned 23' 拆开, 退一步找面板里的裸数字 # OCR 有可能会把 'Owned 23' 拆开, 退一步找面板里的裸数字
for it in items(): for it in its:
t = it.get('text', '').strip() t = it.get('text', '').strip()
if t.isdigit() and 300 < it.get('y', 0) < 360: if t.isdigit() and 300 < it.get('y', 0) < 360:
return int(t) return int(t)
@@ -424,25 +438,29 @@ def _convert_attempt():
before = read_owned() before = read_owned()
log(' 合成前模组: %s' % before) log(' 合成前模组: %s' % before)
if before is None:
# 读不到起点就无从判断有没有换到。这里**不能报成功** —— 那是假装验证过,
# 和"狂气读不到就静默跳过"是同一类毛病。宁可不合成, 下一轮再来。
return False, '读不到合成前的模组数, 无法确认结果, 本轮不合成', 0
click(*BTN_MAX) click(*BTN_MAX)
time.sleep(2.5) time.sleep(2.5)
click(*BTN_CONFIRM) click(*BTN_CONFIRM)
# 面板会自己刷新 Owned。等它变大, 最多等 20 秒。 # 面板会自己刷新 Owned。等它变大, 最多等 20 秒。
got = 0
t0 = time.time() t0 = time.time()
while time.time() - t0 < 20: while time.time() - t0 < 20:
time.sleep(2.5) time.sleep(2.5)
now = read_owned() now = read_owned()
if now is not None and before is not None and now > before: if now is not None and now > before:
got = now - before return True, '模组 %d -> %d (+%d)' % (before, now, now - before), now - before
return True, '模组 %d -> %d (+%d)' % (before, now, got), got
if now is not None and before is None:
return True, '模组现为 %d' % now, 0
after = read_owned() after = read_owned()
if before is not None and after == before: if after is None:
return False, '合成后读不到模组数, 无法确认结果(合成前为 %d)' % before, 0
if after == before:
return False, '点了确认但模组没变(%s), 可能已达上限或体力不足' % after, 0 return False, '点了确认但模组没变(%s), 可能已达上限或体力不足' % after, 0
return True, '模组 %s -> %s' % (before, after), 0 return True, '模组 %d -> %d (+%d)' % (before, after, after - before), after - before
def close_panel(): def close_panel():
+56
View File
@@ -203,6 +203,62 @@ class EnkephalinGateTest(QuietLogMixin, unittest.TestCase):
self.assertTrue(called, '重试后读到了就该正常合成') self.assertTrue(called, '重试后读到了就该正常合成')
class ConvertAttemptVerifiedTest(QuietLogMixin, unittest.TestCase):
"""⛔ 每一层"读不到"都不能被当成成功。
原来这段有两个假成功分支:
if now is not None and before is None: return True, '模组现为 %d'
return True, '模组 %s -> %s' % (before, after) # 两边都可能是 None
读不到起点就无从判断有没有换到, 却报了成功 —— 和"狂气读不到就静默跳过"
是同一类毛病: 降级路径看起来没事, 实际什么都没验证。
"""
def _clock(self):
c = {'t': 0.0}
def ft():
c['t'] += 3.0
return c['t']
return ft
def _attempt(self, owned_fn, on_tab=True):
with mock.patch.object(cm, 'open_panel', lambda *a, **k: True), \
mock.patch.object(cm, 'on_modules_tab', lambda: on_tab), \
mock.patch.object(cm, '_read_owned_once', owned_fn), \
mock.patch.object(cm, 'click', lambda *a, **k: None), \
mock.patch.object(cm.time, 'sleep', lambda s: None), \
mock.patch.object(cm.time, 'time', self._clock()):
return cm._convert_attempt()
def test_unreadable_start_is_not_success(self):
ok, info, got = self._attempt(lambda: None)
self.assertFalse(ok, '读不到起点绝不能报成功')
self.assertIn('读不到合成前', info)
def test_increase_is_success(self):
seq = [29, 29, 30]
ok, info, got = self._attempt(lambda: seq.pop(0) if seq else 30)
self.assertTrue(ok)
self.assertEqual(got, 1)
self.assertIn('29 -> 30', info)
def test_unchanged_is_failure(self):
ok, info, got = self._attempt(lambda: 29)
self.assertFalse(ok)
self.assertIn('没变', info)
def test_unreadable_after_is_not_success(self):
seq = [29] + [None] * 60
ok, info, got = self._attempt(lambda: seq.pop(0) if seq else None)
self.assertFalse(ok, '合成后读不到也不能报成功')
self.assertIn('无法确认结果', info)
def test_wrong_tab_refuses(self):
ok, info, got = self._attempt(lambda: 29, on_tab=False)
self.assertFalse(ok)
self.assertIn('Modules', info)
class ConvertRetryTest(QuietLogMixin, unittest.TestCase): class ConvertRetryTest(QuietLogMixin, unittest.TestCase):
""""点了确认但模组没变"有两种原因, 该有不同的处置。 """"点了确认但模组没变"有两种原因, 该有不同的处置。