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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync 2026-01-03 18:33:35 +00:00
commit 58ada7c9f2
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/tw/template/TEMPLATE_COMBAT_LOADING.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 746 B

7
module/combat/combat.py
View File

@ -68,6 +68,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
bool:
"""
image = self.image_crop((0, 620, 1280, 690), copy=False)
# note that CN/EN/TW are the same, but JP character is smaller
similarity, button = TEMPLATE_COMBAT_LOADING.match_luma_result(image)
if similarity > 0.85:
loading = (button.area[0] + 38 - LOADING_BAR.area[0]) / (LOADING_BAR.area[2] - LOADING_BAR.area[0])
@ -636,9 +637,3 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
# self.handle_map_after_combat_story()
logger.info('Combat end.')
if __name__ == '__main__':
self = Combat('alas5')
self.image_file = r'C:\Users\LmeSzinc\Documents\MuMu共享文件夹\Screenshots\MuMu12-20251219-021500.png'
self.is_combat_loading()