mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2025-12-18 02:15:23 +00:00
Compare commits
3 Commits
8fe578615d
...
4582406ef2
| Author | SHA1 | Date | |
|---|---|---|---|
| 4582406ef2 | |||
| 256dc96598 | |||
| 04744d6f8c |
@ -67,7 +67,7 @@ class Scrimmage(ScrimmageUI):
|
||||
|
||||
@property
|
||||
def current_task_ap(self):
|
||||
return self.task[0][4]
|
||||
return self.task[0][4] * self.current_count
|
||||
|
||||
@property
|
||||
def current_ticket(self):
|
||||
|
||||
@ -54,7 +54,7 @@ class TacticalChallenge(TacticalChallengeUI):
|
||||
return TCStatus.PREPARE
|
||||
case TCStatus.PREPARE:
|
||||
self.appear_then_click(PREPARE_CHALLENGE)
|
||||
if not self.appear(PREPARE_CHALLENGE):
|
||||
if self.appear(START_CHALLENGE):
|
||||
return TCStatus.SKIP
|
||||
case TCStatus.SKIP:
|
||||
if not self.set_skip():
|
||||
@ -62,7 +62,7 @@ class TacticalChallenge(TacticalChallengeUI):
|
||||
return TCStatus.START
|
||||
case TCStatus.START:
|
||||
self.appear_then_click(START_CHALLENGE)
|
||||
if not self.appear(START_CHALLENGE):
|
||||
if self.appear(CHALLENGE_WIN) or self.appear(CHALLENGE_LOSE):
|
||||
return TCStatus.RESULT
|
||||
case TCStatus.RESULT:
|
||||
if self.appear_then_click(CHALLENGE_WIN):
|
||||
|
||||
@ -32,10 +32,10 @@ class TacticalChallengeUI(UI):
|
||||
if self.match_color(GOT_REWARD_DAILY) and self.match_color(GOT_REWARD_CREDIT):
|
||||
return True
|
||||
if self.match_color(GET_REWARD_DAILY):
|
||||
self.device.click(GET_REWARD_DAILY)
|
||||
self.click_with_interval(GET_REWARD_DAILY, 0.3)
|
||||
logger.info('Get daily reward')
|
||||
if self.match_color(GET_REWARD_CREDIT):
|
||||
self.device.click(GET_REWARD_CREDIT)
|
||||
self.click_with_interval(GET_REWARD_CREDIT, 0.3)
|
||||
logger.info('Get credit reward')
|
||||
if timer.reached():
|
||||
return False
|
||||
|
||||
Loading…
Reference in New Issue
Block a user