mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 07:28:21 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -6,7 +6,11 @@ import numpy as np
|
||||
import requests
|
||||
from adbutils.errors import AdbError
|
||||
|
||||
<<<<<<< HEAD
|
||||
from module.base.decorator import cached_property, del_cached_property, Config
|
||||
=======
|
||||
from module.base.decorator import cached_property, del_cached_property
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
from module.base.timer import Timer
|
||||
from module.device.method.uiautomator_2 import ProcessInfo, Uiautomator2
|
||||
from module.device.method.utils import (
|
||||
@@ -254,7 +258,11 @@ class DroidCast(Uiautomator2):
|
||||
raise DroidCastVersionIncompatible(
|
||||
'Requesting screenshots from `DroidCast_raw` but server is `DroidCast`')
|
||||
# ValueError: cannot reshape array of size 0 into shape (720,1280)
|
||||
<<<<<<< HEAD
|
||||
raise ImageTruncated(str(e)+'\nIf your emulator resolution not 1280x720, please set emulator resolution to 1280x720')
|
||||
=======
|
||||
raise ImageTruncated(str(e))
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
# Convert RGB565 to RGB888
|
||||
# https://blog.csdn.net/happy08god/article/details/10516871
|
||||
|
||||
Reference in New Issue
Block a user