diff --git a/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java b/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java index 30f755c679..624f02e60d 100644 --- a/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java +++ b/src/Java/src/main/java/com/iguigui/maaj/easySample/MaaJavaSample.java @@ -49,13 +49,16 @@ public class MaaJavaSample { //开始执行 instance.AsstStart(pointer); - new Scanner(System.in).next(); + Scanner scanner = new Scanner(System.in); + scanner.next(); //停止执行,会清空taskChain instance.AsstStop(pointer); //销毁实例,释放连接 instance.AsstDestroy(pointer); + + scanner.close(); } diff --git a/src/MaaWpfGui/Models/Copilot/CopilotModel.cs b/src/MaaWpfGui/Models/Copilot/CopilotModel.cs index 3582ed6d85..643a350aa5 100644 --- a/src/MaaWpfGui/Models/Copilot/CopilotModel.cs +++ b/src/MaaWpfGui/Models/Copilot/CopilotModel.cs @@ -117,7 +117,7 @@ public class CopilotModel : CopilotBase return string.Empty; } string[] moduleName = [string.Empty, "χ", "γ", "α", "Δ"]; - //var moduleLevel = req.ModuleLevel > 0 ? $" [Lv.{req.ModuleLevel}]" : string.Empty; + // var moduleLevel = req.ModuleLevel > 0 ? $" [Lv.{req.ModuleLevel}]" : string.Empty; // 模组编号 -1: 不切换模组 / 无要求, 0: 不使用模组, 1: 模组χ, 2: 模组γ, 3: 模组α, 4: 模组Δ return req.Module switch { diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 57b24284e8..e4a3eb2ee8 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -176,7 +176,8 @@ public class TaskQueueViewModel : Screen ConfigFactory.CurrentConfig.TaskQueue.RemoveAt(e.OldStartingIndex); } - for (int i = e.OldStartingIndex; i < TaskItemViewModels.Count; i++) // 更新后续任务的索引 + // 更新后续任务的索引 + for (int i = e.OldStartingIndex; i < TaskItemViewModels.Count; i++) { TaskItemViewModels[i].Index = i; } diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs index b45d225ff6..40c27fe9b8 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs @@ -819,7 +819,9 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel var listCurrent = current.StagePlan.ToList(); var listSource = stageList.Select(i => new StageSourceItem() { Display = i.Display, Value = i.Value, IsVisible = !HideUnavailableStage || i.IsStageOpen(Instances.TaskQueueViewModel.CurDayOfWeek), IsOpen = Instances.StageManager.GetStageList().FirstOrDefault(p => p.Value == i.Value)?.IsStageOpen(Instances.TaskQueueViewModel.CurDayOfWeek) ?? true }).ToList(); - foreach (var item in listCurrent.Where(i => !listSource.Any(p => p.Value == i))) // 补未开放进来 + + // 补未开放进来 + foreach (var item in listCurrent.Where(i => !listSource.Any(p => p.Value == i))) { listSource.Add(new StageSourceItem() { Display = item, Value = item, IsOpen = false, IsVisible = false }); } diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs index 99fe1e2892..19c98805b6 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs @@ -68,7 +68,9 @@ public class InfrastSettingsUserControlModel : TaskSettingsViewModel { var preList = GetTaskConfig().RoomList; var set = new HashSet(preList.Select(i => i.Room)); - if (set.Count != Enum.GetValues().Length || set.Count != preList.Count) // 房间列表不完整,补全 + + // 房间列表不完整,补全 + if (set.Count != Enum.GetValues().Length || set.Count != preList.Count) { var list = new List(preList); foreach (var room in Enum.GetValues())