diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs index c39e113c0..8566a69bd 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs @@ -2041,6 +2041,33 @@ public static string Settings_Operation_LoS_Title { } } + /// + /// Looks up a localized string similar to 連合艦隊時、以下の艦隊を索敵値計算の対象として使用する. + /// + public static string Settings_Operation_LoS_UseFleets { + get { + return ResourceManager.GetString("Settings_Operation_LoS_UseFleets", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 第1艦隊. + /// + public static string Settings_Operation_LoS_UseFleets_Fleet1 { + get { + return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 第2艦隊. + /// + public static string Settings_Operation_LoS_UseFleets_Fleet2 { + get { + return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet2", resourceCulture); + } + } + /// /// Looks up a localized string similar to 索敵値計算. /// @@ -2770,6 +2797,15 @@ public static string ShipCatalog_Column_ASW { } } + /// + /// Looks up a localized string similar to 装備によるステータス上昇を含んだ値です. + /// + public static string ShipCatalog_Column_ASW_Tooltip { + get { + return ResourceManager.GetString("ShipCatalog_Column_ASW_Tooltip", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cond.. /// diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx index 2d52f43fb..612f31173 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx @@ -713,7 +713,7 @@ GPU: Slow! GPU optimization for tablets. Give a notification for ships in critical condition - Settings_Plugins_PluginInfo_Features + LoS Calculation Carrier-based Recon Aircraft @@ -1432,4 +1432,16 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar Below 50 + + In a combined fleet setting, use these fleets to calculate LoS: + + + Fleet #1 + + + Fleet #2 + + + Includes stat bonuses from the equipment + \ No newline at end of file diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx index 1ebc248b6..84410eb5e 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx @@ -1424,4 +1424,16 @@ HTTP プロトコルの通信は自動構成も含め「インターネット 50 未満 + + 連合艦隊時、以下の艦隊を索敵値計算の対象として使用する + + + 第1艦隊 + + + 第2艦隊 + + + 装備によるステータス上昇を含んだ値です + \ No newline at end of file diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml index 16ebfd761..7970dc8d7 100644 --- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml @@ -841,8 +841,8 @@ - + diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml index 34da0a244..97937a4b3 100644 --- a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml @@ -79,16 +79,16 @@ Style="{DynamicResource DetailTextStyleKey}"/> - - -