提交: e0fe8b4e5a66eb997c011b8d72d51cf9a59dc57c - KancolleSniffer (git)

Commit MetaInfo

• 修订版: e0fe8b4e5a66eb997c011b8d72d51cf9a59dc57c (tree)
• 时间: 2015-05-18 19:59:06
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

ship2に代わるship_deckを処理する

更改概述

• modified: KancolleSniffer.Test/SnifferTest.cs
• modified: KancolleSniffer/ShipInfo.cs
• modified: KancolleSniffer/Sniffer.cs

差异

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

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

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