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

Opt: Adjust threshold; Add delay; Add output

Browse Source
This commit is contained in:
Horizon101011
2022-10-12 22:44:33 +08:00
parent aa5f910e3a
commit f2502e766e
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/campaign/gems_farming.py
View File

@@ -296,10 +296,10 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
# End # End
if self._trigger_lv32 or self._trigger_emotion: if self._trigger_lv32 or self._trigger_emotion:
self.flagship_change() success = self.flagship_change()
if self.config.GemsFarming_LowEmotionRetreat: if self.config.GemsFarming_LowEmotionRetreat:
self.vanguard_change() success = success and self.vanguard_change()
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')
@@ -316,6 +316,10 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
if self.config.task_switched(): if self.config.task_switched():
self.campaign.ensure_auto_search_exit() self.campaign.ensure_auto_search_exit()
self.config.task_stop() self.config.task_stop()
elif not success:
self.campaign.ensure_auto_search_exit()
self.config.task_delay(minute=30)
self.config.task_stop()
continue continue
else: else:

2
module/retire/retirement.py
View File

@@ -274,7 +274,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self.dock_favourite_set(False) self.dock_favourite_set(False)
scanner = ShipScanner( scanner = ShipScanner(
rarity='common', fleet=0, status='free', level=(24, 100)) rarity='common', fleet=0, status='free', level=(30, 100))
scanner.disable('emotion') scanner.disable('emotion')
total = 0 total = 0

2
module/retire/scanner.py
View File

@@ -81,6 +81,8 @@ class Scanner(metaclass=ABCMeta):
if cached: if cached:
self._results.extend(result) self._results.extend(result)
else: else:
for ship in result:
print(ship)
return result return result
def move(self, vector) -> None: def move(self, vector) -> None: