Skip to content

Fix: Missing ShopItem attributes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 2 commits into from
Jul 19, 2024
Merged

Fix: Missing ShopItem attributes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016734e
Update ShopGame.cs
Zintixx Jul 19, 2024
29b4dfc
Update Maple2.File.Parser.csproj
Zintixx Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Maple2.File.Parser/Maple2.File.Parser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageTags>MapleStory2, File, Parser, m2d, xml</PackageTags>
<!-- Use following lines to write the generated files to disk. -->
<EmitCompilerGeneratedFiles Condition=" '$(Configuration)' == 'Debug' ">true</EmitCompilerGeneratedFiles>
<PackageVersion>2.1.22</PackageVersion>
<PackageVersion>2.1.23</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
8 changes: 7 additions & 1 deletion Maple2.File.Parser/Xml/Table/Server/ShopGame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Xml.Serialization;
using M2dXmlGenerator;
using Maple2.File.Parser.Enum;
using DayOfWeek = Maple2.File.Parser.Enum.DayOfWeek;

namespace Maple2.File.Parser.Xml.Table.Server;

Expand All @@ -12,7 +13,7 @@ public partial class ShopGameRoot {

public partial class ShopGame {
[XmlAttribute] public int shopID;
[M2dFeatureLocale(Selector = "sn")] private IList<ShopGame.Item> _item;
[M2dFeatureLocale(Selector = "sn")] private IList<Item> _item;

public partial class Item : IFeatureLocale {
[XmlAttribute] public int sn;
Expand All @@ -36,7 +37,12 @@ public partial class Item : IFeatureLocale {
[XmlAttribute] public string requireAchieve = string.Empty;
[XmlAttribute] public string requireAlliance = string.Empty;
[XmlAttribute] public byte requireAllianceGrade;
[XmlAttribute] public int requireGuildTrophy;
[M2dArray] public int[] requireChampionshipInfo = Array.Empty<int>();
[M2dArray] public string[] requireGuildNpc = Array.Empty<string>();
[XmlAttribute] public bool checkGameEvent;
[M2dEnum] public DayOfWeek DayOfWeek;
[XmlAttribute] public string partTime = string.Empty;
[XmlAttribute] public bool onlyVisibleInPeriod;
}
}