進路のネタバレオフ時の海域移動中は直前のセルの情報を表示する

diff --git a/KancolleSniffer/BattleResultPanel.cs b/KancolleSniffer/BattleResultPanel.cs
index 1503887..b1ac480 100644 (file)
--- a/KancolleSniffer/BattleResultPanel.cs
+++ b/KancolleSniffer/BattleResultPanel.cs
@@ -289,9 +289,7 @@ namespace KancolleSniffer
             var text = sniffer.CellInfo;\r
             if (text == null)\r
                 return;\r
-            if ((Spoilers & Spoiler.NextCell) == 0 && text[0] == '次')\r
-                return;\r
-            _cellLabel.Text = sniffer.CellInfo;\r
+            _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? sniffer.CellInfo.Current : sniffer.CellInfo.Next;\r
             _cellLabel.Location = new Point(ClientSize.Width - _cellLabel.Width - 2, 4);\r
         }\r
 \r
@@ -313,7 +311,7 @@ namespace KancolleSniffer
             _cellLabel = new Label\r
             {\r
                 Location = new Point(0, 4),\r
-                AutoSize = true,\r
+                AutoSize = true\r
             };\r
             Controls.Add(_cellLabel);\r
             for (var i = 0; i < 13; i++)\r

diff --git a/KancolleSniffer/CellInfo.cs b/KancolleSniffer/CellInfo.cs
index 45e2d2d..4b6a66a 100644 (file)
--- a/KancolleSniffer/CellInfo.cs
+++ b/KancolleSniffer/CellInfo.cs
@@ -18,18 +18,21 @@ namespace KancolleSniffer
     {\r
         private int _batttleCount;\r
 \r
-        public string Text { get; set; }\r
+        public string Next { get; set; }\r
+\r
+        public string Current { get; set; }\r
 \r
         private string _info;\r
 \r
         public void Port()\r
         {\r
-            Text = _info;\r
+            Current = Next = _info;\r
+            _info = "";\r
         }\r
 \r
         public void StartBattle()\r
         {\r
-            Text = _info;\r
+            Current = Next = _info;\r
         }\r
 \r
         public void InspectMapStart(dynamic json)\r
@@ -40,8 +43,9 @@ namespace KancolleSniffer
 \r
         public void InspectMapNext(dynamic json)\r
         {\r
+            Current = _info;\r
             SetInfo(json);\r
-            Text = "次" + _info;\r
+            Next = "次" + _info;\r
         }\r
 \r
         private void SetInfo(dynamic json)\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 070059c..0c9dbfa 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -600,7 +600,7 @@ namespace KancolleSniffer
 \r
         public BaseAirCoprs.BaseInfo[] BaseAirCorps => _baseAirCoprs.AllAirCorps;\r
 \r
-        public string CellInfo => _cellInfo.Text;\r
+        public CellInfo CellInfo => _cellInfo;\r
 \r
         public void SetLogWriter(Action<string, string, string> writer, Func<DateTime> nowFunc)\r
         {\r