mirror of
https://github.com/TheFunny/ArisuAutoSweeper
synced 2025-12-16 13:25:13 +00:00
fix(cafe): adjust timer of Cafe No.2
This commit is contained in:
parent
d5f4891d4e
commit
29bd71ccc8
@ -112,7 +112,6 @@ class Cafe(CafeUI):
|
|||||||
status = CafeStatus.STUDENT_LIST
|
status = CafeStatus.STUDENT_LIST
|
||||||
loading_timer = Timer(2).start()
|
loading_timer = Timer(2).start()
|
||||||
action_timer = Timer(1, count=1)
|
action_timer = Timer(1, count=1)
|
||||||
is_list = False
|
|
||||||
is_reset = False
|
is_reset = False
|
||||||
is_second = False
|
is_second = False
|
||||||
is_enable = is_reward_on or is_touch_on
|
is_enable = is_reward_on or is_touch_on
|
||||||
@ -129,11 +128,6 @@ class Cafe(CafeUI):
|
|||||||
if not loading_timer.reached():
|
if not loading_timer.reached():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not is_list and status == CafeStatus.STUDENT_LIST and self.appear(STUDENT_LIST):
|
|
||||||
is_list = True
|
|
||||||
loading_timer = Timer(3).start()
|
|
||||||
continue
|
|
||||||
|
|
||||||
if not is_reward_on and status == CafeStatus.OCR:
|
if not is_reward_on and status == CafeStatus.OCR:
|
||||||
logger.info('Skip reward')
|
logger.info('Skip reward')
|
||||||
status = CafeStatus.CLICK
|
status = CafeStatus.CLICK
|
||||||
@ -162,9 +156,9 @@ class Cafe(CafeUI):
|
|||||||
case '2':
|
case '2':
|
||||||
logger.info('Cafe second arrived')
|
logger.info('Cafe second arrived')
|
||||||
status = CafeStatus.STUDENT_LIST
|
status = CafeStatus.STUDENT_LIST
|
||||||
is_list = False
|
|
||||||
is_second = True
|
is_second = True
|
||||||
self.check = 0
|
self.check = 0
|
||||||
|
loading_timer.reset().start()
|
||||||
else:
|
else:
|
||||||
if not SWITCH_CAFE.appear(main=self):
|
if not SWITCH_CAFE.appear(main=self):
|
||||||
logger.warning('Cafe switch not found')
|
logger.warning('Cafe switch not found')
|
||||||
@ -183,7 +177,6 @@ class Cafe(CafeUI):
|
|||||||
logger.info('Cafe second arrived')
|
logger.info('Cafe second arrived')
|
||||||
SWITCH_CAFE.set('off', main=self)
|
SWITCH_CAFE.set('off', main=self)
|
||||||
status = CafeStatus.STUDENT_LIST
|
status = CafeStatus.STUDENT_LIST
|
||||||
is_list = False
|
|
||||||
is_second = True
|
is_second = True
|
||||||
self.check = 0
|
self.check = 0
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user