Merge pull request #2669 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

module/config/argument/args.json

@@ -28,6 +28,7 @@
           "com.bilibili.blhx.mzw",
           "com.yiwu.blhx.yx15",
           "com.bilibili.blhx.m4399",
+          "com.bilibili.blhx.bilibiliMove",
           "com.hkmanjuu.azurlane.gp.mc"
         ]
       },

module/config/config_generated.py

@@ -19,7 +19,7 @@ class GeneratedConfig:
 
     # Group `Emulator`
     Emulator_Serial = 'auto'
-    Emulator_PackageName = 'auto'  # auto, com.bilibili.azurlane, com.YoStarEN.AzurLane, com.YoStarJP.AzurLane, com.hkmanjuu.azurlane.gp, com.bilibili.blhx.huawei, com.bilibili.blhx.mi, com.tencent.tmgp.bilibili.blhx, com.bilibili.blhx.baidu, com.bilibili.blhx.qihoo, com.bilibili.blhx.nearme.gamecenter, com.bilibili.blhx.vivo, com.bilibili.blhx.mz, com.bilibili.blhx.dl, com.bilibili.blhx.uc, com.bilibili.blhx.mzw, com.yiwu.blhx.yx15, com.bilibili.blhx.m4399, com.hkmanjuu.azurlane.gp.mc
+    Emulator_PackageName = 'auto'  # auto, com.bilibili.azurlane, com.YoStarEN.AzurLane, com.YoStarJP.AzurLane, com.hkmanjuu.azurlane.gp, com.bilibili.blhx.huawei, com.bilibili.blhx.mi, com.tencent.tmgp.bilibili.blhx, com.bilibili.blhx.baidu, com.bilibili.blhx.qihoo, com.bilibili.blhx.nearme.gamecenter, com.bilibili.blhx.vivo, com.bilibili.blhx.mz, com.bilibili.blhx.dl, com.bilibili.blhx.uc, com.bilibili.blhx.mzw, com.yiwu.blhx.yx15, com.bilibili.blhx.m4399, com.bilibili.blhx.bilibiliMove, com.hkmanjuu.azurlane.gp.mc
     Emulator_ServerName = 'disabled'  # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17
     Emulator_ScreenshotMethod = 'auto'  # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, scrcpy
     Emulator_ControlMethod = 'minitouch'  # ADB, uiautomator2, minitouch, Hermit, MaaTouch

module/config/i18n/en-US.json

@@ -327,6 +327,7 @@
       "com.bilibili.blhx.mzw": "CN com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "CN com.yiwu.blhx.yx15",
       "com.bilibili.blhx.m4399": "CN com.bilibili.blhx.m4399",
+      "com.bilibili.blhx.bilibiliMove": "CN com.bilibili.blhx.bilibiliMove",
       "com.hkmanjuu.azurlane.gp.mc": "TW com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {

module/config/i18n/ja-JP.json

@@ -327,6 +327,7 @@
       "com.bilibili.blhx.mzw": "CN com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "CN com.yiwu.blhx.yx15",
       "com.bilibili.blhx.m4399": "CN com.bilibili.blhx.m4399",
+      "com.bilibili.blhx.bilibiliMove": "CN com.bilibili.blhx.bilibiliMove",
       "com.hkmanjuu.azurlane.gp.mc": "TW com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {

module/config/i18n/zh-CN.json

@@ -327,6 +327,7 @@
       "com.bilibili.blhx.mzw": "国服 拇指玩渠道服 com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "国服 一五游戏渠道服 com.yiwu.blhx.yx15",
       "com.bilibili.blhx.m4399": "国服 4399渠道服 com.bilibili.blhx.m4399",
+      "com.bilibili.blhx.bilibiliMove": "国服 迁移渠道服 com.bilibili.blhx.bilibiliMove",
       "com.hkmanjuu.azurlane.gp.mc": "台服 com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {

module/config/i18n/zh-TW.json

@@ -327,6 +327,7 @@
       "com.bilibili.blhx.mzw": "國服 com.bilibili.blhx.mzw",
       "com.yiwu.blhx.yx15": "國服 com.yiwu.blhx.yx15",
       "com.bilibili.blhx.m4399": "國服 com.bilibili.blhx.m4399",
+      "com.bilibili.blhx.bilibiliMove": "國服 com.bilibili.blhx.bilibiliMove",
       "com.hkmanjuu.azurlane.gp.mc": "台服 MyCard渠道服 com.hkmanjuu.azurlane.gp.mc"
     },
     "ServerName": {

module/config/server.py

@@ -30,6 +30,7 @@
     'com.bilibili.blhx.mzw': ('cn', '拇指玩'),
     'com.yiwu.blhx.yx15': ('cn', '一五游戏'),
     'com.bilibili.blhx.m4399': ('cn', '4399'),
+    'com.bilibili.blhx.bilibiliMove': ('cn', '迁移'),
 
     # Tw
     'com.hkmanjuu.azurlane.gp.mc': ('tw', 'MyCard'),

module/os/globe_camera.py

@@ -86,7 +86,7 @@ def globe_swipe(self, vector, box=(20, 220, 980, 620)):
             bool: if camera moved.
         """
         name = 'GLOBE_SWIPE_' + '_'.join([str(int(round(x))) for x in vector])
-        if np.any(np.abs(vector) > 25):
+        if np.linalg.norm(vector) > 25:
             if self.config.DEVICE_CONTROL_METHOD == 'minitouch':
                 distance = self.config.MAP_SWIPE_MULTIPLY_MINITOUCH
             elif self.config.DEVICE_CONTROL_METHOD == 'MaaTouch':
@@ -100,6 +100,8 @@ def globe_swipe(self, vector, box=(20, 220, 980, 620)):
             self.device.sleep(0.3)
 
             self.globe_update()
+        else:
+            logger.warning(f'Globe swipe to short: {vector}, dropped')
 
     def globe_wait_until_stable(self):
         prev = self.globe_camera
@@ -164,8 +166,7 @@ def globe_in_sight(self, zone, swipe_limit=(620, 340), sight=(20, 220, 980, 620)
             area = (400, 200, GLOBE_MAP_SHAPE[0] - 400, GLOBE_MAP_SHAPE[1] - 250)
             loca = point_limit(zone.location, area=area)
             vector = np.array(loca) - self.globe_camera
-            # TODO: Yeah, 0.8 multiplier is shit, better implement needed
-            vector = vector * 0.8 / self.config.OS_GLOBE_SWIPE_MULTIPLY
+            vector = vector / self.config.OS_GLOBE_SWIPE_MULTIPLY
             swipe = tuple(np.min([np.abs(vector), swipe_limit], axis=0) * np.sign(vector))
             self.globe_swipe(swipe)
 

module/os/operation_siren.py

@@ -401,12 +401,12 @@ def os_hazard1_leveling(self):
 
             self.get_current_zone()
 
-            # Preset action point to 100
+            # Preset action point to 70
             # When running CL1 oil is for running CL1, not meowfficer farming
             keep_current_ap = True
             if self.config.OpsiGeneral_BuyActionPointLimit > 0:
                 keep_current_ap = False
-            self.action_point_set(cost=100, keep_current_ap=keep_current_ap, check_rest_ap=True)
+            self.action_point_set(cost=70, keep_current_ap=keep_current_ap, check_rest_ap=True)
             if self._action_point_total >= 3000:
                 with self.config.multi_set():
                     self.config.task_delay(server_update=True)
@@ -442,13 +442,6 @@ def _os_explore_task_delay(self):
                     logger.info(f'Delay task `{task}` to {next_run}')
                     self.config.cross_set(keys=keys, value=next_run)
 
-            # ResetActionPointPreserve
-            # Unbound attribute, default to 500
-            preserve = self.config.OpsiMeowfficerFarming_ActionPointPreserve
-            logger.info(f'Set OpsiMeowfficerFarming.ActionPointPreserve to {preserve}')
-            self.config.cross_set(
-                keys='OpsiMeowfficerFarming.OpsiMeowfficerFarming.ActionPointPreserve', value=preserve)
-
     def _os_explore(self):
         """
         Explore all dangerous zones at the beginning of month.