1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00

Upd: emotion record in gemsfarming

This commit is contained in:
sui-feng-cb 2025-08-19 19:52:20 +08:00
parent 604222d100
commit 9075dcd34d

View File

@ -717,8 +717,11 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
try: try:
super().run(name=name, folder=folder, total=total) super().run(name=name, folder=folder, total=total)
except CampaignEnd as e: except CampaignEnd as e:
if e.args[0] in ['Emotion withdraw', 'Emotion control']: if e.args[0] == 'Emotion control':
self._trigger_emotion = True self._trigger_emotion = True
elif e.args[0] == 'Emotion withdraw':
self._trigger_emotion = True
self.set_emotion(0)
else: else:
raise e raise e
except RequestHumanTakeover as e: except RequestHumanTakeover as e:
@ -739,10 +742,13 @@ class GemsFarming(CampaignRun, GemsEquipmentHandler, Retirement):
if self._trigger_lv32 or self._trigger_emotion: if self._trigger_lv32 or self._trigger_emotion:
success = True success = True
self.hard_mode_override() self.hard_mode_override()
emotion = self.get_emotion()
if self.change_flagship: if self.change_flagship:
success = self.flagship_change() success = self.flagship_change()
if self.change_vanguard: if self.change_vanguard and success:
success = success and self.vanguard_change() success = self.vanguard_change()
if not success and self.config.GemsFarming_ALLowHighFlagshipLevel:
self.set_emotion(emotion)
if is_limit and self.config.StopCondition_RunCount <= 0: if is_limit and self.config.StopCondition_RunCount <= 0:
logger.hr('Triggered stop condition: Run count') logger.hr('Triggered stop condition: Run count')