1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 22:47:22 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -268,8 +268,4 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy, NemuIpc):
return False
else:
self._screen_black_checked = True
<<<<<<< HEAD
return True
=======
return True
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0