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

Merge branch 'master_lme'

Browse Source 
# Conflicts:
#	module/map/assets.py
This commit is contained in:
Zuosizhu
2023-10-20 00:59:49 +08:00
parent 526d26e6c6 5d4178a875
commit e2f7cd544f
49 changed files with 89 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/handler/assets.py
View File

@@ -10,12 +10,12 @@ AUTO_SEARCH_MENU_CONTINUE = Button(area={'cn': (789, 610, 903, 638), 'en': (781,
AUTO_SEARCH_MENU_EXIT = Button(area={'cn': (419, 609, 475, 637), 'en': (421, 611, 472, 633), 'jp': (348, 609, 401, 636), 'tw': (414, 609, 477, 637)}, color={'cn': (198, 199, 201), 'en': (210, 210, 212), 'jp': (184, 184, 187), 'tw': (204, 204, 206)}, button={'cn': (373, 598, 520, 647), 'en': (373, 598, 520, 647), 'jp': (305, 597, 451, 645), 'tw': (393, 604, 498, 644)}, file={'cn': './assets/cn/handler/AUTO_SEARCH_MENU_EXIT.png', 'en': './assets/en/handler/AUTO_SEARCH_MENU_EXIT.png', 'jp': './assets/jp/handler/AUTO_SEARCH_MENU_EXIT.png', 'tw': './assets/tw/handler/AUTO_SEARCH_MENU_EXIT.png'})
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': (830, 189, 849, 207), 'en': (814, 192, 832, 209), 'jp': (830, 189, 849, 207), 'tw': (830, 189, 849, 207)}, color={'cn': (38, 39, 40), 'en': (33, 33, 35), 'jp': (43, 41, 42), 'tw': (42, 41, 43)}, button={'cn': (830, 189, 849, 207), 'en': (814, 192, 832, 209), 'jp': (830, 189, 849, 207), 'tw': (830, 189, 849, 207)}, 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_BOSS = Button(area={'cn': (633, 189, 651, 207), 'en': (616, 192, 634, 210), 'jp': (633, 189, 651, 207), 'tw': (633, 189, 651, 207)}, color={'cn': (37, 38, 39), 'en': (36, 38, 38), 'jp': (42, 40, 41), 'tw': (41, 41, 42)}, button={'cn': (633, 189, 651, 207), 'en': (616, 192, 634, 210), 'jp': (633, 189, 651, 207), 'tw': (633, 189, 651, 207)}, 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_MOB = Button(area={'cn': (494, 189, 513, 207), 'en': (477, 191, 496, 210), 'jp': (494, 189, 513, 207), 'tw': (494, 189, 513, 207)}, color={'cn': (38, 39, 39), 'en': (38, 40, 40), 'jp': (92, 136, 59), 'tw': (76, 105, 56)}, button={'cn': (494, 189, 513, 207), 'en': (477, 191, 496, 210), 'jp': (494, 189, 513, 207), 'tw': (494, 189, 513, 207)}, 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_STANDBY = Button(area={'cn': (930, 189, 948, 207), 'en': (941, 192, 959, 210), 'jp': (930, 189, 948, 207), 'tw': (930, 189, 948, 207)}, color={'cn': (75, 106, 55), 'en': (36, 36, 37), 'jp': (40, 40, 40), 'tw': (40, 39, 40)}, button={'cn': (930, 189, 948, 207), 'en': (941, 192, 959, 210), 'jp': (930, 189, 948, 207), 'tw': (930, 189, 948, 207)}, 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_SUB_AUTO = Button(area={'cn': (576, 469, 595, 488), 'en': (577, 475, 595, 492), 'jp': (576, 469, 595, 488), 'tw': (576, 469, 595, 488)}, color={'cn': (40, 40, 42), 'en': (34, 37, 37), 'jp': (37, 37, 38), 'tw': (40, 40, 41)}, button={'cn': (576, 469, 595, 488), 'en': (577, 475, 595, 492), 'jp': (576, 469, 595, 488), 'tw': (576, 469, 595, 488)}, 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_STANDBY = Button(area={'cn': (892, 469, 911, 488), 'en': (856, 475, 874, 492), 'jp': (892, 469, 911, 488), 'tw': (892, 469, 911, 488)}, color={'cn': (39, 39, 42), 'en': (32, 33, 34), 'jp': (72, 100, 53), 'tw': (37, 37, 38)}, button={'cn': (892, 469, 911, 488), 'en': (856, 475, 874, 492), 'jp': (892, 469, 911, 488), 'tw': (892, 469, 911, 488)}, 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_ALL = Button(area={'cn': (832, 207, 851, 226), 'en': (814, 192, 832, 209), 'jp': (830, 189, 849, 207), 'tw': (830, 189, 849, 207)}, color={'cn': (32, 32, 38), 'en': (33, 33, 35), 'jp': (43, 41, 42), 'tw': (42, 41, 43)}, button={'cn': (832, 207, 851, 226), 'en': (814, 192, 832, 209), 'jp': (830, 189, 849, 207), 'tw': (830, 189, 849, 207)}, 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_BOSS = Button(area={'cn': (635, 207, 653, 226), 'en': (616, 192, 634, 210), 'jp': (633, 189, 651, 207), 'tw': (633, 189, 651, 207)}, color={'cn': (30, 30, 33), 'en': (36, 38, 38), 'jp': (42, 40, 41), 'tw': (41, 41, 42)}, button={'cn': (635, 207, 653, 226), 'en': (616, 192, 634, 210), 'jp': (633, 189, 651, 207), 'tw': (633, 189, 651, 207)}, 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_MOB = Button(area={'cn': (496, 207, 515, 226), 'en': (477, 191, 496, 210), 'jp': (494, 189, 513, 207), 'tw': (494, 189, 513, 207)}, color={'cn': (69, 96, 51), 'en': (38, 40, 40), 'jp': (92, 136, 59), 'tw': (76, 105, 56)}, button={'cn': (496, 207, 515, 226), 'en': (477, 191, 496, 210), 'jp': (494, 189, 513, 207), 'tw': (494, 189, 513, 207)}, 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_STANDBY = Button(area={'cn': (932, 207, 950, 226), 'en': (941, 192, 959, 210), 'jp': (930, 189, 948, 207), 'tw': (930, 189, 948, 207)}, color={'cn': (30, 30, 37), 'en': (36, 36, 37), 'jp': (40, 40, 40), 'tw': (40, 39, 40)}, button={'cn': (932, 207, 950, 226), 'en': (941, 192, 959, 210), 'jp': (930, 189, 948, 207), 'tw': (930, 189, 948, 207)}, 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_SUB_AUTO = Button(area={'cn': (578, 457, 597, 476), 'en': (577, 475, 595, 492), 'jp': (576, 469, 595, 488), 'tw': (576, 469, 595, 488)}, color={'cn': (69, 96, 52), 'en': (34, 37, 37), 'jp': (37, 37, 38), 'tw': (40, 40, 41)}, button={'cn': (578, 457, 597, 476), 'en': (577, 475, 595, 492), 'jp': (576, 469, 595, 488), 'tw': (576, 469, 595, 488)}, 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_STANDBY = Button(area={'cn': (894, 457, 913, 476), 'en': (856, 475, 874, 492), 'jp': (892, 469, 911, 488), 'tw': (892, 469, 911, 488)}, color={'cn': (32, 31, 34), 'en': (32, 33, 34), 'jp': (72, 100, 53), 'tw': (37, 37, 38)}, button={'cn': (894, 457, 913, 476), 'en': (856, 475, 874, 492), 'jp': (892, 469, 911, 488), 'tw': (892, 469, 911, 488)}, 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'})
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'})
@@ -77,7 +77,7 @@ STORY_SKIP = Button(area={'cn': (1216, 676, 1258, 708), 'en': (1215, 672, 1259,
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'})
STORY_SKIP_3 = Button(area={'cn': (28, 23, 55, 50), 'en': (28, 23, 55, 50), 'jp': (28, 23, 55, 50), 'tw': (28, 23, 55, 50)}, color={'cn': (192, 199, 209), 'en': (192, 199, 209), 'jp': (192, 199, 209), 'tw': (192, 199, 209)}, button={'cn': (28, 23, 55, 50), 'en': (28, 23, 55, 50), 'jp': (28, 23, 55, 50), 'tw': (28, 23, 55, 50)}, file={'cn': './assets/cn/handler/STORY_SKIP_3.png', 'en': './assets/en/handler/STORY_SKIP_3.png', 'jp': './assets/jp/handler/STORY_SKIP_3.png', 'tw': './assets/tw/handler/STORY_SKIP_3.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'})
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': (968, 403, 994, 488), 'en': (968, 403, 994, 488), 'jp': (968, 403, 994, 488), 'tw': (968, 403, 994, 488)}, 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'})
SUBMARINE_HUNT_ON = Button(area={'cn': (1200, 415, 1262, 477), 'en': (1200, 415, 1262, 477), 'jp': (1200, 415, 1262, 477), 'tw': (1200, 415, 1262, 477)}, color={'cn': (124, 125, 132), 'en': (124, 125, 132), 'jp': (124, 125, 132), 'tw': (124, 125, 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_ON.png', 'en': './assets/en/handler/SUBMARINE_HUNT_ON.png', 'jp': './assets/jp/handler/SUBMARINE_HUNT_ON.png', 'tw': './assets/tw/handler/SUBMARINE_HUNT_ON.png'})
SUBMARINE_MOVE_CANCEL = Button(area={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (889, 646, 1006, 674)}, color={'cn': (219, 172, 167), 'en': (211, 162, 158), 'jp': (198, 141, 133), 'tw': (215, 164, 161)}, button={'cn': (891, 647, 1005, 673), 'en': (911, 650, 984, 667), 'jp': (889, 645, 1008, 675), 'tw': (889, 646, 1006, 674)}, file={'cn': './assets/cn/handler/SUBMARINE_MOVE_CANCEL.png', 'en': './assets/en/handler/SUBMARINE_MOVE_CANCEL.png', 'jp': './assets/jp/handler/SUBMARINE_MOVE_CANCEL.png', 'tw': './assets/tw/handler/SUBMARINE_MOVE_CANCEL.png'})

35
module/handler/auto_search.py
View File

@@ -1,10 +1,20 @@
import numpy as np
from module.base.button import ButtonGrid
from module.base.decorator import Config
from module.handler.assets import *
from module.handler.enemy_searching import EnemySearchingHandler
from module.logger import logger
from module.map.assets import FLEET_PREPARATION_CHECK
AUTO_SEARCH_SETTINGS = [AUTO_SEARCH_SET_MOB, AUTO_SEARCH_SET_BOSS, AUTO_SEARCH_SET_ALL, AUTO_SEARCH_SET_STANDBY, AUTO_SEARCH_SET_SUB_AUTO, AUTO_SEARCH_SET_SUB_STANDBY]
AUTO_SEARCH_SETTINGS = [
AUTO_SEARCH_SET_MOB,
AUTO_SEARCH_SET_BOSS,
AUTO_SEARCH_SET_ALL,
AUTO_SEARCH_SET_STANDBY,
AUTO_SEARCH_SET_SUB_AUTO,
AUTO_SEARCH_SET_SUB_STANDBY
]
dic_setting_name_to_index = {
'fleet1_mob_fleet2_boss': 0,
'fleet1_boss_fleet2_mob': 1,
@@ -19,13 +29,25 @@ dic_setting_index_to_name = {v: k for k, v in dic_setting_name_to_index.items()}
class AutoSearchHandler(EnemySearchingHandler):
@Config.when(SERVER='en')
def _fleet_sidebar(self):
if FLEET_PREPARATION_CHECK.match(self.device.image, offset=(20, 80)):
offset = np.subtract(FLEET_PREPARATION_CHECK.button, FLEET_PREPARATION_CHECK._button)[1]
else:
offset = 0
logger.attr('_fleet_sidebar_offset', offset)
return ButtonGrid(
origin=(1177, 138), delta=(0, 54), button_shape=(102, 43), grid_shape=(1, 3), name='FLEET_SIDEBAR')
origin=(1177, 138 + offset), delta=(0, 54),
button_shape=(102, 43), grid_shape=(1, 3), name='FLEET_SIDEBAR')
@Config.when(SERVER=None)
def _fleet_sidebar(self):
if FLEET_PREPARATION_CHECK.match(self.device.image, offset=(20, 80)):
offset = np.subtract(FLEET_PREPARATION_CHECK.button, FLEET_PREPARATION_CHECK._button)[1]
else:
offset = 0
logger.attr('_fleet_sidebar_offset', offset)
return ButtonGrid(
origin=(1185, 125), delta=(0, 109), button_shape=(53, 104), grid_shape=(1, 3), name='FLEET_SIDEBAR')
origin=(1185, 155 + offset), delta=(0, 111),
button_shape=(53, 104), grid_shape=(1, 3), name='FLEET_SIDEBAR')
def _fleet_preparation_sidebar_click(self, index):
"""
@@ -44,8 +66,9 @@ class AutoSearchHandler(EnemySearchingHandler):
current = 0
total = 0
sidebar = self._fleet_sidebar()
for idx, button in enumerate(self._fleet_sidebar().buttons):
for idx, button in enumerate(sidebar.buttons):
if self.image_color_count(button, color=(99, 235, 255), threshold=221, count=50):
current = idx + 1
total = idx + 1
@@ -61,7 +84,7 @@ class AutoSearchHandler(EnemySearchingHandler):
if current == index:
return False
self.device.click(self._fleet_sidebar()[0, index - 1])
self.device.click(sidebar[0, index - 1])
return True
def fleet_preparation_sidebar_ensure(self, index, skip_first_screenshot=True):
@@ -160,7 +183,7 @@ class AutoSearchHandler(EnemySearchingHandler):
_auto_search_offset = (5, 5)
# Move 213px left when MULTIPLE_SORTIE appears
_auto_search_menu_offset = (250, 20)
_auto_search_menu_offset = (250, 30)
def is_auto_search_running(self):
"""

2
module/handler/enemy_searching.py
View File

@@ -40,7 +40,7 @@ class EnemySearchingHandler(InfoHandler):
else:
return False
else:
if self.appear(MAP_PREPARATION, offset=(20, 20)) or self.appear(FLEET_PREPARATION, offset=(20, 20)):
if self.appear(MAP_PREPARATION, offset=(20, 20)) or self.appear(FLEET_PREPARATION, offset=(20, 50)):
self.device.click(MAP_PREPARATION_CANCEL)
self.in_stage_timer.reset()
return False

7
module/handler/strategy.py
View File

@@ -6,16 +6,17 @@ from module.template.assets import (TEMPLATE_FORMATION_1, TEMPLATE_FORMATION_2,
TEMPLATE_FORMATION_3)
from module.ui.switch import Switch
formation = Switch('Formation', offset=120)
# 2023.10.19, icons on one row increased from 2 to 3
formation = Switch('Formation', offset=(100, 200))
formation.add_status('line_ahead', check_button=FORMATION_1)
formation.add_status('double_line', check_button=FORMATION_2)
formation.add_status('diamond', check_button=FORMATION_3)
submarine_hunt = Switch('Submarine_hunt', offset=120)
submarine_hunt = Switch('Submarine_hunt', offset=(100, 200))
submarine_hunt.add_status('on', check_button=SUBMARINE_HUNT_ON)
submarine_hunt.add_status('off', check_button=SUBMARINE_HUNT_OFF)
submarine_view = Switch('Submarine_view', offset=120)
submarine_view = Switch('Submarine_view', offset=(100, 200))
submarine_view.add_status('on', check_button=SUBMARINE_VIEW_ON)
submarine_view.add_status('off', check_button=SUBMARINE_VIEW_OFF)