diff --git a/ElectronicObserver.Avalonia/Assets/Equipment/JetFighterShinden.png b/ElectronicObserver.Avalonia/Assets/Equipment/JetFighterShinden.png new file mode 100644 index 000000000..df741a82d Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Equipment/JetFighterShinden.png differ diff --git a/ElectronicObserver.Avalonia/Controls/EquipmentIcon.axaml.cs b/ElectronicObserver.Avalonia/Controls/EquipmentIcon.axaml.cs index f13766509..386f01b07 100644 --- a/ElectronicObserver.Avalonia/Controls/EquipmentIcon.axaml.cs +++ b/ElectronicObserver.Avalonia/Controls/EquipmentIcon.axaml.cs @@ -89,6 +89,7 @@ private void UpdateIcon() EquipmentIconType.JetBomberKeiun => "Assets/Equipment/JetFightingBomberKeiun.png", EquipmentIconType.JetBomberKikka => "Assets/Equipment/JetFightingBomberKikka.png", EquipmentIconType.JetBomberHo229 => "Assets/Equipment/JetFightingBomberHo229.png", + EquipmentIconType.JetFighterShinden => "Assets/Equipment/JetFighterShinden.png", EquipmentIconType.TransportMaterial => "Assets/Equipment/TransportMaterials.png", EquipmentIconType.SubmarineEquipment => "Assets/Equipment/SubmarineEquipment.png", EquipmentIconType.SeaplaneFighter => "Assets/Equipment/SeaplaneFighter.png", diff --git a/ElectronicObserver.Core/Properties/EquipmentIconType.en.resx b/ElectronicObserver.Core/Properties/EquipmentIconType.en.resx index 4afc010d4..acadfb29b 100644 --- a/ElectronicObserver.Core/Properties/EquipmentIconType.en.resx +++ b/ElectronicObserver.Core/Properties/EquipmentIconType.en.resx @@ -294,4 +294,7 @@ Unknown + + Jet Fighter Shinden + \ No newline at end of file diff --git a/ElectronicObserver.Core/Properties/EquipmentIconType.resx b/ElectronicObserver.Core/Properties/EquipmentIconType.resx index b22ed01b6..c48997364 100644 --- a/ElectronicObserver.Core/Properties/EquipmentIconType.resx +++ b/ElectronicObserver.Core/Properties/EquipmentIconType.resx @@ -294,4 +294,7 @@ 不明 + + 噴式艦上戦闘機(震電) + \ No newline at end of file diff --git a/ElectronicObserver.Core/Types/EquipmentIconType.cs b/ElectronicObserver.Core/Types/EquipmentIconType.cs index 06a20dc69..5538c8211 100644 --- a/ElectronicObserver.Core/Types/EquipmentIconType.cs +++ b/ElectronicObserver.Core/Types/EquipmentIconType.cs @@ -178,6 +178,9 @@ public enum EquipmentIconType /// JetBomberHo229 = 59, + /// + JetFighterShinden = 60, + Locked, Unknown, } diff --git a/ElectronicObserver.Core/Types/Extensions/EquipmentIconTypeExtensions.cs b/ElectronicObserver.Core/Types/Extensions/EquipmentIconTypeExtensions.cs index 9a1526b98..9be74aec6 100644 --- a/ElectronicObserver.Core/Types/Extensions/EquipmentIconTypeExtensions.cs +++ b/ElectronicObserver.Core/Types/Extensions/EquipmentIconTypeExtensions.cs @@ -61,6 +61,7 @@ public static class EquipmentIconTypeExtensions EquipmentIconType.LandBasedFighterJet => Properties.EquipmentIconType.LandBasedFighterJet, EquipmentIconType.LandBasedFighterShinden => Properties.EquipmentIconType.LandBasedFighter, EquipmentIconType.JetBomberHo229 => Properties.EquipmentIconType.JetBomberHo229, + EquipmentIconType.JetFighterShinden => Properties.EquipmentIconType.JetFighterShinden, EquipmentIconType.Locked => Properties.EquipmentIconType.Locked, _ => Properties.EquipmentIconType.Unknown, }; diff --git a/ElectronicObserver/Assets.zip b/ElectronicObserver/Assets.zip index f234287bd..4b4d47a2d 100644 Binary files a/ElectronicObserver/Assets.zip and b/ElectronicObserver/Assets.zip differ diff --git a/ElectronicObserver/Common/EquipmentIcon.xaml b/ElectronicObserver/Common/EquipmentIcon.xaml index 3634ff2a6..03040d7ab 100644 --- a/ElectronicObserver/Common/EquipmentIcon.xaml +++ b/ElectronicObserver/Common/EquipmentIcon.xaml @@ -88,6 +88,7 @@ + diff --git a/ElectronicObserver/Icons.xaml b/ElectronicObserver/Icons.xaml index b1fbb7239..383210069 100644 --- a/ElectronicObserver/Icons.xaml +++ b/ElectronicObserver/Icons.xaml @@ -67,6 +67,7 @@ + diff --git a/ElectronicObserver/Resource/ResourceManager.cs b/ElectronicObserver/Resource/ResourceManager.cs index d218cddf3..e442e4992 100644 --- a/ElectronicObserver/Resource/ResourceManager.cs +++ b/ElectronicObserver/Resource/ResourceManager.cs @@ -99,6 +99,7 @@ public enum EquipmentContent LandBasedFighterShinden, NightBomber, JetBomberHo229 = 59, + JetFighterShinden = 60, Locked, Unknown, } @@ -355,6 +356,7 @@ private void LoadFromArchive(string path) LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/LandBasedFighterShinden.png", "Equipment_LandBasedFighterShinden"); LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/NightBomber.png", "Equipment_NightBomber"); LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/JetFightingBomberHo229.png", "JetBomberHo229"); + LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/JetFighterShinden.png", "JetFighterShinden"); LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Locked.png", "Equipment_Locked"); LoadImageFromArchive(Equipments, archive, mstpath + @"Equipment/Unknown.png", "Equipment_Unknown"); }