WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-09 20:00:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Handle another STORY_SKIP (#2284)

Browse Source
This commit is contained in:
LmeSzinc 2023-02-24 21:25:36 +08:00
parent 0a89ff7e87
commit db0431994c
6 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/handler/STORY_SKIP_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
assets/en/handler/STORY_SKIP_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
assets/jp/handler/STORY_SKIP_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
assets/tw/handler/STORY_SKIP_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

1
module/handler/assets.py
View File

@ -72,6 +72,7 @@ POPUP_CONFIRM = Button(area={'cn': (754, 502, 825, 532), 'en': (707, 487, 874, 5
STORY_LETTERS_ONLY = Button(area={'cn': (1159, 26, 1264, 52), 'en': (1159, 26, 1264, 52), 'jp': (1159, 26, 1264, 52), 'tw': (1159, 26, 1264, 52)}, color={'cn': (123, 128, 141), 'en': (123, 128, 141), 'jp': (123, 128, 141), 'tw': (123, 128, 141)}, button={'cn': (1159, 26, 1264, 52), 'en': (1159, 26, 1264, 52), 'jp': (1159, 26, 1264, 52), 'tw': (1159, 26, 1264, 52)}, file={'cn': './assets/cn/handler/STORY_LETTERS_ONLY.png', 'en': './assets/en/handler/STORY_LETTERS_ONLY.png', 'jp': './assets/jp/handler/STORY_LETTERS_ONLY.png', 'tw': './assets/tw/handler/STORY_LETTERS_ONLY.png'})
STORY_LETTER_BLACK = Button(area={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, color={'cn': (16, 20, 16), 'en': (16, 20, 16), 'jp': (16, 20, 16), 'tw': (16, 20, 16)}, button={'cn': (1145, 585, 1280, 720), 'en': (1145, 585, 1280, 720), 'jp': (1145, 585, 1280, 720), 'tw': (1145, 585, 1280, 720)}, file={'cn': './assets/cn/handler/STORY_LETTER_BLACK.png', 'en': './assets/en/handler/STORY_LETTER_BLACK.png', 'jp': './assets/jp/handler/STORY_LETTER_BLACK.png', 'tw': './assets/tw/handler/STORY_LETTER_BLACK.png'})
STORY_SKIP = Button(area={'cn': (1216, 676, 1258, 708), 'en': (1215, 672, 1259, 705), 'jp': (1216, 676, 1258, 708), 'tw': (1216, 676, 1258, 708)}, color={'cn': (148, 159, 178), 'en': (146, 155, 175), 'jp': (148, 159, 178), 'tw': (148, 159, 178)}, button={'cn': (1178, 25, 1196, 54), 'en': (1178, 25, 1196, 54), 'jp': (1178, 25, 1196, 54), 'tw': (1178, 25, 1196, 54)}, file={'cn': './assets/cn/handler/STORY_SKIP.png', 'en': './assets/en/handler/STORY_SKIP.png', 'jp': './assets/jp/handler/STORY_SKIP.png', 'tw': './assets/tw/handler/STORY_SKIP.png'})
STORY_SKIP_2 = Button(area={'cn': (1181, 26, 1225, 40), 'en': (1181, 26, 1225, 40), 'jp': (1181, 26, 1225, 40), 'tw': (1181, 26, 1225, 40)}, color={'cn': (173, 172, 181), 'en': (173, 172, 181), 'jp': (173, 172, 181), 'tw': (173, 172, 181)}, button={'cn': (1181, 26, 1225, 40), 'en': (1181, 26, 1225, 40), 'jp': (1181, 26, 1225, 40), 'tw': (1181, 26, 1225, 40)}, file={'cn': './assets/cn/handler/STORY_SKIP_2.png', 'en': './assets/en/handler/STORY_SKIP_2.png', 'jp': './assets/jp/handler/STORY_SKIP_2.png', 'tw': './assets/tw/handler/STORY_SKIP_2.png'})
STRATEGY_OPEN = Button(area={'cn': (1198, 411, 1269, 471), 'en': (1198, 410, 1270, 473), 'jp': (1199, 411, 1270, 472), 'tw': (1198, 411, 1269, 471)}, color={'cn': (81, 85, 101), 'en': (84, 87, 104), 'jp': (100, 95, 114), 'tw': (81, 85, 101)}, button={'cn': (1198, 411, 1269, 471), 'en': (1198, 410, 1270, 473), 'jp': (1199, 411, 1270, 472), 'tw': (1198, 411, 1269, 471)}, file={'cn': './assets/cn/handler/STRATEGY_OPEN.png', 'en': './assets/en/handler/STRATEGY_OPEN.png', 'jp': './assets/jp/handler/STRATEGY_OPEN.png', 'tw': './assets/tw/handler/STRATEGY_OPEN.png'})
STRATEGY_OPENED = Button(area={'cn': (1176, 366, 1275, 393), 'en': (1176, 366, 1276, 393), 'jp': (1178, 367, 1273, 391), 'tw': (1176, 366, 1275, 392)}, color={'cn': (128, 155, 218), 'en': (108, 139, 210), 'jp': (156, 176, 223), 'tw': (126, 153, 218)}, button={'cn': (1060, 406, 1092, 485), 'en': (1060, 406, 1092, 485), 'jp': (1060, 406, 1092, 485), 'tw': (1060, 406, 1092, 485)}, file={'cn': './assets/cn/handler/STRATEGY_OPENED.png', 'en': './assets/en/handler/STRATEGY_OPENED.png', 'jp': './assets/jp/handler/STRATEGY_OPENED.png', 'tw': './assets/tw/handler/STRATEGY_OPENED.png'})
SUBMARINE_HUNT_OFF = Button(area={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, color={'cn': (125, 127, 132), 'en': (125, 127, 132), 'jp': (125, 127, 132), 'tw': (125, 127, 132)}, button={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, file={'cn': './assets/cn/handler/SUBMARINE_HUNT_OFF.png', 'en': './assets/en/handler/SUBMARINE_HUNT_OFF.png', 'jp': './assets/jp/handler/SUBMARINE_HUNT_OFF.png', 'tw': './assets/tw/handler/SUBMARINE_HUNT_OFF.png'})

4
module/handler/info_handler.py
View File

@ -350,10 +350,12 @@ class InfoHandler(ModuleBase):
else:
self._story_option_record = options_count
self._story_option_confirm.reset()
if self.appear(STORY_SKIP, offset=(20, 20), interval=2):
if self.appear(STORY_SKIP, offset=(20, 20), interval=2) \
or self.appear(STORY_SKIP_2, offset=(20, 20), interval=2):
# Confirm it's story
# When story play speed is Very Fast, Alas clicked story skip but story disappeared
# This click will interrupt auto search
self.interval_reset([STORY_SKIP, STORY_SKIP_2])
if self._story_confirm.reached():
if drop:
drop.handle_add(self, before=2)