case BattleState.None:\r
if (_result[0] == null && _result[1] == null)\r
return;\r
- ClearResult();\r
- SetPhase("結果");\r
- UpdateCellInfo(_cellInfo);\r
- return;\r
+ ClearResult();\r
+ SetPhase("結果");\r
+ UpdateCellInfo(_cellInfo);\r
+ return;\r
case BattleState.Day:\r
case BattleState.SpNight:\r
_result[0] = _result[1] = null;\r
private string GetEquipString(ShipStatus ship)\r
{\r
var result =\r
- (from i in Enumerable.Range(0, ship.Slot.Count)\r
- let item = ship.Slot[i]\r
- where !item.Empty\r
- select item.Spec.Name + (item.Spec.IsAircraft && ship.OnSlot.Length > 0 && ship.Spec.MaxEq.Length > 0\r
- ? $"{ship.OnSlot[i]}/{ship.Spec.MaxEq[i]}"\r
- : ""));\r
+ (from i in Enumerable.Range(0, ship.Slot.Count)\r
+ let item = ship.Slot[i]\r
+ where !item.Empty\r
+ select item.Spec.Name +\r
+ (item.Spec.IsAircraft && ship.OnSlot.Length > 0 && ship.Spec.MaxEq.Length > 0\r
+ ? $"{ship.OnSlot[i]}/{ship.Spec.MaxEq[i]}"\r
+ : ""));\r
if (ship.SlotEx.Id > 0)\r
result = result.Concat(new[] {ship.SlotEx.Spec.Name});\r
return string.Join("\r\n", result);\r