From a36097ae12d061c973f1557f2de1b61000ab64d9 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Fri, 17 May 2019 16:27:14 +0900 Subject: [PATCH] =?utf8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88?= =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/View/BattleResultPanel.cs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs index 4e421ef..3fc5898 100644 --- a/KancolleSniffer/View/BattleResultPanel.cs +++ b/KancolleSniffer/View/BattleResultPanel.cs @@ -70,10 +70,10 @@ namespace KancolleSniffer.View case BattleState.None: if (_result[0] == null && _result[1] == null) return; - ClearResult(); - SetPhase("結果"); - UpdateCellInfo(_cellInfo); - return; + ClearResult(); + SetPhase("結果"); + UpdateCellInfo(_cellInfo); + return; case BattleState.Day: case BattleState.SpNight: _result[0] = _result[1] = null; @@ -271,12 +271,13 @@ namespace KancolleSniffer.View private string GetEquipString(ShipStatus ship) { var result = - (from i in Enumerable.Range(0, ship.Slot.Count) - let item = ship.Slot[i] - where !item.Empty - select item.Spec.Name + (item.Spec.IsAircraft && ship.OnSlot.Length > 0 && ship.Spec.MaxEq.Length > 0 - ? $"{ship.OnSlot[i]}/{ship.Spec.MaxEq[i]}" - : "")); + (from i in Enumerable.Range(0, ship.Slot.Count) + let item = ship.Slot[i] + where !item.Empty + select item.Spec.Name + + (item.Spec.IsAircraft && ship.OnSlot.Length > 0 && ship.Spec.MaxEq.Length > 0 + ? $"{ship.OnSlot[i]}/{ship.Spec.MaxEq[i]}" + : "")); if (ship.SlotEx.Id > 0) result = result.Concat(new[] {ship.SlotEx.Spec.Name}); return string.Join("\r\n", result); -- 2.11.0