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

BIN
mower/resources/navigation/activity/banner.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
mower/resources/navigation/activity/entry.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
mower/resources/navigation/activity/terminal.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 437 KiB

Before After
Before After

26
mower/solvers/navigation/activity.py
View file

@ -28,21 +28,21 @@ class ActivityNavigation(SceneGraphSolver):
solver_name = "活动关卡导航" solver_name = "活动关卡导航"
_location = { _location = {
"PV-1": (0, 0), "ZT-1": (0, 0),
"PV-2": [337, -199], "ZT-2": [317, 144],
"PV-3": [558, 56], "ZT-3": [585, -1],
"PV-4": [920, 57], "ZT-4": [860, 145],
"PV-5": [1481, 81], "ZT-5": [1113, 313],
"PV-6": [1715, 242], "ZT-6": [1489, 470],
"PV-7": [1928, 42], "ZT-7": [1932, 471],
"PV-8": [2208, 200], "ZT-8": [2544, 470],
"PV-9": [2803, 71], "ZT-9": [2835, 251],
"PV-10": [3046, -166], "ZT-10": [2824, -102],
} }
@classproperty @classproperty
def location(cls): def location(cls):
if datetime.now() > datetime(2024, 11, 22, 4): if datetime.now() > datetime(2024, 12, 5, 4):
return {} return {}
return cls._location return cls._location
@ -90,9 +90,9 @@ class ActivityNavigation(SceneGraphSolver):
target = va(vs(loc, self.location[name]), self.location[self.name]) target = va(vs(loc, self.location[name]), self.location[self.name])
if target[0] + 200 > 1920: if target[0] + 200 > 1920:
self.swipe_noinertia((1400, 540), (-1000, 0)) self.swipe_ext([(1400, 540), (400, 540)], [200], 500, 0.2)
elif target[0] < 0: elif target[0] < 0:
self.swipe_noinertia((400, 540), (1000, 0)) self.swipe_ext([(400, 540), (1400, 0)], [200], 500, 0.2)
else: else:
self.tap(va(target, (60, 20))) self.tap(va(target, (60, 20)))
elif scene == Scene.OPERATOR_BEFORE: elif scene == Scene.OPERATOR_BEFORE:

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

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

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

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