修复运行日志复核发现的任务控制与结果误判
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user