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

Fix: Visited inaccessible grid if support fleet was missing

Browse Source
This commit is contained in:
LmeSzinc
2024-04-26 11:29:18 +08:00
parent bfb9bd0d61
commit b07d266e49
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
campaign/campaign_main/campaign_15_1.py
View File

@@ -79,8 +79,9 @@ class Campaign(CampaignBase):
def battle_0(self): def battle_0(self):
if not self.map_is_clear_mode and self.map_has_mob_move: if not self.map_is_clear_mode and self.map_has_mob_move:
self.mob_move(B3, C3) self.mob_move(B3, C3)
self.clear_chosen_enemy(B1) if B1.is_accessible:
return True self.clear_chosen_enemy(B1)
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True return True

5
campaign/campaign_main/campaign_15_2.py
View File

@@ -81,8 +81,9 @@ class Campaign(CampaignBase):
if not self.map_is_clear_mode and self.map_has_mob_move: if not self.map_is_clear_mode and self.map_has_mob_move:
self.mob_move(I6, I7) self.mob_move(I6, I7)
self.mob_move(I7, H7) self.mob_move(I7, H7)
self.clear_chosen_enemy(G7) if G7.is_accessible:
return True self.clear_chosen_enemy(G7)
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True return True

5
campaign/campaign_main/campaign_15_3.py
View File

@@ -83,8 +83,9 @@ class Campaign(CampaignBase):
def battle_0(self): def battle_0(self):
if not self.map_is_clear_mode and self.map_has_mob_move: if not self.map_is_clear_mode and self.map_has_mob_move:
self.mob_move(B3, B4) self.mob_move(B3, B4)
self.clear_chosen_enemy(A1) if A1.is_accessible:
return True self.clear_chosen_enemy(A1)
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True return True

10
campaign/campaign_main/campaign_15_4.py
View File

@@ -92,8 +92,9 @@ class Campaign(CampaignBase):
def battle_0(self): def battle_0(self):
if not self.map_is_clear_mode and self.map_has_mob_move: if not self.map_is_clear_mode and self.map_has_mob_move:
self.mob_move(J8, K8) self.mob_move(J8, K8)
self.clear_chosen_enemy(K9) if K9.is_accessible:
return True self.clear_chosen_enemy(K9)
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True
@@ -102,8 +103,9 @@ class Campaign(CampaignBase):
def battle_1(self): def battle_1(self):
if not self.map_is_clear_mode: if not self.map_is_clear_mode:
self.clear_chosen_enemy(A1) if A1.is_accessible:
return True self.clear_chosen_enemy(A1)
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True

3
campaign/campaign_main/campaign_15_base.py
View File

@@ -36,7 +36,7 @@ class CampaignBase(CampaignBase_):
_ = ASSETS.ui_mask _ = ASSETS.ui_mask
ASSETS.ui_mask = MASK_MAP_UI_W15.image ASSETS.ui_mask = MASK_MAP_UI_W15.image
map_has_mob_move = False map_has_mob_move = True
def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None): def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None):
super().strategy_set_execute( super().strategy_set_execute(
@@ -201,4 +201,5 @@ class CampaignBase(CampaignBase_):
self.strategy_close(skip_first_screenshot=False) self.strategy_close(skip_first_screenshot=False)
self._mob_move_info_change(location, target) self._mob_move_info_change(location, target)
self.find_path_initial()
self.map.show() self.map.show()