Merge pull request #4497 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

assets/jp/guild/GUILD_MISSION_NEW.png

@@ -59,17 +59,34 @@ def patch_uiautomator2():
     https://tool.appetizer.io is added to bypass the wall in China but https://tool.appetizer.io is slow outside of CN
     plus some CN users cannot access it for unknown reason.
 
-    So we patch `uiautomator2/init.py` to a local assets cache `uiautomator2cache/cache`.
+    1. So we patch `uiautomator2/init.py` to a local assets cache `uiautomator2cache/cache`.
         appdir = os.path.join(os.path.expanduser('~'), '.uiautomator2')
     to:
         appdir = os.path.join(__file__, '../../uiautomator2cache')
 
-    And we also remove minicap installations since emulators doesn't need it.
+    2. And we also remove minicap installations since emulators doesn't need it.
         for url in self.minicap_urls:
             self.push_url(url)
     to:
         for url in []:
             self.push_url(url)
+
+    3. Fix atx_agent_url so ARM Mac can have correct ATX installed
+    ```
+    @property
+    def atx_agent_url(self):
+        files = {
+            'armeabi-v7a': 'atx-agent_{v}_linux_armv7.tar.gz',
+            'arm64-v8a': 'atx-agent_{v}_linux_armv7.tar.gz',
+            'armeabi': 'atx-agent_{v}_linux_armv6.tar.gz',
+            'x86': 'atx-agent_{v}_linux_386.tar.gz',
+            'x86_64': 'atx-agent_{v}_linux_386.tar.gz',
+        }
+    ```
+    where
+        'arm64-v8a': 'atx-agent_{v}_linux_armv7.tar.gz',
+    to
+        'arm64-v8a': 'atx-agent_{v}_linux_arm64.tar.gz',
     """
     init_file = './toolkit/Lib/site-packages/uiautomator2/init.py'
     cache_dir = './toolkit/Lib/site-packages/uiautomator2cache/cache'
@@ -92,6 +109,17 @@ def patch_uiautomator2():
     else:
         logger.info(f'{init_file} minicap_urls no need to patch')
 
+    # Patch atx_agent_url
+    res = re.search(r"'arm64-v8a': 'atx-agent_\{v}_linux_armv7.tar.gz'", content)
+    if res:
+        content = re.sub(r"'arm64-v8a': 'atx-agent_\{v}_linux_armv7.tar.gz'",
+                         "'arm64-v8a': 'atx-agent_{v}_linux_arm64.tar.gz'",
+                         content)
+        modified = True
+        logger.info(f'{init_file} atx_agent_url patched')
+    else:
+        logger.info(f'{init_file} atx_agent_url no need to patch')
+
     # Patch appdir
     if os.path.exists(cache_dir):
         res = re.search(r'appdir ?=(.*)\n', content)

assets/jp/os_handler/ACTION_POINT_BUY_REMAIN.png

@@ -282,7 +282,7 @@ def get_common_rarity_dd(self):
             return ships
 
         scanner.set_limitation(fleet=0)
-        if self.config.GemsFarming_CommonDD in ['any', 'favourite']:
+        if self.config.GemsFarming_CommonDD in ['any', 'favourite', 'z20_or_z21']:
             # Change to any ship
             return scanner.scan(self.device.image, output=False)
 

assets/jp/os_handler/OS_MONTHBOSS_HARD.png

@@ -9,6 +9,7 @@
 import numpy as np
 
 from module.base.decorator import cached_property
+from module.device.env import IS_WINDOWS
 from module.device.method.utils import RETRY_TRIES, get_serial_pair, retry_sleep
 from module.device.platform import Platform
 from module.exception import RequestHumanTakeover
@@ -312,6 +313,8 @@ def ldopengl(self):
             raise RequestHumanTakeover
 
     def ldopengl_available(self) -> bool:
+        if not IS_WINDOWS:
+            return False
         if not self.is_ldplayer_bluestacks_family:
             return False
         logger.attr('EmulatorInfo_Emulator', self.config.EmulatorInfo_Emulator)

assets/jp/os_handler/OS_MONTHBOSS_NORMAL.png

@@ -12,6 +12,7 @@
 from module.base.timer import Timer
 from module.base.utils import ensure_time
 from module.config.utils import deep_get
+from module.device.env import IS_WINDOWS
 from module.device.method.minitouch import insert_swipe, random_rectangle_point
 from module.device.method.pool import JobTimeout, WORKER_POOL
 from module.device.method.utils import RETRY_TRIES, retry_sleep
@@ -500,6 +501,8 @@ def nemu_ipc(self) -> NemuIpcImpl:
             raise RequestHumanTakeover
 
     def nemu_ipc_available(self) -> bool:
+        if not IS_WINDOWS:
+            return False
         if not self.is_mumu_family:
             return False
         # >= 4.0 has no info in getprop

deploy/Windows/patch.py

@@ -73,6 +73,38 @@ def setup_logger(*args, **kwargs):
 u2.init.setup_logger = setup_logger
 
 
+# Patch Initer
+class PatchedIniter(u2.init.Initer):
+    @property
+    def atx_agent_url(self):
+        files = {
+            'armeabi-v7a': 'atx-agent_{v}_linux_armv7.tar.gz',
+            # 'arm64-v8a': 'atx-agent_{v}_linux_armv7.tar.gz',
+            'arm64-v8a': 'atx-agent_{v}_linux_arm64.tar.gz',
+            'armeabi': 'atx-agent_{v}_linux_armv6.tar.gz',
+            'x86': 'atx-agent_{v}_linux_386.tar.gz',
+            'x86_64': 'atx-agent_{v}_linux_386.tar.gz',
+        }
+        name = None
+        for abi in self.abis:
+            name = files.get(abi)
+            if name:
+                break
+        if not name:
+            raise Exception(
+                "arch(%s) need to be supported yet, please report an issue in github"
+                % self.abis)
+        return u2.init.GITHUB_BASEURL + '/atx-agent/releases/download/%s/%s' % (
+            u2.version.__atx_agent_version__, name.format(v=u2.version.__atx_agent_version__))
+
+    @property
+    def minicap_urls(self):
+        return []
+
+
+u2.init.Initer = PatchedIniter
+
+
 def is_port_using(port_num):
     """ if port is using by others, return True. else return False """
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

module/campaign/gems_farming.py

@@ -18,7 +18,7 @@
 GUILD_LOGISTICS_ENSURE_CHECK = Button(area={'cn': (390, 382, 516, 393), 'en': (390, 382, 516, 393), 'jp': (390, 382, 516, 393), 'tw': (390, 382, 516, 393)}, color={'cn': (155, 87, 90), 'en': (155, 87, 90), 'jp': (155, 87, 90), 'tw': (155, 87, 90)}, button={'cn': (390, 382, 516, 393), 'en': (390, 382, 516, 393), 'jp': (390, 382, 516, 393), 'tw': (390, 382, 516, 393)}, file={'cn': './assets/cn/guild/GUILD_LOGISTICS_ENSURE_CHECK.png', 'en': './assets/en/guild/GUILD_LOGISTICS_ENSURE_CHECK.png', 'jp': './assets/jp/guild/GUILD_LOGISTICS_ENSURE_CHECK.png', 'tw': './assets/tw/guild/GUILD_LOGISTICS_ENSURE_CHECK.png'})
 GUILD_MISSION = Button(area={'cn': (1068, 279, 1224, 320), 'en': (1070, 281, 1222, 318), 'jp': (1068, 279, 1224, 320), 'tw': (1070, 281, 1222, 318)}, color={'cn': (105, 124, 179), 'en': (168, 104, 104), 'jp': (115, 131, 176), 'tw': (168, 104, 104)}, button={'cn': (1068, 279, 1224, 320), 'en': (1070, 281, 1222, 318), 'jp': (1068, 279, 1224, 320), 'tw': (1070, 281, 1222, 318)}, file={'cn': './assets/cn/guild/GUILD_MISSION.png', 'en': './assets/en/guild/GUILD_MISSION.png', 'jp': './assets/jp/guild/GUILD_MISSION.png', 'tw': './assets/tw/guild/GUILD_MISSION.png'})
 GUILD_MISSION_CHOOSE = Button(area={'cn': (406, 194, 565, 235), 'en': (406, 194, 565, 235), 'jp': (406, 194, 565, 235), 'tw': (406, 194, 565, 235)}, color={'cn': (106, 107, 112), 'en': (106, 107, 112), 'jp': (106, 107, 112), 'tw': (106, 107, 112)}, button={'cn': (406, 194, 565, 235), 'en': (406, 194, 565, 235), 'jp': (406, 194, 565, 235), 'tw': (406, 194, 565, 235)}, file={'cn': './assets/cn/guild/GUILD_MISSION_CHOOSE.png', 'en': './assets/cn/guild/GUILD_MISSION_CHOOSE.png', 'jp': './assets/cn/guild/GUILD_MISSION_CHOOSE.png', 'tw': './assets/cn/guild/GUILD_MISSION_CHOOSE.png'})
-GUILD_MISSION_NEW = Button(area={'cn': (414, 199, 551, 230), 'en': (414, 199, 551, 230), 'jp': (414, 199, 551, 230), 'tw': (414, 199, 551, 230)}, color={'cn': (127, 128, 132), 'en': (127, 128, 132), 'jp': (127, 128, 132), 'tw': (127, 128, 132)}, button={'cn': (414, 199, 551, 230), 'en': (414, 199, 551, 230), 'jp': (414, 199, 551, 230), 'tw': (414, 199, 551, 230)}, file={'cn': './assets/cn/guild/GUILD_MISSION_NEW.png', 'en': './assets/cn/guild/GUILD_MISSION_NEW.png', 'jp': './assets/cn/guild/GUILD_MISSION_NEW.png', 'tw': './assets/cn/guild/GUILD_MISSION_NEW.png'})
+GUILD_MISSION_NEW = Button(area={'cn': (414, 199, 551, 230), 'en': (414, 199, 551, 230), 'jp': (415, 198, 626, 231), 'tw': (414, 199, 551, 230)}, color={'cn': (127, 128, 132), 'en': (127, 128, 132), 'jp': (165, 172, 178), 'tw': (127, 128, 132)}, button={'cn': (414, 199, 551, 230), 'en': (414, 199, 551, 230), 'jp': (415, 198, 626, 231), 'tw': (414, 199, 551, 230)}, file={'cn': './assets/cn/guild/GUILD_MISSION_NEW.png', 'en': './assets/cn/guild/GUILD_MISSION_NEW.png', 'jp': './assets/jp/guild/GUILD_MISSION_NEW.png', 'tw': './assets/cn/guild/GUILD_MISSION_NEW.png'})
 GUILD_MISSION_SELECT = Button(area={'cn': (1023, 131, 1052, 160), 'en': (1023, 131, 1052, 160), 'jp': (1023, 131, 1052, 160), 'tw': (1023, 131, 1052, 160)}, color={'cn': (185, 75, 72), 'en': (185, 75, 72), 'jp': (185, 75, 72), 'tw': (185, 75, 72)}, button={'cn': (912, 532, 975, 565), 'en': (912, 532, 975, 565), 'jp': (912, 532, 975, 565), 'tw': (912, 532, 975, 565)}, file={'cn': './assets/cn/guild/GUILD_MISSION_SELECT.png', 'en': './assets/cn/guild/GUILD_MISSION_SELECT.png', 'jp': './assets/cn/guild/GUILD_MISSION_SELECT.png', 'tw': './assets/cn/guild/GUILD_MISSION_SELECT.png'})
 GUILD_OPERATIONS_ACTIVE_CHECK = Button(area={'cn': (967, 640, 1078, 667), 'en': (941, 634, 1222, 672), 'jp': (946, 637, 1103, 668), 'tw': (967, 639, 1081, 667)}, color={'cn': (116, 123, 191), 'en': (87, 99, 178), 'jp': (104, 110, 186), 'tw': (112, 119, 190)}, button={'cn': (967, 640, 1078, 667), 'en': (941, 634, 1222, 672), 'jp': (946, 637, 1103, 668), 'tw': (967, 639, 1081, 667)}, file={'cn': './assets/cn/guild/GUILD_OPERATIONS_ACTIVE_CHECK.png', 'en': './assets/en/guild/GUILD_OPERATIONS_ACTIVE_CHECK.png', 'jp': './assets/jp/guild/GUILD_OPERATIONS_ACTIVE_CHECK.png', 'tw': './assets/tw/guild/GUILD_OPERATIONS_ACTIVE_CHECK.png'})
 GUILD_OPERATIONS_CLICK_SAFE_AREA = Button(area={'cn': (271, 680, 320, 704), 'en': (271, 680, 320, 704), 'jp': (271, 680, 320, 704), 'tw': (271, 680, 320, 704)}, color={'cn': (18, 21, 36), 'en': (18, 21, 36), 'jp': (18, 21, 36), 'tw': (18, 21, 36)}, button={'cn': (271, 680, 320, 704), 'en': (271, 680, 320, 704), 'jp': (271, 680, 320, 704), 'tw': (271, 680, 320, 704)}, file={'cn': './assets/cn/guild/GUILD_OPERATIONS_CLICK_SAFE_AREA.png', 'en': './assets/en/guild/GUILD_OPERATIONS_CLICK_SAFE_AREA.png', 'jp': './assets/jp/guild/GUILD_OPERATIONS_CLICK_SAFE_AREA.png', 'tw': './assets/tw/guild/GUILD_OPERATIONS_CLICK_SAFE_AREA.png'})