diff --git a/Entity/System/Activity.cs b/Entity/Explore/Activity.cs similarity index 100% rename from Entity/System/Activity.cs rename to Entity/Explore/Activity.cs diff --git a/Entity/System/Quest.cs b/Entity/Explore/Quest.cs similarity index 98% rename from Entity/System/Quest.cs rename to Entity/Explore/Quest.cs index 9ef1570..dba3f4f 100644 --- a/Entity/System/Quest.cs +++ b/Entity/Explore/Quest.cs @@ -9,6 +9,7 @@ namespace Milimoe.FunGame.Core.Entity public QuestState Status { get; set; } = QuestState.NotStarted; public long CharacterId { get; set; } = 0; public long RegionId { get; set; } = 0; + public string NeedyExploreItemName { get; set; } = ""; public double CreditsAward { get; set; } = 0; public double MaterialsAward { get; set; } = 0; public HashSet Awards { get; set; } = []; diff --git a/Entity/System/Region.cs b/Entity/Explore/Region.cs similarity index 99% rename from Entity/System/Region.cs rename to Entity/Explore/Region.cs index b70435d..f1d2fbc 100644 --- a/Entity/System/Region.cs +++ b/Entity/Explore/Region.cs @@ -1,6 +1,7 @@ using System.Text; using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Model; namespace Milimoe.FunGame.Core.Entity { diff --git a/Entity/System/Goods.cs b/Entity/Trade/Goods.cs similarity index 100% rename from Entity/System/Goods.cs rename to Entity/Trade/Goods.cs diff --git a/Entity/System/MarketItem.cs b/Entity/Trade/MarketItem.cs similarity index 100% rename from Entity/System/MarketItem.cs rename to Entity/Trade/MarketItem.cs diff --git a/Entity/System/Offer.cs b/Entity/Trade/Offer.cs similarity index 100% rename from Entity/System/Offer.cs rename to Entity/Trade/Offer.cs diff --git a/Entity/System/Store.cs b/Entity/Trade/Store.cs similarity index 100% rename from Entity/System/Store.cs rename to Entity/Trade/Store.cs diff --git a/Entity/System/Inventory.cs b/Entity/User/Inventory.cs similarity index 100% rename from Entity/System/Inventory.cs rename to Entity/User/Inventory.cs diff --git a/Library/Common/JsonConverter/QuestConverter.cs b/Library/Common/JsonConverter/QuestConverter.cs index 02f7645..daae35a 100644 --- a/Library/Common/JsonConverter/QuestConverter.cs +++ b/Library/Common/JsonConverter/QuestConverter.cs @@ -38,6 +38,9 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter case nameof(Quest.RegionId): result.RegionId = reader.GetInt64(); break; + case nameof(Quest.NeedyExploreItemName): + result.NeedyExploreItemName = reader.GetString() ?? ""; + break; case nameof(Quest.CreditsAward): result.CreditsAward = reader.GetDouble(); break; @@ -102,6 +105,7 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter writer.WriteNumber(nameof(Quest.Status), (int)value.Status); writer.WriteNumber(nameof(Quest.CharacterId), value.CharacterId); writer.WriteNumber(nameof(Quest.RegionId), value.RegionId); + writer.WriteString(nameof(Quest.NeedyExploreItemName), value.NeedyExploreItemName); writer.WriteNumber(nameof(Quest.CreditsAward), value.CreditsAward); writer.WriteNumber(nameof(Quest.MaterialsAward), value.MaterialsAward); writer.WritePropertyName(nameof(Quest.Awards));