diff --git a/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0020.params b/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0020.params new file mode 100644 index 000000000..e814bdff4 Binary files /dev/null and b/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0020.params differ diff --git a/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0093.params b/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0093.params deleted file mode 100644 index 119a715bc..000000000 Binary files a/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-0093.params and /dev/null differ diff --git a/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json b/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json index 36a23a377..6933f9ed3 100644 --- a/bin/cnocr_models/azur_lane_jp/cnocr-v1.2.0-densenet-lite-gru-symbol.json +++ b/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]} } \ No newline at end of file diff --git a/campaign/Readme.md b/campaign/Readme.md index a3d2d94b7..90c3bee23 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -285,3 +285,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 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 | ワンダラー募集計画 | - | diff --git a/campaign/event_20260326_cn/ht1.py b/campaign/event_20260326_cn/ht1.py new file mode 100644 index 000000000..4bf6c23fa --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/ht2.py b/campaign/event_20260326_cn/ht2.py new file mode 100644 index 000000000..36797457b --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/ht3.py b/campaign/event_20260326_cn/ht3.py new file mode 100644 index 000000000..85da13596 --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/sp.py b/campaign/event_20260326_cn/sp.py new file mode 100644 index 000000000..5102d0ebf --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/t1.py b/campaign/event_20260326_cn/t1.py new file mode 100644 index 000000000..61617e89c --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/t2.py b/campaign/event_20260326_cn/t2.py new file mode 100644 index 000000000..4ac497198 --- /dev/null +++ b/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() diff --git a/campaign/event_20260326_cn/t3.py b/campaign/event_20260326_cn/t3.py new file mode 100644 index 000000000..0af8db179 --- /dev/null +++ b/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() diff --git a/module/campaign/run.py b/module/campaign/run.py index d90ca74f8..994bb29b6 100644 --- a/module/campaign/run.py +++ b/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) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 4d2e77eea..a2da88143 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1967,24 +1967,24 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -2388,23 +2388,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -2802,23 +2802,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -4609,23 +4609,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -5041,23 +5041,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -5473,23 +5473,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -5905,23 +5905,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { @@ -6327,23 +6327,23 @@ "value": "campaign_main", "option": [ "event_20220728_cn", - "event_20240229_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_20220728_cn" ], "option_bold": [ "event_20220728_cn", - "event_20240229_cn" + "event_20260326_cn" ] }, "Mode": { diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 4517fc22b..86ec78b49 100644 --- a/module/config/i18n/en-US.json +++ b/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", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 04f909faa..ac599ba5f 100644 --- a/module/config/i18n/ja-JP.json +++ b/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": "秘密事件調査", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 1021aa8ec..71a1d76fa 100644 --- a/module/config/i18n/zh-CN.json +++ b/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": "演习神秘事件调查", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index bd21ec06a..ff9dd3d11 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -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": "演習神秘事件調查", diff --git a/module/ocr/models.py b/module/ocr/models.py index 69a4decb7..07c389631 100644 --- a/module/ocr/models.py +++ b/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 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 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