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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-06 05:16:51 +08:00
parent fe59ef732b a97cf304b6
commit 4bbbf27b8a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/combat/combat.py
View File

@@ -211,7 +211,7 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
continue
if self.handle_combat_manual():
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():
continue
if call_submarine_at_boss:

1
module/reward/commission.py
View File

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