From a5b368cc8ea5a256e779cd3b601f2af3ea9812b1 Mon Sep 17 00:00:00 2001 From: Andante Date: Sun, 7 Jun 2020 22:06:18 +0900 Subject: [PATCH] Version 4.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 艦船図鑑：艦型も表示するように --- ElectronicObserver/Utility/SoftwareInformation.cs | 6 +++--- .../Window/Dialog/DialogAlbumMasterShip.cs | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs index eab3688e7..c34769161 100644 --- a/ElectronicObserver/Utility/SoftwareInformation.cs +++ b/ElectronicObserver/Utility/SoftwareInformation.cs @@ -29,20 +29,20 @@ public static class SoftwareInformation /// /// バージョン(日本語, ソフトウェア名を含みます) /// - public static string VersionJapanese => SoftwareNameJapanese + "四五型改"; + public static string VersionJapanese => SoftwareNameJapanese + "四六型"; /// /// バージョン(英語) /// - public static string VersionEnglish => "4.5.1"; + public static string VersionEnglish => "4.6.0"; /// /// 更新日時 /// - public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/04/26 15:00:00"); + public static DateTime UpdateTime => DateTimeHelper.CSVStringToTime("2020/06/07 23:00:00"); diff --git a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs index 83c623644..9e9eb912b 100644 --- a/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs +++ b/ElectronicObserver/Window/Dialog/DialogAlbumMasterShip.cs @@ -297,16 +297,19 @@ private void UpdateAlbumPage(int shipID) ToolTipInfo.SetToolTip(ResourceName, string.Format("リソース名: {0}\r\nグラフィック ver. {1}\r\nボイス ver. {2}\r\n母港ボイス ver. {3}\r\n({4})", ship.ResourceName, ship.ResourceGraphicVersion, ship.ResourceVoiceVersion, ship.ResourcePortVoiceVersion, Constants.GetVoiceFlag(ship.VoiceFlag))); - - ShipType.Text = ship.IsLandBase ? "陸上施設" : ship.ShipTypeName; { + string shipClassName = Constants.GetShipClass(ship.ShipClass); + bool isShipClassUnknown = shipClassName == "不明"; + + ShipType.Text = (ship.IsAbyssalShip ? "深海" : isShipClassUnknown ? "" : shipClassName) + (ship.IsLandBase ? "陸上施設" : ship.ShipTypeName); + var tip = new StringBuilder(); if (ship.IsAbyssalShip) tip.AppendLine($"艦型ID: {ship.ShipClass}"); - else if (Constants.GetShipClass(ship.ShipClass) == "不明") + else if (isShipClassUnknown) tip.AppendLine($"艦型不明: {ship.ShipClass}"); else - tip.AppendLine($"{Constants.GetShipClass(ship.ShipClass)}: {ship.ShipClass}"); + tip.AppendLine($"{shipClassName}: {ship.ShipClass}"); tip.AppendLine(); tip.AppendLine("装備可能：");