sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	module/device/emulator.py
This commit is contained in:
LmeSzinc
2022-09-02 00:13:11 +08:00
parent 59b94395c9 2540f6fd1f
commit f1ef87ca50
20 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/campaign/gems_farming.py
View File

@@ -331,12 +331,11 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
raise e
# End
success = True
if self._trigger_lv32 or self._trigger_emotion:
success = success and self.flagship_change()
self.flagship_change()
if self.config.GemsFarming_LowEmotionRetreat:
success = success and self.vanguard_change()
self.vanguard_change()
if is_limit and self.config.StopCondition_RunCount <= 0:
logger.hr('Triggered stop condition: Run count')
@@ -353,10 +352,6 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
if self.config.task_switched():
self.campaign.ensure_auto_search_exit()
self.config.task_stop()
# Delay
if not success:
self.campaign.ensure_auto_search_exit()
self.config.task_delay(minute=30)
continue
else: