合成: 清掉同类"假成功"路径(读不到读数时不能报成功)
上一轮查明狂气防线是因为"读不到就静默跳过"而哑掉。顺着这个模式把代码过了一遍,
在 _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:
+32
-14
@@ -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():
|
||||||
|
|||||||
Reference in New Issue
Block a user