ship2で一隻分のデータしか来ない場合に対応する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index ce9ff1d..e0ab9d3 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -672,5 +672,16 @@ namespace KancolleSniffer.Test
             var expected = Enumerable.Repeat(new ChargeStatus(5, 5), ShipInfo.FleetCount);\r
             PAssert.That(() => expected.SequenceEqual(sniffer.ChargeStatuses));\r
         }\r
+\r
+        /// <summary>\r
+        /// ship2がリクエストで指定した艦娘のデータしか返さない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void Ship2ReturnShipSpecifiedByRequest()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "ship2_001");\r
+            PAssert.That(() => sniffer.Item.NowShips == 243);\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index aa1d9f8..f9012c8 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit aa1d9f836f05d30e5166a8d3781c27653a67e9ba
+Subproject commit f9012c80155a0960371c5519888496d58cbb4c30

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index ba8cacb..2b66b02 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -111,10 +111,9 @@ namespace KancolleSniffer
             }\r
             else if (json.api_data()) // ship2\r
             {\r
-                ClearShipInfo();\r
+                // 一隻分のデータしか来ないことがあるので艦娘数を数えない\r
                 InspectDeck(json.api_data_deck);\r
                 InspectShipData(json.api_data);\r
-                _itemInfo.NowShips = ((object[])json.api_data).Length;\r
             }\r
             else if (json.api_ship_data()) // ship3とship_deck\r
             {\r