修复"位置正确却点不上":点击前做句柄级前台校验
用户反馈: 点击有时候一直点也没点上, 位置明明正确。
---
## 实测排查过程
第一版假设是两个时序问题(按下 30ms 太短 / 移动后立刻按下)。实测否决:
press= 30ms -> 画面切换 4/4
press= 60ms -> 画面切换 4/4
press=120ms -> 画面切换 4/4
在干净环境里三种时长全中, 所以时长不是元凶。
(第一版测试本身有缺陷: 它只验证 click() 返回 True, 而 True 只代表"定位
到了", 不代表游戏收到点击。改成截图前后比对画面是否变化才有意义。)
真实原因: **前台不是游戏**。现场证据:
窗口位置: (-7, 0) ← 出界
前台窗口: '...DeepSeek Harness' ← 不是游戏
点击结果: True ← 但光标最后在 (204,1063), 没到目标
排查中还否定了一个想当然的结论: 窗口出界**本身不致命**(坐标按实际窗口位置
算, 目标只要还在屏幕内就能点中) —— 实测窗口在 (-8,0) 时画面照样切换成功。
真正致命的是前台窗口不是游戏。
## 修复
click() 加 require_foreground 校验。**关键是比对句柄而不是比对矩形**:
第一版只判断"点击点是否落在前台窗口矩形内", 结果把浏览器切到前台、点游戏里
同一个坐标, 校验**照样通过** —— 那个屏幕坐标同时也落在浏览器窗口的矩形里。
窗口重叠时几何判断毫无意义。
现在给了 hwnd 就要求前台窗口就是它(或是它的子窗口), 否则拒绝并说明"这次点击
会打到别的窗口"。DriverInput 新增 bind_window(), 代理安装时自动绑定游戏句柄。
拒绝比静默失败好: 以前"点了个寂寞"也返回 True, AALC 无从知道要重试。
## 顺带调整
press_ms 30 -> 60, 定位成功后加 settle 间隔。这两项实测在干净环境下不是必需,
但负载高/掉帧时更稳, 成本只有几十毫秒。
## 验证
真机(游戏窗口 133358):
[1] 前台是 DSH -> False | 前台不是目标窗口(前台='...DeepSeek Harness',
目标='LimbusCompany') —— 这次点击会打到别的窗口
[2] DSH 在前台同点 -> False | 同上(正确拒绝)
[3] 游戏在前台 -> True | ok
测试新增 HwndForegroundCheckTest 4 个 + ForegroundCheckTest 6 个, 全套 441 通过。
This commit is contained in:
+165
-3
@@ -132,7 +132,8 @@ class ClickTest(unittest.TestCase):
|
|||||||
{'v': (pos['v'][0] + dx, pos['v'][1] + dy)})
|
{'v': (pos['v'][0] + dx, pos['v'][1] + dy)})
|
||||||
with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \
|
with mock.patch.object(di, 'get_cursor', lambda: pos['v']), \
|
||||||
mock.patch.object(di.time, 'sleep', lambda s: None):
|
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))
|
self.assertEqual(pos['v'], (500, 400))
|
||||||
d._dll.mouse_down.assert_called_once_with(1)
|
d._dll.mouse_down.assert_called_once_with(1)
|
||||||
d._dll.mouse_up.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)
|
d = self._drv(False)
|
||||||
with mock.patch.object(di, 'get_cursor', lambda: (0, 0)), \
|
with mock.patch.object(di, 'get_cursor', lambda: (0, 0)), \
|
||||||
mock.patch.object(di.time, 'sleep', lambda s: None):
|
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_down.assert_not_called()
|
||||||
d._dll.mouse_up.assert_not_called()
|
d._dll.mouse_up.assert_not_called()
|
||||||
|
|
||||||
@@ -353,9 +354,12 @@ class DriverFailureTest(unittest.TestCase):
|
|||||||
drv = di.DriverInput()
|
drv = di.DriverInput()
|
||||||
drv._open, drv._dll = True, mock.Mock()
|
drv._open, drv._dll = True, mock.Mock()
|
||||||
with mock.patch.object(drv, 'move_to', return_value=True), \
|
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):
|
mock.patch.object(di.time, 'sleep', side_effect=InterruptedError):
|
||||||
with self.assertRaises(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)
|
drv._dll.mouse_up.assert_called_once_with(1)
|
||||||
|
|
||||||
def test_release_even_if_coordinate_lookup_fails(self):
|
def test_release_even_if_coordinate_lookup_fails(self):
|
||||||
@@ -435,3 +439,161 @@ class ForegroundFallbackTest(unittest.TestCase):
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.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()
|
||||||
Reference in New Issue
Block a user