Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

2026-06-20 01:12:58 +08:00 · 2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
--- a/module/device/screenshot.py
+++ b/module/device/screenshot.py
@@ -268,4 +268,8 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy, NemuIpc):
                return False
        else:
            self._screen_black_checked = True
-            return True
+<<<<<<< HEAD
+            return True
+=======
+            return True
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0