修复运行日志复核发现的任务控制与结果误判
This commit is contained in:
+67
-39
@@ -13,6 +13,7 @@
|
|||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import subprocess
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from lc_ui import HERE, PY, click, drag, items, keypress, probe, run
|
from lc_ui import HERE, PY, click, drag, items, keypress, probe, run
|
||||||
@@ -127,31 +128,37 @@ def ensure_team1():
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def clear_blocking_modal():
|
def blocking_module_modal():
|
||||||
"""清掉挡在 AALC 前面的模态框, 返回清掉的说明或 None。
|
"""只读识别缺模组弹窗, 返回 Cancel 中心。AALC 运行期间不发送输入。"""
|
||||||
|
|
||||||
2026-10-13 实测: Enkephalin Modules 不足时游戏弹出
|
|
||||||
"You don't have enough Enkephalin Modules. / Would you like to go assemble some?"
|
|
||||||
而 AALC 的 Luxcavation 流程不认这个框 —— 它一直在后面点被挡住的 Enter 按钮,
|
|
||||||
每次都要等满 10 分钟被 no_progress 判据救回来。点 Cancel 拒绝去组装,
|
|
||||||
AALC 就会自己往下走(该关卡过不去, 它会降级试下一关)。
|
|
||||||
|
|
||||||
只在轮询里做这件事, 不碰 AALC 自己的识别; 模态框本来就挡住了一切输入,
|
|
||||||
点它的 Cancel 不会造成误操作。
|
|
||||||
"""
|
|
||||||
its = items()
|
its = items()
|
||||||
txt = ' '.join(i.get('text', '') for i in its).replace(' ', '')
|
txt = ''.join(''.join(i.get('text', '').split()) for i in its).lower()
|
||||||
if 'enoughEnkephalinModules' not in txt:
|
if 'enoughenkephalinmodules' not in txt:
|
||||||
return None
|
return None
|
||||||
for it in its:
|
for it in its:
|
||||||
if 'cancel' in it.get('text', '').lower():
|
if 'cancel' in it.get('text', '').lower():
|
||||||
w = it.get('w') or 0
|
w = it.get('w') or 0
|
||||||
h = it.get('h') or 0
|
h = it.get('h') or 0
|
||||||
click(it['x'] + w / 2.0, it['y'] + h / 2.0)
|
return it['x'] + w / 2.0, it['y'] + h / 2.0
|
||||||
return 'Enkephalin Modules 不足 -> 点 Cancel'
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def clear_blocking_modal():
|
||||||
|
"""任务停止后重新识别并取消缺模组弹窗; 点击被拒绝时不能报成功。"""
|
||||||
|
pos = blocking_module_modal()
|
||||||
|
if pos is None:
|
||||||
|
return None
|
||||||
|
result = click(*pos)
|
||||||
|
if not result.get('ok'):
|
||||||
|
raise RuntimeError('取消缺模组弹窗失败: %s' % result.get('error', result))
|
||||||
|
return 'Enkephalin Modules 不足 -> 已发送 Cancel'
|
||||||
|
|
||||||
|
|
||||||
|
def stop_running_task():
|
||||||
|
result = probe('stop_task')
|
||||||
|
if not result.get('ok'):
|
||||||
|
raise RuntimeError('停止 AALC 任务失败: %s' % result.get('error', result))
|
||||||
|
|
||||||
|
|
||||||
# 同一轮里连着这么多次看到"模组不足", 就不是偶发了, 是资源真的见底
|
# 同一轮里连着这么多次看到"模组不足", 就不是偶发了, 是资源真的见底
|
||||||
RESOURCE_OUT_LIMIT = 3
|
RESOURCE_OUT_LIMIT = 3
|
||||||
|
|
||||||
@@ -160,10 +167,13 @@ def poll_task(task, timeout_s, sleep=time.sleep):
|
|||||||
"""轮询到任务结束。返回 (ok, 说明, 是否因卡死被停)。"""
|
"""轮询到任务结束。返回 (ok, 说明, 是否因卡死被停)。"""
|
||||||
t0 = time.time()
|
t0 = time.time()
|
||||||
stalled = 0
|
stalled = 0
|
||||||
cleared = 0
|
resource_polls = 0
|
||||||
while time.time() - t0 < timeout_s:
|
while time.time() - t0 < timeout_s:
|
||||||
sleep(POLL_S)
|
sleep(POLL_S)
|
||||||
st = probe('task_status', {'lines': 1})
|
st = probe('task_status', {'lines': 1})
|
||||||
|
if st.get('ok') is False or not st.get('state'):
|
||||||
|
stop_running_task()
|
||||||
|
raise RuntimeError('无法读取任务状态: %s' % st.get('error', st))
|
||||||
s = st.get('state')
|
s = st.get('state')
|
||||||
el = int(time.time() - t0)
|
el = int(time.time() - t0)
|
||||||
if s != 'running':
|
if s != 'running':
|
||||||
@@ -173,25 +183,28 @@ def poll_task(task, timeout_s, sleep=time.sleep):
|
|||||||
return False, '%s: %s' % (s, st['errors'][-1]), False
|
return False, '%s: %s' % (s, st['errors'][-1]), False
|
||||||
return s == 'succeeded', 'state=%s elapsed=%ds' % (s, el), False
|
return s == 'succeeded', 'state=%s elapsed=%ds' % (s, el), False
|
||||||
try:
|
try:
|
||||||
msg = clear_blocking_modal()
|
modal = blocking_module_modal()
|
||||||
except Exception as e: # 清道夫不该拖垮轮询
|
except Exception as e: # 清道夫不该拖垮轮询
|
||||||
msg = None
|
modal = None
|
||||||
log(' [warn] 清模态框时出错: %s' % e)
|
log(' [warn] 读取缺模组弹窗时出错: %s' % e)
|
||||||
if msg:
|
resource_polls = resource_polls + 1 if modal is not None else 0
|
||||||
cleared += 1
|
if resource_polls:
|
||||||
log(' [fix] %s (%d/%d)' % (msg, cleared, RESOURCE_OUT_LIMIT))
|
log(' 缺模组弹窗连续出现 (%d/%d)' % (resource_polls, RESOURCE_OUT_LIMIT))
|
||||||
if cleared >= RESOURCE_OUT_LIMIT:
|
if resource_polls >= RESOURCE_OUT_LIMIT:
|
||||||
# 反复缺模组 = 体力/模组真的见底了。继续点下去只是空转到超时,
|
# 反复缺模组 = 体力/模组真的见底了。继续点下去只是空转到超时,
|
||||||
# 浪费掉这一轮的时间(实测每次都烧满 10 分钟)。直接收工, 等下一轮。
|
# 浪费掉这一轮的时间(实测每次都烧满 10 分钟)。直接收工, 等下一轮。
|
||||||
probe('stop_task')
|
stop_running_task()
|
||||||
|
msg = clear_blocking_modal()
|
||||||
|
if msg:
|
||||||
|
log(' [fix] %s' % msg)
|
||||||
return False, 'RESOURCE_OUT', False
|
return False, 'RESOURCE_OUT', False
|
||||||
stalled = stalled + 1 if st.get('stall') else 0
|
stalled = stalled + 1 if st.get('stall') else 0
|
||||||
if stalled >= STALL_POLLS:
|
if stalled >= STALL_POLLS:
|
||||||
probe('stop_task')
|
stop_running_task()
|
||||||
return False, '卡死(%s), 已停止任务 elapsed=%ds' % (st['stall'], el), True
|
return False, '卡死(%s), 已停止任务 elapsed=%ds' % (st['stall'], el), True
|
||||||
if el % 600 < POLL_S:
|
if el % 600 < POLL_S:
|
||||||
log(' ...%s running %ds' % (task, el))
|
log(' ...%s running %ds' % (task, el))
|
||||||
probe('stop_task')
|
stop_running_task()
|
||||||
return False, '超时 %ds' % timeout_s, False
|
return False, '超时 %ds' % timeout_s, False
|
||||||
|
|
||||||
|
|
||||||
@@ -213,7 +226,7 @@ def run_aalc(task, params, timeout_s, retries=STALL_RETRIES, sleep=time.sleep):
|
|||||||
|
|
||||||
|
|
||||||
def report_grid():
|
def report_grid():
|
||||||
out = run([PY, '-X', 'utf8', LEVELUP, 'list'])
|
out = run([PY, '-X', 'utf8', LEVELUP, 'list'], check=True)
|
||||||
return out.strip()
|
return out.strip()
|
||||||
|
|
||||||
|
|
||||||
@@ -228,35 +241,36 @@ def read_lunacy(reads=5, pause=1.0):
|
|||||||
2. **同一个画面上数字本身就会抖**: 放大 6 倍肉眼确认余额是 6388, 而 OCR 在
|
2. **同一个画面上数字本身就会抖**: 放大 6 倍肉眼确认余额是 6388, 而 OCR 在
|
||||||
同一画面连读 5 次得到 6388 四次、8859 一次。8859 被当成基线后, 之后正确
|
同一画面连读 5 次得到 6388 四次、8859 一次。8859 被当成基线后, 之后正确
|
||||||
的 6388 反而被判成"已消耗"并中止整轮 —— 一次误读就能造成一次误报。
|
的 6388 反而被判成"已消耗"并中止整轮 —— 一次误读就能造成一次误报。
|
||||||
所以取众数(至少出现 2 次才采信), 而不是"最后读到什么就是什么"。
|
所以读完所有帧再取唯一众数(至少出现 2 次才采信), 平票返回 None。
|
||||||
|
|
||||||
曾经试过"只在主界面取数", 但那样几乎总是读不到(轮次开始/结束时常停在副本、
|
曾经试过"只在主界面取数", 但那样几乎总是读不到(轮次开始/结束时常停在副本、
|
||||||
网格、结算页), 守卫直接跳过 —— 防线等于没有。众数投票已经能压住误读,
|
网格、结算页), 守卫直接跳过。多帧投票只能减少偶发误读, 无法证明消费。
|
||||||
覆盖率更重要。
|
|
||||||
"""
|
"""
|
||||||
votes = {}
|
votes = {}
|
||||||
for attempt in range(reads):
|
for attempt in range(reads):
|
||||||
its = items()
|
its = items()
|
||||||
lab = None
|
lab = None
|
||||||
for it in its:
|
for it in its:
|
||||||
if 'LUNACY' in it.get('text', '').upper():
|
if 'NACY' in it.get('text', '').upper():
|
||||||
lab = it
|
lab = it
|
||||||
break
|
break
|
||||||
if lab:
|
if lab:
|
||||||
best = None
|
best = None
|
||||||
for it in its:
|
for it in its:
|
||||||
t = it.get('text', '').strip()
|
t = it.get('text', '').strip()
|
||||||
if t.isdigit() and len(t) >= 3:
|
if t.isdigit():
|
||||||
dy = it.get('y', 0) - lab.get('y', 0)
|
dy = it.get('y', 0) - lab.get('y', 0)
|
||||||
dx = abs(it.get('x', 0) - lab.get('x', 0))
|
dx = abs(it.get('x', 0) - lab.get('x', 0))
|
||||||
if 0 < dy < 70 and dx < 130:
|
if 0 < dy < 70 and dx < 130:
|
||||||
best = int(t)
|
best = int(t)
|
||||||
if best is not None:
|
if best is not None:
|
||||||
votes[best] = votes.get(best, 0) + 1
|
votes[best] = votes.get(best, 0) + 1
|
||||||
if votes[best] >= 2:
|
|
||||||
return best
|
|
||||||
if attempt < reads - 1:
|
if attempt < reads - 1:
|
||||||
time.sleep(pause)
|
time.sleep(pause)
|
||||||
|
ranked = sorted(votes, key=votes.get, reverse=True)
|
||||||
|
if ranked and votes[ranked[0]] >= 2:
|
||||||
|
if len(ranked) == 1 or votes[ranked[0]] > votes[ranked[1]]:
|
||||||
|
return ranked[0]
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@@ -279,7 +293,7 @@ def lunacy_guard():
|
|||||||
f.write(str(cur))
|
f.write(str(cur))
|
||||||
return True, '记录狂气基线 %d' % cur
|
return True, '记录狂气基线 %d' % cur
|
||||||
if cur < base:
|
if cur < base:
|
||||||
return False, '狂气从 %d 降到 %d —— 已消耗, 立即停止' % (base, cur)
|
return False, '狂气读数从 %d 降到 %d, 需人工核查(OCR 也可能误读), 本轮暂停' % (base, cur)
|
||||||
if cur > base:
|
if cur > base:
|
||||||
with open(LUNACY_BASELINE, 'w', encoding='utf-8') as f:
|
with open(LUNACY_BASELINE, 'w', encoding='utf-8') as f:
|
||||||
f.write(str(cur))
|
f.write(str(cur))
|
||||||
@@ -316,9 +330,23 @@ def main(argv=None):
|
|||||||
json.dump(report, f, ensure_ascii=False, indent=2)
|
json.dump(report, f, ensure_ascii=False, indent=2)
|
||||||
return code
|
return code
|
||||||
|
|
||||||
|
try:
|
||||||
|
return run_cycle(args, step, finish)
|
||||||
|
except (OSError, RuntimeError, subprocess.SubprocessError) as e:
|
||||||
|
if isinstance(e, subprocess.CalledProcessError):
|
||||||
|
output = (e.stdout or '') + (e.stderr or '')
|
||||||
|
for line in output.splitlines():
|
||||||
|
log(' ' + line)
|
||||||
|
step('执行异常', False, '%s: %s' % (type(e).__name__, e))
|
||||||
|
return finish(1, '本轮失败: 执行异常')
|
||||||
|
finally:
|
||||||
|
_log_file = None
|
||||||
|
|
||||||
|
|
||||||
|
def run_cycle(args, step, finish):
|
||||||
log('=== 一轮开始 ===')
|
log('=== 一轮开始 ===')
|
||||||
if not step('狂气校验', *lunacy_guard()):
|
if not step('狂气校验', *lunacy_guard()):
|
||||||
return finish(1, '中止: 狂气被消耗, 按用户要求不得使用')
|
return finish(1, '中止: 狂气读数下降, 需人工核查')
|
||||||
|
|
||||||
# 先把预设列表拉回顶部并选中 TEAMS #1——AALC 只朝列表下方找, 停在底部会找不到
|
# 先把预设列表拉回顶部并选中 TEAMS #1——AALC 只朝列表下方找, 停在底部会找不到
|
||||||
if not ensure_team1():
|
if not ensure_team1():
|
||||||
@@ -344,7 +372,7 @@ def main(argv=None):
|
|||||||
# AALC 任务结束后在主界面, 这里才是能读到 LUNACY 的时机
|
# AALC 任务结束后在主界面, 这里才是能读到 LUNACY 的时机
|
||||||
time.sleep(8)
|
time.sleep(8)
|
||||||
if not step('狂气校验(刷后)', *lunacy_guard()):
|
if not step('狂气校验(刷后)', *lunacy_guard()):
|
||||||
return finish(1, '中止: 狂气被消耗, 按用户要求不得使用')
|
return finish(1, '中止: 狂气读数下降, 需人工核查')
|
||||||
|
|
||||||
if not goto_identities():
|
if not goto_identities():
|
||||||
# 镜牢超时被强杀时游戏还停在副本里, 这时进不去网格是正常的, 不是缺陷。
|
# 镜牢超时被强杀时游戏还停在副本里, 这时进不去网格是正常的, 不是缺陷。
|
||||||
@@ -358,7 +386,7 @@ def main(argv=None):
|
|||||||
log('对队内低于 Lv.%d 的人格升级 + 同步' % args.target)
|
log('对队内低于 Lv.%d 的人格升级 + 同步' % args.target)
|
||||||
# 用 progress 而非 weakest: 网格 OCR 会把 LV14 读成 Lv.1,
|
# 用 progress 而非 weakest: 网格 OCR 会把 LV14 读成 Lv.1,
|
||||||
# progress 会逐个打开详情页以真实等级判断目标。
|
# progress 会逐个打开详情页以真实等级判断目标。
|
||||||
out = run([PY, '-X', 'utf8', LEVELUP, 'progress', str(args.target), '--uptie'])
|
out = run([PY, '-X', 'utf8', LEVELUP, 'progress', str(args.target), '--uptie'], check=True)
|
||||||
lines = out.strip().splitlines()
|
lines = out.strip().splitlines()
|
||||||
for line in lines:
|
for line in lines:
|
||||||
log(' ' + line)
|
log(' ' + line)
|
||||||
|
|||||||
+21
-17
@@ -19,7 +19,7 @@
|
|||||||
1. **绝不消费狂气**。Use Lunacy 页签的坐标 USE_LUNACY_TAB 在代码里只用于
|
1. **绝不消费狂气**。Use Lunacy 页签的坐标 USE_LUNACY_TAB 在代码里只用于
|
||||||
"确认自己没点到它", 任何点击路径都不会碰它。
|
"确认自己没点到它", 任何点击路径都不会碰它。
|
||||||
2. **不打任何关卡**。全程只碰底栏模组图标和合成面板。
|
2. **不打任何关卡**。全程只碰底栏模组图标和合成面板。
|
||||||
3. 合成前后各读一次狂气, 不一致就报错退出(宁可不合成, 也不冒险)。
|
3. 记录合成前后狂气读数; 已知 OCR 抖动以外的变化需要人工核查。
|
||||||
"""
|
"""
|
||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
@@ -243,7 +243,7 @@ def panel_open(txt):
|
|||||||
LABEL_KEY = 'NACY' # 见下: LUNACY 的首字母常被 OCR 吃掉, 只认后半段
|
LABEL_KEY = 'NACY' # 见下: LUNACY 的首字母常被 OCR 吃掉, 只认后半段
|
||||||
|
|
||||||
|
|
||||||
def find_lunacy_label():
|
def find_lunacy_label(its=None):
|
||||||
"""找狂气标签所在的那个 OCR 元素。
|
"""找狂气标签所在的那个 OCR 元素。
|
||||||
|
|
||||||
⛔ 实测坑(2026-10-16 11:11): OCR 把 "LUNACY" 读成了 **"UNACY"** —— 首字母 L
|
⛔ 实测坑(2026-10-16 11:11): OCR 把 "LUNACY" 读成了 **"UNACY"** —— 首字母 L
|
||||||
@@ -254,6 +254,7 @@ def find_lunacy_label():
|
|||||||
改成认后半段 "NACY": LUNACY / UNACY / 甚至 NACY 都能命中, 而这个词根
|
改成认后半段 "NACY": LUNACY / UNACY / 甚至 NACY 都能命中, 而这个词根
|
||||||
在游戏界面里不会出现在别处。
|
在游戏界面里不会出现在别处。
|
||||||
"""
|
"""
|
||||||
|
if its is None:
|
||||||
its = items()
|
its = items()
|
||||||
for it in its:
|
for it in its:
|
||||||
if LABEL_KEY in it.get('text', '').upper():
|
if LABEL_KEY in it.get('text', '').upper():
|
||||||
@@ -272,30 +273,30 @@ def read_lunacy(reads=5, pause=1.0):
|
|||||||
|
|
||||||
两个实测坑:
|
两个实测坑:
|
||||||
1. 标签首字母会被 OCR 吃掉(LUNACY -> UNACY), 所以不能整词匹配, 见 find_lunacy_label。
|
1. 标签首字母会被 OCR 吃掉(LUNACY -> UNACY), 所以不能整词匹配, 见 find_lunacy_label。
|
||||||
2. 数字是像素风艺术字, OCR 很容易把 6 认成 9、3 认成 8 —— 实测同一个画面上
|
2. 读完所有帧再取唯一众数(至少出现两次), 平票返回 None。标签和数字必须来自
|
||||||
真实 6636 会被读成 9699、真实 6388 被读成 8859。所以取众数, 并且合成前后
|
同一帧。OCR 的系统性误读仍可能存在, 前后不同不能直接证明消费。
|
||||||
各读一次做**相对**比对(同一画面同一字体, 误读方式一致), 这样即使绝对值
|
|
||||||
读错, 也能发现"数字变了"。
|
|
||||||
"""
|
"""
|
||||||
votes = {}
|
votes = {}
|
||||||
for i in range(reads):
|
for i in range(reads):
|
||||||
its = items()
|
its = items()
|
||||||
lab = find_lunacy_label()
|
lab = find_lunacy_label(its)
|
||||||
if lab:
|
if lab:
|
||||||
best = None
|
best = None
|
||||||
for it in its:
|
for it in its:
|
||||||
t = it.get('text', '').strip()
|
t = it.get('text', '').strip()
|
||||||
if t.isdigit() and len(t) >= 3:
|
if t.isdigit():
|
||||||
dy = it.get('y', 0) - lab.get('y', 0)
|
dy = it.get('y', 0) - lab.get('y', 0)
|
||||||
dx = abs(it.get('x', 0) - lab.get('x', 0))
|
dx = abs(it.get('x', 0) - lab.get('x', 0))
|
||||||
if 0 < dy < 70 and dx < 130:
|
if 0 < dy < 70 and dx < 130:
|
||||||
best = int(t)
|
best = int(t)
|
||||||
if best is not None:
|
if best is not None:
|
||||||
votes[best] = votes.get(best, 0) + 1
|
votes[best] = votes.get(best, 0) + 1
|
||||||
if votes[best] >= 2:
|
|
||||||
return best
|
|
||||||
if i < reads - 1:
|
if i < reads - 1:
|
||||||
time.sleep(pause)
|
time.sleep(pause)
|
||||||
|
ranked = sorted(votes, key=votes.get, reverse=True)
|
||||||
|
if ranked and votes[ranked[0]] >= 2:
|
||||||
|
if len(ranked) == 1 or votes[ranked[0]] > votes[ranked[1]]:
|
||||||
|
return ranked[0]
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@@ -307,8 +308,8 @@ def read_lunacy(reads=5, pause=1.0):
|
|||||||
# 只点了模组图标和面板内的 » / 确认, 根本没碰 Use Lunacy 页签, 没有任何消费)。
|
# 只点了模组图标和面板内的 » / 确认, 根本没碰 Use Lunacy 页签, 没有任何消费)。
|
||||||
#
|
#
|
||||||
# 能站得住的判断只有两种:
|
# 能站得住的判断只有两种:
|
||||||
# * 后读数落在"已知读法"集合里 -> 视为没变(可能只是换了个误读法)
|
# * 前后读数都落在"已知读法"集合里 -> 可能只是换了个误读法
|
||||||
# * 后读数不在集合里 -> 出现了从没见过的值, 值得人工看一眼
|
# * 变化涉及集合以外的读数 -> 需要人工核查
|
||||||
# 真正的防线是结构性的(只点 Modules 页签, 且 Use Lunacy 坐标被测试盯着),
|
# 真正的防线是结构性的(只点 Modules 页签, 且 Use Lunacy 坐标被测试盯着),
|
||||||
# 这里只是补一层"数字有没有变成陌生值"的旁证。
|
# 这里只是补一层"数字有没有变成陌生值"的旁证。
|
||||||
LUNACY_KNOWN_READINGS = (6636, 9699, 6388, 8859)
|
LUNACY_KNOWN_READINGS = (6636, 9699, 6388, 8859)
|
||||||
@@ -320,11 +321,11 @@ def lunacy_verdict(before, after):
|
|||||||
return False, '读数不完整(%s -> %s), 本次未做比对' % (before, after)
|
return False, '读数不完整(%s -> %s), 本次未做比对' % (before, after)
|
||||||
if before == after:
|
if before == after:
|
||||||
return False, '前后读数一致 %s' % after
|
return False, '前后读数一致 %s' % after
|
||||||
if after in LUNACY_KNOWN_READINGS:
|
if before in LUNACY_KNOWN_READINGS and after in LUNACY_KNOWN_READINGS:
|
||||||
return False, ('前后读法不同(%s -> %s), 但 %s 是已知读法之一, 判为 OCR 抖动, '
|
return False, ('前后均为已知读法(%s -> %s), 可能为 OCR 抖动, 不单凭此判定消费'
|
||||||
'不算消费' % (before, after, after))
|
% (before, after))
|
||||||
return True, ('读数 %s -> %s, 而 %s 不在已知读法 %s 里, 需人工核查'
|
return True, ('读数 %s -> %s, 前后至少一项不在已知读法 %s 里, 需人工核查'
|
||||||
% (before, after, after, list(LUNACY_KNOWN_READINGS)))
|
% (before, after, list(LUNACY_KNOWN_READINGS)))
|
||||||
|
|
||||||
|
|
||||||
def read_owned(retries=3, pause=2.0):
|
def read_owned(retries=3, pause=2.0):
|
||||||
@@ -638,6 +639,8 @@ def _convert_attempt():
|
|||||||
after = read_owned()
|
after = read_owned()
|
||||||
if after is None:
|
if after is None:
|
||||||
return False, '合成后读不到模组数, 无法确认结果(合成前为 %d)' % before, 0
|
return False, '合成后读不到模组数, 无法确认结果(合成前为 %d)' % before, 0
|
||||||
|
if after < before:
|
||||||
|
return False, '模组读数下降(%d -> %d), 无法确认合成结果' % (before, after), 0
|
||||||
if after == before:
|
if after == before:
|
||||||
# 走到这里时调用方已经确认体力 >= 20, 所以"体力不足"不是可能的原因,
|
# 走到这里时调用方已经确认体力 >= 20, 所以"体力不足"不是可能的原因,
|
||||||
# 写进去只会把排查方向带偏。真实原因只有这两种。
|
# 写进去只会把排查方向带偏。真实原因只有这两种。
|
||||||
@@ -665,6 +668,7 @@ def main(argv=None):
|
|||||||
args = ap.parse_args(argv)
|
args = ap.parse_args(argv)
|
||||||
|
|
||||||
t_start = time.time()
|
t_start = time.time()
|
||||||
|
_result.clear()
|
||||||
_result.update({'started': time.strftime('%Y-%m-%d %H:%M:%S'), 'steps': []})
|
_result.update({'started': time.strftime('%Y-%m-%d %H:%M:%S'), 'steps': []})
|
||||||
|
|
||||||
def done(code, why):
|
def done(code, why):
|
||||||
|
|||||||
+2
-2
@@ -33,9 +33,9 @@ BASE_W, BASE_H = 1600, 900
|
|||||||
_scale = None
|
_scale = None
|
||||||
|
|
||||||
|
|
||||||
def run(cmd):
|
def run(cmd, *, check=False):
|
||||||
r = subprocess.run(cmd, capture_output=True, text=True,
|
r = subprocess.run(cmd, capture_output=True, text=True,
|
||||||
encoding='utf-8', errors='replace', **NO_WINDOW)
|
encoding='utf-8', errors='replace', check=check, **NO_WINDOW)
|
||||||
return (r.stdout or '') + (r.stderr or '')
|
return (r.stdout or '') + (r.stderr or '')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+13
-5
@@ -411,6 +411,7 @@ def cmd_progress(target=34, uptie=True, max_try=6):
|
|||||||
if not team:
|
if not team:
|
||||||
print('未找到队内(SELECTED)人格')
|
print('未找到队内(SELECTED)人格')
|
||||||
return 1
|
return 1
|
||||||
|
unreadable = 0
|
||||||
for ci, ri, cx, ry, ocr_lvl, sel, nm in team[:max_try]:
|
for ci, ri, cx, ry, ocr_lvl, sel, nm in team[:max_try]:
|
||||||
print('--- 候选 col=%d row=%d (网格读作 Lv.%s %s)' % (ci, ri, ocr_lvl, nm))
|
print('--- 候选 col=%d row=%d (网格读作 Lv.%s %s)' % (ci, ri, ocr_lvl, nm))
|
||||||
# 长按前先清残留弹窗: 一张卡没关干净, 后面每张都会被挡住
|
# 长按前先清残留弹窗: 一张卡没关干净, 后面每张都会被挡住
|
||||||
@@ -422,13 +423,16 @@ def cmd_progress(target=34, uptie=True, max_try=6):
|
|||||||
txt = screen_text(items)
|
txt = screen_text(items)
|
||||||
if not detail_page_open(txt):
|
if not detail_page_open(txt):
|
||||||
print(' 长按未打开详情, 跳过')
|
print(' 长按未打开详情, 跳过')
|
||||||
|
unreadable += 1
|
||||||
continue
|
continue
|
||||||
true_lvl, true_name, _ = read_detail(hint=ocr_lvl)
|
true_lvl, true_name, _ = read_detail(hint=ocr_lvl)
|
||||||
print(' 详情页: %s 真实等级=%s' % (true_name, true_lvl))
|
print(' 详情页: %s 真实等级=%s' % (true_name, true_lvl))
|
||||||
if true_lvl is None:
|
if true_lvl is None:
|
||||||
# 详情页读不到时退回网格值——网格会误读, 但总比跳过整张卡好
|
print(' 详情页读不到等级, 无法确认是否需要升级, 跳过')
|
||||||
print(' 详情页读不到等级, 退回网格值 Lv.%s' % ocr_lvl)
|
unreadable += 1
|
||||||
true_lvl = ocr_lvl
|
click(*BACK)
|
||||||
|
time.sleep(2.5)
|
||||||
|
continue
|
||||||
if true_lvl >= target:
|
if true_lvl >= target:
|
||||||
print(' 已达目标 Lv.%d, 跳过' % target)
|
print(' 已达目标 Lv.%d, 跳过' % target)
|
||||||
click(*BACK)
|
click(*BACK)
|
||||||
@@ -436,6 +440,7 @@ def cmd_progress(target=34, uptie=True, max_try=6):
|
|||||||
continue
|
continue
|
||||||
ok, desc = do_level_up(hint=true_lvl)
|
ok, desc = do_level_up(hint=true_lvl)
|
||||||
print(' 升级: %s (%s)' % ('OK' if ok else ('SKIP' if ok is None else 'FAIL'), desc))
|
print(' 升级: %s (%s)' % ('OK' if ok else ('SKIP' if ok is None else 'FAIL'), desc))
|
||||||
|
ok2 = True
|
||||||
if uptie:
|
if uptie:
|
||||||
ok2, desc2 = do_uptie()
|
ok2, desc2 = do_uptie()
|
||||||
print(' 同步: %s (%s)' % ('OK' if ok2 else 'FAIL', desc2))
|
print(' 同步: %s (%s)' % ('OK' if ok2 else 'FAIL', desc2))
|
||||||
@@ -446,8 +451,11 @@ def cmd_progress(target=34, uptie=True, max_try=6):
|
|||||||
if not ('IDENTITIES' in txt and 'Facades' in txt):
|
if not ('IDENTITIES' in txt and 'Facades' in txt):
|
||||||
click(*BACK)
|
click(*BACK)
|
||||||
time.sleep(2.5)
|
time.sleep(2.5)
|
||||||
return 0 if ok else 1
|
return 0 if ok and ok2 else 1
|
||||||
print('前 %d 个候选都不需要升级或无法读取' % max_try)
|
if unreadable:
|
||||||
|
print('FAIL: %d 个候选未能核实详情等级, 不能判定为无需升级' % unreadable)
|
||||||
|
return 1
|
||||||
|
print('已核实的 %d 个候选均达到目标等级, 无需升级' % len(team[:max_try]))
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user