敵連合艦隊に第1艦隊以外で戦うとログに第1艦隊が出力されるのを直す

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index 43ab804..a3d7c38 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -105,11 +105,11 @@ namespace KancolleSniffer
 \r
         private bool IsNightBattle(dynamic json) => json.api_hougeki();\r
 \r
-        private int DeckId(dynamic json)\r
+        public static int DeckId(dynamic json)\r
         {\r
             if (json.api_dock_id()) // 昼戦はtypoしている\r
                 return (int)json.api_dock_id - 1;\r
-            if (json.api_deck_id is string) // 通常の夜戦では文字列\r
+            if (json.api_deck_id is string) // é\80\9a常ã\81®å¤\9cæ\88¦ã\81¨é\80£å\90\88è\89¦é\9a\8a(å\91³æ\96¹ã\81®ã\81¿)ã\81§ã\81¯æ\96\87å­\97å\88\97\r
                 return int.Parse(json.api_deck_id) - 1;\r
             return (int)json.api_deck_id - 1;\r
         }\r

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index 5df9b58..feec873 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -140,7 +140,7 @@ namespace KancolleSniffer
                 return;\r
             }\r
             var fships = new List<string>();\r
-            var deckId = _battle.api_dock_id() ? (int)_battle.api_dock_id - 1 : 0;\r
+            int deckId = BattleInfo.DeckId(_battle);\r
             var deck = _shipInfo.GetDeck(deckId);\r
             fships.AddRange(deck.Select(id =>\r
             {\r