From a4f9c63f2e920da04a45bfaed0f3a9708d9fbffa Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 4 Jun 2022 04:35:07 +0800
Subject: [PATCH] =?UTF-8?q?feat.=E4=B8=8D=E7=94=A8=E7=94=A8=E9=9B=B7?=
 =?UTF-8?q?=E7=94=B5=EF=BC=8C=E4=BC=9A=E5=8F=98=E5=BE=97=E4=B8=8D=E5=B9=B8?=
 =?UTF-8?q?.jpg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/Helper/AsstProxy.cs              | 6 ++++++
 src/MeoAsstGui/ViewModels/CopilotViewModel.cs   | 5 +++++
 src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs | 7 ++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index d8ab552425..57eb353e3c 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -607,6 +607,7 @@ namespace MeoAsstGui
 
         public bool AsstConnect(ref string error)
         {
+            error = "";
             var settings = _container.Get<SettingsViewModel>();
             if (settings.AdbPath == String.Empty ||
                 settings.ConnectAddress == String.Empty)
@@ -618,6 +619,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/ViewModels/CopilotViewModel.cs b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
index cdc6b1cea5..4225747162 100644
--- a/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/CopilotViewModel.cs
@@ -209,6 +209,11 @@ namespace MeoAsstGui
                 AddLog(errMsg, "darkred");
                 return;
             }
+            if (errMsg.Length != 0)
+            {
+                AddLog(errMsg, "darkred");
+            }
+
             if (Filename.Length == 0 || !File.Exists(Filename))
             {
                 AddLog("作业文件不存在", "darkred");
diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
index 9e56fe558b..3c3785dcf0 100644
--- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
@@ -44,6 +44,7 @@ namespace MeoAsstGui
         }
 
         private Visibility _visible = Visibility.Collapsed;
+
         public Visibility Visible
         {
             get { return _visible; }
@@ -127,7 +128,7 @@ namespace MeoAsstGui
                 new CombData { Display = "SV-7", Value = "SV-7" },
                 new CombData { Display = "SV-8", Value = "SV-8" },
                 new CombData { Display = "SV-9", Value = "SV-9" },
-                
+
                 // “愚人号” 活动关卡
                 //new CombData { Display = "SN-8", Value = "SN-8" },
                 //new CombData { Display = "SN-9", Value = "SN-9" },
@@ -228,6 +229,10 @@ namespace MeoAsstGui
                 Idle = true;
                 return;
             }
+            if (errMsg.Length != 0)
+            {
+                AddLog(errMsg, "darkred");
+            }
 
             bool ret = true;
             // 直接遍历TaskItemViewModels里面的内容，是排序后的