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

活动商店点击物品使用ctap
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
Details

Browse source
This commit is contained in:
zhbaor 2025-02-02 09:32:53 +08:00
parent e6d2398bb9
commit b42b052e29
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mower/solvers/sign_in/shop.py
View file

@ -67,9 +67,8 @@ class Shop(BaseSolver):
name = crop2content(name)
name = ocr_rec(name)
if name not in config.conf.activity_shop_blacklist:
self.product = name
return va(top_left, (245, 110))
return None
return name, va(top_left, (245, 110))
return None, None
def transition(self):
if (scene := self.scene()) == Scene.TERMINAL_MAIN:
@ -79,8 +78,10 @@ class Shop(BaseSolver):
elif scene == Scene.ACTIVITY_SHOP:
if self.animation():
return
if pos := self.next_product():
self.tap(pos)
name, pos = self.next_product()
if pos is not None:
if self.ctap(pos):
self.product = name
return
self.swipe_ext([(1600, 340), (300, 340), (300, 150)], [0.2, 0.3], 0, 0.1)
elif scene == Scene.ACTIVITY_SHOP_BUY: