LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 20:29:31 +08:00
Code Activity

Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev

Browse Source 
# Conflicts:
#	module/config/argument/args.json
This commit is contained in:
mulaikurisu
2024-01-31 18:40:21 +08:00
parent fb9dd37914 fc673c311a
commit 0067321df9
98 changed files with 3303 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/handler/assets.py
View File

@@ -11,11 +11,17 @@ AUTO_SEARCH_MENU_EXIT = Button(area={'cn': (419, 609, 475, 637), 'en': (421, 611
AUTO_SEARCH_OFF = Button(area={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, color={'cn': (94, 92, 94), 'en': (90, 89, 92), 'jp': (99, 99, 109), 'tw': (94, 92, 94)}, button={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_OFF.png', 'en': './assets/en/handler/AUTO_SEARCH_OFF.png', 'jp': './assets/jp/handler/AUTO_SEARCH_OFF.png', 'tw': './assets/tw/handler/AUTO_SEARCH_OFF.png'})
AUTO_SEARCH_ON = Button(area={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, color={'cn': (140, 167, 120), 'en': (139, 168, 112), 'jp': (140, 167, 122), 'tw': (140, 167, 120)}, button={'cn': (867, 588, 883, 604), 'en': (830, 588, 846, 604), 'jp': (849, 588, 865, 604), 'tw': (867, 588, 883, 604)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_ON.png', 'en': './assets/en/handler/AUTO_SEARCH_ON.png', 'jp': './assets/jp/handler/AUTO_SEARCH_ON.png', 'tw': './assets/tw/handler/AUTO_SEARCH_ON.png'})
AUTO_SEARCH_SET_ALL = Button(area={'cn': (832, 207, 851, 226), 'en': (940, 322, 959, 340), 'jp': (832, 207, 851, 226), 'tw': (832, 207, 851, 226)}, color={'cn': (32, 32, 38), 'en': (39, 40, 41), 'jp': (38, 37, 38), 'tw': (39, 41, 41)}, button={'cn': (832, 207, 851, 226), 'en': (940, 322, 959, 340), 'jp': (832, 207, 851, 226), 'tw': (832, 207, 851, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_ALL.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_ALL.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_ALL.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_ALL.png'})
AUTO_SEARCH_SET_ALL_15 = Button(area={'cn': (832, 161, 851, 180), 'en': (832, 161, 851, 180), 'jp': (832, 161, 851, 180), 'tw': (832, 161, 851, 180)}, color={'cn': (74, 101, 55), 'en': (74, 101, 55), 'jp': (74, 101, 55), 'tw': (74, 101, 55)}, button={'cn': (832, 161, 851, 180), 'en': (832, 161, 851, 180), 'jp': (832, 161, 851, 180), 'tw': (832, 161, 851, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_ALL_15.png'})
AUTO_SEARCH_SET_BOSS = Button(area={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, color={'cn': (30, 30, 33), 'en': (42, 40, 43), 'jp': (37, 36, 37), 'tw': (37, 39, 39)}, button={'cn': (635, 207, 653, 226), 'en': (616, 208, 634, 226), 'jp': (635, 207, 653, 226), 'tw': (635, 207, 653, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_BOSS.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_BOSS.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_BOSS.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_BOSS.png'})
AUTO_SEARCH_SET_BOSS_15 = Button(area={'cn': (635, 161, 653, 180), 'en': (635, 161, 653, 180), 'jp': (635, 161, 653, 180), 'tw': (635, 161, 653, 180)}, color={'cn': (37, 37, 39), 'en': (37, 37, 39), 'jp': (37, 37, 39), 'tw': (37, 37, 39)}, button={'cn': (635, 161, 653, 180), 'en': (635, 161, 653, 180), 'jp': (635, 161, 653, 180), 'tw': (635, 161, 653, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_BOSS_15.png'})
AUTO_SEARCH_SET_MOB = Button(area={'cn': (496, 207, 515, 226), 'en': (477, 208, 496, 226), 'jp': (496, 207, 515, 226), 'tw': (496, 207, 515, 226)}, color={'cn': (69, 96, 51), 'en': (77, 106, 57), 'jp': (73, 100, 52), 'tw': (73, 101, 55)}, button={'cn': (496, 207, 515, 226), 'en': (477, 208, 496, 226), 'jp': (496, 207, 515, 226), 'tw': (496, 207, 515, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_MOB.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_MOB.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_MOB.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_MOB.png'})
AUTO_SEARCH_SET_MOB_15 = Button(area={'cn': (496, 161, 515, 180), 'en': (496, 161, 515, 180), 'jp': (496, 161, 515, 180), 'tw': (496, 161, 515, 180)}, color={'cn': (39, 39, 40), 'en': (39, 39, 40), 'jp': (39, 39, 40), 'tw': (39, 39, 40)}, button={'cn': (496, 161, 515, 180), 'en': (496, 161, 515, 180), 'jp': (496, 161, 515, 180), 'tw': (496, 161, 515, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_MOB_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_MOB_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_MOB_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_MOB_15.png'})
AUTO_SEARCH_SET_STANDBY = Button(area={'cn': (932, 207, 950, 226), 'en': (813, 322, 832, 340), 'jp': (932, 207, 950, 226), 'tw': (932, 207, 950, 226)}, color={'cn': (30, 30, 37), 'en': (41, 41, 42), 'jp': (37, 36, 37), 'tw': (37, 38, 39)}, button={'cn': (932, 207, 950, 226), 'en': (813, 322, 832, 340), 'jp': (932, 207, 950, 226), 'tw': (932, 207, 950, 226)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_STANDBY.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_STANDBY.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_STANDBY.png'})
AUTO_SEARCH_SET_STANDBY_15 = Button(area={'cn': (932, 161, 950, 180), 'en': (932, 161, 950, 180), 'jp': (932, 161, 950, 180), 'tw': (932, 161, 950, 180)}, color={'cn': (37, 37, 39), 'en': (37, 37, 39), 'jp': (37, 37, 39), 'tw': (37, 37, 39)}, button={'cn': (932, 161, 950, 180), 'en': (932, 161, 950, 180), 'jp': (932, 161, 950, 180), 'tw': (932, 161, 950, 180)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_STANDBY_15.png'})
AUTO_SEARCH_SET_SUB_AUTO = Button(area={'cn': (578, 457, 597, 476), 'en': (577, 460, 595, 478), 'jp': (578, 457, 597, 476), 'tw': (578, 457, 597, 476)}, color={'cn': (69, 96, 52), 'en': (41, 39, 41), 'jp': (39, 37, 39), 'tw': (73, 100, 53)}, button={'cn': (578, 457, 597, 476), 'en': (577, 460, 595, 478), 'jp': (578, 457, 597, 476), 'tw': (578, 457, 597, 476)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_SUB_AUTO.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_SUB_AUTO.png'})
AUTO_SEARCH_SET_SUB_AUTO_15 = Button(area={'cn': (578, 389, 597, 408), 'en': (578, 389, 597, 408), 'jp': (578, 389, 597, 408), 'tw': (578, 389, 597, 408)}, color={'cn': (42, 42, 43), 'en': (42, 42, 43), 'jp': (42, 42, 43), 'tw': (42, 42, 43)}, button={'cn': (578, 389, 597, 408), 'en': (578, 389, 597, 408), 'jp': (578, 389, 597, 408), 'tw': (578, 389, 597, 408)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_SUB_AUTO_15.png'})
AUTO_SEARCH_SET_SUB_STANDBY = Button(area={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, color={'cn': (32, 31, 34), 'en': (75, 104, 54), 'jp': (73, 100, 52), 'tw': (35, 36, 38)}, button={'cn': (894, 457, 913, 476), 'en': (855, 460, 874, 478), 'jp': (894, 457, 913, 476), 'tw': (894, 457, 913, 476)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'en': './assets/en/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'jp': './assets/jp/handler/AUTO_SEARCH_SET_SUB_STANDBY.png', 'tw': './assets/tw/handler/AUTO_SEARCH_SET_SUB_STANDBY.png'})
AUTO_SEARCH_SET_SUB_STANDBY_15 = Button(area={'cn': (894, 389, 913, 408), 'en': (894, 389, 913, 408), 'jp': (894, 389, 913, 408), 'tw': (894, 389, 913, 408)}, color={'cn': (74, 101, 55), 'en': (74, 101, 55), 'jp': (74, 101, 55), 'tw': (74, 101, 55)}, button={'cn': (894, 389, 913, 408), 'en': (894, 389, 913, 408), 'jp': (894, 389, 913, 408), 'tw': (894, 389, 913, 408)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'en': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'jp': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png', 'tw': './assets/cn/handler/AUTO_SEARCH_SET_SUB_STANDBY_15.png'})
BATTLE_PASS_NOTICE = Button(area={'cn': (554, 483, 726, 540), 'en': (716, 488, 869, 533), 'jp': (554, 483, 726, 540), 'tw': (554, 483, 726, 540)}, color={'cn': (107, 152, 207), 'en': (89, 138, 201), 'jp': (107, 152, 207), 'tw': (107, 152, 207)}, button={'cn': (863, 173, 929, 217), 'en': (863, 173, 929, 217), 'jp': (863, 173, 929, 217), 'tw': (863, 173, 929, 217)}, file={'cn': './assets/cn/handler/BATTLE_PASS_NOTICE.png', 'en': './assets/en/handler/BATTLE_PASS_NOTICE.png', 'jp': './assets/cn/handler/BATTLE_PASS_NOTICE.png', 'tw': './assets/cn/handler/BATTLE_PASS_NOTICE.png'})
BOOK_BOX_AUTO = Button(area={'cn': (737, 614, 756, 631), 'en': (739, 615, 754, 630), 'jp': (808, 614, 825, 631), 'tw': (807, 613, 826, 632)}, color={'cn': (67, 74, 82), 'en': (57, 64, 74), 'jp': (59, 62, 68), 'tw': (62, 66, 71)}, button={'cn': (737, 614, 756, 631), 'en': (739, 615, 754, 630), 'jp': (808, 614, 825, 631), 'tw': (807, 613, 826, 632)}, file={'cn': './assets/cn/handler/BOOK_BOX_AUTO.png', 'en': './assets/en/handler/BOOK_BOX_AUTO.png', 'jp': './assets/jp/handler/BOOK_BOX_AUTO.png', 'tw': './assets/tw/handler/BOOK_BOX_AUTO.png'})
BOOK_BOX_PREP = Button(area={'cn': (922, 600, 940, 617), 'en': (906, 604, 922, 619), 'jp': (921, 602, 939, 621), 'tw': (906, 604, 922, 619)}, color={'cn': (88, 122, 68), 'en': (29, 32, 29), 'jp': (35, 35, 36), 'tw': (29, 32, 29)}, button={'cn': (922, 600, 940, 617), 'en': (906, 604, 922, 619), 'jp': (921, 602, 939, 621), 'tw': (906, 604, 922, 619)}, file={'cn': './assets/cn/handler/BOOK_BOX_PREP.png', 'en': './assets/en/handler/BOOK_BOX_PREP.png', 'jp': './assets/jp/handler/BOOK_BOX_PREP.png', 'tw': './assets/tw/handler/BOOK_BOX_PREP.png'})

15
module/handler/auto_search.py
View File

@@ -15,6 +15,14 @@ AUTO_SEARCH_SETTINGS = [
AUTO_SEARCH_SET_SUB_AUTO,
AUTO_SEARCH_SET_SUB_STANDBY
]
AUTO_SEARCH_SETTINGS_15 = [
AUTO_SEARCH_SET_MOB_15,
AUTO_SEARCH_SET_BOSS_15,
AUTO_SEARCH_SET_ALL_15,
AUTO_SEARCH_SET_STANDBY_15,
AUTO_SEARCH_SET_SUB_AUTO_15,
AUTO_SEARCH_SET_SUB_STANDBY_15
]
dic_setting_name_to_index = {
'fleet1_mob_fleet2_boss': 0,
'fleet1_boss_fleet2_mob': 1,
@@ -131,8 +139,9 @@ class AutoSearchHandler(EnemySearchingHandler):
bool: If selected to the correct option.
"""
active = []
for index, button in enumerate(AUTO_SEARCH_SETTINGS):
self.AUTO_SEARCH_SETTINGS = AUTO_SEARCH_SETTINGS_15 if 'campaign_15' in self.config.campaign_name \
else AUTO_SEARCH_SETTINGS
for index, button in enumerate(self.AUTO_SEARCH_SETTINGS):
if self.image_color_count(button, color=(156, 255, 82), threshold=221, count=20):
active.append(index)
@@ -150,7 +159,7 @@ class AutoSearchHandler(EnemySearchingHandler):
logger.info('Selected to the correct auto search setting')
return True
else:
self.device.click(AUTO_SEARCH_SETTINGS[target_index])
self.device.click(self.AUTO_SEARCH_SETTINGS[target_index])
return False
def auto_search_setting_ensure(self, setting, skip_first_screenshot=True):

1
module/handler/fast_forward.py
View File

@@ -99,6 +99,7 @@ class FastForwardHandler(AutoSearchHandler):
> 12-1 > 12-2 > 12-3 > 12-4
> 13-1 > 13-2 > 13-3 > 13-4
> 14-1 > 14-2 > 14-3 > 14-4
> 15-1 > 15-2
""",
'A1 > A2 > A3',
'B1 > B2 > B3',