1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 09:25:02 +08:00

Merge branch 'master' into dev

This commit is contained in:
LmeSzinc
2020-07-06 05:16:51 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -211,7 +211,7 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
continue continue
if self.handle_combat_manual(): if self.handle_combat_manual():
continue continue
if not auto and self.is_combat_executing(): if not auto and self.auto_mode_checked and self.is_combat_executing():
if self.handle_combat_weapon_release(): if self.handle_combat_weapon_release():
continue continue
if call_submarine_at_boss: if call_submarine_at_boss:

View File

@@ -582,6 +582,7 @@ class RewardCommission(UI, InfoHandler):
self.ui_goto(page_commission) self.ui_goto(page_commission)
self.handle_info_bar() # info_bar appears when get ship in Launch Ceremony commissions
self.commission_start() self.commission_start()
self.ui_goto(page_reward, skip_first_screenshot=True) self.ui_goto(page_reward, skip_first_screenshot=True)