Merge pull request #4157 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

assets/mask/MASK_MAIN_WHITE.png

@@ -43,7 +43,7 @@ def merge(self, info, mode='normal'):
 
 
 class CampaignBase(CampaignBase_):
-    ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
+    ENEMY_FILTER = '1L > 1M > 1E > 2L > 3L > 2M > 2E > 1C > 2C > 3M > 3E > 3C'
 
     def map_data_init(self, map_):
         super().map_data_init(map_)

campaign/campaign_main/campaign_15_base.py

@@ -85,8 +85,8 @@ def before_boss(self):
         # Handle giant boss at A8
         logger.info('B2 before boss')
         grid = SelectedGrids([B6, C7]).sort('weight', 'cost')[0]
-        self.goto(grid)
-        self.goto(B8)
+        self.fleet_boss.goto(grid)
+        self.fleet_boss.goto(B8)
 
     def clear_boss(self):
         self.before_boss()

campaign/event_20240815_cn/b2.py

@@ -94,8 +94,8 @@ def before_boss(self):
         # Handle giant boss at A8
         logger.info('B2 before boss')
         grid = SelectedGrids([B6, C7]).sort('weight', 'cost')[0]
-        self.goto(grid)
-        self.goto(B8)
+        self.fleet_boss.goto(grid)
+        self.fleet_boss.goto(B8)
 
     def clear_boss(self):
         self.before_boss()

campaign/event_20240815_cn/d2.py

@@ -715,18 +715,25 @@ def adb_brute_force_connect(self, serial_list):
             serial_list (list[str]):
         """
         import asyncio
+        from concurrent.futures import ThreadPoolExecutor
         ev = asyncio.new_event_loop()
+        pool = ThreadPoolExecutor(
+            max_workers=len(serial_list),
+            thread_name_prefix='adb_brute_force_connect',
+        )
 
         def _connect(serial):
             msg = self.adb_client.connect(serial)
             logger.info(msg)
             return msg
 
         async def connect():
-            tasks = [ev.run_in_executor(None, _connect, serial) for serial in serial_list]
+            tasks = [ev.run_in_executor(pool, _connect, serial) for serial in serial_list]
             await asyncio.gather(*tasks)
 
         ev.run_until_complete(connect())
+        pool.shutdown(wait=False)
+        ev.close()
 
     @Config.when(DEVICE_OVER_HTTP=True)
     def adb_connect(self):

module/device/connection.py

@@ -275,11 +275,25 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.disconnect()
+        if has_cached_property(self, '_ev'):
+            self._ev.close()
+            del_cached_property(self, '_ev')
+        if has_cached_property(self, '_pool'):
+            self._pool.shutdown(wait=False)
+            del_cached_property(self, '_pool')
 
     @cached_property
     def _ev(self):
         return asyncio.new_event_loop()
 
+    @cached_property
+    def _pool(self):
+        from concurrent.futures import ThreadPoolExecutor
+        return ThreadPoolExecutor(
+            max_workers=1,
+            thread_name_prefix='NemuIpc',
+        )
+
     async def ev_run_async(self, func, *args, timeout=0.15, **kwargs):
         """
         Args:
@@ -294,7 +308,7 @@ async def ev_run_async(self, func, *args, timeout=0.15, **kwargs):
         func_wrapped = partial(func, *args, **kwargs)
         # Increased timeout for slow PCs
         # Default screenshot interval is 0.2s, so a 0.15s timeout would have a fast retry without extra time costs
-        result = await asyncio.wait_for(self._ev.run_in_executor(None, func_wrapped), timeout=timeout)
+        result = await asyncio.wait_for(self._ev.run_in_executor(self._pool, func_wrapped), timeout=timeout)
         return result
 
     def ev_run_sync(self, func, *args, **kwargs):

module/device/method/nemu_ipc.py

@@ -5,6 +5,7 @@
 from module.ui.page import MAIN_GOTO_CAMPAIGN_WHITE, MAIN_GOTO_FLEET
 
 MASK_MAIN = Mask('./assets/mask/MASK_MAIN.png')
+MASK_MAIN_WHITE = Mask('./assets/mask/MASK_MAIN_WHITE.png')
 MASK_PLAYER = Mask('./assets/mask/MASK_PLAYER.png')
 
 
@@ -21,7 +22,7 @@ def handle_sensitive_image(image):
     if MAIN_GOTO_FLEET.match(image, offset=(30, 30)):
         image = MASK_MAIN.apply(image)
     if MAIN_GOTO_CAMPAIGN_WHITE.match(image, offset=(30, 30)):
-        image = MASK_MAIN.apply(image)
+        image = MASK_MAIN_WHITE.apply(image)
 
     return image
 

module/handler/sensitive_info.py

@@ -348,6 +348,7 @@ def handle_retirement(self):
                 self._retire_handler(mode='one_click_retire')
                 self._unable_to_enhance = False
                 self.interval_reset(IN_RETIREMENT_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
         elif self.config.Retirement_RetireMode == 'enhance':
             if self.appear_then_click(RETIRE_APPEAR_3, offset=(20, 20), interval=3):
@@ -367,16 +368,19 @@ def handle_retirement(self):
                     logger.info('Too few spare docks, retire next time')
                     self._unable_to_enhance = True
                 self.interval_reset(DOCK_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
         else:
             if self.appear_then_click(RETIRE_APPEAR_1, offset=(20, 20), interval=3):
                 self.interval_clear(IN_RETIREMENT_CHECK)
                 self.interval_reset([AUTO_SEARCH_MAP_OPTION_OFF, AUTO_SEARCH_MAP_OPTION_ON])
+                self.map_cat_attack_timer.reset()
                 return False
             if self.appear(IN_RETIREMENT_CHECK, offset=(20, 20), interval=10):
                 self._retire_handler()
                 self._unable_to_enhance = False
                 self.interval_reset(IN_RETIREMENT_CHECK)
+                self.map_cat_attack_timer.reset()
                 return True
 
         return False
@@ -500,7 +504,10 @@ def retirement_get_common_rarity_cv(self, skip_first_screenshot=False):
         if button is not None:
             return button
 
-        while RETIRE_CONFIRM_SCROLL.appear(main=self):
+        for _ in range(7):
+            if not RETIRE_CONFIRM_SCROLL.appear(main=self):
+                logger.info('Scroll bar disappeared, stop')
+                break
             RETIRE_CONFIRM_SCROLL.next_page(main=self)
             button = self.retirement_get_common_rarity_cv_in_page()
             if button is not None:

module/retire/retirement.py

@@ -64,10 +64,9 @@
         "display": "hide"
       },
       "OnePushConfig": {
-        "type": "input",
+        "type": "textarea",
         "value": "provider: null",
-        "mode": "yaml",
-        "display": "hide"
+        "mode": "yaml"
       }
     },
     "Optimization": {

submodule/AlasMaaBridge/module/config/argument/args.json

@@ -27,9 +27,9 @@ Error:
     value: false
     display: hide
   OnePushConfig:
+    type: textarea
     mode: yaml
     value: 'provider: null'
-    display: hide
 Optimization:
   WhenTaskQueueEmpty:
     value: stay_there