From: Kazuhiro Fujieda Date: Mon, 23 Dec 2019 15:21:13 +0000 (+0900) Subject: 南西諸島海域の制海権を握れ!のカウンターがエラーになるのを直す X-Git-Tag: v11.30~9 X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=9c4742aa2f9a2dd09d6ef7a052b8ef5f9ad4a574 南西諸島海域の制海権を握れ!のカウンターがエラーになるのを直す --- diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs index 4b2c4a8..961f1ba 100644 --- a/KancolleSniffer.Test/QuestCounterTest.cs +++ b/KancolleSniffer.Test/QuestCounterTest.cs @@ -137,7 +137,8 @@ namespace KancolleSniffer.Test new QuestCount {Id = 894, NowArray = new[] {1, 1, 1, 1, 1}}, new QuestCount {Id = 280, NowArray = new[] {1, 1, 1, 1}}, new QuestCount {Id = 872, NowArray = new[] {1, 1, 1, 1}}, - new QuestCount {Id = 284, NowArray = new[] {1, 1, 1, 1}} + new QuestCount {Id = 284, NowArray = new[] {1, 1, 1, 1}}, + new QuestCount {Id = 226, Now = 2} } }; new QuestInfo().LoadState(status); @@ -177,6 +178,9 @@ namespace KancolleSniffer.Test var q284 = status.QuestCountList.First(q => q.Id == 284); Assert.AreEqual("1\u200a1\u200a1\u200a1", q284.ToString()); Assert.AreEqual("1-4 2-1 2-2 2-3", q284.ToToolTip()); + var q226 = status.QuestCountList.First(q => q.Id == 226); + Assert.AreEqual("2/5", q226.ToString()); + Assert.AreEqual("", q226.ToToolTip()); } } diff --git a/KancolleSniffer/Model/QuestCounter.cs b/KancolleSniffer/Model/QuestCounter.cs index 20cae9b..9c47c06 100644 --- a/KancolleSniffer/Model/QuestCounter.cs +++ b/KancolleSniffer/Model/QuestCounter.cs @@ -113,7 +113,7 @@ namespace KancolleSniffer.Model public string ToToolTip() { - if (Spec is QuestSortie spec && spec.Maps != null) + if (Spec is QuestSortie spec && spec.Maps != null && spec.MaxArray != null) { var flags = spec.MaxArray.All(x => x == 1); return string.Join(" ",