1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-05 06:15:21 +08:00

Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"

This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
This commit is contained in:
whoamikyo
2020-08-18 20:47:27 -03:00
parent bdc5aa0720
commit ac9303012c
741 changed files with 8380 additions and 18943 deletions

View File

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