Opt: Use MaaTouch as default control method

Author: LmeSzinc

config/template.json

@@ -5,7 +5,7 @@
       "PackageName": "auto",
       "ServerName": "disabled",
       "ScreenshotMethod": "auto",
-      "ControlMethod": "minitouch",
+      "ControlMethod": "MaaTouch",
       "ScreenshotDedithering": false,
       "AdbRestart": false
     },

module/config/argument/args.json

@@ -123,7 +123,7 @@
       },
       "ControlMethod": {
         "type": "select",
-        "value": "minitouch",
+        "value": "MaaTouch",
         "option": [
           "ADB",
           "uiautomator2",

module/config/argument/argument.yaml

@@ -46,7 +46,7 @@ Emulator:
       ldopengl,
     ]
   ControlMethod:
-    value: minitouch
+    value: MaaTouch
     option: [
       ADB,
       uiautomator2,

module/config/config_generated.py

@@ -22,7 +22,7 @@ class GeneratedConfig:
     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.lenovo, 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, nemu_ipc, ldopengl
-    Emulator_ControlMethod = 'minitouch'  # ADB, uiautomator2, minitouch, Hermit, MaaTouch
+    Emulator_ControlMethod = 'MaaTouch'  # ADB, uiautomator2, minitouch, Hermit, MaaTouch
     Emulator_ScreenshotDedithering = False
     Emulator_AdbRestart = False
 

module/device/device.py

@@ -138,7 +138,11 @@ def method_check(self):
         # Allow Hermit on VMOS only
         if self.config.Emulator_ControlMethod == 'Hermit' and not self.is_vmos:
             logger.warning('ControlMethod is allowed on VMOS only')
-            self.config.Emulator_ControlMethod = 'minitouch'
+            self.config.Emulator_ControlMethod = 'MaaTouch'
+        if self.config.Emulator_ScreenshotMethod == 'ldopengl' \
+                and self.config.Emulator_ControlMethod == 'minitouch':
+            logger.warning('Use MaaTouch on ldplayer')
+            self.config.Emulator_ControlMethod = 'MaaTouch'
         pass
 
     def handle_night_commission(self, daily_trigger='21:00', threshold=30):