OSDN Git Service

アイテムが一つもないときにログイン時にエラーになるのを直す
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Sun, 1 Mar 2020 09:05:31 +0000 (18:05 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Sun, 1 Mar 2020 09:05:31 +0000 (18:05 +0900)
KancolleSniffer.Test/SnifferTest.cs
KancolleSniffer.Test/logs
KancolleSniffer/Sniffer.cs

index 45a35ff..acc2361 100644 (file)
@@ -81,6 +81,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 一つもアイテムがない場合\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NoUseItem()\r
+        {\r
+            var sniffer = new Sniffer(true);\r
+            SniffLogFile(sniffer, "require_info_001");\r
+            Assert.IsTrue(true);\r
+        }\r
+\r
+        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
index 4f915f5..9e01c63 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4f915f58976ac96320fd84933a3b8c3a6949642a
+Subproject commit 9e01c6342764ef7c8ac73f79198e0edcf0057fc6
index 8c1a147..1d799f9 100644 (file)
@@ -73,7 +73,7 @@ namespace KancolleSniffer
         public enum Update\r
         {\r
             None = 0,\r
-            Error = 1 << 0,\r
+            Error = 1,\r
             Start = 1 << 1,\r
             Item = 1 << 2,\r
             Ship = 1 << 3,\r
@@ -106,7 +106,7 @@ namespace KancolleSniffer
         public AdditionalData AdditionalData\r
         {\r
             get => _additionalData;\r
-            set\r
+            private set\r
             {\r
                 _additionalData = value;\r
                 _itemMaster.AdditionalData = value;\r
@@ -234,7 +234,8 @@ namespace KancolleSniffer
             if (url.EndsWith("api_get_member/require_info"))\r
             {\r
                 _itemInfo.InspectSlotItem(data.api_slot_item, true);\r
-                _itemInfo.InspectUseItem(data.api_useitem);\r
+                if (data.api_useitem())\r
+                    _itemInfo.InspectUseItem(data.api_useitem);\r
                 _dockInfo.InspectKDock(data.api_kdock);\r
                 return Update.None;\r
             }\r