diff --git a/resource/tasks.json b/resource/tasks.json index 933a10e71a..40252cc8d9 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -485,16 +485,19 @@ ] }, "StageResource": { + "action": "ClickSelf", "doc": "进入资源关卡", + "roi": [ + 455, + 562, + 544, + 158 + ], "next": [ - "StageResourceSwipeToTheLeft" + "StageResource", + "SwipeToTheLeft" ] }, - "StageResourceSwipeToTheLeft": { - "doc": "向左滑动到资源关最左", - "algorithm": "JustReturn", - "action": "SwipeToTheLeft" - }, "StageCE": { "action": "ClickSelf", "cache": false, @@ -649,6 +652,10 @@ "^中$", "山" ], + [ + "^上$", + "山" + ], [ "姜哦", "嵯峨" @@ -701,6 +708,10 @@ "^会$", "令" ], + [ + "^心$", + "令" + ], [ "归漠幽灵鲨", "归溟幽灵鲨" @@ -741,6 +752,10 @@ "韦草", "苇草" ], + [ + "笔草", + "苇草" + ], [ "斯卡蒂的海刷", "斯卡蒂的海嗣" @@ -6700,4 +6715,4 @@ 100 ] } -} +} \ No newline at end of file diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs index a313192e88..a6aa4c7c2a 100644 --- a/src/MeoAsstGui/Helper/AsstProxy.cs +++ b/src/MeoAsstGui/Helper/AsstProxy.cs @@ -627,6 +627,7 @@ namespace MeoAsstGui public bool AsstConnect(ref string error) { + error = ""; var settings = _container.Get(); if (settings.AdbPath == String.Empty || settings.ConnectAddress == String.Empty) @@ -638,6 +639,11 @@ namespace MeoAsstGui } settings.TryToSetBlueStacksHyperVAddress(); + if (settings.ConnectConfig == "LDPlayer") + { + error = "检测到您正在使用雷电模拟器\n由于雷电模拟器过于离谱\nMAA 不推荐使用\n若您遇到任何问题\n建议更换模拟器并再次尝试"; + } + bool ret = AsstConnect(_handle, settings.AdbPath, settings.ConnectAddress, settings.ConnectConfig); // 尝试默认的备选端口 diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml index 66fd08804a..3fea7e46af 100644 --- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml @@ -41,7 +41,7 @@ -