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

Merge branch 'master' into try_jp

Browse Source 
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
This commit is contained in:
ferina8-14
2020-06-13 03:29:35 +09:00
parent 4fd1b7999a 24a00f095e
commit 47adffd1a0
109 changed files with 1684 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/exercise/combat.py
View File

@@ -40,15 +40,25 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
while 1:
self.device.screenshot()
# Finish
# Finish - S or D rank
if self.appear_then_click(BATTLE_STATUS_S):
success = True
end = True
continue
if self.appear_then_click(BATTLE_STATUS_D):
success = True
end = True
logger.info("Exercise LOST")
continue
if self.appear_then_click(GET_ITEMS_1):
continue
if self.appear_then_click(EXP_INFO_S):
continue
if self.appear_then_click(EXP_INFO_D):
continue
# Last D rank screen
if self.appear_then_click(OPTS_INFO_D, offset=(30,30)):
continue
# Quit
if not end: