ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki 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
commit e5cf62069f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/combat/combat.py
View File

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

8
module/os_combat/combat.py
View File

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