sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-29 12:47:13 +08:00
Code Activity

Add: Support auto search

Browse Source
This commit is contained in:
LmeSzinc
2021-01-28 00:35:15 +08:00
parent c6d5438408
commit 5ac50e6910
25 changed files with 372 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/map/assets.py
View File

@@ -13,6 +13,8 @@ FLEET_2_CHOOSE = Button(area={'cn': (1009, 303, 1071, 360), 'en': (1008, 303, 10
FLEET_2_CLEAR = Button(area={'cn': (1091, 303, 1153, 360), 'en': (1090, 303, 1153, 360), 'jp': (1092, 302, 1151, 360), 'tw': (1108, 299, 1172, 357)}, color={'cn': (155, 155, 157), 'en': (138, 139, 142), 'jp': (149, 149, 151), 'tw': (153, 154, 156)}, button={'cn': (1091, 303, 1153, 360), 'en': (1090, 303, 1153, 360), 'jp': (1092, 302, 1151, 360), 'tw': (1108, 299, 1172, 357)}, 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_IN_USE = Button(area={'cn': (374, 297, 453, 375), 'en': (374, 297, 453, 375), 'jp': (374, 297, 453, 375), 'tw': (390, 291, 473, 374)}, color={'cn': (198, 190, 194), 'en': (198, 190, 194), 'jp': (198, 190, 194), 'tw': (74, 66, 66)}, button={'cn': (374, 297, 453, 375), 'en': (374, 297, 453, 375), 'jp': (374, 297, 453, 375), 'tw': (390, 291, 473, 374)}, 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 = Button(area={'cn': (208, 72, 230, 104), 'en': (205, 71, 229, 104), 'jp': (208, 72, 230, 104), 'tw': (208, 72, 230, 104)}, color={'cn': (42, 93, 125), 'en': (45, 78, 115), 'jp': (42, 93, 125), 'tw': (42, 93, 125)}, button={'cn': (208, 72, 230, 104), 'en': (205, 71, 229, 104), 'jp': (208, 72, 230, 104), 'tw': (208, 72, 230, 104)}, file={'cn': './assets/cn/map/FLEET_NUM.png', 'en': './assets/en/map/FLEET_NUM.png', 'jp': './assets/jp/map/FLEET_NUM.png', 'tw': './assets/tw/map/FLEET_NUM.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/cn/map/FLEET_NUM_1.png', 'jp': './assets/cn/map/FLEET_NUM_1.png', 'tw': './assets/cn/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/cn/map/FLEET_NUM_2.png', 'jp': './assets/cn/map/FLEET_NUM_2.png', 'tw': './assets/cn/map/FLEET_NUM_2.png'})
FLEET_PREPARATION = Button(area={'cn': (965, 578, 1162, 637), 'en': (969, 576, 1160, 637), 'jp': (984, 584, 1139, 631), 'tw': (963, 576, 1164, 640)}, color={'cn': (236, 186, 116), 'en': (233, 175, 90), 'jp': (230, 178, 102), 'tw': (236, 187, 110)}, button={'cn': (965, 578, 1162, 637), 'en': (969, 576, 1160, 637), 'jp': (984, 584, 1139, 631), 'tw': (963, 576, 1164, 640)}, 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'})
FLEET_PREPARATION_HARD_1 = Button(area={'cn': (184, 263, 986, 264), 'en': (184, 263, 986, 264), 'jp': (184, 263, 986, 264), 'tw': (184, 263, 986, 264)}, color={'cn': (255, 219, 0), 'en': (255, 219, 0), 'jp': (255, 219, 0), 'tw': (255, 219, 0)}, button={'cn': (184, 263, 986, 264), 'en': (184, 263, 986, 264), 'jp': (184, 263, 986, 264), 'tw': (184, 263, 986, 264)}, file={'cn': './assets/cn/map/FLEET_PREPARATION_HARD_1.png', 'en': './assets/en/map/FLEET_PREPARATION_HARD_1.png', 'jp': './assets/jp/map/FLEET_PREPARATION_HARD_1.png', 'tw': './assets/tw/map/FLEET_PREPARATION_HARD_1.png'})
FLEET_PREPARATION_HARD_2 = Button(area={'cn': (185, 396, 985, 397), 'en': (185, 396, 985, 397), 'jp': (185, 396, 985, 397), 'tw': (185, 396, 985, 397)}, color={'cn': (255, 215, 0), 'en': (255, 215, 0), 'jp': (255, 215, 0), 'tw': (255, 215, 0)}, button={'cn': (185, 396, 985, 397), 'en': (185, 396, 985, 397), 'jp': (185, 396, 985, 397), 'tw': (185, 396, 985, 397)}, file={'cn': './assets/cn/map/FLEET_PREPARATION_HARD_2.png', 'en': './assets/en/map/FLEET_PREPARATION_HARD_2.png', 'jp': './assets/jp/map/FLEET_PREPARATION_HARD_2.png', 'tw': './assets/tw/map/FLEET_PREPARATION_HARD_2.png'})

2
module/map/fleet.py
View File

@@ -555,7 +555,7 @@ class Fleet(Camera, AmbushHandler):
portal=self.config.MAP_HAS_PORTAL,
)
self.handle_strategy(index=1 if not self.fleets_reversed() else 2)
self.handle_strategy(index=1 if not self.fleets_reversed else 2)
self.update()
if self.handle_fleet_reverse():
self.handle_strategy(index=1)

27
module/map/map_operation.py
View File

@@ -84,6 +84,11 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
campaign_timer.reset()
continue
# Auto search continue
if self.handle_auto_search_continue():
campaign_timer.reset()
continue
# Retire
if self.handle_retirement():
continue
@@ -111,9 +116,13 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
continue
# End
if self.handle_in_map_with_enemy_searching():
self.handle_map_after_combat_story()
break
if self.config.ENABLE_AUTO_SEARCH:
if self.is_auto_search_running():
break
else:
if self.handle_in_map_with_enemy_searching():
self.handle_map_after_combat_story()
break
return True
@@ -167,6 +176,8 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
continue
if self.appear_then_click(WITHDRAW, interval=5):
continue
if self.handle_auto_search_exit():
continue
# End
if self.handle_in_stage():
@@ -186,9 +197,13 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
return False
@property
def fleets_reversed(self):
# return (self.config.FLEET_2 != 0) and (self.config.FLEET_2 < self.config.FLEET_1)
return self.map_is_hard_mode and self.config.ENABLE_FLEET_REVERSE_IN_HARD
if self.config.ENABLE_AUTO_SEARCH:
return self.config.AUTO_SEARCH_SETTING in ['fleet1_boss_fleet2_mob', 'fleet1_standby_fleet2_all']
else:
# return (self.config.FLEET_2 != 0) and (self.config.FLEET_2 < self.config.FLEET_1)
return self.map_is_hard_mode and self.config.ENABLE_FLEET_REVERSE_IN_HARD
def handle_fleet_reverse(self):
"""
@@ -200,7 +215,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
Returns:
bool: Fleet changed
"""
if not self.fleets_reversed():
if not self.fleets_reversed:
return False
self.fleet_switch_click()