1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-01-15 23:35:19 +00:00

Compare commits

..

No commits in common. "6ef18ed8c0c4cac8c814c843dabb146c764dbfc5" and "84f78230d25d4dcad4f260fbd2ae169198f37d1d" have entirely different histories.

8 changed files with 6 additions and 33 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -24,10 +24,10 @@ AP_EXCEED = ButtonWrapper(
name='AP_EXCEED',
jp=Button(
file='./assets/jp/base/popup/AP_EXCEED.png',
area=(611, 147, 669, 177),
search=(591, 127, 689, 197),
color=(143, 156, 170),
button=(539, 470, 743, 533),
area=(610, 124, 669, 153),
search=(590, 104, 689, 173),
color=(139, 153, 168),
button=(535, 494, 746, 565),
),
en=Button(
file='./assets/en/base/popup/AP_EXCEED.png',
@ -124,13 +124,7 @@ GET_REWARD_SKIP = ButtonWrapper(
)
INSUFFICIENT_INVENTORY = ButtonWrapper(
name='INSUFFICIENT_INVENTORY',
jp=Button(
file='./assets/jp/base/popup/INSUFFICIENT_INVENTORY.png',
area=(610, 124, 669, 153),
search=(590, 104, 689, 173),
color=(139, 153, 168),
button=(535, 494, 746, 565),
),
jp=None,
en=Button(
file='./assets/en/base/popup/INSUFFICIENT_INVENTORY.png',
area=(578, 117, 703, 152),

View File

@ -94,12 +94,6 @@ class PopupHandler(ModuleBase):
return False
def handle_insufficient_inventory(self, interval=5) -> bool:
if self.appear_then_click(INSUFFICIENT_INVENTORY, interval=interval):
return True
return False
def handle_item_expired(self, interval=5) -> bool:
if self.appear_then_click(ITEM_EXPIRED, interval=interval):
return True

View File

@ -345,8 +345,6 @@ class UI(MainPage):
return True
if self.handle_ap_exceed():
return True
if self.handle_insufficient_inventory():
return True
if self.handle_item_expired():
return True

View File

@ -1,10 +1,9 @@
from module.base.timer import Timer
from module.base.decorator import Config
from module.exception import GameNotRunningError
from module.logger import logger
from tasks.base.page import page_main
from tasks.base.ui import UI
from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING, UPDATE, SURVEY
from tasks.login.assets.assets_login import LOGIN_CONFIRM, LOGIN_LOADING, UPDATE
class Login(UI):
@ -30,16 +29,6 @@ class Login(UI):
return True
return False
@Config.when(Emulator_GameLanguage='jp')
def _handle_survey():
pass
@Config.when(Emulator_GameLanguage='en')
def _handle_survey():
if self.appear_then_click(SURVEY):
return True
return False
logger.hr('App login')
orientation_timer = Timer(5)
startup_timer = Timer(5).start()
@ -89,8 +78,6 @@ class Login(UI):
# continue
if self.appear_then_click(UPDATE):
continue
if _handle_survey():
continue
if self.ui_additional():
continue