fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
MistEO
2022-02-15 18:47:24 +08:00
parent c7790eb196 77a941dee1
commit e23faa6f06
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MeoAsstGui/MeoAsstGui.csproj
View File

@@ -263,16 +263,11 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.6.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="gong-wpf-dragdrop">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="HandyControl">
<Version>3.2.0</Version>
<Version>3.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>5.0.4</Version>

8
src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
View File

@@ -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<string, List<DayOfWeek>>
@@ -94,6 +93,7 @@ namespace MeoAsstGui
{ "空中威胁（技能）", new List<DayOfWeek> { DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Sunday } },
{ "资源保障（碳）", new List<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Wednesday, DayOfWeek.Friday, DayOfWeek.Saturday } },
{ "战术演习（经验）", new List<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday, DayOfWeek.Saturday, DayOfWeek.Sunday } },
{ "周一了，可以打剿灭了~", new List<DayOfWeek> { DayOfWeek.Monday } },
{ "周日了，记得打剿灭哦~", new List<DayOfWeek> { 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";
}