1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 07:28:21 +08:00

Merge branch 'master' into dev

# Conflicts:
#	module/ui/assets.py
This commit is contained in:
LmeSzinc
2021-08-07 14:32:31 +08:00
26 changed files with 88 additions and 49 deletions

View File

@@ -94,6 +94,10 @@ def ensure_time(second, n=3, precision=3):
lower, upper = second.replace(' ', '').split(',')
lower, upper = int(lower), int(upper)
return ensure_time((lower, upper), n=n, precision=precision)
if '-' in second:
lower, upper = second.replace(' ', '').split('-')
lower, upper = int(lower), int(upper)
return ensure_time((lower, upper), n=n, precision=precision)
else:
return int(second)
else: