1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 22:05:12 +00:00

Compare commits

..

2 Commits

Author SHA1 Message Date
77f0ded95f
feat(cafe): handle unexpected popups 2023-11-05 23:19:51 +08:00
937a7c63e8
fix(cafe): use smaller default pinch area 2023-11-05 23:09:46 +08:00
6 changed files with 29 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -172,7 +172,7 @@ class Control(Hermit, Minitouch, Scrcpy, MaaTouch):
self.click(ClickButton(button=area_offset(point_random, p2), name=name))
# just used in cafe
def pinch(self, box=(33, 130, 1247, 569), name='PINCH'):
def pinch(self, box=(35, 130, 1250, 560), name='PINCH'):
self.handle_control_check(name)
middle_point = (box[0] + box[2]) // 2, (box[1] + box[3]) // 2
width = box[2] - middle_point[0]

View File

@ -103,6 +103,26 @@ GOT_REWARD = ButtonWrapper(
button=(561, 501, 718, 556),
),
)
INVENTORY = ButtonWrapper(
name='INVENTORY',
jp=Button(
file='./assets/jp/cafe/INVENTORY.png',
area=(553, 94, 725, 122),
search=(533, 74, 745, 142),
color=(198, 205, 213),
button=(1130, 94, 1156, 120),
),
)
MOMOTALK_CLOSE = ButtonWrapper(
name='MOMOTALK_CLOSE',
jp=Button(
file='./assets/jp/cafe/MOMOTALK_CLOSE.png',
area=(824, 82, 850, 108),
search=(804, 62, 870, 128),
color=(252, 182, 194),
button=(824, 82, 850, 108),
),
)
OCR_CAFE = ButtonWrapper(
name='OCR_CAFE',
jp=Button(

View File

@ -120,6 +120,13 @@ class Cafe(UI):
logger.attr('Reward', num)
return num
def _cafe_additional(self) -> bool:
if self.appear_then_click(INVENTORY):
return True
if self.appear_then_click(MOMOTALK_CLOSE):
return True
return False
def _handle_cafe(self, status):
match status:
case CafeStatus.STUDENT_LIST:
@ -206,7 +213,7 @@ class Cafe(UI):
self.device.screenshot()
if self.ui_additional():
if self.ui_additional() or self._cafe_additional():
continue
if not loading_timer.reached():