mirror of
https://github.com/LmeSzinc/AzurLaneAutoScript.git
synced 2025-01-07 07:07:15 +08:00
Upd: [CN] Fleet preparation
This commit is contained in:
LmeSzinc
parent
dffa87d5df
commit
4969dc01b0
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 8.1 KiB |
BIN
assets/cn/map/FLEET_PREPARATION.BUTTON.png
Normal file
BIN
assets/cn/map/FLEET_PREPARATION.BUTTON.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB |
@ -89,7 +89,7 @@ class Campaign(CampaignBase, HardEquipment):
|
||||
continue
|
||||
|
||||
# Fleet preparation
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 20)):
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 50)):
|
||||
self.equipment_take_off()
|
||||
self.ui_back(check_button=CAMPAIGN_CHECK, appear_button=FLEET_PREPARATION)
|
||||
break
|
||||
|
||||
@ -53,7 +53,7 @@ class GemsCampaignOverride(CampaignBase):
|
||||
self.withdraw()
|
||||
break
|
||||
|
||||
if self.appear(FLEET_PREPARATION, offset=(20, 20), interval=2) \
|
||||
if self.appear(FLEET_PREPARATION, offset=(20, 50), interval=2) \
|
||||
or self.appear(MAP_PREPARATION, offset=(20, 20), interval=2):
|
||||
self.enter_map_cancel()
|
||||
break
|
||||
|
||||
@ -154,7 +154,7 @@ class CoalitionUI(Combat):
|
||||
continue
|
||||
|
||||
# Fleet preparation
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 20)):
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 50)):
|
||||
self.handle_fleet_preparation(stage, fleet)
|
||||
self.device.click(FLEET_PREPARATION)
|
||||
fleet_click += 1
|
||||
|
||||
@ -35,7 +35,7 @@ class AzurLaneDaemon(DaemonBase, CampaignBase):
|
||||
if self.config.Daemon_EnterMap:
|
||||
if self.appear_then_click(MAP_PREPARATION, offset=(20, 20), interval=2):
|
||||
continue
|
||||
if self.appear_then_click(FLEET_PREPARATION, offset=(20, 20), interval=2):
|
||||
if self.appear_then_click(FLEET_PREPARATION, offset=(20, 50), interval=2):
|
||||
continue
|
||||
|
||||
# Retire
|
||||
|
||||
@ -160,7 +160,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):
|
||||
"""
|
||||
|
||||
@ -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
|
||||
|
||||
@ -4,32 +4,31 @@ from module.base.template import Template
|
||||
# This file was automatically generated by dev_tools/button_extract.py.
|
||||
# Don't modify it manually.
|
||||
|
||||
FLEET_1_ADVICE = Button(area={'cn': (1031, 182, 1076, 202), 'en': (1010, 193, 1071, 205), 'jp': (1031, 182, 1076, 203), 'tw': (1031, 181, 1076, 203)}, color={'cn': (243, 221, 177), 'en': (213, 180, 125), 'jp': (234, 213, 169), 'tw': (237, 213, 166)}, button={'cn': (1031, 182, 1076, 202), 'en': (1010, 193, 1071, 205), 'jp': (1031, 182, 1076, 203), 'tw': (1031, 181, 1076, 203)}, file={'cn': './assets/cn/map/FLEET_1_ADVICE.png', 'en': './assets/en/map/FLEET_1_ADVICE.png', 'jp': './assets/jp/map/FLEET_1_ADVICE.png', 'tw': './assets/tw/map/FLEET_1_ADVICE.png'})
|
||||
FLEET_1_BAR = Button(area={'cn': (1015, 244, 1186, 447), 'en': (998, 247, 1169, 492), 'jp': (1015, 244, 1186, 489), 'tw': (1015, 244, 1186, 489)}, color={'cn': (180, 170, 150), 'en': (177, 169, 155), 'jp': (177, 169, 155), 'tw': (176, 168, 154)}, button={'cn': (1015, 244, 1186, 447), 'en': (998, 247, 1169, 492), 'jp': (1015, 244, 1186, 489), 'tw': (1015, 244, 1186, 489)}, file={'cn': './assets/cn/map/FLEET_1_BAR.png', 'en': './assets/en/map/FLEET_1_BAR.png', 'jp': './assets/jp/map/FLEET_1_BAR.png', 'tw': './assets/tw/map/FLEET_1_BAR.png'})
|
||||
FLEET_1_CHOOSE = Button(area={'cn': (1026, 167, 1088, 224), 'en': (1008, 170, 1071, 227), 'jp': (1024, 165, 1090, 226), 'tw': (1024, 165, 1090, 226)}, color={'cn': (209, 164, 104), 'en': (198, 149, 84), 'jp': (199, 158, 103), 'tw': (207, 164, 105)}, button={'cn': (1026, 167, 1088, 224), 'en': (1008, 170, 1071, 227), 'jp': (1024, 165, 1090, 226), 'tw': (1024, 165, 1090, 226)}, file={'cn': './assets/cn/map/FLEET_1_CHOOSE.png', 'en': './assets/en/map/FLEET_1_CHOOSE.png', 'jp': './assets/jp/map/FLEET_1_CHOOSE.png', 'tw': './assets/tw/map/FLEET_1_CHOOSE.png'})
|
||||
FLEET_1_CLEAR = Button(area={'cn': (1109, 167, 1170, 224), 'en': (1090, 170, 1153, 227), 'jp': (1108, 165, 1169, 226), 'tw': (1106, 165, 1172, 226)}, color={'cn': (155, 154, 155), 'en': (138, 140, 142), 'jp': (150, 151, 153), 'tw': (154, 154, 156)}, button={'cn': (1109, 167, 1170, 224), 'en': (1090, 170, 1153, 227), 'jp': (1108, 165, 1169, 226), 'tw': (1106, 165, 1172, 226)}, file={'cn': './assets/cn/map/FLEET_1_CLEAR.png', 'en': './assets/en/map/FLEET_1_CLEAR.png', 'jp': './assets/jp/map/FLEET_1_CLEAR.png', 'tw': './assets/tw/map/FLEET_1_CLEAR.png'})
|
||||
FLEET_1_HARD_SATIESFIED = Button(area={'cn': (208, 134, 227, 267), 'en': (208, 134, 227, 267), 'jp': (208, 134, 227, 267), 'tw': (208, 134, 227, 267)}, color={'cn': (87, 67, 63), 'en': (87, 67, 63), 'jp': (87, 67, 63), 'tw': (87, 67, 63)}, button={'cn': (208, 134, 227, 267), 'en': (208, 134, 227, 267), 'jp': (208, 134, 227, 267), 'tw': (208, 134, 227, 267)}, file={'cn': './assets/cn/map/FLEET_1_HARD_SATIESFIED.png', 'en': './assets/en/map/FLEET_1_HARD_SATIESFIED.png', 'jp': './assets/jp/map/FLEET_1_HARD_SATIESFIED.png', 'tw': './assets/tw/map/FLEET_1_HARD_SATIESFIED.png'})
|
||||
FLEET_1_IN_USE = Button(area={'cn': (389, 158, 472, 241), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, color={'cn': (147, 161, 160), 'en': (147, 161, 160), 'jp': (147, 161, 160), 'tw': (147, 161, 160)}, button={'cn': (389, 158, 472, 241), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, file={'cn': './assets/cn/map/FLEET_1_IN_USE.png', 'en': './assets/en/map/FLEET_1_IN_USE.png', 'jp': './assets/jp/map/FLEET_1_IN_USE.png', 'tw': './assets/tw/map/FLEET_1_IN_USE.png'})
|
||||
FLEET_2_ADVICE = Button(area={'cn': (1031, 315, 1076, 335), 'en': (1010, 326, 1071, 338), 'jp': (1031, 315, 1076, 336), 'tw': (1031, 314, 1076, 336)}, color={'cn': (243, 221, 177), 'en': (222, 187, 130), 'jp': (243, 221, 176), 'tw': (237, 213, 166)}, button={'cn': (1031, 315, 1076, 335), 'en': (1010, 326, 1071, 338), 'jp': (1031, 315, 1076, 336), 'tw': (1031, 314, 1076, 336)}, file={'cn': './assets/cn/map/FLEET_2_ADVICE.png', 'en': './assets/en/map/FLEET_2_ADVICE.png', 'jp': './assets/jp/map/FLEET_2_ADVICE.png', 'tw': './assets/tw/map/FLEET_2_ADVICE.png'})
|
||||
FLEET_2_BAR = Button(area={'cn': (1015, 377, 1186, 622), 'en': (998, 380, 1169, 625), 'jp': (1015, 377, 1186, 622), 'tw': (1015, 377, 1186, 622)}, color={'cn': (178, 169, 154), 'en': (179, 170, 154), 'jp': (177, 169, 154), 'tw': (177, 168, 153)}, button={'cn': (1015, 377, 1186, 622), 'en': (998, 380, 1169, 625), 'jp': (1015, 377, 1186, 622), 'tw': (1015, 377, 1186, 622)}, file={'cn': './assets/cn/map/FLEET_2_BAR.png', 'en': './assets/en/map/FLEET_2_BAR.png', 'jp': './assets/jp/map/FLEET_2_BAR.png', 'tw': './assets/tw/map/FLEET_2_BAR.png'})
|
||||
FLEET_2_CHOOSE = Button(area={'cn': (1026, 300, 1088, 357), 'en': (1008, 303, 1071, 360), 'jp': (1024, 298, 1090, 359), 'tw': (1024, 298, 1090, 359)}, color={'cn': (208, 164, 103), 'en': (197, 148, 83), 'jp': (198, 158, 103), 'tw': (206, 163, 105)}, button={'cn': (1026, 300, 1088, 357), 'en': (1008, 303, 1071, 360), 'jp': (1024, 298, 1090, 359), 'tw': (1024, 298, 1090, 359)}, file={'cn': './assets/cn/map/FLEET_2_CHOOSE.png', 'en': './assets/en/map/FLEET_2_CHOOSE.png', 'jp': './assets/jp/map/FLEET_2_CHOOSE.png', 'tw': './assets/tw/map/FLEET_2_CHOOSE.png'})
|
||||
FLEET_2_CLEAR = Button(area={'cn': (1108, 300, 1170, 357), 'en': (1090, 303, 1153, 360), 'jp': (1108, 298, 1169, 359), 'tw': (1106, 298, 1172, 359)}, color={'cn': (153, 153, 154), 'en': (138, 139, 142), 'jp': (150, 151, 153), 'tw': (153, 154, 156)}, button={'cn': (1108, 300, 1170, 357), 'en': (1090, 303, 1153, 360), 'jp': (1108, 298, 1169, 359), 'tw': (1106, 298, 1172, 359)}, file={'cn': './assets/cn/map/FLEET_2_CLEAR.png', 'en': './assets/en/map/FLEET_2_CLEAR.png', 'jp': './assets/jp/map/FLEET_2_CLEAR.png', 'tw': './assets/tw/map/FLEET_2_CLEAR.png'})
|
||||
FLEET_2_HARD_SATIESFIED = Button(area={'cn': (208, 267, 227, 401), 'en': (208, 267, 227, 401), 'jp': (208, 267, 227, 401), 'tw': (208, 267, 227, 401)}, color={'cn': (93, 73, 64), 'en': (93, 73, 64), 'jp': (93, 73, 64), 'tw': (93, 73, 64)}, button={'cn': (208, 267, 227, 401), 'en': (208, 267, 227, 401), 'jp': (208, 267, 227, 401), 'tw': (208, 267, 227, 401)}, file={'cn': './assets/cn/map/FLEET_2_HARD_SATIESFIED.png', 'en': './assets/en/map/FLEET_2_HARD_SATIESFIED.png', 'jp': './assets/jp/map/FLEET_2_HARD_SATIESFIED.png', 'tw': './assets/tw/map/FLEET_2_HARD_SATIESFIED.png'})
|
||||
FLEET_2_IN_USE = Button(area={'cn': (389, 351, 472, 385), 'en': (389, 351, 472, 385), 'jp': (389, 351, 472, 385), 'tw': (389, 351, 472, 385)}, color={'cn': (125, 130, 124), 'en': (125, 130, 124), 'jp': (125, 130, 124), 'tw': (125, 130, 124)}, button={'cn': (389, 351, 472, 385), 'en': (389, 351, 472, 385), 'jp': (389, 351, 472, 385), 'tw': (389, 351, 472, 385)}, file={'cn': './assets/cn/map/FLEET_2_IN_USE.png', 'en': './assets/en/map/FLEET_2_IN_USE.png', 'jp': './assets/jp/map/FLEET_2_IN_USE.png', 'tw': './assets/tw/map/FLEET_2_IN_USE.png'})
|
||||
FLEET_1_ADVICE = Button(area={'cn': (1030, 207, 1074, 227), 'en': (1010, 193, 1071, 205), 'jp': (1031, 182, 1076, 203), 'tw': (1031, 181, 1076, 203)}, color={'cn': (243, 222, 179), 'en': (213, 180, 125), 'jp': (234, 213, 169), 'tw': (237, 213, 166)}, button={'cn': (1030, 207, 1074, 227), 'en': (1010, 193, 1071, 205), 'jp': (1031, 182, 1076, 203), 'tw': (1031, 181, 1076, 203)}, file={'cn': './assets/cn/map/FLEET_1_ADVICE.png', 'en': './assets/en/map/FLEET_1_ADVICE.png', 'jp': './assets/jp/map/FLEET_1_ADVICE.png', 'tw': './assets/tw/map/FLEET_1_ADVICE.png'})
|
||||
FLEET_1_BAR = Button(area={'cn': (1012, 269, 1183, 515), 'en': (998, 247, 1169, 492), 'jp': (1015, 244, 1186, 489), 'tw': (1015, 244, 1186, 489)}, color={'cn': (177, 170, 154), 'en': (177, 169, 155), 'jp': (177, 169, 155), 'tw': (176, 168, 154)}, button={'cn': (1012, 269, 1183, 515), 'en': (998, 247, 1169, 492), 'jp': (1015, 244, 1186, 489), 'tw': (1015, 244, 1186, 489)}, file={'cn': './assets/cn/map/FLEET_1_BAR.png', 'en': './assets/en/map/FLEET_1_BAR.png', 'jp': './assets/jp/map/FLEET_1_BAR.png', 'tw': './assets/tw/map/FLEET_1_BAR.png'})
|
||||
FLEET_1_CHOOSE = Button(area={'cn': (1021, 192, 1083, 251), 'en': (1008, 170, 1071, 227), 'jp': (1024, 165, 1090, 226), 'tw': (1024, 165, 1090, 226)}, color={'cn': (201, 162, 104), 'en': (198, 149, 84), 'jp': (199, 158, 103), 'tw': (207, 164, 105)}, button={'cn': (1021, 192, 1083, 251), 'en': (1008, 170, 1071, 227), 'jp': (1024, 165, 1090, 226), 'tw': (1024, 165, 1090, 226)}, file={'cn': './assets/cn/map/FLEET_1_CHOOSE.png', 'en': './assets/en/map/FLEET_1_CHOOSE.png', 'jp': './assets/jp/map/FLEET_1_CHOOSE.png', 'tw': './assets/tw/map/FLEET_1_CHOOSE.png'})
|
||||
FLEET_1_CLEAR = Button(area={'cn': (1107, 192, 1170, 251), 'en': (1090, 170, 1153, 227), 'jp': (1108, 165, 1169, 226), 'tw': (1106, 165, 1172, 226)}, color={'cn': (154, 158, 158), 'en': (138, 140, 142), 'jp': (150, 151, 153), 'tw': (154, 154, 156)}, button={'cn': (1107, 192, 1170, 251), 'en': (1090, 170, 1153, 227), 'jp': (1108, 165, 1169, 226), 'tw': (1106, 165, 1172, 226)}, file={'cn': './assets/cn/map/FLEET_1_CLEAR.png', 'en': './assets/en/map/FLEET_1_CLEAR.png', 'jp': './assets/jp/map/FLEET_1_CLEAR.png', 'tw': './assets/tw/map/FLEET_1_CLEAR.png'})
|
||||
FLEET_1_HARD_SATIESFIED = Button(area={'cn': (211, 142, 364, 186), 'en': (208, 134, 227, 267), 'jp': (208, 134, 227, 267), 'tw': (208, 134, 227, 267)}, color={'cn': (61, 42, 37), 'en': (87, 67, 63), 'jp': (87, 67, 63), 'tw': (87, 67, 63)}, button={'cn': (211, 142, 364, 186), 'en': (208, 134, 227, 267), 'jp': (208, 134, 227, 267), 'tw': (208, 134, 227, 267)}, file={'cn': './assets/cn/map/FLEET_1_HARD_SATIESFIED.png', 'en': './assets/en/map/FLEET_1_HARD_SATIESFIED.png', 'jp': './assets/jp/map/FLEET_1_HARD_SATIESFIED.png', 'tw': './assets/tw/map/FLEET_1_HARD_SATIESFIED.png'})
|
||||
FLEET_1_IN_USE = Button(area={'cn': (391, 177, 474, 260), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, color={'cn': (198, 188, 179), 'en': (147, 161, 160), 'jp': (147, 161, 160), 'tw': (147, 161, 160)}, button={'cn': (391, 177, 474, 260), 'en': (389, 158, 472, 241), 'jp': (389, 158, 472, 241), 'tw': (389, 158, 472, 241)}, file={'cn': './assets/cn/map/FLEET_1_IN_USE.png', 'en': './assets/en/map/FLEET_1_IN_USE.png', 'jp': './assets/jp/map/FLEET_1_IN_USE.png', 'tw': './assets/tw/map/FLEET_1_IN_USE.png'})
|
||||
FLEET_2_ADVICE = Button(area={'cn': (1030, 321, 1074, 341), 'en': (1010, 326, 1071, 338), 'jp': (1031, 315, 1076, 336), 'tw': (1031, 314, 1076, 336)}, color={'cn': (243, 222, 179), 'en': (222, 187, 130), 'jp': (243, 221, 176), 'tw': (237, 213, 166)}, button={'cn': (1030, 321, 1074, 341), 'en': (1010, 326, 1071, 338), 'jp': (1031, 315, 1076, 336), 'tw': (1031, 314, 1076, 336)}, file={'cn': './assets/cn/map/FLEET_2_ADVICE.png', 'en': './assets/en/map/FLEET_2_ADVICE.png', 'jp': './assets/jp/map/FLEET_2_ADVICE.png', 'tw': './assets/tw/map/FLEET_2_ADVICE.png'})
|
||||
FLEET_2_BAR = Button(area={'cn': (1012, 383, 1183, 628), 'en': (998, 380, 1169, 625), 'jp': (1015, 377, 1186, 622), 'tw': (1015, 377, 1186, 622)}, color={'cn': (177, 169, 153), 'en': (179, 170, 154), 'jp': (177, 169, 154), 'tw': (177, 168, 153)}, button={'cn': (1012, 383, 1183, 628), 'en': (998, 380, 1169, 625), 'jp': (1015, 377, 1186, 622), 'tw': (1015, 377, 1186, 622)}, file={'cn': './assets/cn/map/FLEET_2_BAR.png', 'en': './assets/en/map/FLEET_2_BAR.png', 'jp': './assets/jp/map/FLEET_2_BAR.png', 'tw': './assets/tw/map/FLEET_2_BAR.png'})
|
||||
FLEET_2_CHOOSE = Button(area={'cn': (1022, 306, 1083, 365), 'en': (1008, 303, 1071, 360), 'jp': (1024, 298, 1090, 359), 'tw': (1024, 298, 1090, 359)}, color={'cn': (202, 163, 104), 'en': (197, 148, 83), 'jp': (198, 158, 103), 'tw': (206, 163, 105)}, button={'cn': (1022, 306, 1083, 365), 'en': (1008, 303, 1071, 360), 'jp': (1024, 298, 1090, 359), 'tw': (1024, 298, 1090, 359)}, file={'cn': './assets/cn/map/FLEET_2_CHOOSE.png', 'en': './assets/en/map/FLEET_2_CHOOSE.png', 'jp': './assets/jp/map/FLEET_2_CHOOSE.png', 'tw': './assets/tw/map/FLEET_2_CHOOSE.png'})
|
||||
FLEET_2_CLEAR = Button(area={'cn': (1109, 306, 1169, 365), 'en': (1090, 303, 1153, 360), 'jp': (1108, 298, 1169, 359), 'tw': (1106, 298, 1172, 359)}, color={'cn': (155, 158, 159), 'en': (138, 139, 142), 'jp': (150, 151, 153), 'tw': (153, 154, 156)}, button={'cn': (1109, 306, 1169, 365), 'en': (1090, 303, 1153, 360), 'jp': (1108, 298, 1169, 359), 'tw': (1106, 298, 1172, 359)}, file={'cn': './assets/cn/map/FLEET_2_CLEAR.png', 'en': './assets/en/map/FLEET_2_CLEAR.png', 'jp': './assets/jp/map/FLEET_2_CLEAR.png', 'tw': './assets/tw/map/FLEET_2_CLEAR.png'})
|
||||
FLEET_2_HARD_SATIESFIED = Button(area={'cn': (208, 372, 361, 401), 'en': (208, 267, 227, 401), 'jp': (208, 267, 227, 401), 'tw': (208, 267, 227, 401)}, color={'cn': (75, 54, 43), 'en': (93, 73, 64), 'jp': (93, 73, 64), 'tw': (93, 73, 64)}, button={'cn': (208, 372, 361, 401), 'en': (208, 267, 227, 401), 'jp': (208, 267, 227, 401), 'tw': (208, 267, 227, 401)}, file={'cn': './assets/cn/map/FLEET_2_HARD_SATIESFIED.png', 'en': './assets/en/map/FLEET_2_HARD_SATIESFIED.png', 'jp': './assets/jp/map/FLEET_2_HARD_SATIESFIED.png', 'tw': './assets/tw/map/FLEET_2_HARD_SATIESFIED.png'})
|
||||
FLEET_2_IN_USE = Button(area={'cn': (391, 351, 475, 374), 'en': (389, 351, 472, 385), 'jp': (389, 351, 472, 385), 'tw': (389, 351, 472, 385)}, color={'cn': (182, 165, 200), 'en': (125, 130, 124), 'jp': (125, 130, 124), 'tw': (125, 130, 124)}, button={'cn': (391, 351, 475, 374), 'en': (389, 351, 472, 385), 'jp': (389, 351, 472, 385), 'tw': (389, 351, 472, 385)}, file={'cn': './assets/cn/map/FLEET_2_IN_USE.png', 'en': './assets/en/map/FLEET_2_IN_USE.png', 'jp': './assets/jp/map/FLEET_2_IN_USE.png', 'tw': './assets/tw/map/FLEET_2_IN_USE.png'})
|
||||
FLEET_NUM_1 = Button(area={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, color={'cn': (51, 143, 186), 'en': (51, 143, 186), 'jp': (51, 143, 186), 'tw': (51, 143, 186)}, button={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_1.png', 'en': './assets/en/map/FLEET_NUM_1.png', 'jp': './assets/jp/map/FLEET_NUM_1.png', 'tw': './assets/tw/map/FLEET_NUM_1.png'})
|
||||
FLEET_NUM_2 = Button(area={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, color={'cn': (52, 150, 194), 'en': (52, 150, 194), 'jp': (52, 150, 194), 'tw': (52, 150, 194)}, button={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_2.png', 'en': './assets/en/map/FLEET_NUM_2.png', 'jp': './assets/jp/map/FLEET_NUM_2.png', 'tw': './assets/tw/map/FLEET_NUM_2.png'})
|
||||
FLEET_PREPARATION = Button(area={'cn': (965, 578, 1162, 637), 'en': (969, 576, 1160, 637), 'jp': (984, 573, 1185, 637), 'tw': (964, 577, 1163, 638)}, color={'cn': (236, 186, 116), 'en': (233, 175, 90), 'jp': (234, 184, 100), 'tw': (235, 186, 114)}, button={'cn': (965, 578, 1162, 637), 'en': (969, 576, 1160, 637), 'jp': (984, 573, 1185, 637), 'tw': (964, 577, 1163, 638)}, file={'cn': './assets/cn/map/FLEET_PREPARATION.png', 'en': './assets/en/map/FLEET_PREPARATION.png', 'jp': './assets/jp/map/FLEET_PREPARATION.png', 'tw': './assets/tw/map/FLEET_PREPARATION.png'})
|
||||
HARD_MODE_DETECTION = Button(area={'cn': (200, 127, 206, 552), 'en': (200, 127, 206, 552), 'jp': (200, 127, 206, 552), 'tw': (200, 127, 206, 552)}, color={'cn': (82, 72, 67), 'en': (82, 72, 67), 'jp': (82, 72, 67), 'tw': (82, 72, 67)}, button={'cn': (200, 127, 206, 552), 'en': (200, 127, 206, 552), 'jp': (200, 127, 206, 552), 'tw': (200, 127, 206, 552)}, file={'cn': './assets/cn/map/HARD_MODE_DETECTION.png', 'en': './assets/en/map/HARD_MODE_DETECTION.png', 'jp': './assets/jp/map/HARD_MODE_DETECTION.png', 'tw': './assets/tw/map/HARD_MODE_DETECTION.png'})
|
||||
FLEET_PREPARATION = Button(area={'cn': (1013, 558, 1141, 588), 'en': (969, 576, 1160, 637), 'jp': (984, 573, 1185, 637), 'tw': (964, 577, 1163, 638)}, color={'cn': (242, 211, 160), 'en': (233, 175, 90), 'jp': (234, 184, 100), 'tw': (235, 186, 114)}, button={'cn': (980, 549, 1181, 612), 'en': (969, 576, 1160, 637), 'jp': (984, 573, 1185, 637), 'tw': (964, 577, 1163, 638)}, file={'cn': './assets/cn/map/FLEET_PREPARATION.png', 'en': './assets/en/map/FLEET_PREPARATION.png', 'jp': './assets/jp/map/FLEET_PREPARATION.png', 'tw': './assets/tw/map/FLEET_PREPARATION.png'})
|
||||
MAP_CAT_ATTACK = Button(area={'cn': (1237, 103, 1252, 153), 'en': (1237, 103, 1252, 153), 'jp': (1237, 103, 1252, 153), 'tw': (1237, 103, 1252, 153)}, color={'cn': (43, 45, 52), 'en': (43, 45, 52), 'jp': (43, 45, 52), 'tw': (43, 45, 52)}, button={'cn': (1148, 653, 1262, 705), 'en': (1147, 651, 1263, 701), 'jp': (1149, 653, 1261, 704), 'tw': (1148, 653, 1262, 705)}, file={'cn': './assets/cn/map/MAP_CAT_ATTACK.png', 'en': './assets/en/map/MAP_CAT_ATTACK.png', 'jp': './assets/jp/map/MAP_CAT_ATTACK.png', 'tw': './assets/tw/map/MAP_CAT_ATTACK.png'})
|
||||
MAP_CAT_ATTACK_MIRROR = Button(area={'cn': (147, 145, 187, 157), 'en': (147, 145, 187, 157), 'jp': (147, 145, 187, 157), 'tw': (147, 145, 187, 157)}, color={'cn': (214, 191, 99), 'en': (214, 191, 99), 'jp': (214, 191, 99), 'tw': (214, 191, 99)}, button={'cn': (147, 145, 187, 157), 'en': (147, 145, 187, 157), 'jp': (147, 145, 187, 157), 'tw': (147, 145, 187, 157)}, file={'cn': './assets/cn/map/MAP_CAT_ATTACK_MIRROR.png', 'en': './assets/en/map/MAP_CAT_ATTACK_MIRROR.png', 'jp': './assets/jp/map/MAP_CAT_ATTACK_MIRROR.png', 'tw': './assets/tw/map/MAP_CAT_ATTACK_MIRROR.png'})
|
||||
MAP_OFFENSIVE = Button(area={'cn': (1148, 653, 1262, 705), 'en': (1147, 652, 1263, 701), 'jp': (1147, 652, 1263, 706), 'tw': (1148, 653, 1262, 705)}, color={'cn': (234, 180, 108), 'en': (234, 183, 108), 'jp': (233, 184, 105), 'tw': (234, 180, 108)}, button={'cn': (1148, 653, 1262, 705), 'en': (1147, 652, 1263, 701), 'jp': (1147, 652, 1263, 706), 'tw': (1148, 653, 1262, 705)}, file={'cn': './assets/cn/map/MAP_OFFENSIVE.png', 'en': './assets/en/map/MAP_OFFENSIVE.png', 'jp': './assets/jp/map/MAP_OFFENSIVE.png', 'tw': './assets/tw/map/MAP_OFFENSIVE.png'})
|
||||
MAP_PREPARATION = Button(area={'cn': (854, 488, 1052, 548), 'en': (852, 489, 1054, 553), 'jp': (850, 485, 1051, 548), 'tw': (854, 488, 1052, 548)}, color={'cn': (236, 186, 115), 'en': (234, 179, 93), 'jp': (232, 181, 101), 'tw': (236, 186, 115)}, button={'cn': (854, 488, 1052, 548), 'en': (852, 489, 1054, 553), 'jp': (850, 485, 1051, 548), 'tw': (854, 488, 1052, 548)}, file={'cn': './assets/cn/map/MAP_PREPARATION.png', 'en': './assets/en/map/MAP_PREPARATION.png', 'jp': './assets/jp/map/MAP_PREPARATION.png', 'tw': './assets/tw/map/MAP_PREPARATION.png'})
|
||||
MAP_PREPARATION_CANCEL = Button(area={'cn': (234, 12, 278, 47), 'en': (234, 12, 278, 47), 'jp': (234, 12, 278, 47), 'tw': (234, 12, 278, 47)}, color={'cn': (45, 46, 69), 'en': (45, 46, 69), 'jp': (45, 46, 69), 'tw': (45, 46, 69)}, button={'cn': (234, 12, 278, 47), 'en': (234, 12, 278, 47), 'jp': (234, 12, 278, 47), 'tw': (234, 12, 278, 47)}, file={'cn': './assets/cn/map/MAP_PREPARATION_CANCEL.png', 'en': './assets/en/map/MAP_PREPARATION_CANCEL.png', 'jp': './assets/jp/map/MAP_PREPARATION_CANCEL.png', 'tw': './assets/tw/map/MAP_PREPARATION_CANCEL.png'})
|
||||
SUBMARINE_ADVICE = Button(area={'cn': (1035, 462, 1080, 483), 'en': (1010, 474, 1071, 486), 'jp': (1036, 462, 1081, 482), 'tw': (1031, 461, 1076, 483)}, color={'cn': (242, 219, 174), 'en': (222, 187, 130), 'jp': (244, 223, 180), 'tw': (237, 213, 166)}, button={'cn': (1035, 462, 1080, 483), 'en': (1010, 474, 1071, 486), 'jp': (1036, 462, 1081, 482), 'tw': (1031, 461, 1076, 483)}, file={'cn': './assets/cn/map/SUBMARINE_ADVICE.png', 'en': './assets/en/map/SUBMARINE_ADVICE.png', 'jp': './assets/jp/map/SUBMARINE_ADVICE.png', 'tw': './assets/tw/map/SUBMARINE_ADVICE.png'})
|
||||
SUBMARINE_BAR = Button(area={'cn': (1015, 525, 1186, 602), 'en': (998, 528, 1169, 605), 'jp': (1015, 524, 1186, 602), 'tw': (1015, 525, 1186, 602)}, color={'cn': (193, 178, 146), 'en': (192, 177, 145), 'jp': (193, 177, 145), 'tw': (192, 177, 146)}, button={'cn': (1015, 525, 1186, 602), 'en': (998, 528, 1169, 605), 'jp': (1015, 524, 1186, 602), 'tw': (1015, 525, 1186, 602)}, file={'cn': './assets/cn/map/SUBMARINE_BAR.png', 'en': './assets/en/map/SUBMARINE_BAR.png', 'jp': './assets/jp/map/SUBMARINE_BAR.png', 'tw': './assets/tw/map/SUBMARINE_BAR.png'})
|
||||
SUBMARINE_CHOOSE = Button(area={'cn': (1026, 448, 1088, 505), 'en': (1008, 451, 1071, 508), 'jp': (1024, 446, 1090, 506), 'tw': (1024, 446, 1090, 506)}, color={'cn': (200, 157, 99), 'en': (197, 148, 83), 'jp': (198, 156, 100), 'tw': (206, 163, 103)}, button={'cn': (1026, 448, 1088, 505), 'en': (1008, 451, 1071, 508), 'jp': (1024, 446, 1090, 506), 'tw': (1024, 446, 1090, 506)}, file={'cn': './assets/cn/map/SUBMARINE_CHOOSE.png', 'en': './assets/en/map/SUBMARINE_CHOOSE.png', 'jp': './assets/jp/map/SUBMARINE_CHOOSE.png', 'tw': './assets/tw/map/SUBMARINE_CHOOSE.png'})
|
||||
SUBMARINE_CLEAR = Button(area={'cn': (1109, 448, 1170, 505), 'en': (1091, 451, 1153, 508), 'jp': (1108, 446, 1169, 506), 'tw': (1106, 446, 1172, 506)}, color={'cn': (153, 153, 154), 'en': (139, 140, 142), 'jp': (148, 149, 151), 'tw': (152, 153, 155)}, button={'cn': (1109, 448, 1170, 505), 'en': (1091, 451, 1153, 508), 'jp': (1108, 446, 1169, 506), 'tw': (1106, 446, 1172, 506)}, file={'cn': './assets/cn/map/SUBMARINE_CLEAR.png', 'en': './assets/en/map/SUBMARINE_CLEAR.png', 'jp': './assets/jp/map/SUBMARINE_CLEAR.png', 'tw': './assets/tw/map/SUBMARINE_CLEAR.png'})
|
||||
SUBMARINE_HARD_SATIESFIED = Button(area={'cn': (208, 414, 227, 547), 'en': (208, 414, 227, 547), 'jp': (208, 414, 227, 547), 'tw': (208, 414, 227, 547)}, color={'cn': (39, 62, 98), 'en': (39, 62, 98), 'jp': (39, 62, 98), 'tw': (39, 62, 98)}, button={'cn': (208, 414, 227, 547), 'en': (208, 414, 227, 547), 'jp': (208, 414, 227, 547), 'tw': (208, 414, 227, 547)}, file={'cn': './assets/cn/map/SUBMARINE_HARD_SATIESFIED.png', 'en': './assets/en/map/SUBMARINE_HARD_SATIESFIED.png', 'jp': './assets/jp/map/SUBMARINE_HARD_SATIESFIED.png', 'tw': './assets/tw/map/SUBMARINE_HARD_SATIESFIED.png'})
|
||||
SUBMARINE_IN_USE = Button(area={'cn': (453, 438, 538, 523), 'en': (453, 438, 538, 523), 'jp': (453, 438, 538, 523), 'tw': (453, 438, 538, 523)}, color={'cn': (118, 114, 124), 'en': (118, 114, 124), 'jp': (118, 114, 124), 'tw': (118, 114, 124)}, button={'cn': (453, 438, 538, 523), 'en': (453, 438, 538, 523), 'jp': (453, 438, 538, 523), 'tw': (453, 438, 538, 523)}, file={'cn': './assets/cn/map/SUBMARINE_IN_USE.png', 'en': './assets/en/map/SUBMARINE_IN_USE.png', 'jp': './assets/jp/map/SUBMARINE_IN_USE.png', 'tw': './assets/tw/map/SUBMARINE_IN_USE.png'})
|
||||
SUBMARINE_ADVICE = Button(area={'cn': (1030, 457, 1074, 477), 'en': (1010, 474, 1071, 486), 'jp': (1036, 462, 1081, 482), 'tw': (1031, 461, 1076, 483)}, color={'cn': (243, 222, 179), 'en': (222, 187, 130), 'jp': (244, 223, 180), 'tw': (237, 213, 166)}, button={'cn': (1030, 457, 1074, 477), 'en': (1010, 474, 1071, 486), 'jp': (1036, 462, 1081, 482), 'tw': (1031, 461, 1076, 483)}, file={'cn': './assets/cn/map/SUBMARINE_ADVICE.png', 'en': './assets/en/map/SUBMARINE_ADVICE.png', 'jp': './assets/jp/map/SUBMARINE_ADVICE.png', 'tw': './assets/tw/map/SUBMARINE_ADVICE.png'})
|
||||
SUBMARINE_BAR = Button(area={'cn': (1012, 519, 1183, 597), 'en': (998, 528, 1169, 605), 'jp': (1015, 524, 1186, 602), 'tw': (1015, 525, 1186, 602)}, color={'cn': (200, 184, 147), 'en': (192, 177, 145), 'jp': (193, 177, 145), 'tw': (192, 177, 146)}, button={'cn': (1012, 519, 1183, 597), 'en': (998, 528, 1169, 605), 'jp': (1015, 524, 1186, 602), 'tw': (1015, 525, 1186, 602)}, file={'cn': './assets/cn/map/SUBMARINE_BAR.png', 'en': './assets/en/map/SUBMARINE_BAR.png', 'jp': './assets/jp/map/SUBMARINE_BAR.png', 'tw': './assets/tw/map/SUBMARINE_BAR.png'})
|
||||
SUBMARINE_CHOOSE = Button(area={'cn': (1022, 443, 1082, 501), 'en': (1008, 451, 1071, 508), 'jp': (1024, 446, 1090, 506), 'tw': (1024, 446, 1090, 506)}, color={'cn': (202, 162, 104), 'en': (197, 148, 83), 'jp': (198, 156, 100), 'tw': (206, 163, 103)}, button={'cn': (1022, 443, 1082, 501), 'en': (1008, 451, 1071, 508), 'jp': (1024, 446, 1090, 506), 'tw': (1024, 446, 1090, 506)}, file={'cn': './assets/cn/map/SUBMARINE_CHOOSE.png', 'en': './assets/en/map/SUBMARINE_CHOOSE.png', 'jp': './assets/jp/map/SUBMARINE_CHOOSE.png', 'tw': './assets/tw/map/SUBMARINE_CHOOSE.png'})
|
||||
SUBMARINE_CLEAR = Button(area={'cn': (1109, 443, 1169, 501), 'en': (1091, 451, 1153, 508), 'jp': (1108, 446, 1169, 506), 'tw': (1106, 446, 1172, 506)}, color={'cn': (156, 158, 159), 'en': (139, 140, 142), 'jp': (148, 149, 151), 'tw': (152, 153, 155)}, button={'cn': (1109, 443, 1169, 501), 'en': (1091, 451, 1153, 508), 'jp': (1108, 446, 1169, 506), 'tw': (1106, 446, 1172, 506)}, file={'cn': './assets/cn/map/SUBMARINE_CLEAR.png', 'en': './assets/en/map/SUBMARINE_CLEAR.png', 'jp': './assets/jp/map/SUBMARINE_CLEAR.png', 'tw': './assets/tw/map/SUBMARINE_CLEAR.png'})
|
||||
SUBMARINE_HARD_SATIESFIED = Button(area={'cn': (211, 514, 375, 539), 'en': (208, 414, 227, 547), 'jp': (208, 414, 227, 547), 'tw': (208, 414, 227, 547)}, color={'cn': (59, 57, 58), 'en': (39, 62, 98), 'jp': (39, 62, 98), 'tw': (39, 62, 98)}, button={'cn': (211, 514, 375, 539), 'en': (208, 414, 227, 547), 'jp': (208, 414, 227, 547), 'tw': (208, 414, 227, 547)}, file={'cn': './assets/cn/map/SUBMARINE_HARD_SATIESFIED.png', 'en': './assets/en/map/SUBMARINE_HARD_SATIESFIED.png', 'jp': './assets/jp/map/SUBMARINE_HARD_SATIESFIED.png', 'tw': './assets/tw/map/SUBMARINE_HARD_SATIESFIED.png'})
|
||||
SUBMARINE_IN_USE = Button(area={'cn': (454, 427, 537, 510), 'en': (453, 438, 538, 523), 'jp': (453, 438, 538, 523), 'tw': (453, 438, 538, 523)}, color={'cn': (99, 98, 116), 'en': (118, 114, 124), 'jp': (118, 114, 124), 'tw': (118, 114, 124)}, button={'cn': (454, 427, 537, 510), 'en': (453, 438, 538, 523), 'jp': (453, 438, 538, 523), 'tw': (453, 438, 538, 523)}, file={'cn': './assets/cn/map/SUBMARINE_IN_USE.png', 'en': './assets/en/map/SUBMARINE_IN_USE.png', 'jp': './assets/jp/map/SUBMARINE_IN_USE.png', 'tw': './assets/tw/map/SUBMARINE_IN_USE.png'})
|
||||
SWITCH_OVER = Button(area={'cn': (947, 654, 1118, 706), 'en': (945, 647, 1119, 702), 'jp': (946, 653, 1119, 707), 'tw': (947, 654, 1118, 706)}, color={'cn': (144, 158, 198), 'en': (139, 154, 194), 'jp': (142, 156, 195), 'tw': (144, 158, 198)}, button={'cn': (947, 654, 1118, 706), 'en': (945, 647, 1119, 702), 'jp': (946, 653, 1119, 707), 'tw': (947, 654, 1118, 706)}, file={'cn': './assets/cn/map/SWITCH_OVER.png', 'en': './assets/en/map/SWITCH_OVER.png', 'jp': './assets/jp/map/SWITCH_OVER.png', 'tw': './assets/tw/map/SWITCH_OVER.png'})
|
||||
WITHDRAW = Button(area={'cn': (749, 654, 921, 707), 'en': (748, 652, 922, 702), 'jp': (748, 653, 921, 707), 'tw': (749, 654, 921, 707)}, color={'cn': (213, 124, 124), 'en': (211, 124, 124), 'jp': (210, 122, 122), 'tw': (213, 124, 124)}, button={'cn': (749, 654, 921, 707), 'en': (748, 652, 922, 702), 'jp': (748, 653, 921, 707), 'tw': (749, 654, 921, 707)}, file={'cn': './assets/cn/map/WITHDRAW.png', 'en': './assets/en/map/WITHDRAW.png', 'jp': './assets/jp/map/WITHDRAW.png', 'tw': './assets/tw/map/WITHDRAW.png'})
|
||||
|
||||
@ -16,6 +16,8 @@ class FleetOperator:
|
||||
FLEET_BAR_ACTIVE_STD = 45 # Active: 67, inactive: 12.
|
||||
FLEET_IN_USE_STD = 27 # In use 52, not in use (3, 6).
|
||||
|
||||
OFFSET = (-20, -80, 20, 5)
|
||||
|
||||
def __init__(self, choose, advice, bar, clear, in_use, hard_satisfied, main):
|
||||
"""
|
||||
Args:
|
||||
@ -35,6 +37,12 @@ class FleetOperator:
|
||||
self._hard_satisfied = hard_satisfied
|
||||
self.main = main
|
||||
|
||||
_ = main.appear(clear, offset=FleetOperator.OFFSET)
|
||||
choose.load_offset(clear)
|
||||
bar.load_offset(clear)
|
||||
in_use.load_offset(clear)
|
||||
hard_satisfied.load_offset(clear)
|
||||
|
||||
def __str__(self):
|
||||
return str(self._choose)[:-7]
|
||||
|
||||
@ -66,12 +74,13 @@ class FleetOperator:
|
||||
Returns:
|
||||
Button: Button instance.
|
||||
"""
|
||||
bar = self._bar.button
|
||||
area = area_offset(area=(
|
||||
0,
|
||||
(self.FLEET_BAR_SHAPE_Y + self.FLEET_BAR_MARGIN_Y) * (index - 1),
|
||||
self._bar.area[2] - self._bar.area[0],
|
||||
bar[2] - bar[0],
|
||||
(self.FLEET_BAR_SHAPE_Y + self.FLEET_BAR_MARGIN_Y) * (index - 1) + self.FLEET_BAR_SHAPE_Y
|
||||
), offset=(self._bar.area[0:2]))
|
||||
), offset=(bar[0:2]))
|
||||
return Button(area=(), color=(), button=area, name='%s_INDEX_%s' % (str(self._bar), str(index)))
|
||||
|
||||
def allow(self):
|
||||
@ -79,14 +88,14 @@ class FleetOperator:
|
||||
Returns:
|
||||
bool: If current fleet is allow to be chosen.
|
||||
"""
|
||||
return self.main.appear(self._choose, threshold=30)
|
||||
return self.main.appear(self._clear, offset=FleetOperator.OFFSET)
|
||||
|
||||
def is_hard(self):
|
||||
"""
|
||||
Returns:
|
||||
bool: Whether to have a recommend. If so, this stage is a hard campaign.
|
||||
"""
|
||||
return self.main.appear(self._advice, offset=(20, 20))
|
||||
return self.main.appear(self._advice, offset=FleetOperator.OFFSET)
|
||||
|
||||
def is_hard_satisfied(self):
|
||||
"""
|
||||
@ -101,7 +110,7 @@ class FleetOperator:
|
||||
if not self.is_hard():
|
||||
return None
|
||||
|
||||
area = self._hard_satisfied.area
|
||||
area = self._hard_satisfied.button
|
||||
image = color_similarity_2d(self.main.image_crop(area), color=(249, 199, 0))
|
||||
height = np.max(image, axis=1)
|
||||
parameters = {'height': 180, 'distance': 5}
|
||||
@ -218,7 +227,7 @@ class FleetOperator:
|
||||
Returns:
|
||||
list: List of int. Currently selected fleet ranges from 1 to 6.
|
||||
"""
|
||||
data = self.parse_fleet_bar(self.main.image_crop(self._bar))
|
||||
data = self.parse_fleet_bar(self.main.image_crop(self._bar.button))
|
||||
return data
|
||||
|
||||
def in_use(self):
|
||||
@ -232,7 +241,7 @@ class FleetOperator:
|
||||
|
||||
# Cropping FLEET_*_IN_USE to avoid detecting info_bar, also do the trick.
|
||||
# It also avoids wasting time on handling the info_bar.
|
||||
image = rgb2gray(self.main.image_crop(self._in_use))
|
||||
image = rgb2gray(self.main.image_crop(self._in_use.button))
|
||||
return np.std(image.flatten(), ddof=1) > self.FLEET_IN_USE_STD
|
||||
|
||||
def bar_opened(self):
|
||||
@ -241,7 +250,7 @@ class FleetOperator:
|
||||
bool: If dropdown menu appears.
|
||||
"""
|
||||
# Check the brightness of the rightest column of the bar area.
|
||||
luma = rgb2gray(self.main.image_crop(self._bar))[:, -1]
|
||||
luma = rgb2gray(self.main.image_crop(self._bar.button))[:, -1]
|
||||
return np.sum(luma > 127) / luma.size > 0.5
|
||||
|
||||
def ensure_to_be(self, index):
|
||||
|
||||
@ -169,7 +169,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
|
||||
continue
|
||||
|
||||
# Fleet preparation
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 20)):
|
||||
if fleet_timer.reached() and self.appear(FLEET_PREPARATION, offset=(20, 50)):
|
||||
if mode == 'normal' or mode == 'hard':
|
||||
self.handle_2x_book_setting(mode='prep')
|
||||
self.fleet_preparation()
|
||||
@ -244,7 +244,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
|
||||
if self.appear(MAP_PREPARATION, offset=(20, 20), interval=2):
|
||||
self.device.click(MAP_PREPARATION_CANCEL)
|
||||
continue
|
||||
if self.appear(FLEET_PREPARATION, offset=(20, 20), interval=2):
|
||||
if self.appear(FLEET_PREPARATION, offset=(20, 50), interval=2):
|
||||
self.device.click(MAP_PREPARATION_CANCEL)
|
||||
continue
|
||||
|
||||
|
||||
@ -454,7 +454,7 @@ class UI(InfoHandler):
|
||||
|
||||
# Campaign preparation
|
||||
if self.appear(MAP_PREPARATION, offset=(30, 30), interval=3) \
|
||||
or self.appear(FLEET_PREPARATION, offset=(30, 30), interval=3) \
|
||||
or self.appear(FLEET_PREPARATION, offset=(20, 50), interval=3) \
|
||||
or self.appear(RAID_FLEET_PREPARATION, offset=(30, 30), interval=3) \
|
||||
or self.appear(COALITION_FLEET_PREPARATION, offset=(30, 30), interval=3):
|
||||
self.device.click(MAP_PREPARATION_CANCEL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user