Merge pull request #3180 from LmeSzinc/dev

Bug fix
LmeSzinc · Oct 5, 2023 · fa0182a · fa0182a
2 parents b31864f + 07fa439
commit fa0182a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/module/device/connection_attr.py b/module/device/connection_attr.py
@@ -84,8 +84,9 @@ def revise_serial(serial):
         except ValueError:
             pass
         # 夜神模拟器 127.0.0.1:62001
+        # MuMu模拟器12127.0.0.1:16384
         if '模拟' in serial:
-            res = re.search(r'(\d+\.\d+\.\d+\.\d+:\d+)', serial)
+            res = re.search(r'(127\.\d+\.\d+\.\d+:\d+)', serial)
             if res:
                 serial = res.group(1)
         return str(serial)

diff --git a/module/meowfficer/enhance.py b/module/meowfficer/enhance.py
@@ -92,7 +92,7 @@ def meow_feed_scan(self):
                 break
 
             # Exit if button is empty slot
-            if self.image_color_count(button, color=(231, 223, 221), threshold=221, count=450):
+            if self.image_color_count(button, color=(231, 223, 221), threshold=235, count=450):
                 break
 
             # Continue onto next if button