Status-Lineが空のときに例外を出さない

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Logger.cs

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index ba4ac4a..6d199bb 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -58,12 +58,12 @@ namespace KancolleSniffer
 \r
         public int MaterialLogInterval\r
         {\r
-            set { _materialLogInterval = value; }\r
+            set => _materialLogInterval = value;\r
         }\r
 \r
         public string OutputDir\r
         {\r
-            set { _writer = new LogWriter(value).Write; }\r
+            set => _writer = new LogWriter(value).Write;\r
         }\r
 \r
         public Logger(ShipInfo ship, ItemInfo item, BattleInfo battle)\r
@@ -132,9 +132,33 @@ 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
+        public void InspectClearItemGet(dynamic json)\r
+        {\r
+            if ((_logType & LogType.Achivement) == 0)\r
+                return;\r
+            if (json.api_bounus_count == 0)\r
+                return;\r
+            foreach (var entry in json.api_bounus)\r
+            {\r
+                if (entry.api_type != 18)\r
+                    continue;\r
+                _writer("戦果",\r
+                    _nowFunc().ToString(DateTimeFormat) + "," + _lastExp + "," + (int)entry.api_count,\r
+                    "日付,経験値,EO");\r
+                break;\r
+            }\r
+\r
+        }\r
+\r
         public void InspectBattle(dynamic json)\r
         {\r
             if (_battle != null) // 通常の夜戦は無視する\r
@@ -198,7 +222,7 @@ namespace KancolleSniffer
                 dropType, dropName,\r
                 string.Join(",", fships),\r
                 string.Join(",", eships),\r
-                fpower, _battleInfo.EnemyFighterPower,\r
+                fpower, _battleInfo.EnemyFighterPower.AirCombat + _battleInfo.EnemyFighterPower.UnknownMark,\r
                 AirControlLevelName(_battle)),\r
                 "日付,海域,マス,ボス,ランク,艦隊行動,味方陣形,敵陣形,敵艦隊,ドロップ艦種,ドロップ艦娘," +\r
                 "味方艦1,味方艦1HP,味方艦2,味方艦2HP,味方艦3,味方艦3HP,味方艦4,味方艦4HP,味方艦5,味方艦5HP,味方艦6,味方艦6HP," +\r
@@ -378,8 +402,8 @@ namespace KancolleSniffer
                         _endOfMonth = _endOfMonth.AddDays(days);\r
                     }\r
                 }\r
-                _nextDate = new DateTime(now.Year, now.Month, now.Day, 5, 0, 0);\r
-                if (now.Hour >= 5)\r
+                _nextDate = new DateTime(now.Year, now.Month, now.Day, 2, 0, 0);\r
+                if (now.Hour >= 2)\r
                     _nextDate = _nextDate.AddDays(1);\r
                 if (_nextDate.Day == 1)\r
                     _nextDate = _nextDate.AddDays(1);\r