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

fix: update ui assets and circle for jp

This commit is contained in:
YoursFunny 2024-01-25 19:40:09 +08:00
parent a5d478ce56
commit daca32d4fe
11 changed files with 73 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

BIN
assets/jp/circle/CIRCLE.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -251,6 +251,13 @@ MAIL_CHECK = ButtonWrapper(
) )
MAIN_GO_TO_CAFE = ButtonWrapper( MAIN_GO_TO_CAFE = ButtonWrapper(
name='MAIN_GO_TO_CAFE', name='MAIN_GO_TO_CAFE',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
area=(76, 638, 104, 674),
search=(56, 618, 124, 694),
color=(173, 212, 230),
button=(76, 638, 104, 674),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CAFE.png', file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
area=(81, 638, 102, 668), area=(81, 638, 102, 668),
@ -261,6 +268,13 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
) )
MAIN_GO_TO_CIRCLE = ButtonWrapper( MAIN_GO_TO_CIRCLE = ButtonWrapper(
name='MAIN_GO_TO_CIRCLE', name='MAIN_GO_TO_CIRCLE',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
area=(486, 630, 522, 665),
search=(466, 610, 542, 685),
color=(166, 228, 245),
button=(486, 630, 522, 665),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png', file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
area=(540, 631, 583, 660), area=(540, 631, 583, 660),
@ -271,6 +285,13 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
) )
MAIN_GO_TO_CRAFTING = ButtonWrapper( MAIN_GO_TO_CRAFTING = ButtonWrapper(
name='MAIN_GO_TO_CRAFTING', name='MAIN_GO_TO_CRAFTING',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
area=(626, 623, 654, 664),
search=(606, 603, 674, 684),
color=(190, 228, 241),
button=(626, 623, 654, 664),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png', file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
area=(665, 622, 693, 664), area=(665, 622, 693, 664),
@ -281,6 +302,13 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
) )
MAIN_GO_TO_GACHA = ButtonWrapper( MAIN_GO_TO_GACHA = ButtonWrapper(
name='MAIN_GO_TO_GACHA', name='MAIN_GO_TO_GACHA',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
area=(898, 631, 927, 663),
search=(878, 611, 947, 683),
color=(170, 229, 247),
button=(898, 631, 927, 663),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_GACHA.png', file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
area=(900, 623, 924, 670), area=(900, 623, 924, 670),
@ -321,6 +349,13 @@ MAIN_GO_TO_PURCHASE = ButtonWrapper(
) )
MAIN_GO_TO_SCHEDULE = ButtonWrapper( MAIN_GO_TO_SCHEDULE = ButtonWrapper(
name='MAIN_GO_TO_SCHEDULE', name='MAIN_GO_TO_SCHEDULE',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
area=(217, 640, 237, 672),
search=(197, 620, 257, 692),
color=(154, 201, 228),
button=(217, 640, 237, 672),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png', file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
area=(194, 638, 216, 672), area=(194, 638, 216, 672),
@ -331,6 +366,13 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
) )
MAIN_GO_TO_SHOP = ButtonWrapper( MAIN_GO_TO_SHOP = ButtonWrapper(
name='MAIN_GO_TO_SHOP', name='MAIN_GO_TO_SHOP',
jp=Button(
file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
area=(756, 629, 795, 666),
search=(736, 609, 815, 686),
color=(151, 215, 241),
button=(756, 629, 795, 666),
),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SHOP.png', file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
area=(773, 630, 816, 667), area=(773, 630, 816, 667),

View File

@ -3,6 +3,17 @@ from module.base.button import Button, ButtonWrapper
# This file was auto-generated, do not modify it manually. To generate: # This file was auto-generated, do not modify it manually. To generate:
# ``` python -m dev_tools.button_extract ``` # ``` python -m dev_tools.button_extract ```
CIRCLE = ButtonWrapper(
name='CIRCLE',
jp=Button(
file='./assets/jp/circle/CIRCLE.png',
area=(197, 315, 228, 350),
search=(177, 295, 248, 370),
color=(166, 215, 235),
button=(188, 299, 435, 456),
),
en=None,
)
GET_REWARD_AP = ButtonWrapper( GET_REWARD_AP = ButtonWrapper(
name='GET_REWARD_AP', name='GET_REWARD_AP',
jp=Button( jp=Button(

View File

@ -1,8 +1,9 @@
from enum import Enum from enum import Enum
from module.base.decorator import Config
from module.base.timer import Timer from module.base.timer import Timer
from module.logger import logger from module.logger import logger
from tasks.base.page import page_circle from tasks.base.page import page_circle, MAIN_GO_TO_CIRCLE, CIRCLE_CHECK
from tasks.base.ui import UI from tasks.base.ui import UI
from tasks.circle.assets.assets_circle import * from tasks.circle.assets.assets_circle import *
@ -17,6 +18,23 @@ class CircleStatus(Enum):
class Circle(UI): class Circle(UI):
@Config.when(Emulator_GameLanguage='jp')
def _enter_circle(self):
self.ui_goto_main()
action_timer = Timer(1, 8)
while not self.appear(CIRCLE_CHECK):
self.device.screenshot()
if not action_timer.reached_and_reset():
continue
if self.appear_then_click(CIRCLE):
continue
else:
self.device.click(MAIN_GO_TO_CIRCLE)
@Config.when(Emulator_GameLanguage=None)
def _enter_circle(self):
self.ui_ensure(page_circle)
def _handle_circle(self, status): def _handle_circle(self, status):
match status: match status:
case CircleStatus.REWARD: case CircleStatus.REWARD:
@ -31,7 +49,7 @@ class Circle(UI):
return status return status
def run(self): def run(self):
self.ui_ensure(page_circle) self._enter_circle()
status = CircleStatus.REWARD status = CircleStatus.REWARD
action_timer = Timer(0.5) action_timer = Timer(0.5)