YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-01-08 20:25:12 +00:00
Code Releases Wiki Activity

Compare commits

base: YoursFunny:d756b0dc3fd1710d2e4d5dbcf1d77b57ad713f91
Branches Tags
YoursFunny:master
YoursFunny:copilot/refactor-webui-with-fastapi
YoursFunny:dev
YoursFunny:sync_src
YoursFunny:v0.2.0
YoursFunny:v0.1.1
YoursFunny:v0.1.0
..
compare: YoursFunny:44b6d5cdf8f0228ea16115e81170ee3a9655f06c
Branches Tags
YoursFunny:copilot/refactor-webui-with-fastapi
YoursFunny:dev
YoursFunny:master
YoursFunny:sync_src
YoursFunny:v0.2.0
YoursFunny:v0.1.1
YoursFunny:v0.1.0

No commits in common. "d756b0dc3fd1710d2e4d5dbcf1d77b57ad713f91" and "44b6d5cdf8f0228ea16115e81170ee3a9655f06c" have entirely different histories.
d756b0dc3f ... 44b6d5cdf8

3 changed files with 11 additions and 17 deletions
Show Stats Expand all files Collapse all files

5
tasks/bounty/bounty.py
View File

@ -41,9 +41,8 @@ class Bounty(BountyUI):
if action == 'stop': if action == 'stop':
raise RequestHumanTakeover raise RequestHumanTakeover
elif action == 'skip': elif action == 'skip':
with self.config.multi_set(): self.config.task_delay(server_update=True)
self.config.task_delay(server_update=True) self.config.task_stop()
self.config.task_stop()
@property @property
def is_ticket_enough(self) -> bool: def is_ticket_enough(self) -> bool:

18
tasks/item/data_update.py
View File

@ -12,10 +12,7 @@ class DataUpdate(UI):
Page: Page:
in: page_work in: page_work
""" """
ap, _, ap_total = DigitCounter(OCR_AP).ocr_single_line(self.device.image) ap = DigitCounter(OCR_AP).ocr_single_line(self.device.image)
if ap_total == 0:
logger.warning('Invalid AP')
return False
# Data for Credit and Pyroxene # Data for Credit and Pyroxene
ocr = Digit(OCR_DATA) ocr = Digit(OCR_DATA)
timeout = Timer(2, count=6).start() timeout = Timer(2, count=6).start()
@ -24,28 +21,27 @@ class DataUpdate(UI):
if len(data) != 2: if len(data) != 2:
data = [data[0], data[-1]] data = [data[0], data[-1]]
logger.attr('Data', data) logger.attr('Data', data)
credit, pyroxene = [int(''.join(filter(lambda x: x.isdigit(), d.ocr_text))) for d in data] credit, pyroxene = [int(''.join([v for v in d.ocr_text if v.isdigit()])) for d in data]
if credit > 0 or pyroxene > 0: if credit > 0 or pyroxene > 0:
break break
logger.warning(f'Invalid credit and pyroxene: {data}') logger.warning(f'Invalid credit and pyroxene: {data}')
if timeout.reached(): if timeout.reached():
logger.warning('Get data timeout') logger.warning('Get data timeout')
return False break
logger.attr('Credit', credit) logger.attr('Credit', credit)
logger.attr('Pyroxene', pyroxene) logger.attr('Pyroxene', pyroxene)
with self.config.multi_set(): with self.config.multi_set():
self.config.stored.AP.set(ap, ap_total) self.config.stored.AP.set(ap[0], ap[2])
self.config.stored.Credit.value = credit self.config.stored.Credit.value = credit
self.config.stored.Pyroxene.value = pyroxene self.config.stored.Pyroxene.value = pyroxene
return True return ap, credit, pyroxene
def run(self): def run(self):
self.ui_ensure(page_work, acquire_lang_checked=False) self.ui_ensure(page_work, acquire_lang_checked=False)
if self._get_data(): with self.config.multi_set():
self._get_data()
self.config.task_delay(server_update=True) self.config.task_delay(server_update=True)
else:
self.config.task_delay(minute=1)

5
tasks/scrimmage/scrimmage.py
View File

@ -42,9 +42,8 @@ class Scrimmage(ScrimmageUI):
if action == 'stop': if action == 'stop':
raise RequestHumanTakeover raise RequestHumanTakeover
elif action == 'skip': elif action == 'skip':
with self.config.multi_set(): self.config.task_delay(server_update=True)
self.config.task_delay(server_update=True) self.config.task_stop()
self.config.task_stop()
@property @property
def is_ticket_enough(self) -> bool: def is_ticket_enough(self) -> bool: