复查修正: 饰品三选一被上游倒序、选队顶栏同名被覆盖
- 饰品(P1-3): 三张及以上时上游把认出体系图标的卡逐张 insert(0), 后看的排到最前,
两张命中关键词的卡都带图标时补丁的顺序会被倒过来, 先拿命中少的。现在交给上游
"没命中的(原顺序) + 命中的(倒着)", 上游查体系图标时对命中的卡答"有", 拼出来是
命中多 -> 命中少 -> 只认出图标 -> 其余。测试的假界面加上体系图标, 先复现再修。
- 选队(P1-5): _team_ocr 经 _run_ocr_for_text 的 {文本: 坐标} 取结果, 选中某队后
顶栏和列表同名, 顶栏那条会被覆盖; 旧测试用成对结果模拟重复, 真实 dict 做不到。
改读 OCR 引擎逐行结果(同一引擎、同一截图), 引擎导入不了才退回 dict。
- 事件(P1-4): 同一张截图只判断一次, 单通模式再找 "???" 时不再整屏 OCR 第二遍。
- 文档: 修正 BACKLOG/README/交接文档对应描述, 去掉两处没核实的推断。
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -146,12 +146,14 @@ class EventScreen:
|
|||||||
self.chosen = []
|
self.chosen = []
|
||||||
self.model = None
|
self.model = None
|
||||||
self.screenshot = object()
|
self.screenshot = object()
|
||||||
|
self.ocr_runs = 0
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def options(self):
|
def options(self):
|
||||||
return self.screens[self.stage] if self.stage < len(self.screens) else None
|
return self.screens[self.stage] if self.stage < len(self.screens) else None
|
||||||
|
|
||||||
def take_screenshot(self, *args, **kwargs):
|
def take_screenshot(self, *args, **kwargs):
|
||||||
|
self.screenshot = object() # 每次截图都是新对象, 与 AALC 一致
|
||||||
return self.screenshot
|
return self.screenshot
|
||||||
|
|
||||||
def mouse_to_blank(self, *args, **kwargs):
|
def mouse_to_blank(self, *args, **kwargs):
|
||||||
@@ -194,6 +196,7 @@ class EventScreen:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def run(self, image):
|
def run(self, image):
|
||||||
|
self.ocr_runs += 1
|
||||||
lines = [('事件叙述文字', 200, 60)]
|
lines = [('事件叙述文字', 200, 60)]
|
||||||
for (x, y), text in zip(markers(len(self.options or ())), self.options or ()):
|
for (x, y), text in zip(markers(len(self.options or ())), self.options or ()):
|
||||||
lines.append((text, x + 200, y))
|
lines.append((text, x + 200, y))
|
||||||
@@ -243,6 +246,7 @@ class UpstreamEventHandlingTest(unittest.TestCase):
|
|||||||
self.assertEqual(mirror.event_times, 1)
|
self.assertEqual(mirror.event_times, 1)
|
||||||
self.assertNotIn('find_element', vars(screen), 'find_element 必须还原')
|
self.assertNotIn('find_element', vars(screen), 'find_element 必须还原')
|
||||||
self.assertNotIn('mouse_click', vars(screen), 'mouse_click 必须还原')
|
self.assertNotIn('mouse_click', vars(screen), 'mouse_click 必须还原')
|
||||||
|
self.screen = screen
|
||||||
return screen.chosen
|
return screen.chosen
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -276,6 +280,11 @@ class UpstreamEventHandlingTest(unittest.TestCase):
|
|||||||
self.assertEqual(self.play(options, **kwargs), self.play(options, patched=False, **kwargs))
|
self.assertEqual(self.play(options, **kwargs), self.play(options, patched=False, **kwargs))
|
||||||
self.assertIn('事件选项: 1=战斗 | 2=离开; 表里没有这个事件, 交给 AALC', self.log)
|
self.assertIn('事件选项: 1=战斗 | 2=离开; 表里没有这个事件, 交给 AALC', self.log)
|
||||||
|
|
||||||
|
def test_one_ocr_per_screenshot_in_solo_mode(self):
|
||||||
|
# 单通模式下上游会再找一次 "???"; 同一张截图不再整屏 OCR 第二遍
|
||||||
|
self.assertEqual(self.play([['战斗', '离开']], unknown=1, solo=True), [0])
|
||||||
|
self.assertEqual(self.screen.ocr_runs, 1)
|
||||||
|
|
||||||
def test_misread_target_falls_back_to_upstream(self):
|
def test_misread_target_falls_back_to_upstream(self):
|
||||||
options = [['鸡肉就是鸡', CHICKEN[1], CHICKEN[2]]]
|
options = [['鸡肉就是鸡', CHICKEN[1], CHICKEN[2]]]
|
||||||
self.assertEqual(self.play(options), [0])
|
self.assertEqual(self.play(options), [0])
|
||||||
|
|||||||
Reference in New Issue
Block a user