sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-06-23 05:16:54 +08:00
Code Activity

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

Browse Source
This commit is contained in:
sui-feng-cb
2026-06-22 03:54:33 +08:00
parent 27eef08ad5 cf7f88d95e
commit 270ce82f0a
15 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/handler/assets.py
View File

@@ -45,6 +45,7 @@ GAME_TIPS = Button(area={'cn': (1009, 586, 1028, 614), 'en': (1009, 586, 1028, 6
GAME_TIPS3 = Button(area={'cn': (1008, 586, 1028, 614), 'en': (1008, 586, 1028, 614), 'jp': (1008, 586, 1028, 614), 'tw': (1008, 586, 1028, 614)}, color={'cn': (105, 104, 105), 'en': (105, 104, 105), 'jp': (105, 104, 105), 'tw': (105, 104, 105)}, button={'cn': (1008, 586, 1028, 614), 'en': (1008, 586, 1028, 614), 'jp': (1008, 586, 1028, 614), 'tw': (1008, 586, 1028, 614)}, file={'cn': './assets/cn/handler/GAME_TIPS3.png', 'en': './assets/en/handler/GAME_TIPS3.png', 'jp': './assets/jp/handler/GAME_TIPS3.png', 'tw': './assets/tw/handler/GAME_TIPS3.png'})
GAME_TIPS4 = Button(area={'cn': (1008, 587, 1028, 614), 'en': (1008, 587, 1028, 614), 'jp': (1008, 587, 1028, 614), 'tw': (1008, 587, 1028, 614)}, color={'cn': (106, 105, 106), 'en': (106, 105, 106), 'jp': (106, 105, 106), 'tw': (106, 105, 106)}, button={'cn': (1008, 587, 1028, 614), 'en': (1008, 587, 1028, 614), 'jp': (1008, 587, 1028, 614), 'tw': (1008, 587, 1028, 614)}, file={'cn': './assets/cn/handler/GAME_TIPS4.png', 'en': './assets/en/handler/GAME_TIPS4.png', 'jp': './assets/jp/handler/GAME_TIPS4.png', 'tw': './assets/tw/handler/GAME_TIPS4.png'})
GET_AMMO = Button(area={'cn': (792, 315, 794, 333), 'en': (792, 315, 794, 333), 'jp': (792, 315, 794, 333), 'tw': (792, 315, 794, 333)}, color={'cn': (251, 250, 255), 'en': (251, 250, 255), 'jp': (251, 250, 255), 'tw': (251, 250, 255)}, button={'cn': (792, 315, 794, 333), 'en': (792, 315, 794, 333), 'jp': (792, 315, 794, 333), 'tw': (792, 315, 794, 333)}, file={'cn': './assets/cn/handler/GET_AMMO.png', 'en': './assets/en/handler/GET_AMMO.png', 'jp': './assets/jp/handler/GET_AMMO.png', 'tw': './assets/tw/handler/GET_AMMO.png'})
GET_ITEMS_SHIP_1 = Button(area={'cn': (563, 193, 720, 219), 'en': (563, 193, 724, 218), 'jp': (564, 193, 724, 219), 'tw': (563, 193, 720, 219)}, color={'cn': (179, 201, 243), 'en': (169, 193, 229), 'jp': (169, 200, 244), 'tw': (179, 201, 243)}, button={'cn': (563, 193, 720, 219), 'en': (563, 193, 724, 218), 'jp': (564, 193, 724, 219), 'tw': (563, 193, 720, 219)}, file={'cn': './assets/cn/handler/GET_ITEMS_SHIP_1.png', 'en': './assets/en/handler/GET_ITEMS_SHIP_1.png', 'jp': './assets/jp/handler/GET_ITEMS_SHIP_1.png', 'tw': './assets/cn/handler/GET_ITEMS_SHIP_1.png'})
GET_MISSION = Button(area={'cn': (604, 495, 676, 525), 'en': (579, 496, 700, 520), 'jp': (604, 498, 675, 527), 'tw': (604, 495, 676, 526)}, color={'cn': (151, 181, 221), 'en': (156, 184, 221), 'jp': (139, 172, 215), 'tw': (145, 177, 219)}, button={'cn': (604, 495, 676, 525), 'en': (579, 496, 700, 520), 'jp': (604, 498, 675, 527), 'tw': (604, 495, 676, 526)}, file={'cn': './assets/cn/handler/GET_MISSION.png', 'en': './assets/en/handler/GET_MISSION.png', 'jp': './assets/jp/handler/GET_MISSION.png', 'tw': './assets/tw/handler/GET_MISSION.png'})
GET_SKIN = Button(area={'cn': (990, 550, 1022, 565), 'en': (991, 553, 1055, 564), 'jp': (990, 550, 1022, 565), 'tw': (990, 550, 1022, 565)}, color={'cn': (113, 114, 124), 'en': (142, 142, 152), 'jp': (113, 114, 124), 'tw': (113, 114, 124)}, button={'cn': (990, 550, 1022, 565), 'en': (991, 553, 1055, 564), 'jp': (990, 550, 1022, 565), 'tw': (990, 550, 1022, 565)}, file={'cn': './assets/cn/handler/GET_SKIN.png', 'en': './assets/en/handler/GET_SKIN.png', 'jp': './assets/cn/handler/GET_SKIN.png', 'tw': './assets/cn/handler/GET_SKIN.png'})
GUILD_POPUP_CANCEL = Button(area={'cn': (422, 449, 623, 486), 'en': (425, 452, 620, 483), 'jp': (422, 449, 623, 486), 'tw': (422, 449, 623, 486)}, color={'cn': (127, 125, 127), 'en': (125, 123, 125), 'jp': (119, 117, 119), 'tw': (127, 125, 127)}, button={'cn': (422, 449, 623, 486), 'en': (425, 452, 620, 483), 'jp': (422, 449, 623, 486), 'tw': (422, 449, 623, 486)}, file={'cn': './assets/cn/handler/GUILD_POPUP_CANCEL.png', 'en': './assets/en/handler/GUILD_POPUP_CANCEL.png', 'jp': './assets/jp/handler/GUILD_POPUP_CANCEL.png', 'tw': './assets/tw/handler/GUILD_POPUP_CANCEL.png'})

4
module/handler/enemy_searching.py
View File

@@ -120,6 +120,10 @@ class EnemySearchingHandler(InfoHandler):
# although here expects an enemy searching animation.
if self.handle_in_stage():
return True
# immediately enter submarine combat in W16
if hasattr(self, 'is_combat_loading') and self.is_combat_loading():
logger.warning('Entered map with is_combat_loading appeared')
break
if self.handle_auto_search_exit(drop=drop):
timeout.limit = 10
timeout.reset()

3
module/handler/fast_forward.py
View File

@@ -380,8 +380,7 @@ class FastForwardHandler(AutoSearchHandler):
# Insert custom increase logic
if self.config.STAGE_INCREASE_AB:
stage_increase = [
'A1 > A2 > A3 > B1 > B2 > B3',
'C1 > C2 > C3 > D1 > D2 > D3',
'A1 > A2 > A3 > B1 > B2 > B3',
] + stage_increase
custom = self.config.STAGE_INCREASE_CUSTOM
if custom:

18
module/handler/info_handler.py
View File

@@ -245,6 +245,24 @@ class InfoHandler(ModuleBase):
"""
return self.appear_then_click(GET_SKIN, offset=(20, 20), interval=2)
def handle_get_items_ship(self, drop=None):
"""
2026.06.12 added different GET_ITEMS popup when getting ship
Args:
drop (DropImage):
Returns:
bool:
"""
if self.appear(GET_ITEMS_SHIP_1, offset=5, interval=2):
if drop:
drop.handle_add(self)
self.device.click(GET_ITEMS_SHIP_1)
return True
return False
"""
Guild popup info
"""