ship2に代わるship_deckを処理する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 8c6b92a..019a9aa 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -255,6 +255,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// ship2に代わるship_deckを処理する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ShipDeck()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "ship_deck_001");\r
+            PAssert.That(() => sniffer.GetShipStatuses(0)[0].Fuel == 36);\r
+        }\r
+\r
+        /// <summary>\r
         /// 編成で空き番号を使ったローテートを正しく反映する\r
         /// </summary>\r
         [TestMethod]\r

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

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index c24e701..2a72247 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -167,6 +167,13 @@ namespace KancolleSniffer
                 _battleInfo.InBattle = false;\r
                 return Update.Item | Update.Ship | Update.Battle;\r
             }\r
+            if (url.EndsWith("api_get_member/ship_deck"))\r
+            {\r
+                _shipInfo.InspectShip(data);\r
+                _akashiTimer.SetTimer();\r
+                _battleInfo.InBattle = false;\r
+                return Update.Ship | Update.Battle;\r
+            }\r
             if (url.EndsWith("api_get_member/ship3"))\r
             {\r
                 _shipInfo.InspectShip(data);\r