イベント海域のマップのクリア後に海域選択画面でエラーになるのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 6f8762d..fa10960 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -747,6 +747,26 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 2019冬イベからクリア済みマップのゲージ情報がない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ClearedExMapGage()\r
+        {\r
+            var miscTextInfo = new MiscTextInfo(null, null);\r
+            using (var stream = OpenLogFile("mapgauge_003"))\r
+            {\r
+                miscTextInfo.InspectMapInfo(JsonParser.Parse(stream.ReadToEnd()));\r
+            }\r
+            PAssert.That(() =>\r
+                miscTextInfo.Text ==\r
+                "[海域ゲージ]\r\n" +\r
+                "1-6 : 残り 5/7\r\n" +\r
+                "5-5 : 残り 5/5\r\n" +\r
+                "7-2 : 残り 1/4\r\n" +\r
+                "43-2 : HP 1050/1400\r\n");\r
+        }\r
+\r
+        /// <summary>\r
         /// 演習の獲得経験値を計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 8240485..f4075f0 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 82404851893934b7fe6b9a69359d2a5b04c0668a
+Subproject commit f4075f057ca8d554bc12cb76bf9785f6bfa14072

diff --git a/KancolleSniffer/Model/MiscTextInfo.cs b/KancolleSniffer/Model/MiscTextInfo.cs
index 8c911d9..46bcafb 100644 (file)
--- a/KancolleSniffer/Model/MiscTextInfo.cs
+++ b/KancolleSniffer/Model/MiscTextInfo.cs
@@ -73,8 +73,11 @@ namespace KancolleSniffer.Model
                 if (entry.api_eventmap())\r
                 {\r
                     var eventMap = entry.api_eventmap;\r
-                    Text +=\r
-                        $"{map / 10}-{map % 10} : HP {(int)eventMap.api_now_maphp}/{(int)eventMap.api_max_maphp}\r\n";\r
+                    if (eventMap.api_now_maphp())\r
+                    {\r
+                        Text +=\r
+                            $"{map / 10}-{map % 10} : HP {(int)eventMap.api_now_maphp}/{(int)eventMap.api_max_maphp}\r\n";\r
+                    }\r
                     continue;\r
                 }\r
                 if (!entry.api_defeat_count())\r