diff --git a/source/Grabacr07.KanColleViewer.Controls/Controls/ColorIndicator.cs b/source/Grabacr07.KanColleViewer.Controls/Controls/ColorIndicator.cs index 3586ec9b4..c8b56e314 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Controls/ColorIndicator.cs +++ b/source/Grabacr07.KanColleViewer.Controls/Controls/ColorIndicator.cs @@ -41,6 +41,17 @@ private static void LimitedValuePropertyChangedCallback(DependencyObject d, Depe #endregion + #region Columns 依存関係プロパティ + + public int Columns + { + get { return (int)this.GetValue(ColumnsProperty); } + set { this.SetValue(ColumnsProperty, value); } + } + public static readonly DependencyProperty ColumnsProperty = + DependencyProperty.Register(nameof(Columns), typeof(int), typeof(ColorIndicator), new UIPropertyMetadata(4)); + + #endregion private void ChangeColor(LimitedValue value) { diff --git a/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.nuspec b/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.nuspec index 41db955ad..bc56a6794 100644 --- a/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.nuspec +++ b/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.nuspec @@ -16,7 +16,7 @@ - + diff --git a/source/Grabacr07.KanColleViewer.Controls/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer.Controls/Properties/AssemblyInfo.cs index 09a714204..b3735229a 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Properties/AssemblyInfo.cs +++ b/source/Grabacr07.KanColleViewer.Controls/Properties/AssemblyInfo.cs @@ -20,5 +20,5 @@ [assembly: XmlnsDefinition("http://schemes.grabacr.net/winfx/2015/kancolleviewer/converters", "Grabacr07.KanColleViewer.Converters")] [assembly: XmlnsDefinition("http://schemes.grabacr.net/winfx/2015/kancolleviewer/interactivity", "Grabacr07.KanColleViewer.Interactivity")] -[assembly: AssemblyVersion("1.3.1")] -[assembly: AssemblyInformationalVersion("1.3.1")] +[assembly: AssemblyVersion("1.3.2")] +[assembly: AssemblyInformationalVersion("1.3.2")] diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.ColorIndicator.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.ColorIndicator.xaml index e428ea30c..04a7cc1c3 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.ColorIndicator.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.ColorIndicator.xaml @@ -4,21 +4,67 @@ + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml index b91831c28..3c25ddb3f 100644 --- a/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml +++ b/source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml @@ -638,21 +638,21 @@ - - + + @@ -679,8 +679,25 @@ - - + + @@ -729,7 +746,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs index c6e15dd12..021bc2bdf 100644 --- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs +++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs @@ -21,4 +21,4 @@ ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("4.2.7.1")] +[assembly: AssemblyVersion("4.2.9.0")] diff --git a/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml b/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml index 95ca4dac4..b2df4acb3 100644 --- a/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml @@ -24,6 +24,7 @@ + @@ -245,12 +246,14 @@ Width="55" LimitedValue="{Binding Ship.Fuel, Mode=OneWay}" Height="6" + Columns="5" Margin="0,6,0,7" /> - - - - - - - - + - + + + + + + + + + + + @@ -285,6 +358,18 @@ Property="Visibility" Value="Collapsed" /> + + + + + + diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml index 5c2a5b924..5e1e4fd5f 100644 --- a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml @@ -309,6 +309,7 @@ @@ -336,6 +337,7 @@ diff --git a/source/Grabacr07.KanColleViewer/bin/Debug/Plugins/EventMapHpViewer.dll b/source/Grabacr07.KanColleViewer/bin/Debug/Plugins/EventMapHpViewer.dll index 1d220d1c9..8038443fd 100644 Binary files a/source/Grabacr07.KanColleViewer/bin/Debug/Plugins/EventMapHpViewer.dll and b/source/Grabacr07.KanColleViewer/bin/Debug/Plugins/EventMapHpViewer.dll differ diff --git a/source/Grabacr07.KanColleViewer/bin/Release (beta)/Plugins/EventMapHpViewer.dll b/source/Grabacr07.KanColleViewer/bin/Release (beta)/Plugins/EventMapHpViewer.dll index 521c4d44b..8038443fd 100644 Binary files a/source/Grabacr07.KanColleViewer/bin/Release (beta)/Plugins/EventMapHpViewer.dll and b/source/Grabacr07.KanColleViewer/bin/Release (beta)/Plugins/EventMapHpViewer.dll differ diff --git a/source/Grabacr07.KanColleViewer/bin/Release/Plugins/EventMapHpViewer.dll b/source/Grabacr07.KanColleViewer/bin/Release/Plugins/EventMapHpViewer.dll index 521c4d44b..8038443fd 100644 Binary files a/source/Grabacr07.KanColleViewer/bin/Release/Plugins/EventMapHpViewer.dll and b/source/Grabacr07.KanColleViewer/bin/Release/Plugins/EventMapHpViewer.dll differ diff --git a/source/Grabacr07.KanColleWrapper/Master.cs b/source/Grabacr07.KanColleWrapper/Master.cs index c224e9ebc..523d3297b 100644 --- a/source/Grabacr07.KanColleWrapper/Master.cs +++ b/source/Grabacr07.KanColleWrapper/Master.cs @@ -56,7 +56,8 @@ public class Master /// /// すべてのセルの定義を取得します。 /// - public MasterTable MapCells { get; } + [Obsolete("マスター データから削除されました。")] + public MasterTable MapCells { get; } = new MasterTable(); internal Master(kcsapi_start2 start2) @@ -67,8 +68,7 @@ internal Master(kcsapi_start2 start2) this.SlotItems = new MasterTable(start2.api_mst_slotitem.Select(x => new SlotItemInfo(x, this.SlotItemEquipTypes))); this.UseItems = new MasterTable(start2.api_mst_useitem.Select(x => new UseItemInfo(x))); this.Missions = new MasterTable(start2.api_mst_mission.Select(x => new Mission(x))); - this.MapCells = new MasterTable(start2.api_mst_mapcell.Select(x => new MapCell(x))); - this.MapInfos = new MasterTable(start2.api_mst_mapinfo.Select(x => new MapInfo(x, this.MapCells))); + this.MapInfos = new MasterTable(start2.api_mst_mapinfo.Select(x => new MapInfo(x))); this.MapAreas = new MasterTable(start2.api_mst_maparea.Select(x => new MapArea(x, this.MapInfos))); } } diff --git a/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs b/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs index 0aef8163e..9df9f417f 100644 --- a/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs +++ b/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs @@ -26,9 +26,7 @@ public class MapInfo : RawDataWrapper, IIdentifiable public int RequiredDefeatCount { get; } - public MasterTable MapCells { get; } - - public MapInfo(kcsapi_mst_mapinfo mapinfo, MasterTable mapCells) + public MapInfo(kcsapi_mst_mapinfo mapinfo) : base(mapinfo) { this.Id = mapinfo.api_id; @@ -39,9 +37,6 @@ public MapInfo(kcsapi_mst_mapinfo mapinfo, MasterTable mapCells) this.OperationName = mapinfo.api_opetext; this.OperationSummary = mapinfo.api_infotext; this.RequiredDefeatCount = mapinfo.api_required_defeat_count ?? 1; - this.MapCells = new MasterTable(mapCells.Values.Where(x => x.MapInfoId == mapinfo.api_id)); - foreach (var cell in this.MapCells.Values) - cell.MapInfo = this; } public override string ToString() @@ -58,7 +53,7 @@ public override string ToString() api_maparea_id = 0, api_no = 0, api_level = 0, - }, new MasterTable()) + }) { MapArea = MapArea.Dummy, }; diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs index d8fa1bce0..cd1dc6964 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs @@ -5,10 +5,14 @@ namespace Grabacr07.KanColleWrapper.Models.Raw { + // ReSharper disable InconsistentNaming + public class kcsapi_mst_maparea { public int api_id { get; set; } public string api_name { get; set; } public int api_type { get; set; } } + + // ReSharper restore InconsistentNaming } diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs index 868a91975..d2395c624 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs @@ -5,6 +5,7 @@ namespace Grabacr07.KanColleWrapper.Models.Raw { + // ReSharper disable InconsistentNaming public class kcsapi_mst_mapinfo { public int api_id { get; set; } @@ -19,4 +20,5 @@ public class kcsapi_mst_mapinfo public int? api_required_defeat_count { get; set; } public int[] api_sally_flag { get; set; } } + // ReSharper restore InconsistentNaming } diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs index 76bc0f598..05ebcfcbc 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs @@ -35,6 +35,8 @@ public class kcsapi_mst_slotitem public int[] api_broken { get; set; } public string api_info { get; set; } public string api_usebull { get; set; } + public int api_cost { get; set; } + public int api_distance { get; set; } } // ReSharper restore InconsistentNaming } diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_start2.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_start2.cs index 729f59846..eadec5888 100644 --- a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_start2.cs +++ b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_start2.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Grabacr07.KanColleWrapper.Models.Raw { @@ -11,316 +9,13 @@ namespace Grabacr07.KanColleWrapper.Models.Raw public class kcsapi_start2 { public kcsapi_mst_ship[] api_mst_ship { get; set; } - public Api_Mst_Shipgraph[] api_mst_shipgraph { get; set; } public kcsapi_mst_slotitem_equiptype[] api_mst_slotitem_equiptype { get; set; } public kcsapi_mst_stype[] api_mst_stype { get; set; } public kcsapi_mst_slotitem[] api_mst_slotitem { get; set; } - public Api_Mst_Furniture[] api_mst_furniture { get; set; } - public Api_Mst_Furnituregraph[] api_mst_furnituregraph { get; set; } public kcsapi_mst_useitem[] api_mst_useitem { get; set; } - public Api_Mst_Payitem[] api_mst_payitem { get; set; } - public Api_Mst_Item_Shop api_mst_item_shop { get; set; } public kcsapi_mst_maparea[] api_mst_maparea { get; set; } public kcsapi_mst_mapinfo[] api_mst_mapinfo { get; set; } - public Api_Mst_Mapbgm[] api_mst_mapbgm { get; set; } - public kcsapi_mst_mapcell[] api_mst_mapcell { get; set; } public kcsapi_mission[] api_mst_mission { get; set; } - public Api_Mst_Const api_mst_const { get; set; } - public Api_Mst_Shipupgrade[] api_mst_shipupgrade { get; set; } - public Api_Mst_Bgm[] api_mst_bgm { get; set; } - } - - public class Api_Mst_Item_Shop - { - public int[] api_cabinet_1 { get; set; } - public int[] api_cabinet_2 { get; set; } - } - - public class Api_Mst_Const - { - public Api_Boko_Max_Ships api_boko_max_ships { get; set; } - public Api_Dpflag_Quest api_dpflag_quest { get; set; } - public Api_Parallel_Quest_Max api_parallel_quest_max { get; set; } - } - - public class Api_Boko_Max_Ships - { - public string api_string_value { get; set; } - public int api_int_value { get; set; } - } - - public class Api_Dpflag_Quest - { - public string api_string_value { get; set; } - public int api_int_value { get; set; } - } - - public class Api_Parallel_Quest_Max - { - public string api_string_value { get; set; } - public int api_int_value { get; set; } - } - - public class Api_Mst_Ship - { - public int api_id { get; set; } - public int api_sortno { get; set; } - public string api_name { get; set; } - public string api_yomi { get; set; } - public int api_stype { get; set; } - public int api_afterlv { get; set; } - public string api_aftershipid { get; set; } - public int[] api_taik { get; set; } - public int[] api_souk { get; set; } - public int[] api_houg { get; set; } - public int[] api_raig { get; set; } - public int[] api_tyku { get; set; } - public int[] api_luck { get; set; } - public int api_soku { get; set; } - public int api_leng { get; set; } - public int api_slot_num { get; set; } - public int[] api_maxeq { get; set; } - public int api_buildtime { get; set; } - public int[] api_broken { get; set; } - public int[] api_powup { get; set; } - public int api_backs { get; set; } - public string api_getmes { get; set; } - public int api_afterfuel { get; set; } - public int api_afterbull { get; set; } - public int api_fuel_max { get; set; } - public int api_bull_max { get; set; } - public int api_voicef { get; set; } - } - - public class Api_Mst_Shipgraph - { - public int api_id { get; set; } - public int api_sortno { get; set; } - public string api_filename { get; set; } - //public string api_version { get; set; } - public int[] api_boko_n { get; set; } - public int[] api_boko_d { get; set; } - public int[] api_kaisyu_n { get; set; } - public int[] api_kaisyu_d { get; set; } - public int[] api_kaizo_n { get; set; } - public int[] api_kaizo_d { get; set; } - public int[] api_map_n { get; set; } - public int[] api_map_d { get; set; } - public int[] api_ensyuf_n { get; set; } - public int[] api_ensyuf_d { get; set; } - public int[] api_ensyue_n { get; set; } - public int[] api_battle_n { get; set; } - public int[] api_battle_d { get; set; } - public int[] api_weda { get; set; } - public int[] api_wedb { get; set; } - } - - public class Api_Mst_Slotitem_Equiptype - { - public int api_id { get; set; } - public string api_name { get; set; } - public int api_show_flg { get; set; } - } - - public class Api_Mst_Stype - { - public int api_id { get; set; } - public int api_sortno { get; set; } - public string api_name { get; set; } - public int api_scnt { get; set; } - public int api_kcnt { get; set; } - public Api_Equip_Type api_equip_type { get; set; } - } - - public class Api_Equip_Type - { - public int _1 { get; set; } - public int _2 { get; set; } - public int _3 { get; set; } - public int _4 { get; set; } - public int _5 { get; set; } - public int _6 { get; set; } - public int _7 { get; set; } - public int _8 { get; set; } - public int _9 { get; set; } - public int _10 { get; set; } - public int _11 { get; set; } - public int _12 { get; set; } - public int _13 { get; set; } - public int _14 { get; set; } - public int _15 { get; set; } - public int _16 { get; set; } - public int _17 { get; set; } - public int _18 { get; set; } - public int _19 { get; set; } - public int _20 { get; set; } - public int _21 { get; set; } - public int _22 { get; set; } - public int _23 { get; set; } - public int _24 { get; set; } - public int _25 { get; set; } - public int _26 { get; set; } - public int _27 { get; set; } - public int _28 { get; set; } - public int _29 { get; set; } - public int _30 { get; set; } - public int _31 { get; set; } - public int _32 { get; set; } - public int _33 { get; set; } - public int _34 { get; set; } - public int _35 { get; set; } - public int _36 { get; set; } - public int _37 { get; set; } - public int _38 { get; set; } - public int _39 { get; set; } - public int _40 { get; set; } - public int _41 { get; set; } - public int _42 { get; set; } - public int _43 { get; set; } - } - - public class Api_Mst_Slotitem - { - public int api_id { get; set; } - public int api_sortno { get; set; } - public string api_name { get; set; } - public int[] api_type { get; set; } - public int api_taik { get; set; } - public int api_souk { get; set; } - public int api_houg { get; set; } - public int api_raig { get; set; } - public int api_soku { get; set; } - public int api_baku { get; set; } - public int api_tyku { get; set; } - public int api_tais { get; set; } - public int api_atap { get; set; } - public int api_houm { get; set; } - public int api_raim { get; set; } - public int api_houk { get; set; } - public int api_raik { get; set; } - public int api_bakk { get; set; } - public int api_saku { get; set; } - public int api_sakb { get; set; } - public int api_luck { get; set; } - public int api_leng { get; set; } - public int api_rare { get; set; } - public int[] api_broken { get; set; } - public string api_info { get; set; } - public string api_usebull { get; set; } - } - - public class Api_Mst_Furniture - { - public int api_id { get; set; } - public int api_type { get; set; } - public int api_no { get; set; } - public string api_title { get; set; } - public string api_description { get; set; } - public int api_rarity { get; set; } - public int api_price { get; set; } - public int api_saleflg { get; set; } - public int api_season { get; set; } - } - - public class Api_Mst_Furnituregraph - { - public int api_id { get; set; } - public int api_type { get; set; } - public int api_no { get; set; } - public string api_filename { get; set; } - //public string api_version { get; set; } - } - - public class Api_Mst_Useitem - { - public int api_id { get; set; } - public int api_usetype { get; set; } - public int api_category { get; set; } - public string api_name { get; set; } - public string[] api_description { get; set; } - public int api_price { get; set; } - } - - public class Api_Mst_Payitem - { - public int api_id { get; set; } - public int api_type { get; set; } - public string api_name { get; set; } - public string api_description { get; set; } - public int[] api_item { get; set; } - public int api_price { get; set; } - } - - public class Api_Mst_Maparea - { - public int api_id { get; set; } - public string api_name { get; set; } - public int api_type { get; set; } - } - - public class Api_Mst_Mapinfo - { - public int api_id { get; set; } - public int api_maparea_id { get; set; } - public int api_no { get; set; } - public string api_name { get; set; } - public int api_level { get; set; } - public string api_opetext { get; set; } - public string api_infotext { get; set; } - public int[] api_item { get; set; } - public object api_max_maphp { get; set; } - public int? api_required_defeat_count { get; set; } - public int[] api_sally_flag { get; set; } - } - - public class Api_Mst_Mapbgm - { - public int api_id { get; set; } - public int api_maparea_id { get; set; } - public int api_no { get; set; } - public int[] api_map_bgm { get; set; } - public int[] api_boss_bgm { get; set; } - } - - public class Api_Mst_Mapcell - { - public int api_map_no { get; set; } - public int api_maparea_id { get; set; } - public int api_mapinfo_no { get; set; } - public int api_id { get; set; } - public int api_no { get; set; } - public int api_color_no { get; set; } - } - - public class Api_Mst_Mission - { - public int api_id { get; set; } - public int api_maparea_id { get; set; } - public string api_name { get; set; } - public string api_details { get; set; } - public int api_time { get; set; } - public int api_difficulty { get; set; } - public float api_use_fuel { get; set; } - public float api_use_bull { get; set; } - public int[] api_win_item1 { get; set; } - public int[] api_win_item2 { get; set; } - public int api_return_flag { get; set; } - } - - public class Api_Mst_Shipupgrade - { - public int api_id { get; set; } - public int api_original_ship_id { get; set; } - public int api_upgrade_type { get; set; } - public int api_upgrade_level { get; set; } - public int api_drawing_count { get; set; } - public int api_sortno { get; set; } - } - - public class Api_Mst_Bgm - { - public int api_id { get; set; } - public string api_name { get; set; } } // ReSharper restore InconsistentNaming diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs index d8674a1e1..bd96b610d 100644 --- a/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs +++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemIconType.cs @@ -184,5 +184,20 @@ public enum SlotItemIconType /// 洋上補給。 /// OffshoreResupply = 35, + + /// + /// 内火艇。 + /// + AmphibiousLandingCraft = 36, + + /// + /// 陸上攻撃機。 + /// + LandBasedAttacker = 37, + + /// + /// 局地戦闘機。 + /// + LandBasedFighter = 38, } } diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs index 601dda8c1..25164fb30 100644 --- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs +++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs @@ -10,5 +10,5 @@ [assembly: ComVisible(false)] [assembly: Guid("8A13AB28-4E9F-423D-80AD-23EEF2821959")] -[assembly: AssemblyVersion("1.6.0")] -[assembly: AssemblyInformationalVersion("1.6.0")] +[assembly: AssemblyVersion("1.6.2")] +[assembly: AssemblyInformationalVersion("1.6.2")]