Merge pull request #4773 from LmeSzinc/bug_fix

Bug fix

campaign/event_20240912_cn/a1.py

@@ -53,6 +53,9 @@ class Config:
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219 = True
+    MAP_HAS_MODE_SWITCH = True
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (120, 255 - 49),
         'width': (1.5, 10),

campaign/event_20240912_cn/b1.py

@@ -57,6 +57,9 @@ class Config:
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219 = True
+    MAP_HAS_MODE_SWITCH = True
     STAGE_ENTRANCE = ['half', '20240725']
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (80, 255 - 17),

campaign/event_20240912_cn/c1.py

@@ -54,6 +54,8 @@ class Config:
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_CHAPTER_SWITCH_20241219 = True
+    MAP_HAS_MODE_SWITCH = True
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (120, 255 - 49),
         'width': (1.5, 10),

campaign/event_20240912_cn/campaign_base.py

@@ -29,12 +29,14 @@ class CampaignBase(CampaignBase_):
 
     def campaign_set_chapter_20241219(self, *args, **kwargs):
         """
+        THe origin event is mixed with classic stage entrance and MODE_SWITCH_20240912
         2025.05.01 TW airs event_20240912_cn but uses event entry after 20241219
+        See https://github.com/LmeSzinc/AzurLaneAutoScript/pull/4768
         """
-        if self.config.SERVER == 'tw':
+        if self.config.SERVER != 'tw':
             self.config.override(
-                MAP_CHAPTER_SWITCH_20241219=True,
+                MAP_CHAPTER_SWITCH_20241219=False,
-                MAP_HAS_MODE_SWITCH=True
+                MAP_HAS_MODE_SWITCH=False,
             )
         return super().campaign_set_chapter_20241219(*args, **kwargs)
 

campaign/event_20240912_cn/d1.py

@@ -57,6 +57,9 @@ class Config:
     MAP_HAS_AMBUSH = False
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
+
+    MAP_CHAPTER_SWITCH_20241219 = True
+    MAP_HAS_MODE_SWITCH = True
     STAGE_ENTRANCE = ['half', '20240725']
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (80, 255 - 17),

campaign/event_20240912_cn/sp.py

@@ -54,6 +54,7 @@ class Config:
     STAR_REQUIRE_3 = 0
     # ===== End of generated config =====
 
+    MAP_CHAPTER_SWITCH_20241219 = True
     MAP_IS_ONE_TIME_STAGE = True
     STAGE_ENTRANCE = ['half', '20240725']
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {

module/commission/project.py

@@ -164,6 +164,8 @@ class Commission:
         ocr = Ocr(button, letter=(201, 201, 201), lang='jp')
         self.button = button
         self.name = ocr.ocr(self.image)
+        # NB装備輸送 -> NYB装備輸送
+        self.name = self.name.replace('NB', 'BYB').replace('BW', 'BIW')
         self.genre = self.commission_name_parse(self.name)
 
         # Suffix

module/device/method/nemu_ipc.py

@@ -505,11 +505,15 @@ class NemuIpc(Platform):
             return False
         if not self.is_mumu_family:
             return False
-        # >= 4.0 has no info in getprop
         if self.nemud_player_version == '':
-            return True
+            # >= 4.0 has no info in getprop
-        if self.nemud_app_keep_alive == '':
+            # Try initializing nemu_ipc for final check
-            return False
+            pass
+        else:
+            # Having version, probably MuMu6 or MuMu12 version 3.x
+            if self.nemud_app_keep_alive == '':
+                # Empty property, probably MuMu6 or MuMu12 version < 3.5.6
+                return False
         try:
             _ = self.nemu_ipc
         except RequestHumanTakeover: