IUpdatableをIUpdateContextとIUpdateTimerに分離する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / View / BattleResultPanel.cs

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index de95683..f1d0348 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -58,6 +58,7 @@ namespace KancolleSniffer.View
                 switch (state)\r
                 {\r
                     case BattleState.Day:\r
+                    case BattleState.AirRaid:\r
                         return _day;\r
                     case BattleState.SpNight:\r
                     case BattleState.Night:\r
@@ -72,6 +73,7 @@ namespace KancolleSniffer.View
                 switch (battle.BattleState)\r
                 {\r
                     case BattleState.Day:\r
+                    case BattleState.AirRaid:\r
                         _day = new Result {Damage = battle.Result, Rank = battle.ResultRank};\r
                         _night = null;\r
                         break;\r
@@ -142,6 +144,7 @@ namespace KancolleSniffer.View
                 switch (state)\r
                 {\r
                     case BattleState.Day:\r
+                    case BattleState.AirRaid:\r
                         SetPhase("昼戦");\r
                         break;\r
                     case BattleState.Night:\r
@@ -258,8 +261,9 @@ namespace KancolleSniffer.View
                 }\r
                 else\r
                 {\r
-                    labels.Hp.Set(ship);\r
-                    labels.Name.SetName(ShortenAirBaseName(ship.Name));\r
+                    labels.Set(ship);\r
+                    if (ship.Name.StartsWith("基地航空隊"))\r
+                        labels.Name.SetName(ship.Name.Substring(2));\r
                 }\r
                 ToolTip.SetToolTip(labels.Name, GetEquipString(ship));\r
             }\r
@@ -295,11 +299,6 @@ namespace KancolleSniffer.View
                 match => match.Value == "(elite)" ? "(e)" : "(f)");\r
         }\r
 \r
-        private static string ShortenAirBaseName(string name)\r
-        {\r
-            return Regex.Replace(name, "^基地航空隊", "航空隊");\r
-        }\r
-\r
         private void ShowResultRank(BattleResultRank rank)\r
         {\r
             var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E"};\r