Fix: 修复停止条件: 如果船坞已满无效的问题

(其实是没写)
This commit is contained in:
LmeSzinc 2020-04-01 12:55:17 +08:00
parent 6272284ad5
commit fc0e075422
3 changed files with 8 additions and 2 deletions

View File

@ -84,11 +84,15 @@ class CampaignRun(CampaignUI):
self.config.config.set('Setting', 'if_time_reach', '0')
self.config.save()
return True
# Oil limit
# Dock full limit
if self.config.STOP_IF_DOCK_FULL and self.campaign.config.DOCK_FULL_TRIGGERED:
logger.hr('Triggered dock full limit')
return True
# Emotion limit
if self.config.STOP_IF_TRIGGER_EMOTION_LIMIT and self.campaign.config.EMOTION_LIMIT_TRIGGERED:
logger.hr('Triggered emotion limit')
return True
# Emotion limit
# Oil limit
if self.config.STOP_IF_OIL_LOWER_THAN:
if OCR_OIL.ocr(self.device.image) < self.config.STOP_IF_OIL_LOWER_THAN:
logger.hr('Triggered oil limit')

View File

@ -169,6 +169,7 @@ class AzurLaneConfig:
module.retire
"""
ENABLE_RETIREMENT = True
DOCK_FULL_TRIGGERED = False
RETIRE_MODE = '10' # all, 10
RETIRE_N = True
RETIRE_R = False

View File

@ -192,4 +192,5 @@ class Retirement(UI, InfoBarHandler):
self.retire_ships(amount=amount, rarity=rarity)
self._retirement_quit()
self.config.DOCK_FULL_TRIGGERED = True
return True