From 8a7a919d04487bdc43f97b1b6a7f96c38828d883 Mon Sep 17 00:00:00 2001 From: Kei-Luna Date: Sat, 9 May 2026 17:30:25 +0900 Subject: [PATCH] Changed the Resources folder structure to match the official one. --- Common/Data/Excel/ArItemExcel.cs | 4 ++-- Common/Data/Excel/BreakExcel.cs | 4 ++-- Common/Data/Excel/BreakLevelLimitExcel.cs | 4 ++-- Common/Data/Excel/CallItemExcel.cs | 2 +- Common/Data/Excel/CardExcel.cs | 2 +- Common/Data/Excel/CardSkinExcel.cs | 2 +- Common/Data/Excel/CardSkinPartsExcel.cs | 2 +- Common/Data/Excel/ChapterLevelExcel.cs | 2 +- Common/Data/Excel/DailyLevelExcel.cs | 2 +- Common/Data/Excel/ManifestationExcel.cs | 2 +- Common/Data/Excel/NodeConditionExcel.cs | 4 ++-- Common/Data/Excel/ProfileExcel.cs | 2 +- Common/Data/Excel/RecycleExcel.cs | 4 ++-- Common/Data/Excel/Rogue3DDailyBuffExcel.cs | 4 ++-- Common/Data/Excel/Rogue3DDifficultExcel.cs | 4 ++-- Common/Data/Excel/Rogue3DSeasonExcel.cs | 4 ++-- Common/Data/Excel/Rogue3DTalentExcel.cs | 4 ++-- Common/Data/Excel/SpineExcel.cs | 4 ++-- Common/Data/Excel/SuppliesExcel.cs | 4 ++-- Common/Data/Excel/SupportCardExcel.cs | 4 ++-- Common/Data/Excel/UpgradeExpExcel.cs | 4 ++-- Common/Data/Excel/WeaponExcel.cs | 4 ++-- Common/Data/Excel/WeaponPartsExcel.cs | 2 +- Common/Data/Excel/WeaponSkinExcel.cs | 2 +- Common/Data/ResourceManager.cs | 2 +- 25 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Common/Data/Excel/ArItemExcel.cs b/Common/Data/Excel/ArItemExcel.cs index 4c40d92..6a6d348 100644 --- a/Common/Data/Excel/ArItemExcel.cs +++ b/Common/Data/Excel/ArItemExcel.cs @@ -1,6 +1,6 @@ -namespace MikuSB.Data.Excel; +namespace MikuSB.Data.Excel; -[ResourceEntity("ar_item.json")] +[ResourceEntity("item/templates/ar_item.json")] public class ArItemExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/BreakExcel.cs b/Common/Data/Excel/BreakExcel.cs index 5abd201..b134198 100644 --- a/Common/Data/Excel/BreakExcel.cs +++ b/Common/Data/Excel/BreakExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("break.json")] +[ResourceEntity("item/break.json")] public class BreakExcel : ExcelResource { [JsonProperty("ID")] public int Id { get; set; } diff --git a/Common/Data/Excel/BreakLevelLimitExcel.cs b/Common/Data/Excel/BreakLevelLimitExcel.cs index 4278407..ded4f34 100644 --- a/Common/Data/Excel/BreakLevelLimitExcel.cs +++ b/Common/Data/Excel/BreakLevelLimitExcel.cs @@ -1,6 +1,6 @@ -namespace MikuSB.Data.Excel; +namespace MikuSB.Data.Excel; -[ResourceEntity("break_level_limit.json")] +[ResourceEntity("item/break_level_limit.json")] public class BreakLevelLimitExcel : ExcelResource { public int ID { get; set; } diff --git a/Common/Data/Excel/CallItemExcel.cs b/Common/Data/Excel/CallItemExcel.cs index 2c1fb60..2945f12 100644 --- a/Common/Data/Excel/CallItemExcel.cs +++ b/Common/Data/Excel/CallItemExcel.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("call_item.json")] +[ResourceEntity("item/templates/call_item.json")] public class CallItemExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/CardExcel.cs b/Common/Data/Excel/CardExcel.cs index 83a5b05..731ae9e 100644 --- a/Common/Data/Excel/CardExcel.cs +++ b/Common/Data/Excel/CardExcel.cs @@ -2,7 +2,7 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("card.json")] +[ResourceEntity("item/templates/card.json")] public class CardExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/CardSkinExcel.cs b/Common/Data/Excel/CardSkinExcel.cs index ee0d8fe..0cb063b 100644 --- a/Common/Data/Excel/CardSkinExcel.cs +++ b/Common/Data/Excel/CardSkinExcel.cs @@ -2,7 +2,7 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("card_skin.json")] +[ResourceEntity("item/templates/card_skin.json")] public class CardSkinExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/CardSkinPartsExcel.cs b/Common/Data/Excel/CardSkinPartsExcel.cs index dd97684..bdec95d 100644 --- a/Common/Data/Excel/CardSkinPartsExcel.cs +++ b/Common/Data/Excel/CardSkinPartsExcel.cs @@ -2,7 +2,7 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("card_skin_parts.json")] +[ResourceEntity("item/templates/card_skin_parts.json")] public class CardSkinPartsExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/ChapterLevelExcel.cs b/Common/Data/Excel/ChapterLevelExcel.cs index d8bb7e2..db0b658 100644 --- a/Common/Data/Excel/ChapterLevelExcel.cs +++ b/Common/Data/Excel/ChapterLevelExcel.cs @@ -1,6 +1,6 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("level.json")] +[ResourceEntity("chapter/level.json")] public class ChapterLevelExcel : ExcelResource { public uint ID { get; set; } diff --git a/Common/Data/Excel/DailyLevelExcel.cs b/Common/Data/Excel/DailyLevelExcel.cs index 12d0974..c1687e8 100644 --- a/Common/Data/Excel/DailyLevelExcel.cs +++ b/Common/Data/Excel/DailyLevelExcel.cs @@ -1,6 +1,6 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("daily_level.json")] +[ResourceEntity("daily/level.json")] public class DailyLevelExcel : ExcelResource { public uint ID { get; set; } diff --git a/Common/Data/Excel/ManifestationExcel.cs b/Common/Data/Excel/ManifestationExcel.cs index 1ab7684..e5049df 100644 --- a/Common/Data/Excel/ManifestationExcel.cs +++ b/Common/Data/Excel/ManifestationExcel.cs @@ -2,7 +2,7 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("manifestation.json")] +[ResourceEntity("item/templates/manifestation.json")] public class ManifestationExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/NodeConditionExcel.cs b/Common/Data/Excel/NodeConditionExcel.cs index 419ce45..d08ffa8 100644 --- a/Common/Data/Excel/NodeConditionExcel.cs +++ b/Common/Data/Excel/NodeConditionExcel.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; // nodecondition.json: NodeConditionId → NodeXCost per sub-node (1-9) -[ResourceEntity("nodecondition.json")] +[ResourceEntity("item/skill/nodecondition.json")] public class NodeConditionExcel : ExcelResource { [JsonProperty("ID")] public uint Id { get; set; } diff --git a/Common/Data/Excel/ProfileExcel.cs b/Common/Data/Excel/ProfileExcel.cs index 8084e13..6c9becb 100644 --- a/Common/Data/Excel/ProfileExcel.cs +++ b/Common/Data/Excel/ProfileExcel.cs @@ -1,6 +1,6 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("profile.json")] +[ResourceEntity("item/templates/profile.json")] public class ProfileExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/RecycleExcel.cs b/Common/Data/Excel/RecycleExcel.cs index dbb665e..32eb4bb 100644 --- a/Common/Data/Excel/RecycleExcel.cs +++ b/Common/Data/Excel/RecycleExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("recycle.json")] +[ResourceEntity("item/recycle.json")] public class RecycleExcel : ExcelResource { public int ID { get; set; } diff --git a/Common/Data/Excel/Rogue3DDailyBuffExcel.cs b/Common/Data/Excel/Rogue3DDailyBuffExcel.cs index 5e4e6b9..35cfec9 100644 --- a/Common/Data/Excel/Rogue3DDailyBuffExcel.cs +++ b/Common/Data/Excel/Rogue3DDailyBuffExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("dailybuff.json")] +[ResourceEntity("dlc/rogue3d/dailybuff.json")] public class Rogue3DDailyBuffExcel : ExcelResource { [JsonProperty("ID")] public uint Id { get; set; } diff --git a/Common/Data/Excel/Rogue3DDifficultExcel.cs b/Common/Data/Excel/Rogue3DDifficultExcel.cs index 150909e..2fbb916 100644 --- a/Common/Data/Excel/Rogue3DDifficultExcel.cs +++ b/Common/Data/Excel/Rogue3DDifficultExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("server_01_difficult.json")] +[ResourceEntity("dlc/rogue3d/server_01_difficult.json")] public class Rogue3DDifficultExcel : ExcelResource { [JsonProperty("DifficultID")] public uint DifficultId { get; set; } diff --git a/Common/Data/Excel/Rogue3DSeasonExcel.cs b/Common/Data/Excel/Rogue3DSeasonExcel.cs index bca84dc..31debf1 100644 --- a/Common/Data/Excel/Rogue3DSeasonExcel.cs +++ b/Common/Data/Excel/Rogue3DSeasonExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("server_10_season.json")] +[ResourceEntity("dlc/rogue3d/server_10_season.json")] public class Rogue3DSeasonExcel : ExcelResource { [JsonProperty("SeasonID")] public uint SeasonId { get; set; } diff --git a/Common/Data/Excel/Rogue3DTalentExcel.cs b/Common/Data/Excel/Rogue3DTalentExcel.cs index 7caa3b4..8191df5 100644 --- a/Common/Data/Excel/Rogue3DTalentExcel.cs +++ b/Common/Data/Excel/Rogue3DTalentExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("server_03_talent.json")] +[ResourceEntity("dlc/rogue3d/server_03_talent.json")] public class Rogue3DTalentExcel : ExcelResource { [JsonProperty("TalentID")] public uint TalentId { get; set; } diff --git a/Common/Data/Excel/SpineExcel.cs b/Common/Data/Excel/SpineExcel.cs index 7737d56..9e0403e 100644 --- a/Common/Data/Excel/SpineExcel.cs +++ b/Common/Data/Excel/SpineExcel.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; // spine.json: SpineId → Node{i}Req (nodecondition ID per master node index) -[ResourceEntity("spine.json")] +[ResourceEntity("item/skill/spine.json")] public class SpineExcel : ExcelResource { [JsonProperty("ID")] public uint Id { get; set; } diff --git a/Common/Data/Excel/SuppliesExcel.cs b/Common/Data/Excel/SuppliesExcel.cs index 0ba8c16..143d9f3 100644 --- a/Common/Data/Excel/SuppliesExcel.cs +++ b/Common/Data/Excel/SuppliesExcel.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("suplies.json")] +[ResourceEntity("item/templates/suplies.json")] public class SuppliesExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/SupportCardExcel.cs b/Common/Data/Excel/SupportCardExcel.cs index 431a290..8502909 100644 --- a/Common/Data/Excel/SupportCardExcel.cs +++ b/Common/Data/Excel/SupportCardExcel.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; namespace MikuSB.Data.Excel; -[ResourceEntity("support_card.json")] +[ResourceEntity("item/templates/support_card.json")] public class SupportCardExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/UpgradeExpExcel.cs b/Common/Data/Excel/UpgradeExpExcel.cs index 4288a6a..59788a5 100644 --- a/Common/Data/Excel/UpgradeExpExcel.cs +++ b/Common/Data/Excel/UpgradeExpExcel.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("upgrade_exp.json")] +[ResourceEntity("item/upgrade_exp.json")] public class UpgradeExpExcel : ExcelResource { public int Lv { get; set; } diff --git a/Common/Data/Excel/WeaponExcel.cs b/Common/Data/Excel/WeaponExcel.cs index 2c6b393..d7d34da 100644 --- a/Common/Data/Excel/WeaponExcel.cs +++ b/Common/Data/Excel/WeaponExcel.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("weapon.json")] +[ResourceEntity("item/templates/weapon.json")] public class WeaponExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/WeaponPartsExcel.cs b/Common/Data/Excel/WeaponPartsExcel.cs index 45a2a0f..3001328 100644 --- a/Common/Data/Excel/WeaponPartsExcel.cs +++ b/Common/Data/Excel/WeaponPartsExcel.cs @@ -2,7 +2,7 @@ namespace MikuSB.Data.Excel; -[ResourceEntity("weapon_parts.json")] +[ResourceEntity("item/templates/weapon_parts.json")] public class WeaponPartsExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/Excel/WeaponSkinExcel.cs b/Common/Data/Excel/WeaponSkinExcel.cs index a51d9c1..4494127 100644 --- a/Common/Data/Excel/WeaponSkinExcel.cs +++ b/Common/Data/Excel/WeaponSkinExcel.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; namespace MikuSB.Data.Excel; -[ResourceEntity("weapon_skin.json")] +[ResourceEntity("item/templates/weapon_skin.json")] public class WeaponSkinExcel : ExcelResource { public uint Genre { get; set; } diff --git a/Common/Data/ResourceManager.cs b/Common/Data/ResourceManager.cs index c2c8f30..f93912a 100644 --- a/Common/Data/ResourceManager.cs +++ b/Common/Data/ResourceManager.cs @@ -46,7 +46,7 @@ public class ResourceManager foreach (var fileName in attribute.FileName) try { - var path = ConfigManager.Config.Path.ResourcePath + "/ExcelOutput/" + fileName; + var path = ConfigManager.Config.Path.ResourcePath + "/" + fileName; var file = new FileInfo(path); if (!file.Exists) {