LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 14:39:25 +08:00
Code Activity

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/device/method/ldopengl.py
View File

@@ -196,7 +196,7 @@ class LDOpenGLImpl:
if not os.path.exists(ldopengl_dll):
raise LDOpenGLIncompatible(
f'ldopengl_dll={ldopengl_dll} does not exist, '
f'ldopengl requires LDPlayer >= 9.0.75, please check your version'
f'ldopengl requires LDPlayer >= 9.0.78, please check your version'
)
else:
raise LDOpenGLIncompatible(
@@ -264,6 +264,8 @@ class LDOpenGLImpl:
int: instance_id, or None if failed to predict
"""
serial, _ = get_serial_pair(serial)
if serial is None:
return None
try:
port = int(serial.split(':')[1])
except (IndexError, ValueError):
@@ -312,6 +314,9 @@ class LDOpenGL(Platform):
def ldopengl_available(self) -> bool:
if not self.is_ldplayer_bluestacks_family:
return False
logger.attr('EmulatorInfo_Emulator', self.config.EmulatorInfo_Emulator)
if self.config.EmulatorInfo_Emulator not in ['LDPlayer9']:
return False
try:
_ = self.ldopengl

2
module/device/method/maatouch.py
View File

@@ -355,7 +355,7 @@ class MaaTouch(Connection):
points = insert_swipe(p0=p1, p3=p2)
builder = self.maatouch_builder
builder.down(*points[0]).wait(10).commit()
builder.down(*points[0]).commit().wait(10)
builder.send_sync()
for point in points[1:]:

4
module/device/method/minitouch.py
View File

@@ -683,7 +683,7 @@ class Minitouch(Connection):
points = insert_swipe(p0=p1, p3=p2)
builder = self.minitouch_builder
builder.down(*points[0]).commit()
builder.down(*points[0]).commit().wait(10)
builder.send()
for point in points[1:]:
@@ -700,7 +700,7 @@ class Minitouch(Connection):
points = insert_swipe(p0=p1, p3=p2, speed=20)
builder = self.minitouch_builder
builder.down(*points[0]).commit()
builder.down(*points[0]).commit().wait(10)
builder.send()
for point in points[1:]: