Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Bug fix

alas.py

@@ -87,6 +87,20 @@ class AzurLaneAutoScript:
             self.config.task_call('Restart')
             self.device.sleep(10)
             return False
+        except EmulatorNetworkError as e:
+            logger.error(e)
+            self.save_error_log()
+            if self.device.is_emulator:
+                logger.info('Game update stuck 3 times. Checking network status on both ends.')
+                self.checker.check_now()
+                if self.checker.is_available() and not self.device.is_network_available():
+                    logger.critical('Emulator network is disconnected despite host being online.')
+                    logger.warning('Restarting emulator to fix internal network.')
+                    self.device.emulator_start()
+                    deep_set(self.failure_record, keys='Restart', value=1)
+            self.config.task_call('Restart')
+            self.device.sleep(10)
+            return False
         except GameBugError as e:
             logger.warning(e)
             self.save_error_log()
@@ -434,6 +448,10 @@ class AzurLaneAutoScript:
         from module.storage.box_disassemble import StorageBox
         StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
 
+    def island_pearl(self):
+        from module.island.pearl_daemon import IslandPearl
+        IslandPearl(config=self.config, device=self.device, task="IslandPearl").run()
+
     def azur_lane_uncensored(self):
         from module.daemon.uncensored import AzurLaneUncensored
         AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
@@ -556,12 +574,8 @@ class AzurLaneAutoScript:
             _ = self.device
             self.device.config = self.config
             # Skip first restart
-            if task == 'Restart':
-                if self.is_first_task:
-                    logger.info('Skip task `Restart` at scheduler start')
-                else:
-                    from module.handler.login import LoginHandler
-                    LoginHandler(self.config, self.device).app_restart()
+            if task == 'Restart' and self.is_first_task:
+                logger.info('Skip task `Restart` at scheduler start')
                 self.config.task_delay(server_update=True)
                 del_cached_property(self, 'config')
                 continue

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

@@ -255,7 +255,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20250703   | event 20250424 cn        | Toward Tulipa’s Seas                         | -                          | -                                                  | -                                    | 揚起鬱金之旗               |
 | 20250724   | event 20241219 cn        | Substellar Crepuscule                        | -                          | -                                                  | -                                    | 星光下的餘暉               |
 | 20250724   | event 20250724 cn        | The Alchemist and the Tower of Horizons      | 优米雅的炼金工房           | The Alchemist and the Tower of Horizons            | 錬金術士と天空邂逅の塔               | -                          |
-| 20250726   | event 20221124 cn        | The Alchemist and the Archipelago of Secrets | 复刻炼金术士与秘密遗迹群岛 | The Alchemist and the Archipelago of Secrets Rerun | 錬金術士と謎の遺跡群島（復刻）       | -                          |
+| 20250724   | event 20221124 cn        | The Alchemist and the Archipelago of Secrets | 复刻炼金术士与秘密遗迹群岛 | The Alchemist and the Archipelago of Secrets Rerun | 錬金術士と謎の遺跡群島（復刻）       | -                          |
 | 20250807   | event 20250724 cn        | The Alchemist and the Tower of Horizons      | -                          | -                                                  | -                                    | 鍊金術士與天際交會之塔     |
 | 20250807   | event 20221124 cn        | The Alchemist and the Archipelago of Secrets | -                          | -                                                  | -                                    | 復刻鍊金術士與秘密遺跡群島 |
 | 20250814   | event 20250814 cn        | Secrets of the Abyss                         | 奇渊下的秘密               | Secrets of the Abyss                               | 淵層界の秘密                         | -                          |
@@ -281,4 +281,12 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20260122   | event 20220526 cn        | Pledge of the Radiant Court                  | -                          | -                                                  | -                                    | 泠誓光庭                   |
 | 20260129   | coalition 20260122       | Light & Shadow Fashion Shoot!                | -                          | -                                                  | -                                    | 光影風尚-拍攝進行時        |
 | 20260205   | raid 20240328            | From Zero to Hero                            | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun                            | ゼロから頑張る魔王討伐（復刻）       | -                          |
-| 20260212   | raid 20260212            | Spring Auction Adventure                     | 春宴怀玉香满庭             | Spring Auction Adventure                           | 新春玉逸品会                         | -                          |
+| 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                    | ワンダラー募集計画                   | -                          |
+| 20260402   | event 20260326 cn        | The Vagabond’s Recruitment Plan              | -                          | -                                                  | -                                    | 漫遊者招募計劃             |
+| 20260416   | event 20220915 cn        | Violet Tempest Blooming Lycoris              | -                          | -                                                  | -                                    | 復刻紫絳槿嵐               |
+| 20260417   | event 20260417 cn        | Vacation Lane – Beachside Brilliance         | 假日航线闪耀海滨           | Vacation Lane – Beachside Brilliance               | バケーションレーン・きらめく砂浜     | -                          |
+| 20260417   | event 20201126 cn        | Vacation Lane Rerun                          | 复刻假日航线               | Vacation Lane Rerun                                | バケーションレーン（復刻）           | -                          |

campaign/campaign_main/campaign_15_base.py

@@ -205,3 +205,4 @@ class CampaignBase(CampaignBase_):
         self._mob_move_info_change(location, target)
         self.find_path_initial()
         self.map.show()
+        return True

campaign/campaign_main/campaign_16_1.py

@@ -7,8 +7,8 @@ from .campaign_16_base_submarine import Config as ConfigBase
 
 MAP = CampaignMap('16-1')
 MAP.shape = 'I9'
-MAP.camera_data = ['C2', 'C6', 'F2', 'F6']
-MAP.camera_data_spawn_point = ['F6']
+MAP.camera_data = ['C2', 'C6', 'F2', 'F5']
+MAP.camera_data_spawn_point = ['F7']
 MAP.camera_sight = (-2, -1, 3, 2)
 MAP.map_data = """
     ++ ME -- -- ME -- -- ME --
@@ -57,6 +57,11 @@ class Config(ConfigBase):
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
+    MAP_SWIPE_MULTIPLY = (1.050, 1.069)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.015, 1.034)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (0.985, 1.003)
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/campaign_main/campaign_16_2.py

@@ -54,6 +54,11 @@ class Config(ConfigBase):
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_AMBUSH = True
 
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
+    MAP_SWIPE_MULTIPLY = (1.093, 1.113)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.077)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045)
+
 
 class Campaign(CampaignBase):
     MAP = MAP