YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-10-10 22:12:06 +00:00
Code Releases Wiki Activity

fix: use 'area' in 'ClickButton'

Browse Source
This commit is contained in:
YoursFunny
2026-07-05 16:20:03 +08:00
parent a397539c69
commit 004af69d8f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/base/base.py
+1 -1
View File
@@ -219,7 +219,7 @@ class ModuleBase:
point = fit_points(points, mod=image_size(image), encourage=encourage) point = fit_points(points, mod=image_size(image), encourage=encourage)
point = ensure_int(point + area[:2]) point = ensure_int(point + area[:2])
button_area = area_offset((-encourage, -encourage, encourage, encourage), offset=point) button_area = area_offset((-encourage, -encourage, encourage, encourage), offset=point)
return ClickButton(button=button_area, name=name) return ClickButton(area=button_area, name=name)
def interval_reset(self, button, interval=5): def interval_reset(self, button, interval=5):
if isinstance(button, (list, tuple)): if isinstance(button, (list, tuple)):
module/device/control.py
+3 -3
View File
@@ -1,3 +1,5 @@
import numpy as np
from module.base.button import ClickButton from module.base.button import ClickButton
from module.base.decorator import cached_property from module.base.decorator import cached_property
from module.base.timer import Timer from module.base.timer import Timer
@@ -8,8 +10,6 @@ from module.device.method.minitouch import Minitouch
from module.device.method.scrcpy import Scrcpy from module.device.method.scrcpy import Scrcpy
from module.logger import logger from module.logger import logger
import numpy as np
class Control(Hermit, Minitouch, Scrcpy, MaaTouch): class Control(Hermit, Minitouch, Scrcpy, MaaTouch):
def handle_control_check(self, button): def handle_control_check(self, button):
@@ -169,7 +169,7 @@ class Control(Hermit, Minitouch, Scrcpy, MaaTouch):
logger.warning(f'Control method {method} does not support drag well, ' logger.warning(f'Control method {method} does not support drag well, '
f'falling back to ADB swipe may cause unexpected behaviour') f'falling back to ADB swipe may cause unexpected behaviour')
self.swipe_adb(p1, p2, duration=ensure_time(swipe_duration * 2)) self.swipe_adb(p1, p2, duration=ensure_time(swipe_duration * 2))
self.click(ClickButton(button=area_offset(point_random, p2), name=name)) self.click(ClickButton(area=area_offset(point_random, p2), name=name))
# just used in cafe # just used in cafe
def pinch(self, box=(35, 130, 1250, 560), name='PINCH'): def pinch(self, box=(35, 130, 1250, 560), name='PINCH'):