リビジョン | 47386563301aaa671d7fa546b34919f289da301c (tree) |
---|---|
日時 | 2018-10-10 20:59:56 |
作者 | Kazuhiro Fujieda <fujieda@user...> |
コミッター | Kazuhiro Fujieda |
連合艦隊表示のときに連合の種類を表示する
@@ -645,7 +645,7 @@ namespace KancolleSniffer | ||
645 | 645 | _mainLabels.SetShipLabels(ships); |
646 | 646 | if (!_sniffer.IsCombinedFleet) |
647 | 647 | _combinedFleet = false; |
648 | - labelFleet1.Text = _combinedFleet ? "連合" : "第一"; | |
648 | + labelFleet1.Text = _combinedFleet ? CombinedName : "第一"; | |
649 | 649 | panelCombinedFleet.Visible = _combinedFleet; |
650 | 650 | if (_combinedFleet) |
651 | 651 | _mainLabels.SetCombinedShipLabels(fleets[0].ActualShips, fleets[1].ActualShips); |
@@ -658,6 +658,24 @@ namespace KancolleSniffer | ||
658 | 658 | UpdateCondTimers(); |
659 | 659 | } |
660 | 660 | |
661 | + private string CombinedName | |
662 | + { | |
663 | + get | |
664 | + { | |
665 | + switch (_sniffer.Fleets[0].CombinedType) | |
666 | + { | |
667 | + case CombinedType.Carrier: | |
668 | + return "機動"; | |
669 | + case CombinedType.Surface: | |
670 | + return "水上"; | |
671 | + case CombinedType.Transport: | |
672 | + return "輸送"; | |
673 | + default: | |
674 | + return "連合"; | |
675 | + } | |
676 | + } | |
677 | + } | |
678 | + | |
661 | 679 | private void NotifyDamagedShip() |
662 | 680 | { |
663 | 681 | if (!_sniffer.BadlyDamagedShips.Any()) |
@@ -1204,7 +1222,7 @@ namespace KancolleSniffer | ||
1204 | 1222 | |
1205 | 1223 | private void labelFleet1_MouseLeave(object sender, EventArgs e) |
1206 | 1224 | { |
1207 | - labelFleet1.Text = _combinedFleet ? "連合" : "第一"; | |
1225 | + labelFleet1.Text = _combinedFleet ? CombinedName : "第一"; | |
1208 | 1226 | } |
1209 | 1227 | |
1210 | 1228 | private void labelFleet_DoubleClick(object sender, EventArgs e) |