From 9c4742aa2f9a2dd09d6ef7a052b8ef5f9ad4a574 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Tue, 24 Dec 2019 00:21:13 +0900 Subject: [PATCH] =?utf8?q?=E5=8D=97=E8=A5=BF=E8=AB=B8=E5=B3=B6=E6=B5=B7?= =?utf8?q?=E5=9F=9F=E3=81=AE=E5=88=B6=E6=B5=B7=E6=A8=A9=E3=82=92=E6=8F=A1?= =?utf8?q?=E3=82=8C=EF=BC=81=E3=81=AE=E3=82=AB=E3=82=A6=E3=83=B3=E3=82=BF?= =?utf8?q?=E3=83=BC=E3=81=8C=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?= =?utf8?q?=E3=82=8B=E3=81=AE=E3=82=92=E7=9B=B4=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer.Test/QuestCounterTest.cs | 6 +++++- KancolleSniffer/Model/QuestCounter.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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(" ", -- 2.11.0