diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFMaterial.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFCountInfo.cs similarity index 83% rename from src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFMaterial.cs rename to src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFCountInfo.cs index e4754492..746c4017 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFMaterial.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFCountInfo.cs @@ -3,7 +3,7 @@ namespace Snap.Hutao.Model.InterChange.Inventory; -internal sealed class UIIFMaterial +internal sealed class UIIFCountInfo { public uint Count { get; set; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFEquip.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFEquip.cs new file mode 100644 index 00000000..caa0833e --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFEquip.cs @@ -0,0 +1,23 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Web.Enka.Model; + +namespace Snap.Hutao.Model.InterChange.Inventory; + +internal class UIIFEquip +{ + /// + /// 圣遗物 + /// Artifact Base Info + /// + [JsonPropertyName("reliquary")] + public Reliquary? Reliquary { get; set; } + + /// + /// 武器 + /// Weapon Base Info + /// + [JsonPropertyName("weapon")] + public Weapon? Weapon { get; set; } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFItem.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFItem.cs index 99ceee44..bc3f64d4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFItem.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Inventory/UIIFItem.cs @@ -16,5 +16,11 @@ internal sealed class UIIFItem public uint ItemId { get; set; } [JsonPropertyName("material")] - public UIIFMaterial Material { get; set; } = default!; + public UIIFCountInfo? Material { get; set; } = default!; + + [JsonPropertyName("furniture")] + public UIIFCountInfo? Furniture { get; set; } = default!; + + [JsonPropertyName("equip")] + public UIIFEquip? Equip { get; set; } = default!; } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Enka/Model/Equip.cs b/src/Snap.Hutao/Snap.Hutao/Web/Enka/Model/Equip.cs index b61741d2..6a58495c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Enka/Model/Equip.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Enka/Model/Equip.cs @@ -1,13 +1,15 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. +using Snap.Hutao.Model.InterChange.Inventory; + namespace Snap.Hutao.Web.Enka.Model; /// /// 装备 /// [HighQuality] -internal sealed class Equip +internal sealed class Equip : UIIFEquip { /// /// 物品Id @@ -16,20 +18,6 @@ internal sealed class Equip [JsonPropertyName("itemId")] public uint ItemId { get; set; } - /// - /// 圣遗物 - /// Artifact Base Info - /// - [JsonPropertyName("reliquary")] - public Reliquary? Reliquary { get; set; } - - /// - /// 武器 - /// Weapon Base Info - /// - [JsonPropertyName("weapon")] - public Weapon? Weapon { get; set; } - /// /// Detailed Info of Equipment ///