diff --git a/resource/tasks.json b/resource/tasks.json index 5cd07a7955..f80eaddea1 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -12,7 +12,26 @@ "StartToWakeUp", "TodaysSupplies", "CloseAnno", - "Terminal" + "Terminal", + "GameStart" + ] + }, + "GameStart": { + "action": "clickSelf", + "roi": [ + 550, + 600, + 200, + 120 + ], + "cache": false, + "rearDelay": 5000, + "maskRange": [ + 1, + 255 + ], + "next": [ + "StartToWakeUp" ] }, "ReturnToTerminal": { diff --git a/resource/template/GameStart.png b/resource/template/GameStart.png new file mode 100644 index 0000000000..b042f18a85 Binary files /dev/null and b/resource/template/GameStart.png differ diff --git a/src/MeoAssistance/Version.h b/src/MeoAssistance/Version.h index d84618a605..4267cda6fc 100644 --- a/src/MeoAssistance/Version.h +++ b/src/MeoAssistance/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v2.1.1"; + constexpr static const char* Version = "v2.1.2"; } diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 50d0004e66..52193c657d 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -66,10 +66,10 @@ namespace MeoAsstGui AddLog("捕获模拟器窗口失败,若是第一次运行,请尝试使用管理员权限", "Red"); return; } - AddLog("正在运行中……"); bool ret = true; // 直接遍历TaskItemViewModels里面的内容,是排序后的 + int count = 0; foreach (var item in TaskItemViewModels) { if (item.IsChecked == false) @@ -77,6 +77,7 @@ namespace MeoAsstGui continue; } + ++count; if (item.Name == "基建换班") { ret &= appendInfrast(); @@ -101,11 +102,25 @@ namespace MeoAsstGui { ret &= asstProxy.AsstAppendAward(); } + else + { + --count; + // TODO 报错 + } + } + if (count == 0) + { + AddLog("未选择任务"); + return; } setPenguinId(); ret &= asstProxy.AsstStart(); - if (!ret) + if (ret) + { + AddLog("正在运行中……"); + } + else { AddLog("出现未知错误"); }