diff --git a/lc_mcp/aalc_patches.py b/lc_mcp/aalc_patches.py index 5f29660..ee2c41b 100644 --- a/lc_mcp/aalc_patches.py +++ b/lc_mcp/aalc_patches.py @@ -255,6 +255,13 @@ def install_driver_click(auto, screen, driver=None, log=print): if not ok: log('[lc_mcp] 驱动级输入未启用: %s' % why) return None + # 绑定目标窗口: click() 靠它做句柄级前台校验。 + # 只比矩形是不够的 —— 窗口互相重叠时, 同一个屏幕坐标会同时落在两边, + # 实测把浏览器切到前台后, 几何校验照样通过(2026-10-23)。 + try: + drv.bind_window(screen.handle.hwnd) + except Exception: + pass proxy = DriverClickProxy(auto.input_handler, drv, screen, log=log) trace = os.environ.get('LCP_DRIVER_TRACE') diff --git a/lc_mcp/driver_input.py b/lc_mcp/driver_input.py index d59bb40..cf2317d 100644 --- a/lc_mcp/driver_input.py +++ b/lc_mcp/driver_input.py @@ -106,6 +106,14 @@ class DriverInput: self.log = log self._dll = None self._open = False + # 目标窗口句柄。有它才能做句柄级前台校验 —— 几何校验在窗口重叠时没用: + # 实测把浏览器切到前台, 点游戏里同一个坐标, 只比矩形的话校验照样通过。 + self.hwnd = 0 + + def bind_window(self, hwnd): + """绑定目标窗口。绑定后 click() 会做句柄级前台校验。""" + self.hwnd = int(hwnd or 0) + return self # ---------------------------------------------------------------- 生命周期 @@ -184,8 +192,20 @@ class DriverInput: if self.ready: self._dll.mouse_up(int(button)) - def click(self, sx, sy, times=1, tol=1): - """先确认到位置, 再按下抬起。没到位就不点, 免得点错地方。""" + def click(self, sx, sy, times=1, tol=1, require_foreground=True, + press_ms=60, settle=0.05): + """先确认到位置, 再按下抬起。 + + ⛔ 三个已验证的"位置对却点不上"原因(2026-10-23 实测): + 1. **前台不是游戏** —— 点击会送给当前前台窗口。实测: 窗口位置正确、坐标 + 换算正确, 但前台是别的窗口, 结果点了个寂寞, 而旧版这里照样返回 True。 + 现在用 require_foreground 检查: 点击点必须落在**前台窗口的客户区**内, + 否则拒绝并报错 —— 宁可失败也不要静默点错地方。 + 2. **移动后立刻按下** —— 游戏按帧采样, 移动还没被处理就点击, 会算在旧位置。 + 所以定位成功后先 settle 再按。 + 3. **按下时间太短** —— 默认 30ms 在掉帧时会漏; 改成 60ms。 + 实测 30/60/120ms 在干净环境下都能中, 但 60ms 对负载高的情况更稳。 + """ if not self.ready: return False if not self.move_to(sx, sy, tol=tol): @@ -193,10 +213,17 @@ class DriverInput: self.log('[driver] 定位失败: 目标(%d,%d) 实际(%d,%d), 不点击' % (sx, sy, cx, cy)) return False + if require_foreground: + ok, why = click_point_is_on_foreground(sx, sy, self.hwnd or None) + if not ok: + self.log('[driver] 拒绝点击(%d,%d): %s' % (sx, sy, why)) + return False + if settle: + time.sleep(settle) for _ in range(int(times)): try: self._dll.mouse_down(1) - time.sleep(0.03) + time.sleep(press_ms / 1000.0) finally: self._dll.mouse_up(1) return True @@ -214,6 +241,42 @@ class DriverInput: self._dll.scroll(int(amount)) +def click_point_is_on_foreground(sx, sy, hwnd=None): + """(屏幕坐标) 是否安全可点。 + + 返回 (是否安全, 原因)。 + + ⛔ 为什么必须比对句柄而不是比对矩形(2026-10-23 实测教训): + 最初只判断"点击点落在前台窗口的矩形内", 结果把浏览器切到前台、点游戏里 + 同一个坐标, 校验**照样通过** —— 因为那个屏幕坐标同时也落在浏览器窗口的 + 矩形里。几何判断在窗口互相重叠时毫无意义。 + + 所以: 给了 hwnd 就要求前台窗口**就是它**(或是它的子窗口); 没给 hwnd 时 + 退化成"有前台窗口且点在它矩形内", 可用性有限, 仅作兜底。 + """ + user32 = ctypes.windll.user32 + fg = user32.GetForegroundWindow() + if not fg: + return False, '当前没有前台窗口(GetForegroundWindow=0)' + if hwnd: + if fg == hwnd or user32.IsChild(hwnd, fg): + return True, 'ok' + buf = ctypes.create_unicode_buffer(64) + user32.GetWindowTextW(fg, buf, 64) + other = ctypes.create_unicode_buffer(64) + user32.GetWindowTextW(hwnd, other, 64) + return False, ('前台不是目标窗口(前台=%r, 目标=%r) —— 这次点击会打到别的窗口' + % (buf.value, other.value)) + pt = wintypes.POINT(int(sx), int(sy)) + rect = wintypes.RECT() + if not user32.GetWindowRect(fg, ctypes.byref(rect)): + return False, '取不到前台窗口的区域' + if not (rect.left <= pt.x < rect.right and rect.top <= pt.y < rect.bottom): + return False, ('点击点(%d,%d)不在前台窗口内(区域 %d,%d-%d,%d)' + % (pt.x, pt.y, rect.left, rect.top, rect.right, rect.bottom)) + return True, 'ok' + + def client_to_screen(hwnd, x, y): """游戏客户区坐标 -> 屏幕坐标。""" if not hwnd: diff --git a/tests/test_driver_input.py b/tests/test_driver_input.py index 2da9f10..eb0ce5e 100644 --- a/tests/test_driver_input.py +++ b/tests/test_driver_input.py @@ -132,7 +132,8 @@ class ClickTest(unittest.TestCase): {'v': (pos['v'][0] + dx, pos['v'][1] + dy)}) with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \ mock.patch.object(di.time, 'sleep', lambda s: None): - self.assertTrue(d.click(500, 400)) + # 这里只测定位逻辑, 前台校验另有 ForegroundCheckTest + self.assertTrue(d.click(500, 400, require_foreground=False)) self.assertEqual(pos['v'], (500, 400)) d._dll.mouse_down.assert_called_once_with(1) d._dll.mouse_up.assert_called_once_with(1) @@ -141,7 +142,7 @@ class ClickTest(unittest.TestCase): d = self._drv(False) with mock.patch.object(di, 'get_cursor', lambda: (0, 0)), \ mock.patch.object(di.time, 'sleep', lambda s: None): - self.assertFalse(d.click(500, 400)) + self.assertFalse(d.click(500, 400, require_foreground=False)) d._dll.mouse_down.assert_not_called() d._dll.mouse_up.assert_not_called() @@ -353,9 +354,12 @@ class DriverFailureTest(unittest.TestCase): drv = di.DriverInput() drv._open, drv._dll = True, mock.Mock() with mock.patch.object(drv, 'move_to', return_value=True), \ + mock.patch.object(di, 'click_point_is_on_foreground', + lambda *a, **k: (True, '')), \ mock.patch.object(di.time, 'sleep', side_effect=InterruptedError): with self.assertRaises(InterruptedError): - drv.click(1, 2) + # settle=0 让第一个 sleep 出现在按下之后, 测的才是 try/finally + drv.click(1, 2, require_foreground=False, settle=0) drv._dll.mouse_up.assert_called_once_with(1) def test_release_even_if_coordinate_lookup_fails(self): @@ -435,3 +439,161 @@ class ForegroundFallbackTest(unittest.TestCase): if __name__ == '__main__': unittest.main() + + +class ForegroundCheckTest(unittest.TestCase): + """位置对却点不上 —— 头号原因是前台不是游戏。 + + 2026-10-23 实测: 窗口位置和坐标换算都正确, 但前台是浏览器, 点击全部落到 + 浏览器里, 而旧版 click() 照样返回 True。这组测试守住"必须拒绝"这一条。 + """ + + def _drv(self): + d = di.DriverInput(dll_path='X.dll', log=lambda m: None) + d._dll = mock.Mock() + d._open = True + return d + + def test_rejects_when_no_foreground_window(self): + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=0): + ok, why = di.click_point_is_on_foreground(100, 100) + self.assertFalse(ok) + self.assertIn('前台窗口', why) + + def test_rejects_when_point_outside_foreground_window(self): + def fake_get_window_rect(hwnd, ptr): + r = ptr._obj + r.left, r.top, r.right, r.bottom = 0, 0, 50, 50 + return 1 + + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=12345), \ + mock.patch.object(di.ctypes.windll.user32, 'GetWindowRect', + fake_get_window_rect), \ + mock.patch.object(di.ctypes.windll.user32, 'GetWindowTextW'): + ok, why = di.click_point_is_on_foreground(999, 999) + self.assertFalse(ok) + self.assertIn('不在前台窗口内', why) + + def test_accepts_when_point_inside_foreground_window(self): + def fake_get_window_rect(hwnd, ptr): + r = ptr._obj + r.left, r.top, r.right, r.bottom = 0, 0, 1920, 1080 + return 1 + + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=12345), \ + mock.patch.object(di.ctypes.windll.user32, 'GetWindowRect', + fake_get_window_rect): + ok, why = di.click_point_is_on_foreground(500, 500) + self.assertTrue(ok) + self.assertEqual(why, 'ok') + + def test_click_refuses_when_check_fails(self): + """校验不过 -> 一个按键都不许发。""" + pos = {'v': (500, 400)} + d = self._drv() + d._dll.moveR.side_effect = lambda dx, dy, _: None + with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \ + mock.patch.object(di.time, 'sleep', lambda s: None), \ + mock.patch.object(di, 'click_point_is_on_foreground', + lambda *a, **k: (False, '')): + self.assertFalse(d.click(500, 400)) + d._dll.mouse_down.assert_not_called() + d._dll.mouse_up.assert_not_called() + + def test_click_proceeds_when_check_passes(self): + pos = {'v': (500, 400)} + d = self._drv() + with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \ + mock.patch.object(di.time, 'sleep', lambda s: None), \ + mock.patch.object(di, 'click_point_is_on_foreground', + lambda *a, **k: (True, '')): + self.assertTrue(d.click(500, 400)) + d._dll.mouse_down.assert_called_once_with(1) + d._dll.mouse_up.assert_called_once_with(1) + + def test_press_duration_is_passed_through(self): + """按下时长必须真的用上 —— 30ms 在掉帧时会漏点。""" + pos = {'v': (500, 400)} + d = self._drv() + slept = [] + with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \ + mock.patch.object(di.time, 'sleep', lambda s: slept.append(s)), \ + mock.patch.object(di, 'click_point_is_on_foreground', + lambda *a, **k: (True, '')): + d.click(500, 400, press_ms=120, settle=0) + self.assertIn(0.12, slept, '按下时长没生效') + + def test_settle_delay_happens_before_press(self): + """定位成功到按下之间要有间隔, 否则游戏把这次点击算在旧位置。""" + pos = {'v': (500, 400)} + d = self._drv() + order = [] + d._dll.mouse_down.side_effect = lambda b: order.append('down') + with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \ + mock.patch.object(di, 'click_point_is_on_foreground', + lambda *a, **k: (True, '')), \ + mock.patch.object(di.time, 'sleep', + lambda s: order.append('sleep%.2f' % s)): + d.click(500, 400, settle=0.08) + self.assertIn('down', order) + self.assertTrue(any(x.startswith('sleep') for x in order[:order.index('down')]), + '按下之前必须有 sleep') + +class HwndForegroundCheckTest(unittest.TestCase): + """句柄级前台校验。 + + ⛔ 为什么不能只比矩形(2026-10-23 实测): 把浏览器切到前台, 点游戏里同一个 + 坐标, 只判断"点在不在前台窗口矩形内"的话**照样通过** —— 因为那个屏幕坐标 + 同时也落在浏览器窗口的矩形里。窗口重叠时几何判断毫无意义。 + + 给了 hwnd 就必须要求前台窗口就是它。 + """ + + def test_accepts_when_foreground_is_the_target(self): + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=999): + ok, why = di.click_point_is_on_foreground(100, 100, 999) + self.assertTrue(ok) + self.assertEqual(why, 'ok') + + def test_accepts_child_window_of_target(self): + """游戏可能有子窗口拿到焦点, 也算在目标窗口上。""" + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=1000), \ + mock.patch.object(di.ctypes.windll.user32, 'IsChild', + return_value=True): + ok, _ = di.click_point_is_on_foreground(100, 100, 999) + self.assertTrue(ok) + + def test_rejects_when_foreground_is_another_window(self): + with mock.patch.object(di.ctypes.windll.user32, 'GetForegroundWindow', + return_value=1000), \ + mock.patch.object(di.ctypes.windll.user32, 'IsChild', + return_value=False), \ + mock.patch.object(di.ctypes.windll.user32, 'GetWindowTextW'): + ok, why = di.click_point_is_on_foreground(100, 100, 999) + self.assertFalse(ok) + self.assertIn('前台不是目标窗口', why) + + def test_bind_window_is_used_by_click(self): + """绑定窗口后, click() 必须走句柄级校验。""" + d = di.DriverInput(dll_path='X.dll', log=lambda m: None) + d._dll = mock.Mock() + d._open = True + d.bind_window(4242) + self.assertEqual(d.hwnd, 4242) + seen = {} + + def fake_check(sx, sy, hwnd=None): + seen['hwnd'] = hwnd + return False, '前台不是目标窗口' + + with mock.patch.object(di, 'get_cursor', lambda: (10, 10)), \ + mock.patch.object(di, 'click_point_is_on_foreground', fake_check), \ + mock.patch.object(di.time, 'sleep', lambda s: None): + self.assertFalse(d.click(10, 10)) + self.assertEqual(seen['hwnd'], 4242, 'click 没把绑定的句柄传下去') + d._dll.mouse_down.assert_not_called() \ No newline at end of file