戦果.csvに1-6のボーナス戦果が記録されないのを直す

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index 5ed9d3a..4d048dd 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -349,7 +349,8 @@ namespace KancolleSniffer.Test
                 new DateTime(2017, 4, 1, 5, 0, 0),\r
                 new DateTime(2017, 4, 1, 6, 0, 0),\r
                 new DateTime(2017, 4, 2, 5, 0, 0),\r
-                new DateTime(2017, 4, 2, 6, 0, 0)\r
+                new DateTime(2017, 4, 2, 6, 0, 0),\r
+                new DateTime(2017, 4, 2, 7, 0, 0)\r
             }.GetEnumerator();\r
             logger.SetWriter((path, s, h) => { result += s + "|"; }, () =>\r
             {\r
@@ -359,9 +360,11 @@ namespace KancolleSniffer.Test
             for (var i = 0; i < 6; i++)\r
                 logger.InspectBasic(JsonParser.Parse($"{{\"api_experience\": {i * 1000}}}"));\r
             logger.InspectBattleResult(JsonParser.Parse("{\"api_get_exmap_rate\": \"100\"}"));\r
+            logger.InspectMapNext(JsonParser.Parse("{\"api_get_eo_rate\": 75}"));\r
             PAssert.That(() =>\r
                 "2017-03-31 21:00:00,0,0|2017-03-31 21:00:00,0,0|2017-03-31 22:00:00,1000,0|" +\r
-                "2017-04-01 06:00:00,4000,0|2017-04-02 05:00:00,5000,0|2017-04-02 06:00:00,5000,100|"\r
+                "2017-04-01 06:00:00,4000,0|2017-04-02 05:00:00,5000,0|" +\r
+                "2017-04-02 06:00:00,5000,100|2017-04-02 07:00:00,5000,75|"\r
                 == result);\r
         }\r
 \r

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index ba4ac4a..1b6d7e8 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -132,6 +132,12 @@ namespace KancolleSniffer
 \r
         public void InspectMapNext(dynamic json)\r
         {\r
+            if ((_logType & LogType.Achivement) != 0 && json.api_get_eo_rate() && (int)json.api_get_eo_rate != 0)\r
+            {\r
+                _writer("戦果",\r
+                    _nowFunc().ToString(DateTimeFormat) + "," + _lastExp + "," + (int)json.api_get_eo_rate,\r
+                    "日付,経験値,EO");\r
+            }\r
             _map = json;\r
         }\r
 \r