Merge pull request #612 from LmeSzinc/dev

Bug fix
This commit is contained in:
LmeSzinc 2024-08-20 01:21:32 +08:00 committed by GitHub
commit 2fb637febd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions

View File

@ -299,10 +299,18 @@ class Emulator(EmulatorBase):
for folder in self.list_folder('../vms', is_dir=True):
for file in iter_folder(folder, ext='.nemu'):
serial = Emulator.vbox_file_to_serial(file)
name = os.path.basename(folder)
if serial:
yield EmulatorInstance(
serial=serial,
name=os.path.basename(folder),
name=name,
path=self.path,
)
# Fix for MuMu12 v4.0.4, default instance of which has no forward record in vbox config
elif name == 'MuMuPlayer-12.0-0':
yield EmulatorInstance(
serial='127.0.0.1:16384',
name=name,
path=self.path,
)
elif self == Emulator.MEmuPlayer:

View File

@ -52,6 +52,8 @@ class InventoryItem:
image = color_similarity_2d(image, (255, 255, 255))
param = {
'height': 160,
# [ 10 110 114]
'distance': 10,
}
hori = cv2.reduce(image, 1, cv2.REDUCE_AVG).flatten()
peaks, _ = signal.find_peaks(hori, **param)