1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 11:37:54 +08:00

Opt: Skybound Oratorio Rerun (event_20211028_cn)

- Add: fleet1_boss_fleet2_mob, fleet1_standby_fleet2_all for event hard
- Dev: ENEMY_FILTER in map_extractor.py
This commit is contained in:
LmeSzinc
2021-10-28 17:43:51 +08:00
parent 2587c19b2a
commit 7b66923d51
22 changed files with 196 additions and 64 deletions

View File

@@ -70,4 +70,4 @@ To add a new event, add a new row in here, and run `python -m dev_tools.event_ex
| 20210923 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 蝶海夢花 |
| 20211008 | event 20201012 cn | Sundered Blue | - | - | - | 劃破海空之翼 |
| 20211014 | raid 20210708 | Cross Wave | - | - | - | 穿越彼方的水線 |
| 20211014 | event 20211028 cn | Skybound Oratorio | 复刻穹顶下的圣咏曲 | - | - | - |
| 20211028 | event 20211028 cn | Skybound Oratorio | 复刻穹顶下的圣咏曲 | Skybound Oratorio Rerun | 神穹を衝く聖歌(復刻) | - |

View File

@@ -50,6 +50,7 @@ class Config:
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
DETECTION_BACKEND = 'perspective'
TRUST_EDGE_LINES = False
COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
@@ -65,14 +66,21 @@ class Config:
'distance': 50,
'wlen': 1000
}
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
MAP_SWIPE_PREDICT_WITH_SEA_GRIDS = False
MAP_SWIPE_MULTIPLY = 1.732
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.674
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -55,10 +55,13 @@ class Config(ConfigBase):
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -8,6 +8,7 @@ MAP = CampaignMap('A3')
MAP.shape = 'H7'
MAP.camera_data = ['D2', 'D5', 'E2', 'E5']
MAP.camera_data_spawn_point = ['D5']
MAP.map_covered = ['G2']
MAP.map_data = """
-- Me ME ++ ++ Me ME ME
ME -- -- MS -- -- MB --
@@ -55,13 +56,19 @@ class Config(ConfigBase):
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_SWIPE_MULTIPLY = 1.626
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.572
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -5,7 +5,7 @@ from module.logger import logger
MAP = CampaignMap('B1')
MAP.shape = 'F9'
MAP.camera_data = ['C2', 'C6', 'C7']
MAP.camera_data = ['C2', 'C5', 'C7']
MAP.camera_data_spawn_point = ['C7']
MAP.map_data = """
-- ME ++ ++ -- ME
@@ -60,6 +60,7 @@ class Config:
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
DETECTION_BACKEND = 'perspective'
TRUST_EDGE_LINES = False
COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
@@ -75,14 +76,20 @@ class Config:
'distance': 50,
'wlen': 1000
}
MAP_SWIPE_PREDICT_WITH_SEA_GRIDS = False
MAP_SWIPE_MULTIPLY = 1.513
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.463
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -70,15 +70,21 @@ class Config(ConfigBase):
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====.
MAP_HAS_WALL = True
MAP_SWIPE_MULTIPLY = 1.626
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.572
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -6,8 +6,8 @@ from .b1 import Config as ConfigBase
MAP = CampaignMap('B3')
MAP.shape = 'N10'
MAP.camera_data = ['F2', 'F6', 'F8', 'I2', 'I6', 'I8']
MAP.camera_data_spawn_point = ['F8', 'I8']
MAP.camera_data = ['G8', 'G6', 'F3', 'H4']
MAP.camera_data_spawn_point = ['G8']
MAP.map_data = """
-- -- -- -- -- ME -- -- ME -- -- -- -- ++
-- -- -- ME -- -- MB MB -- -- ME -- -- --
@@ -85,15 +85,21 @@ class Config(ConfigBase):
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_HAS_WALL = True
MAP_SWIPE_MULTIPLY = 1.445
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.397
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -50,6 +50,7 @@ class Config:
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
DETECTION_BACKEND = 'perspective'
TRUST_EDGE_LINES = False
COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
@@ -65,14 +66,21 @@ class Config:
'distance': 50,
'wlen': 1000
}
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
MAP_SWIPE_PREDICT_WITH_SEA_GRIDS = False
MAP_SWIPE_MULTIPLY = 1.732
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.674
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -55,10 +55,13 @@ class Config(ConfigBase):
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -8,6 +8,7 @@ MAP = CampaignMap('C3')
MAP.shape = 'H7'
MAP.camera_data = ['D2', 'D5', 'E2', 'E5']
MAP.camera_data_spawn_point = ['D5']
MAP.map_covered = ['G2']
MAP.map_data = """
-- Me ME ++ ++ Me ME ME
ME -- -- MS -- -- MB --
@@ -56,13 +57,19 @@ class Config(ConfigBase):
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_SWIPE_MULTIPLY = 1.626
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.572
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -5,7 +5,7 @@ from module.logger import logger
MAP = CampaignMap('D1')
MAP.shape = 'F9'
MAP.camera_data = ['C2', 'C6', 'C7']
MAP.camera_data = ['C2', 'C5', 'C7']
MAP.camera_data_spawn_point = ['C7']
MAP.map_data = """
-- ME ++ ++ -- ME
@@ -60,6 +60,7 @@ class Config:
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
DETECTION_BACKEND = 'perspective'
TRUST_EDGE_LINES = False
COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
@@ -75,14 +76,20 @@ class Config:
'distance': 50,
'wlen': 1000
}
MAP_SWIPE_PREDICT_WITH_SEA_GRIDS = False
MAP_SWIPE_MULTIPLY = 1.513
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.463
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -71,15 +71,29 @@ class Config(ConfigBase):
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_HAS_WALL = True
MAP_SWIPE_MULTIPLY = 1.626
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.572
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_5(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -6,8 +6,8 @@ from .d1 import Config as ConfigBase
MAP = CampaignMap('D3')
MAP.shape = 'N10'
MAP.camera_data = ['F2', 'F6', 'F8', 'I2', 'I6', 'I8']
MAP.camera_data_spawn_point = ['F8', 'I8']
MAP.camera_data = ['G8', 'G6', 'F3', 'H4']
MAP.camera_data_spawn_point = ['G8']
MAP.map_data = """
-- -- -- -- -- ME -- -- ME -- -- -- -- ++
-- -- -- ME -- -- MB MB -- -- ME -- -- --
@@ -86,15 +86,29 @@ class Config(ConfigBase):
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_HAS_WALL = True
MAP_SWIPE_MULTIPLY = 1.445
MAP_SWIPE_MULTIPLY_MINITOUCH = 1.397
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=1):
return True
return self.battle_default()
def battle_5(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()

View File

@@ -66,13 +66,26 @@ class Config:
STAR_REQUIRE_3 = 0
# ===== End of generated config =====
MAP_SWIPE_PREDICT_WITH_SEA_GRIDS = False
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=2):
return True
return self.battle_default()
def battle_5(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()