From 54e468fed1d0d2562208be9af9d79c3efab94f9e Mon Sep 17 00:00:00 2001 From: Wolfgang Kurz Date: Wed, 14 Dec 2016 22:55:16 +0900 Subject: [PATCH 1/8] JetBombFighter icons --- .../Themes/Generic.SlotItemIcon.xaml | 63 +++++++++++++++++++ .../Models/SlotItemIconType.cs | 10 +++ 2 files changed, 73 insertions(+) diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index 3c25ddb3f..2dc4a1ee5 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -820,6 +820,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs index bd96b610d..b2b9b7664 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs @@ -199,5 +199,15 @@ public enum SlotItemIconType /// 局地戦闘機。 /// LandBasedFighter = 38, + + /// + /// 噴式戦闘爆撃機 A (Jet Keiun Kai) + /// + JetbombFighter_A = 39, + + /// + /// 噴式戦闘爆撃機 B (Kikka Kai) + /// + JetBombFighter_B = 40, } } From 6b7efe7d29384daf3f71d3456dc9e2b28d24564e Mon Sep 17 00:00:00 2001 From: Manato KAMEYA Date: Sat, 31 Dec 2016 02:36:14 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Themes/Generic.SlotItemIcon.xaml | 4 ++-- .../Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index 2dc4a1ee5..d9e8fb3d9 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -821,7 +821,7 @@ + Value="JetPowerededBomber1"> @@ -852,7 +852,7 @@ + Value="JetPowerededBomber2"> diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs index b2b9b7664..4bfeae0e2 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs @@ -201,13 +201,13 @@ public enum SlotItemIconType LandBasedFighter = 38, /// - /// 噴式戦闘爆撃機 A (Jet Keiun Kai) + /// 噴式戦闘爆撃機 /// - JetbombFighter_A = 39, + JetPowerededBomber1 = 39, /// - /// 噴式戦闘爆撃機 B (Kikka Kai) + /// 噴式戦闘爆撃機 /// - JetBombFighter_B = 40, + JetPowerededBomber2 = 40, } } From 7819d9b550fadf113d7fec491b01cb1b15e36f49 Mon Sep 17 00:00:00 2001 From: Grabacr07 Date: Sat, 11 Feb 2017 02:32:25 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=E9=80=9F=E5=8A=9B=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KanColleViewer.csproj | 1 + .../ViewModels/Catalogs/ShipCatalogFilter.cs | 60 +++++++++++++------ .../ViewModels/Catalogs/ShipViewModel.cs | 5 +- .../Contents/Fleets/FleetStateViewModel.cs | 22 ++----- .../Contents/ShipSpeedExtensions.cs | 28 +++++++++ .../Views/Catalogs/ShipCatalogWindow.xaml | 56 ++++++++++++++--- .../Models/FleetSpeed.cs | 28 ++++++--- .../Models/FleetState.cs | 8 +-- .../Models/Raw/kcsapi_ship2.cs | 3 +- .../Grabacr07.KanColleWrapper/Models/Ship.cs | 8 ++- .../Models/ShipInfo.cs | 7 +-- .../Models/ShipSpeed.cs | 42 +++++++++++-- 12 files changed, 198 insertions(+), 70 deletions(-) create mode 100644 source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj index b689593aa..2316ef5db 100644 --- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj +++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj @@ -175,6 +175,7 @@ + diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs index 0eb89394a..c7ea753e0 100644 --- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs +++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -184,18 +184,38 @@ public override bool Predicate(Ship ship) public class ShipSpeedFilter : ShipCatalogFilter { - #region Both 変更通知プロパティ + #region Fastest 変更通知プロパティ - private bool _Both; + private bool _Fastest; - public bool Both + public bool Fastest { - get { return this._Both; } + get { return this._Fastest; } set { - if (this._Both != value) + if (this._Fastest != value) { - this._Both = value; + this._Fastest = value; + this.RaisePropertyChanged(); + this.Update(); + } + } + } + + #endregion + + #region Faster 変更通知プロパティ + + private bool _Faster; + + public bool Faster + { + get { return this._Faster; } + set + { + if (this._Faster != value) + { + this._Faster = value; this.RaisePropertyChanged(); this.Update(); } @@ -224,37 +244,41 @@ public bool Fast #endregion - #region Low 変更通知プロパティ + #region Slow 変更通知プロパティ - private bool _Low; + private bool _Slow; - public bool Low + public bool Slow { - get { return this._Low; } + get { return this._Slow; } set { - if (this._Low != value) + if (this._Slow != value) { - this._Low = value; + this._Slow = value; this.RaisePropertyChanged(); + this.Update(); } } } #endregion - public ShipSpeedFilter(Action updateAction) : base(updateAction) { - this._Both = true; + this._Fastest = true; + this._Faster = true; + this._Fast = true; + this._Slow = true; } public override bool Predicate(Ship ship) { - if (this.Both) return true; - if (this.Fast && ship.Info.Speed == ShipSpeed.Fast) return true; - if (this.Low && ship.Info.Speed == ShipSpeed.Low) return true; + if (this.Fastest && ship.Speed == ShipSpeed.Fastest) return true; + if (this.Faster && ship.Speed == ShipSpeed.Faster) return true; + if (this.Fast && ship.Speed == ShipSpeed.Fast) return true; + if (this.Slow && ship.Speed == ShipSpeed.Slow) return true; return false; } diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipViewModel.cs index 7298ce02c..a6370ba14 100644 --- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipViewModel.cs +++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipViewModel.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Grabacr07.KanColleViewer.Models; +using Grabacr07.KanColleViewer.ViewModels.Contents; using Grabacr07.KanColleWrapper.Models; using Livet; @@ -16,6 +17,8 @@ public class ShipViewModel : ViewModel public SallyArea SallyArea { get; } + public string Speed => this.Ship.Speed.ToDisplayString(); + public string TimeToRepair => this.Ship.TimeToRepair != TimeSpan.Zero ? $"{(int)this.Ship.TimeToRepair.TotalHours:D2}:{this.Ship.TimeToRepair.ToString(@"mm\:ss")}" : ""; diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs index e01178db4..4c97bb380 100644 --- a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs +++ b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs @@ -1,8 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; -using Grabacr07.KanColleViewer.Properties; using Grabacr07.KanColleWrapper.Models; using Livet; using Livet.EventListeners; @@ -23,21 +21,9 @@ public class FleetStateViewModel : ViewModel public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##"); - public string Speed - { - get - { - switch (this.Source.Speed) - { - case FleetSpeed.Fast: - return Resources.Fleets_Speed_Fast; - case FleetSpeed.Low: - return Resources.Fleets_Speed_Slow; - default: - return "速度混成艦隊"; - } - } - } + public string Speed => this.Source.Speed.IsMixed + ? $"速度混成艦隊 ({this.Source.Speed.Min.ToDisplayString()} ～ {this.Source.Speed.Max.ToDisplayString()})" + : $"{this.Source.Speed.Min.ToDisplayString()}艦隊"; public HomeportViewModel Homeport { get; } diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs new file mode 100644 index 000000000..9cc6e452a --- /dev/null +++ b/source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs @@ -0,0 +1,28 @@ +using System; +using System.Linq; +using Grabacr07.KanColleWrapper.Models; + +namespace Grabacr07.KanColleViewer.ViewModels.Contents +{ + public static class ShipSpeedExtensions + { + public static string ToDisplayString(this ShipSpeed? speed) => ToDisplayString(speed ?? ShipSpeed.Immovable); + + public static string ToDisplayString(this ShipSpeed speed) + { + switch (speed) + { + case ShipSpeed.Fastest: + return "最速"; + case ShipSpeed.Faster: + return "高速+"; + case ShipSpeed.Fast: + return "高速"; + case ShipSpeed.Slow: + return "低速"; + default: + return ""; + } + } + } +} diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml index 409e41d84..932529e41 100644 --- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml @@ -1,4 +1,4 @@ - - - - + + + + @@ -832,6 +834,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Grabacr07.KanColleWrapper/Models/FleetSpeed.cs b/source/Grabacr07.KanColleWrapper/Models/FleetSpeed.cs index 757f32c6a..ecebd8455 100644 --- a/source/Grabacr07.KanColleWrapper/Models/FleetSpeed.cs +++ b/source/Grabacr07.KanColleWrapper/Models/FleetSpeed.cs @@ -1,14 +1,28 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; namespace Grabacr07.KanColleWrapper.Models { - public enum FleetSpeed + /// + /// 艦隊の速度を表します。 + /// + public class FleetSpeed { - Fast, - Low, - Hybrid, + private readonly ShipSpeed[] speeds; + + /// + /// 最も遅い艦を基準とした艦隊の速度を示す識別子を取得します。 + /// + public ShipSpeed? Min => this.speeds.Cast().Min(); + + public ShipSpeed? Max => this.speeds.Cast().Max(); + + public bool IsMixed => this.speeds.Distinct().Count() > 1; + + public FleetSpeed(ShipSpeed[] speeds) + { + this.speeds = speeds; + } } -} \ No newline at end of file +} diff --git a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs index 84f50333d..91d43324e 100644 --- a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs +++ b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -237,11 +237,7 @@ public void Calculate() this.AverageLevel = ships.HasItems() ? (double)this.TotalLevel / ships.Length : 0.0; this.MinAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Minimum)); this.MaxAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Maximum)); - this.Speed = ships.All(x => x.Info.Speed == ShipSpeed.Fast) - ? FleetSpeed.Fast - : ships.All(x => x.Info.Speed == ShipSpeed.Low) - ? FleetSpeed.Low - : FleetSpeed.Hybrid; + this.Speed = new FleetSpeed(Array.ConvertAll(ships, x => x.Speed)); var logic = ViewRangeCalcLogic.Get(KanColleClient.Current.Settings.ViewRangeCalcType); this.ViewRange = logic.Calc(this.source); diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_ship2.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_ship2.cs index b711667bd..f173a2377 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_ship2.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_ship2.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; @@ -29,6 +29,7 @@ public class kcsapi_ship2 public int[] api_karyoku { get; set; } public int[] api_raisou { get; set; } public int[] api_taiku { get; set; } + public int api_soku { get; set; } public int[] api_soukou { get; set; } public int[] api_kaihi { get; set; } public int[] api_taisen { get; set; } diff --git a/source/Grabacr07.KanColleWrapper/Models/Ship.cs b/source/Grabacr07.KanColleWrapper/Models/Ship.cs index df05f63fb..d40e1ff58 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Ship.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Ship.cs @@ -1,7 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using Grabacr07.KanColleWrapper.Internal; using Grabacr07.KanColleWrapper.Models.Raw; @@ -301,6 +300,11 @@ public TimeSpan TimeToRepair #endregion + /// + /// 装備によるボーナスを含めた艦の速力を取得します。 + /// + public ShipSpeed Speed => ShipSpeedConverter.FromInt32(this.RawData.api_soku); + /// /// 装備によるボーナスを含めた索敵ステータス値を取得します。 /// diff --git a/source/Grabacr07.KanColleWrapper/Models/ShipInfo.cs b/source/Grabacr07.KanColleWrapper/Models/ShipInfo.cs index 556056eb1..cb2f92ef9 100644 --- a/source/Grabacr07.KanColleWrapper/Models/ShipInfo.cs +++ b/source/Grabacr07.KanColleWrapper/Models/ShipInfo.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; @@ -96,11 +96,6 @@ public class ShipInfo : RawDataWrapper, IIdentifiable #endregion - /// - /// 速力を取得します。 - /// - public ShipSpeed Speed => (ShipSpeed)this.RawData.api_soku; - /// /// 次の改造が実施できるレベルを取得します。 /// diff --git a/source/Grabacr07.KanColleWrapper/Models/ShipSpeed.cs b/source/Grabacr07.KanColleWrapper/Models/ShipSpeed.cs index 05f2078ef..927b536f9 100644 --- a/source/Grabacr07.KanColleWrapper/Models/ShipSpeed.cs +++ b/source/Grabacr07.KanColleWrapper/Models/ShipSpeed.cs @@ -1,8 +1,6 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Grabacr07.KanColleWrapper.Models { @@ -19,11 +17,47 @@ public enum ShipSpeed /// /// 低速。 /// - Low = 5, + Slow = 5, /// /// 高速。 /// Fast = 10, + + /// + /// 高速＋。 + /// + Faster = 15, + + /// + /// 最速。 + /// + Fastest = 20, + } + + public static class ShipSpeedConverter + { + // ReSharper disable once InconsistentNaming + public static ShipSpeed FromInt32(int api_soku) + { + if (api_soku > 15) + { + return ShipSpeed.Fastest; + } + if (api_soku > 10) + { + return ShipSpeed.Faster; + } + if (api_soku > 5) + { + return ShipSpeed.Fast; + } + if (api_soku > 0) + { + return ShipSpeed.Slow; + } + + return ShipSpeed.Immovable; + } } } From 21258045b8255130c9c6d3cefbc24aee48c343d9 Mon Sep 17 00:00:00 2001 From: Grabacr07 Date: Sat, 11 Feb 2017 03:15:13 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E5=99=B4=E5=BC=8F=E6=88=A6=E9=97=98?= =?UTF-8?q?=E7=88=86=E6=92=83=E6=A9=9F=E3=81=AE=E7=B4=A2=E6=95=B5=E5=80=A4?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Settings/KanColleSettings.cs | 4 ++-- .../Grabacr07.KanColleWrapper/Models/SlotItemType.cs | 10 +++++++++- source/Grabacr07.KanColleWrapper/Models/ViewRange.cs | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs b/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs index c54d9a3ea..b2e697b93 100644 --- a/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs +++ b/source/Grabacr07.KanColleViewer/Models/Settings/KanColleSettings.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -25,7 +25,7 @@ public class KanColleSettings : IKanColleClientSettings /// 索敵計算に使用するロジックを識別する文字列の設定値を取得します。 /// public static SerializableProperty ViewRangeCalcType { get; } - = new SerializableProperty(GetKey(), Providers.Roaming, new ViewRangeType1().Id); + = new SerializableProperty(GetKey(), Providers.Roaming, new ViewRangeType4().Id); /// /// 索敵計算に第1艦隊を含めるかどうかの設定値を取得します。 diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs index 104aada4d..9a49aaaf3 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs @@ -1,4 +1,4 @@ -// ReSharper disable InconsistentNaming +// ReSharper disable InconsistentNaming namespace Grabacr07.KanColleWrapper.Models { @@ -52,6 +52,10 @@ public enum SlotItemType 特型内火艇 = 46, 陸上攻撃機 = 47, 局地戦闘機 = 48, + 噴式戦闘機 = 56, + 噴式戦闘爆撃機 = 57, + 噴式攻撃機 = 58, + 噴式偵察機 = 59, 大型電探_II = 93, 艦上偵察機_II = 94, } @@ -73,6 +77,10 @@ public static bool IsNumerable(this SlotItemType type) case SlotItemType.オートジャイロ: case SlotItemType.対潜哨戒機: case SlotItemType.大型飛行艇: + case SlotItemType.噴式戦闘機: + case SlotItemType.噴式戦闘爆撃機: + case SlotItemType.噴式攻撃機: + case SlotItemType.噴式偵察機: return true; default: diff --git a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs index 5268daf09..ad20a8933 100644 --- a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs +++ b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -289,9 +289,12 @@ private static double GetTypeCoefficient(SlotItemType type) case SlotItemType.大型飛行艇: case SlotItemType.大型探照灯: case SlotItemType.水上戦闘機: + case SlotItemType.噴式戦闘機: // 未実装なのでﾃｷﾄｰ + case SlotItemType.噴式戦闘爆撃機: return 0.6; case SlotItemType.艦上攻撃機: + case SlotItemType.噴式攻撃機: // 未実装なのでﾃｷﾄｰ return 0.8; case SlotItemType.艦上偵察機: @@ -302,6 +305,7 @@ private static double GetTypeCoefficient(SlotItemType type) return 1.1; case SlotItemType.水上偵察機: + case SlotItemType.噴式偵察機: // 未実装なのでﾃｷﾄｰ return 1.2; default: From 685a70da63e48e75a723c4c6c896ae687763ec31 Mon Sep 17 00:00:00 2001 From: Grabacr07 Date: Sat, 11 Feb 2017 03:44:06 +0900 Subject: [PATCH 5/8] version 4.2.10 --- source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs | 4 ++-- source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs index 2322be8ce..33a5d3a53 100644 --- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs +++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.InteropServices; using System.Windows; @@ -15,4 +15,4 @@ ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("4.2.9.0")] +[assembly: AssemblyVersion("4.2.10.0")] diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs index 25164fb30..6b628add8 100644 --- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs +++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.InteropServices; [assembly: AssemblyTitle("KanColleWrapper")] @@ -10,5 +10,5 @@ [assembly: ComVisible(false)] [assembly: Guid("8A13AB28-4E9F-423D-80AD-23EEF2821959")] -[assembly: AssemblyVersion("1.6.2")] -[assembly: AssemblyInformationalVersion("1.6.2")] +[assembly: AssemblyVersion("1.7.0")] +[assembly: AssemblyInformationalVersion("1.7.0")] From 8e7b02f7236aafbf64fbf1b1373751a3602937a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Kurz Date: Thu, 2 Mar 2017 05:11:08 +0900 Subject: [PATCH 6/8] TransportEquipment, SubmarineEquipment --- .../Themes/Generic.SlotItemIcon.xaml | 40 +++++++++++++++++++ .../Models/SlotItemIconType.cs | 10 +++++ 2 files changed, 50 insertions(+) diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index d9e8fb3d9..6c06fba94 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -883,6 +883,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs index 4bfeae0e2..3d67968fb 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs @@ -209,5 +209,15 @@ public enum SlotItemIconType /// 噴式戦闘爆撃機 /// JetPowerededBomber2 = 40, + + /// + /// 輸送機材 + /// + TransportEquipment = 41, + + /// + /// 潜水艦装備 + /// + SubmarineEquipment = 42, } } From 11a731ab8186e47fd36d53ebf1eb5a5ef274fff1 Mon Sep 17 00:00:00 2001 From: Wolfgang Kurz Date: Tue, 21 Mar 2017 22:33:18 +0900 Subject: [PATCH 7/8] New icon for SeaplaneFighter --- .../Themes/Generic.SlotItemIcon.xaml | 20 +++++++++++++++++++ .../Models/SlotItemIconType.cs | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index 6c06fba94..b9a0dd464 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -923,6 +923,26 @@ + + + + + + + + + + + + + diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs index 3d67968fb..f605749fb 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs @@ -219,5 +219,10 @@ public enum SlotItemIconType /// 潜水艦装備 /// SubmarineEquipment = 42, + + /// + /// 水上戦闘機 + /// + SeaplaneFighter = 43, } } From 68406f66b3d786f1af6e58786b8e8fe030a62cdc Mon Sep 17 00:00:00 2001 From: Wolfgang Kurz Date: Sat, 1 Apr 2017 23:35:03 +0900 Subject: [PATCH 8/8] Update SubmarineEquipment --- .../Themes/Generic.SlotItemIcon.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index b9a0dd464..4f4cba5bf 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -910,11 +910,11 @@ -