sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-19 03:57:09 +08:00
Code Activity

Merge remote-tracking branch 'origin/master' into update_asset

Browse Source
This commit is contained in:
nEEtdo0d
2021-01-17 11:08:42 -05:00
parent 4e3f275f4c d3abb53021
commit e5cf62069f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/combat/combat.py
View File

@@ -98,6 +98,7 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
fleet_index (int): fleet_index (int):
""" """
logger.info('Combat preparation.') logger.info('Combat preparation.')
skip_first_screenshot = True
if emotion_reduce: if emotion_reduce:
self.emotion.wait(fleet=fleet_index) self.emotion.wait(fleet=fleet_index)
@@ -105,7 +106,10 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
self.hp_balance() self.hp_balance()
while 1: while 1:
self.device.screenshot() if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(BATTLE_PREPARATION): if self.appear(BATTLE_PREPARATION):
if self.handle_combat_automation_set(auto=auto == 'combat_auto'): if self.handle_combat_automation_set(auto=auto == 'combat_auto'):

10
module/os_combat/combat.py
View File

@@ -34,14 +34,18 @@ class Combat(Combat_, EnemySearchingHandler):
fleet_index (int): fleet_index (int):
""" """
logger.info('Combat preparation.') logger.info('Combat preparation.')
skip_first_screenshot = True
if emotion_reduce: # if emotion_reduce:
self.emotion.wait(fleet=fleet_index) # self.emotion.wait(fleet=fleet_index)
if balance_hp: if balance_hp:
self.hp_balance() self.hp_balance()
while 1: while 1:
self.device.screenshot() if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(BATTLE_PREPARATION): if self.appear(BATTLE_PREPARATION):
if self.handle_combat_automation_set(auto=auto == 'combat_auto'): if self.handle_combat_automation_set(auto=auto == 'combat_auto'):