Merge pull request #1698 from LmeSzinc/bug_fix

Bug fix

Author: LmeSzinc

README.md

@@ -150,7 +150,7 @@ GUI development, thanks **[@18870](https://github.com/18870)** , say HURRAY.
 
 ## 参与开发 Join Development
 
-我们会不定期发布未来的工作在 [Issues](https://github.com/LmeSzinc/AzurLaneAutoScript/issues) 上并标记为 `help wanted`，欢迎向 Alas 提交 [Pull Requests](https://github.com/LmeSzinc/AzurLaneAutoScript/pulls)，我们会认真阅读你的每一行代码的。
+Alas 仍在活跃开发中，我们会不定期发布未来的工作在 [Issues](https://github.com/LmeSzinc/AzurLaneAutoScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) 上并标记为 `help wanted`，欢迎向 Alas 提交 [Pull Requests](https://github.com/LmeSzinc/AzurLaneAutoScript/pulls)，我们会认真阅读你的每一行代码的。
 
 哦对，别忘了阅读 [开发文档](https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/1.-Start)。
 

README_en.md

@@ -92,7 +92,7 @@ Development documents, refer to [WIKI](https://github.com/LmeSzinc/AzurLaneAutoS
 
 ## Join Development
 
-We will occasionally publish future work on [Issues](https://github.com/LmeSzinc/AzurLaneAutoScript/issues) and mark it as `help wanted`, feel free to submit [Pull Requests](https://github.com.com/LmeSzinc/AzurLaneAutoScript/pulls) to Alas, we will read every line of your code.
+Alas is still in active development, we will occasionally publish future work on [Issues](https://github.com/LmeSzinc/AzurLaneAutoScript/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) and mark it as `help wanted`, feel free to submit [Pull Requests](https://github.com.com/LmeSzinc/AzurLaneAutoScript/pulls) to Alas, we will read every line of your code.
 
 Oh yeah, don't forget to read the [development documentation](https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/1.-Start).
 

deploy/set.py

@@ -0,0 +1,37 @@
+import sys
+import typing as t
+
+from deploy.utils import poor_yaml_read, poor_yaml_write, DEPLOY_TEMPLATE
+
+"""
+Set config/deploy.yaml with commands like
+
+python -m deploy.set GitExecutable=/usr/bin/git PythonExecutable=/usr/bin/python3.8
+"""
+
+
+def get_args() -> t.Dict[str, str]:
+    args = {}
+    for arg in sys.argv[1:]:
+        if '=' not in arg:
+            continue
+        k, v = arg.split('=')
+        k, v = k.strip(), v.strip()
+        args[k] = v
+    return args
+
+
+def config_set(output='./config/deploy.yaml'):
+    data = poor_yaml_read(DEPLOY_TEMPLATE)
+    data.update(poor_yaml_read(output))
+    for k, v in get_args().items():
+        if k in data:
+            print(f'{k} set')
+            data[k] = v
+        else:
+            print(f'{k} not exist')
+    poor_yaml_write(data, file=output)
+
+
+if __name__ == '__main__':
+    config_set()

module/device/connection.py

@@ -80,7 +80,8 @@ def __init__(self, config):
             config (AzurLaneConfig, str): Name of the user config under ./config
         """
         super().__init__(config)
-        self.detect_device()
+        if not self.is_over_http:
+            self.detect_device()
 
         # Connect
         self.adb_connect(self.serial)

module/device/connection_attr.py

@@ -87,11 +87,11 @@ def serial_check(self):
                     self.config.Emulator_ScreenshotMethod = 'uiautomator2'
                     self.config.Emulator_ControlMethod = 'uiautomator2'
         if self.is_over_http:
-            if self.config.Emulator_ScreenshotMethod not in ["ADB", "uiautomator2"] \
+            if self.config.Emulator_ScreenshotMethod not in ["ADB", "uiautomator2", "aScreenCap"] \
                     or self.config.Emulator_ControlMethod not in ["ADB", "uiautomator2", "minitouch"]:
                 logger.warning(
                     f'When connecting to a device over http: {self.serial} '
-                    f'ScreenshotMethod can only use ["ADB", "uiautomator2"], '
+                    f'ScreenshotMethod can only use ["ADB", "uiautomator2", "aScreenCap"], '
                     f'ControlMethod can only use ["ADB", "uiautomator2", "minitouch"]'
                 )
                 raise RequestHumanTakeover

module/handler/info_handler.py

@@ -91,8 +91,10 @@ def handle_popup_cancel(self, name='', interval=2):
             return True
         return False
 
-    def handle_popup_single(self, name=''):
-        if self.appear(GET_MISSION, offset=self._popup_offset, interval=2):
+    def handle_popup_single(self, name='', offset=None):
+        if offset is None:
+            offset = self._popup_offset
+        if self.appear(GET_MISSION, offset=offset, interval=2):
             prev_name = GET_MISSION.name
             GET_MISSION.name = POPUP_CONFIRM.name + '_' + name
             self.device.click(GET_MISSION)

module/os_handler/shop.py

@@ -11,6 +11,22 @@
 OCR_SHOP_PURPLE_COINS = Digit(SHOP_PURPLE_COINS, letter=(255, 255, 255), name='OCR_SHOP_PURPLE_COINS')
 
 
+class ShopPriceOcr(Digit):
+    def __init__(self, *args, **kwargs):
+        kwargs['alphabet'] = '0123456789ID'
+        super().__init__(*args, **kwargs)
+
+    def after_process(self, result):
+        result = ''.join(result)
+
+        # I00 -> 100
+        result = result.replace('I', '1')
+        # 1D -> 10
+        result = result.replace('D', '0')
+        result = int(result) if result else 0
+        return result
+
+
 class OSShopHandler(UI, MapEventHandler):
     _shop_yellow_coins = 0
     _shop_purple_coins = 0
@@ -31,6 +47,7 @@ def os_shop_items(self):
         shop_items = ItemGrid(shop_grid, templates={}, amount_area=(60, 74, 96, 95))
         shop_items.load_template_folder('./assets/shop/os')
         shop_items.load_cost_template_folder('./assets/shop/os_cost')
+        shop_items.price_ocr = ShopPriceOcr([], letter=(255, 223, 57), threshold=32, name='Price_ocr')
         return shop_items
 
     def os_shop_get_items(self, name=True):

module/ui/ui.py

@@ -1,11 +1,12 @@
 from module.base.button import Button
 from module.base.decorator import run_once
 from module.base.timer import Timer
+from module.battle_pass.assets import PURCHASE_POPUP
 from module.combat.assets import GET_ITEMS_1, GET_SHIP
 from module.exception import (GameNotRunningError, GamePageUnknownError,
                               RequestHumanTakeover)
 from module.handler.assets import (AUTO_SEARCH_MENU_EXIT, BATTLE_PASS_NOTICE,
-                                   GAME_TIPS, GET_MISSION, LOGIN_ANNOUNCE,
+                                   GAME_TIPS, LOGIN_ANNOUNCE,
                                    LOGIN_CHECK, LOGIN_RETURN_SIGN,
                                    MONTHLY_PASS_NOTICE)
 from module.handler.info_handler import InfoHandler
@@ -15,7 +16,6 @@
 from module.ocr.ocr import Ocr
 from module.os_handler.assets import (EXCHANGE_CHECK, RESET_FLEET_PREPARATION,
                                       RESET_TICKET_POPUP)
-from module.battle_pass.assets import PURCHASE_POPUP
 from module.raid.assets import RAID_FLEET_PREPARATION
 from module.ui.assets import (BACK_ARROW, DORM_FEED_CANCEL, DORM_INFO,
                               DORM_TROPHY_CONFIRM, EVENT_LIST_CHECK, GOTO_MAIN,
@@ -424,7 +424,7 @@ def ui_page_main_popups(self):
         if self.appear_then_click(PURCHASE_POPUP, offset=(44, -77, 84, -37), interval=3):
             return True
         # Item expired offset=(37, 72), skin expired, offset=(24, 68)
-        if self.appear_then_click(GET_MISSION, offset=(-6, 48, 54, 88), interval=3):
+        if self.handle_popup_single(offset=(-6, 48, 54, 88), name='ITEM_EXPIRED'):
             return True
 
         return False