Merge branch 'MaaAssistantArknights:dev' into dev

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
         ]
     }
-}
+}

src/MeoAsstGui/Helper/AsstProxy.cs

@@ -627,6 +627,7 @@ namespace MeoAsstGui
 
         public bool AsstConnect(ref string error)
         {
+            error = "";
             var settings = _container.Get<SettingsViewModel>();
             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);
 
             // 尝试默认的备选端口

src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml

@@ -41,7 +41,7 @@
         <StackPanel Grid.Row="4"  Orientation="Horizontal">
             <TextBlock Style="{StaticResource TextBlockDefault}" Margin="10" VerticalAlignment="Center"
                    Text="关卡选择" />
-            <ComboBox Width="100" Margin="10"
+            <ComboBox Width="110" Margin="10"
                       IsHitTestVisible ="{Binding Path=Idle}"
                       ItemsSource="{Binding StageList}"
                       DisplayMemberPath="Display"

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");

src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs

@@ -44,6 +44,7 @@ namespace MeoAsstGui
         }
 
         private Visibility _visible = Visibility.Collapsed;
+
         public Visibility Visible
         {
             get { return _visible; }
@@ -117,17 +118,19 @@ namespace MeoAsstGui
             {
                 new CombData { Display = "当前关卡", Value = string.Empty },
                 new CombData { Display = "上次作战", Value = "LastBattle" },
-                new CombData { Display = "剿灭作战", Value = "Annihilation" },
+ 
+                // “覆潮之下” 活动关卡 //复刻活动，结束后直接删除
+                new CombData { Display = "SV-9", Value = "SV-9" },
+                new CombData { Display = "SV-8", Value = "SV-8" },
+                new CombData { Display = "SV-7", Value = "SV-7" },
+
+                new CombData { Display = "1-7", Value = "1-7" },
                 new CombData { Display = "龙门币-6/5", Value = "CE-6" },
                 new CombData { Display = "经验-6/5", Value = "LS-6" },
                 new CombData { Display = "红票-5", Value = "AP-5" },
                 new CombData { Display = "技能-5", Value = "CA-5" },
-                new CombData { Display = "1-7", Value = "1-7" },
-                // “覆潮之下” 活动关卡 //复刻活动，结束后直接删除
-                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 = "剿灭作战", Value = "Annihilation" },
+
                 // “愚人号” 活动关卡
                 //new CombData { Display = "SN-8", Value = "SN-8" },
                 //new CombData { Display = "SN-9", Value = "SN-9" },
@@ -228,6 +231,10 @@ namespace MeoAsstGui
                 Idle = true;
                 return;
             }
+            if (errMsg.Length != 0)
+            {
+                AddLog(errMsg, "darkred");
+            }
 
             bool ret = true;
             // 直接遍历TaskItemViewModels里面的内容，是排序后的