sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 22:08:20 +08:00
Code Activity

Fix: Add minimum swipe distance in OpSi globe map

Browse Source
This commit is contained in:
LmeSzinc
2023-06-11 19:09:08 +08:00
parent 6dde835ce1
commit 4f793e9001
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
module/os/globe_camera.py
View File

@@ -86,22 +86,23 @@ class GlobeCamera(GlobeOperation, ZoneManager):
bool: if camera moved.
"""
name = 'GLOBE_SWIPE_' + '_'.join([str(int(round(x))) for x in vector])
if np.linalg.norm(vector) > 25:
if self.config.DEVICE_CONTROL_METHOD == 'minitouch':
distance = self.config.MAP_SWIPE_MULTIPLY_MINITOUCH
elif self.config.DEVICE_CONTROL_METHOD == 'MaaTouch':
distance = self.config.MAP_SWIPE_MULTIPLY_MAATOUCH
else:
distance = self.config.MAP_SWIPE_MULTIPLY
vector = np.array(distance) * vector
if np.linalg.norm(vector) <= 25:
logger.warning(f'Globe swipe to short: {vector}')
vector = np.sign(vector) * 25
vector = -vector
self.device.swipe_vector(vector, name=name, box=box)
self.device.sleep(0.3)
self.globe_update()
if self.config.DEVICE_CONTROL_METHOD == 'minitouch':
distance = self.config.MAP_SWIPE_MULTIPLY_MINITOUCH
elif self.config.DEVICE_CONTROL_METHOD == 'MaaTouch':
distance = self.config.MAP_SWIPE_MULTIPLY_MAATOUCH
else:
logger.warning(f'Globe swipe to short: {vector}, dropped')
distance = self.config.MAP_SWIPE_MULTIPLY
vector = np.array(distance) * vector
vector = -vector
self.device.swipe_vector(vector, name=name, box=box)
self.device.sleep(0.3)
self.globe_update()
def globe_wait_until_stable(self):
prev = self.globe_camera