YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 19:55:12 +00:00
Code Releases Wiki Activity

fix(tc): improve stability of reward

Browse Source
This commit is contained in:
YoursFunny 2024-08-10 17:49:26 +08:00
parent 6e3d5fc4c5
commit 34af75245e
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/tactical_challenge/tactical_challenge.py
View File

@ -41,8 +41,6 @@ class TacticalChallenge(TacticalChallengeUI):
def _handle_challenge(self, status): def _handle_challenge(self, status):
match status: match status:
case TCStatus.REWARD: case TCStatus.REWARD:
if self.ui_additional():
return status
if self.get_reward(): if self.get_reward():
return TCStatus.OCR return TCStatus.OCR
case TCStatus.OCR: case TCStatus.OCR:

11
tasks/tactical_challenge/ui.py
View File

@ -26,17 +26,26 @@ class TacticalChallengeUI(UI):
def get_reward(self): def get_reward(self):
timer = Timer(10, 10).start() timer = Timer(10, 10).start()
action_timer = Timer(0.5, 1)
while 1: while 1:
self.device.screenshot() self.device.screenshot()
self.ui_additional() if not action_timer.reached_and_reset():
continue
if self.handle_insufficient_inventory():
logger.warning('Insufficient inventory, skip reward')
return True
if self.ui_additional():
continue
if self.match_color(GOT_REWARD_DAILY) and self.match_color(GOT_REWARD_CREDIT): if self.match_color(GOT_REWARD_DAILY) and self.match_color(GOT_REWARD_CREDIT):
return True return True
if self.match_color(GET_REWARD_DAILY): if self.match_color(GET_REWARD_DAILY):
self.click_with_interval(GET_REWARD_DAILY, 0.3) self.click_with_interval(GET_REWARD_DAILY, 0.3)
logger.info('Get daily reward') logger.info('Get daily reward')
continue
if self.match_color(GET_REWARD_CREDIT): if self.match_color(GET_REWARD_CREDIT):
self.click_with_interval(GET_REWARD_CREDIT, 0.3) self.click_with_interval(GET_REWARD_CREDIT, 0.3)
logger.info('Get credit reward') logger.info('Get credit reward')
continue
if timer.reached(): if timer.reached():
return False return False