基地空襲戦の次に戦闘がないときに結果が閉じないのを直す

diff --git a/KancolleSniffer/Model/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
index 1ed857f..ed8c285 100644 (file)
--- a/KancolleSniffer/Model/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -301,7 +301,7 @@ namespace KancolleSniffer.Model
         public void InspectMapNext(dynamic json)\r
         {\r
             _lastCell = (int)json.api_next == 0;\r
-\r
+            BattleState = BattleState.None;\r
             if (!json.api_destruction_battle())\r
                 return;\r
             InspectAirRaidBattle((int)json.api_maparea_id, json.api_destruction_battle);\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 44e8f00..9c60aa9 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -279,14 +279,14 @@ namespace KancolleSniffer
                 _shipInfo.InspectShip(url, json);\r
                 _akashiTimer.CheckFleet();\r
                 _battleInfo.BattleState = BattleState.None;\r
-                return Update.Item | Update.Ship | Update.Battle;\r
+                return Update.Item | Update.Ship;\r
             }\r
             if (url.EndsWith("api_get_member/ship_deck"))\r
             {\r
                 _shipInfo.InspectShip(url, data);\r
                 _akashiTimer.CheckFleet();\r
                 _battleInfo.BattleState = BattleState.None;\r
-                return Update.Ship | Update.Battle | Update.Item;\r
+                return Update.Ship | Update.Item;\r
             }\r
             if (url.EndsWith("api_get_member/ship3"))\r
             {\r
@@ -565,7 +565,7 @@ namespace KancolleSniffer
                 _questCounter.InspectMapNext(data);\r
                 _miscTextInfo.InspectMapNext(data);\r
                 _cellInfo.InspectMapNext(data);\r
-                return Update.Cell | (data.api_destruction_battle() ? Update.Battle : 0);\r
+                return Update.Battle;\r
             }\r
             if (url.EndsWith("api_req_mission/start"))\r
             {\r