Opt: use LoggerUnlock in storage

Dev

campaign/Readme.md

@@ -56,6 +56,8 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20250717   | war archives 20220428 cn | Rondo at Rainbow's End                       | 虹彩的终幕曲               | Rondo at Rainbow's End                             | 吟ずる瑠璃の楽章                     | 虹彩的終幕曲               |
 | 20251016   | war archives 20231026 cn | Tempesta and the Fountain of Youth           | 飓风与青春之泉             | Tempesta and the Fountain of Youth                 | テンペスタと若返りの泉               | 飓風與青春之泉             |
 | 20251106   | war archives 20220915 cn | Violet Tempest Blooming Lycoris              | 紫绛槿岚                   | Violet Tempest Blooming Lycoris                    | 赫の涙月 菫の暁風                    | 紫絳槿嵐                   |
+| 20251218   | war archives 20221222 cn | Parallel Superimposition                     | 定向折叠                   | Parallel Superimposition                           | 積重なる事象の幻界                   | 定向折疊                   |
+| 20260129   | war archives 20230223 cn | Revelations of Dust                          | 湮烬尘墟                   | Revelations of Dust                                | 黙示の遺構                           | 湮燼塵墟                   |
 | 20200227   | event 20200227 cn        | Northern Overture                            | 北境序曲                   | Northern Overture                                  | 凍絶の北海                           | -                          |
 | 20200312   | event 20200312 cn        | The Solomon Ranger                           | 复刻斯图尔特的硝烟         | The Solomon Ranger Rerun                           | 南洋に靡く硝煙（復刻）               | -                          |
 | 20200326   | event 20200326 cn        | Microlayer Medley                            | 微层混合                   | Microlayer Medley                                  | 闇靄払う銀翼                         | -                          |
@@ -270,3 +272,10 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20251121   | event 20220428 cn        | Rondo at Rainbow's End                       | -                          | -                                                  | -                                    | 復刻虹彩的終幕曲           |
 | 20251120   | coalition 20251120       | DATE A LANE                                  | DATE A LANE                | DATE A LANE                                        | DATE A LANE                          | -                          |
 | 20251127   | coalition 20251120       | DATE A LANE                                  | -                          | -                                                  | -                                    | DATE A LANE                |
+| 20251211   | event 20251023 cn        | Tempesta and Islas de Libertád               | -                          | -                                                  | -                                    | 颶風與自由群島             |
+| 20251218   | event 20251218 cn        | A Note Through the Firmament                 | 响彻于天穹之音             | A Note Through the Firmament                       | 天穹に響く音謡                       | -                          |
+| 20251231   | event 20251218 cn        | A Note Through the Firmament                 | -                          | -                                                  | -                                    | 響徹於天穹之音             |
+| 20260115   | event 20231221 cn        | Light-Chasing Sea of Stars Rerun             | 复刻星海逐光               | Light-Chasing Sea of Stars Rerun                   | 光追う星の海（復刻）                 | -                          |
+| 20260122   | coalition 20260122       | Light & Shadow Fashion Shoot!                | 光影风尚-拍摄进行时        | Light & Shadow Fashion Shoot!                      | 特集写真-撮影進行中                  | -                          |
+| 20260122   | event 20220526 cn        | Pledge of the Radiant Court                  | -                          | -                                                  | -                                    | 泠誓光庭                   |
+| 20260129   | coalition 20260122       | Light & Shadow Fashion Shoot!                | -                          | -                                                  | -                                    | 光影風尚-拍攝進行時        |

campaign/event_20231026_cn/t2.py

@@ -58,7 +58,7 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
-    MAP_SIREN_HAS_BOSS_ICON = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
     MAP_SWIPE_MULTIPLY = (1.223, 1.246)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (1.183, 1.205)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (1.149, 1.169)

campaign/event_20231026_cn/t5.py

@@ -66,7 +66,7 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
-    MAP_SIREN_HAS_BOSS_ICON = True
+    MAP_SIREN_HAS_BOSS_ICON_SMALL = True
     MAP_SWIPE_MULTIPLY = (0.991, 1.009)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (0.958, 0.976)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (0.930, 0.947)

campaign/event_20251218_cn/a1.py

@@ -0,0 +1,97 @@
+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('A1')
+MAP.shape = 'J8'
+MAP.camera_data = ['D3', 'D6', 'G3', 'G6']
+MAP.camera_data_spawn_point = ['G2']
+MAP.map_data = """
+    ++ -- -- -- -- -- ++ -- SP --
+    ++ ME ++ ++ ++ Me -- -- -- SP
+    -- -- -- -- Me -- -- MS -- --
+    ME -- ME -- -- -- __ -- ++ ++
+    ++ -- ++ ++ -- MS -- -- ++ ++
+    -- -- -- ++ 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 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': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1, 'boss': 1},
+    {'battle': 4, 'enemy': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+    = MAP.flatten()
+
+
+class Config:
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    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 = True
+    STAGE_ENTRANCE = ['half', '20240725']
+    MAP_HAS_MODE_SWITCH = True
+    STAGE_INCREASE_AB = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (80, 255 - 17),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 17, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
+    HOMO_EDGE_COLOR_RANGE = (0, 17)
+    MAP_WALK_USE_CURRENT_FLEET = True
+    MAP_SWIPE_MULTIPLY = (1.232, 1.255)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.191, 1.213)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.156, 1.177)
+
+
+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_3(self):
+        return self.clear_boss()

campaign/event_20251218_cn/a2.py

@@ -0,0 +1,75 @@
+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 .a1 import Config as ConfigBase
+
+MAP = CampaignMap('A2')
+MAP.shape = 'J8'
+MAP.camera_data = ['E3', 'E6', 'F3', 'F6']
+MAP.camera_data_spawn_point = ['E6']
+MAP.map_data = """
+    -- -- -- -- -- ++ ME ++ -- --
+    -- -- MB -- -- ME -- ME -- --
+    ++ ++ -- ++ ++ -- -- -- ME --
+    ++ -- __ -- ++ Me -- ++ ++ ++
+    -- MS -- MS -- -- -- Me -- --
+    -- -- 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 50 50 50 50 50 50 50 50
+"""
+MAP.spawn_data = [
+    {'battle': 0, 'enemy': 2, 'siren': 1},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1, 'boss': 1},
+]
+A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
+A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
+    = MAP.flatten()
+
+
+class Config(ConfigBase):
+    # ===== Start of generated config =====
+    MAP_SIREN_TEMPLATE = ['Vboss_Star']
+    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()