diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 50d92167b2..868cf4051e 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -263,16 +263,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - 6.6.0 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - 2.4.3 - 3.2.0 + 3.3.0 5.0.4 diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 0752f5657a..e4ce691f1f 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -79,12 +79,11 @@ namespace MeoAsstGui //StageList.Add(new CombData { Display = "BI-7", Value = "BI-7" }); //StageList.Add(new CombData { Display = "BI-8", Value = "BI-8" }); - var now = System.DateTime.Now; - DayOfWeek day_of_week = now.DayOfWeek; + var now = DateTime.Now; var hour = now.Hour; if (hour >= 0 && hour < 4) { - day_of_week = now.AddDays(-1).DayOfWeek; + now = now.AddDays(-1); } var stage_dict = new Dictionary> @@ -94,6 +93,7 @@ namespace MeoAsstGui { "空中威胁(技能)", new List { DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Sunday } }, { "资源保障(碳)", new List { DayOfWeek.Monday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Saturday } }, { "战术演习(经验)", new List { DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday, DayOfWeek.Saturday, DayOfWeek.Sunday } }, + { "周一了,可以打剿灭了~", new List { DayOfWeek.Monday } }, { "周日了,记得打剿灭哦~", new List { DayOfWeek.Sunday } } }; @@ -101,7 +101,7 @@ namespace MeoAsstGui foreach (var item in stage_dict) { - if (item.Value.Contains(day_of_week)) + if (item.Value.Contains(now.DayOfWeek)) { StagesOfToday += item.Key + "\n"; }