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

Opt: Simplify grid merge

Browse Source
This commit is contained in:
LmeSzinc
2020-07-31 18:00:14 +08:00
parent 94f6d6536a
commit c79f9e667a
4 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
campaign/campaign_main/campaign_7_2.py
View File

@@ -20,7 +20,8 @@ MAP.weight_data = '''
20 20 20 10 20 20 20 20
30 30 30 30 30 30 30 30
'''
MAP.camera_data = ['D3']
MAP.camera_data = ['D3', 'D2']
MAP.camera_data_spawn_point = ['D3', 'D2']
MAP.spawn_data = [
{'battle': 0, 'enemy': 3},
{'battle': 1, 'enemy': 2, 'mystery': 1},
@@ -53,7 +54,7 @@ class Campaign(CampaignBase):
return True
ignore = None
if self.fleet_at(A3, fleet=2):
if self.fleet_at(A3, fleet=2) and A1.enemy_scale != 3 and not self.fleet_at(A1, fleet=1):
ignore = SelectedGrids([A2])
if self.fleet_at(G3, fleet=2):
ignore = SelectedGrids([H3])

2
campaign/campaign_main/campaign_7_2_mystery_farming.py
View File

@@ -27,7 +27,7 @@ class Campaign(CampaignBase):
return True
ignore = None
if self.fleet_at(A3, fleet=2):
if self.fleet_at(A3, fleet=2) and A1.enemy_scale != 3 and not self.fleet_at(A1, fleet=1):
ignore = SelectedGrids([A2])
if self.fleet_at(G3, fleet=2):
ignore = SelectedGrids([H3])