Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript1

bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json

@@ -1901,5 +1901,5 @@
     183
   ], 
   "heads": [[146, 0, 0], [150, 0, 0]], 
-  "attrs": {"mxnet_version": ["int", 10600]}
+  "attrs": {"mxnet_version": ["int", 10901]}
 }

campaign/Readme.md

@@ -284,3 +284,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20260212   | raid 20260212            | Spring Auction Adventure                     | 春宴怀玉香满庭             | Spring Auction Adventure                           | 新春玉逸品会                         | 春宴懷玉香滿庭             |
 | 20260226   | event 20260226 cn        | Springtide Inn Online                        | 春满客栈Online             | Springtide Inn Online                              | 春色旅籠Online                       | 春滿客棧Online             |
 | 20260312   | event 20240229 cn        | Snowrealm Peregrination Rerun                | 复刻雪境迷踪               | Snowrealm Peregrination Rerun                      | 銀界遊廻（復刻）                     | -                          |
+| 20260319   | event 20220728 cn        | Aquilifer's Ballade                          | -                          | -                                                  | -                                    | 復刻雄鷹的敘事歌           |
+| 20260326   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | 漫游者招募计划             | The Vagabond’s Recruitment Plan                    | ワンダラー募集計画                   | -                          |

campaign/event_20260326_cn/ht1.py

@@ -0,0 +1,95 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('HT1')
+MAP.shape = 'I7'
+MAP.camera_data = ['E2', 'F5']
+MAP.camera_data_spawn_point = ['E5']
+MAP.map_data = """
+    -- -- MB -- ++ -- ME -- --
+    -- ME -- Me ++ ME -- ME --
+    -- ++ Me -- -- -- -- -- ++
+    -- MS ++ MS -- Me -- ME --
+    -- -- MS -- ++ ++ ME -- --
+    ++ -- __ -- ++ ++ -- -- ME
+    ++ SP -- SP -- -- -- ME --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    MAP_SWIPE_MULTIPLY = (1.147, 1.168)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.109, 1.129)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.077, 1.096)
+
+
+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()
+
+    def battle_5(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/ht2.py

@@ -0,0 +1,82 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .ht1 import Config as ConfigBase
+
+MAP = CampaignMap('HT2')
+MAP.shape = 'I7'
+MAP.camera_data = ['D2', 'D5', 'F5']
+MAP.camera_data_spawn_point = ['F2']
+MAP.map_data = """
+    -- -- ++ ++ SP -- SP ++ --
+    ME ME ++ ++ -- -- -- ++ --
+    -- -- -- -- -- MS -- Me --
+    ME ME ++ ++ ++ -- ++ ++ ++
+    -- -- -- -- MS -- MS -- Me
+    ME ME ++ -- -- __ -- -- ++
+    -- -- ++ -- Me MB Me -- ME
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2, 'siren': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5},
+    {'battle': 6, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+
+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()
+
+    def battle_6(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/ht3.py

@@ -0,0 +1,85 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .ht1 import Config as ConfigBase
+
+MAP = CampaignMap('HT3')
+MAP.shape = 'I8'
+MAP.camera_data = ['E3', 'E6']
+MAP.camera_data_spawn_point = ['E6']
+MAP.map_data = """
+    -- -- -- ++ ++ ++ -- -- --
+    -- ++ -- Me -- Me -- ++ --
+    -- -- Me -- -- -- Me -- --
+    -- ME -- -- MB -- -- ME --
+    -- ++ ++ MS -- MS ++ ++ --
+    -- ++ ++ -- MS -- ++ ++ --
+    -- ME -- -- __ -- -- ME --
+    -- ME -- SP -- SP -- ME --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2, 'siren': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5},
+    {'battle': 6, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+
+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()
+
+    def battle_6(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/sp.py

@@ -0,0 +1,120 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('SP')
+MAP.shape = 'G8'
+MAP.camera_data = ['D2', 'D6']
+MAP.camera_data_spawn_point = ['D2']
+MAP.map_data = """
+    ++ ++ MS -- MS ++ ++
+    ++ ME -- MS -- ME ++
+    ME -- -- -- -- -- ME
+    ME -- SP __ SP -- ME
+    ME -- -- -- -- -- ME
+    ++ ME ME -- ME ME ++
+    -- ++ ++ -- ++ ++ --
+    -- ++ ++ MB ++ ++ --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+    50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 12, 'siren': 3},
+    {'battle': 1},
+    {'battle': 2},
+    {'battle': 3},
+    {'battle': 4},
+    {'battle': 5},
+    {'battle': 6},
+    {'battle': 7, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, \
+A2, B2, C2, D2, E2, F2, G2, \
+A3, B3, C3, D3, E3, F3, G3, \
+A4, B4, C4, D4, E4, F4, G4, \
+A5, B5, C5, D5, E5, F5, G5, \
+A6, B6, C6, D6, E6, F6, G6, \
+A7, B7, C7, D7, E7, F7, G7, \
+A8, B8, C8, D8, E8, F8, G8, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = False
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    STAR_REQUIRE_1 = 0
+    STAR_REQUIRE_2 = 0
+    STAR_REQUIRE_3 = 0
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    HOMO_STORAGE = ((7, 6), [(135.178, 83.137), (919.07, 83.137), (-16.807, 613.173), (1000.053, 613.173)])
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
+    MAP_IS_ONE_TIME_STAGE = True
+
+    MAP_SWIPE_MULTIPLY = (1.127, 1.148)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.090, 1.110)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.058, 1.077)
+
+
+class Campaign(CampaignBase):
+    MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
+
+    def map_data_init(self, map_):
+        super().map_data_init(map_)
+        C1.is_siren = True
+        D2.is_siren = True
+        E1.is_siren = True
+
+    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()
+
+    def battle_7(self):
+        return self.fleet_boss.clear_boss()

campaign/event_20260326_cn/t1.py

@@ -0,0 +1,94 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+
+MAP = CampaignMap('T1')
+MAP.shape = 'I7'
+MAP.camera_data = ['E2', 'F5']
+MAP.camera_data_spawn_point = ['E5']
+MAP.map_data = """
+    -- -- MB -- ++ -- ME -- --
+    -- ME -- Me ++ ME -- ME --
+    -- ++ Me -- -- -- -- -- ++
+    -- MS ++ MS -- Me -- ME --
+    -- -- MS -- ++ ++ ME -- --
+    ++ -- __ -- ++ ++ -- -- ME
+    ++ SP -- SP -- -- -- ME --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219_SP = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 33),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 210
+    MAP_SWIPE_MULTIPLY = (1.147, 1.168)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.109, 1.129)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.077, 1.096)
+
+
+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()
+
+    def battle_4(self):
+        return self.clear_boss()

campaign/event_20260326_cn/t2.py

@@ -0,0 +1,72 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .t1 import Config as ConfigBase
+
+MAP = CampaignMap('T2')
+MAP.shape = 'I7'
+MAP.camera_data = ['D2', 'D5', 'F5']
+MAP.camera_data_spawn_point = ['F2']
+MAP.map_data = """
+    -- -- ++ ++ SP -- SP ++ --
+    ME ME ++ ++ -- -- -- ++ --
+    -- -- -- -- -- MS -- Me --
+    ME ME ++ ++ ++ -- ++ ++ ++
+    -- -- -- -- MS -- MS -- Me
+    ME ME ++ -- -- __ -- -- ++
+    -- -- ++ -- Me MB Me -- ME
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 1},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+
+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()
+
+    def battle_4(self):
+        return self.clear_boss()

campaign/event_20260326_cn/t3.py

@@ -0,0 +1,76 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+from module.map.map_grids import SelectedGrids, RoadGrids
+from module.logger import logger
+from .t1 import Config as ConfigBase
+
+MAP = CampaignMap('T3')
+MAP.shape = 'I8'
+MAP.camera_data = ['E3', 'E6']
+MAP.camera_data_spawn_point = ['E6']
+MAP.map_data = """
+    -- -- -- ++ ++ ++ -- -- --
+    -- ++ -- Me -- Me -- ++ --
+    -- -- Me -- -- -- Me -- --
+    -- ME -- -- MB -- -- ME --
+    -- ++ ++ MS -- MS ++ ++ --
+    -- ++ ++ -- MS -- ++ ++ --
+    -- ME -- -- __ -- -- ME --
+    -- ME -- SP -- SP -- ME --
+"""
+MAP.weight_data = """
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 3, 'siren': 2},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4},
+    {'battle': 5, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = []
+    MOVABLE_ENEMY_TURN = (2,)
+    MAP_HAS_SIREN = True
+    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_MAP_STORY = False
+    MAP_HAS_FLEET_STEP = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = False
+    # ===== End of generated config =====
+
+
+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()
+
+    def battle_5(self):
+        return self.fleet_boss.clear_boss()

module/campaign/run.py

@@ -225,6 +225,7 @@ class CampaignRun(CampaignEvent, ShopStatus):
             'event_20250724_cn',
             'event_20250814_cn',
             'event_20251023_cn',
+            'event_20260326_cn',
             'war_archives_20231026_cn',
         ]:
             name = convert.get(name, name)
@@ -260,6 +261,7 @@ class CampaignRun(CampaignEvent, ShopStatus):
             'event_20250724_cn',
             'event_20250814_cn',
             'event_20251023_cn',
+            'event_20260326_cn',
             'war_archives_20231026_cn',
         ]:
             name = convert.get(name, name)

module/config/argument/args.json

@@ -1966,25 +1966,25 @@
         "type": "select",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "display": "hide",
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -2387,24 +2387,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -2801,24 +2801,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -4608,24 +4608,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -5040,24 +5040,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -5472,24 +5472,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -5904,24 +5904,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {
@@ -6326,24 +6326,24 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ],
         "option_cn": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_en": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_jp": [
-          "event_20240229_cn"
+          "event_20260326_cn"
         ],
         "option_tw": [
-          "event_20260226_cn"
+          "event_20220728_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
-          "event_20260226_cn"
+          "event_20220728_cn",
+          "event_20260326_cn"
         ]
       },
       "Mode": {

module/config/i18n/en-US.json

@@ -797,6 +797,7 @@
       "event_20251023_cn": "Tempesta and Islas de Libertád",
       "event_20251218_cn": "A Note Through the Firmament",
       "event_20260226_cn": "Springtide Inn Online",
+      "event_20260326_cn": "The Vagabond’s Recruitment Plan",
       "raid_20200624": "Air Raid Drills with Essex Rerun",
       "raid_20210708": "Cross Wave rerun",
       "raid_20220127": "Mystery Investigation",

module/config/i18n/ja-JP.json

@@ -797,6 +797,7 @@
       "event_20251023_cn": "テンペスタと自由群島",
       "event_20251218_cn": "天穹に響く音謡",
       "event_20260226_cn": "春色旅籠Online",
+      "event_20260326_cn": "ワンダラー募集計画",
       "raid_20200624": "特別演習超空強襲波（復刻）",
       "raid_20210708": "交錯する新たな波 (復刻)",
       "raid_20220127": "秘密事件調査",

module/config/i18n/zh-CN.json

@@ -797,6 +797,7 @@
       "event_20251023_cn": "飓风与自由群岛",
       "event_20251218_cn": "响彻于天穹之音",
       "event_20260226_cn": "春满客栈Online",
+      "event_20260326_cn": "漫游者招募计划",
       "raid_20200624": "复刻特别演习埃塞克斯级",
       "raid_20210708": "复刻穿越彼方的水线",
       "raid_20220127": "演习神秘事件调查",

module/config/i18n/zh-TW.json

@@ -765,7 +765,7 @@
       "event_20220414_cn": "復刻-永夜幻光",
       "event_20220428_cn": "復刻虹彩的終幕曲",
       "event_20220526_cn": "泠誓光庭",
-      "event_20220728_cn": "雄鷹的敘事歌",
+      "event_20220728_cn": "復刻雄鷹的敘事歌",
       "event_20220818_cn": "遠匯點作戰",
       "event_20220915_cn": "紫絳槿嵐",
       "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",
@@ -797,6 +797,7 @@
       "event_20251023_cn": "颶風與自由群島",
       "event_20251218_cn": "響徹於天穹之音",
       "event_20260226_cn": "春滿客棧Online",
+      "event_20260326_cn": "The Vagabond’s Recruitment Plan",
       "raid_20200624": "特別演習埃塞克斯級(復刻)",
       "raid_20210708": "復刻穿越彼方的水線",
       "raid_20220127": "演習神秘事件調查",

module/ocr/models.py

@@ -19,15 +19,15 @@ class OcrModel:
     @cached_property
     def azur_lane_jp(self):
         # Folder: ./bin/cnocr_models/azur_lane_jp
-        # Size: 3.29MB
+        # Size: 3.25MB
         # Model: densenet-lite-gru
-        # Epoch: 93
-        # Validation accuracy: 99.38%
-        # Font: Impact, VibeMO Compressed Pro Thin, Folk R
-        # Charset: 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ:/- (Letter 'O' and <space> is not included)
+        # Epoch: 20
+        # Validation accuracy: 99.01%
+        # Font: Impact, VibeMO Compressed Pro Thin, Folk R, Source Han Serif JP
+        # Charset: 0123456789ABCDEFGHIJKLMNPQRSTUVWXYZ:/- (Letter 'O' and <space> is not included)
         # _num_classes: 39
         from module.ocr.al_ocr import AlOcr
-        return AlOcr(model_name='densenet-lite-gru', model_epoch=93, root='./bin/cnocr_models/azur_lane_jp',
+        return AlOcr(model_name='densenet-lite-gru', model_epoch=20, root='./bin/cnocr_models/azur_lane_jp',
                      name='azur_lane_jp')
 
     @cached_property

module/tactical/tactical_class.py

@@ -373,7 +373,7 @@ class RewardTacticalClass(Dock):
         if self.appear(RAPID_TRAINING, offset=offset, interval=1):
             self.device.click(RAPID_TRAINING)
             # Clear interval to enter _tactical_books_choose fast
-            self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2)
+            self.interval_clear(TACTICAL_CLASS_START, interval=2)
             return True
 
         return False
@@ -444,7 +444,7 @@ class RewardTacticalClass(Dock):
             # Get finish time
             # sometimes you have TACTICAL_CHECK without black-blurred background
             # TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
-            if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
+            if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \
                     and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
                 self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 if book_empty:
@@ -495,11 +495,10 @@ class RewardTacticalClass(Dock):
             if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
                 self.device.click(MISSION_POPUP_ACK)
                 continue
-            if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
-                    and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
+            if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
                 if self._tactical_books_choose():
                     self.dock_select_index = 0
-                    self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP])
+                    self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP])
                     self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
                 else:
                     study_finished = True