Merge branch 'dev' into exercise_period_ocr

This commit is contained in:
guoh064 2023-04-09 14:09:35 +08:00 committed by GitHub
commit 600c253309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -218,10 +218,10 @@ class Exercise(ExerciseCombat):
admiral_start, admiral_end = admiral_interval
if admiral_start > int(remain_time.total_seconds() // 3600) >= admiral_end: #set time for getting admiral
logger.info(f'Reach set time for admiral trial, using all attempts.')
logger.info('Reach set time for admiral trial, using all attempts.')
self.preserve = 0
elif int(remain_time.total_seconds() // 3600) < 6: #if not set to "sun18", still depleting at sunday 18pm.
logger.info(f'Exercise period remain less than 6 hours, using all attempts.')
logger.info('Exercise period remain less than 6 hours, using all attempts.')
self.preserve = 0
while 1: