mower-ng/mower-ng
4
0
Fork 0
Code Issues 51 Pull requests Wiki Activity

Merge remote-tracking branch 'origin'

Browse source
This commit is contained in:
Elaina 2024-11-25 20:45:12 +08:00
commit abcbbbf638
6 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mower/utils/device/scrcpy/core.py
View file

@ -176,7 +176,7 @@ class Client:
while try_count < 3:
try:
return f(self, *args, **kwargs)
except (ConnectionResetError, BrokenPipeError):
except (ConnectionResetError, BrokenPipeError, ConnectionAbortedError):
self.stop()
time.sleep(1)
self.check_adb_alive()

6
mower/utils/recognize/data.py
View file

@ -71,8 +71,8 @@ color = {
"mission_trainee_on": (690, 17),
"nav_bar": (655, 0),
"nav_button": (26, 20),
"navigation/activity/banner": (1103, 901),
"navigation/activity/entry": (155, 833),
"navigation/activity/banner": (1298, 958),
"navigation/activity/entry": (1578, 618),
"navigation/collection/AP-1": (203, 821),
"navigation/collection/CA-1": (203, 821),
"navigation/collection/CE-1": (243, 822),
@ -312,7 +312,6 @@ template_matching = {
"sign_in/moon_festival/banner": (704, 92),
"sss/abandon": ((0, 504), (289, 564)),
"sss/accomplished": (640, 381),
"sss/drop_EC": (48, 182),
"sss/drop/CASTER": ((0, 745), (1920, 808)),
"sss/drop/MEDIC": ((0, 745), (1920, 808)),
"sss/drop/PIONEER": ((0, 745), (1920, 808)),
@ -321,6 +320,7 @@ template_matching = {
"sss/drop/SUPPORT": ((0, 745), (1920, 808)),
"sss/drop/TANK": ((0, 745), (1920, 808)),
"sss/drop/WARRIOR": ((0, 745), (1920, 808)),
"sss/drop_EC": (48, 182),
"sss/operation_complete": (30, 770),
"sss/terminated": (29, 241),
"stone_fragment": None,