diff --git a/Common/Data/Excel/ArItemExcel.cs b/Common/Data/Excel/ArItemExcel.cs new file mode 100644 index 0000000..4c40d92 --- /dev/null +++ b/Common/Data/Excel/ArItemExcel.cs @@ -0,0 +1,21 @@ +namespace MikuSB.Data.Excel; + +[ResourceEntity("ar_item.json")] +public class ArItemExcel : ExcelResource +{ + public uint Genre { get; set; } + public uint Detail { get; set; } + public uint Particular { get; set; } + public uint Level { get; set; } + public string I18n { get; set; } = ""; + + public override uint GetId() + { + return (Genre << 24) | (Detail << 16) | (Particular << 8) | Level; + } + + public override void Loaded() + { + GameData.ArItemData.Add(GetId(), this); + } +} diff --git a/Common/Data/Excel/ManifestationExcel.cs b/Common/Data/Excel/ManifestationExcel.cs new file mode 100644 index 0000000..1ab7684 --- /dev/null +++ b/Common/Data/Excel/ManifestationExcel.cs @@ -0,0 +1,24 @@ +using Newtonsoft.Json; + +namespace MikuSB.Data.Excel; + +[ResourceEntity("manifestation.json")] +public class ManifestationExcel : ExcelResource +{ + public uint Genre { get; set; } + public uint Detail { get; set; } + public uint Particular { get; set; } + public uint Level { get; set; } + public string I18n { get; set; } = ""; + [JsonProperty("profile")]public List Profile { get; set; } = []; + + public override uint GetId() + { + return (Genre << 24) | (Detail << 16) | (Particular << 8) | Level; + } + + public override void Loaded() + { + GameData.ManifestationData.Add(GetId(), this); + } +} diff --git a/Common/Data/GameData.cs b/Common/Data/GameData.cs index 046caa2..3de370a 100644 --- a/Common/Data/GameData.cs +++ b/Common/Data/GameData.cs @@ -12,6 +12,8 @@ public static class GameData public static Dictionary BreakLevelLimitData { get; private set; } = []; public static Dictionary RecycleData { get; private set; } = []; public static Dictionary ChapterLevelData { get; private set; } = []; + public static Dictionary ArItemData { get; private set; } = []; + public static Dictionary ManifestationData { get; private set; } = []; } public static class GameResourceTemplateId diff --git a/Common/Database/Inventory/InventoryData.cs b/Common/Database/Inventory/InventoryData.cs index 029f25c..58476e5 100644 --- a/Common/Database/Inventory/InventoryData.cs +++ b/Common/Database/Inventory/InventoryData.cs @@ -19,7 +19,7 @@ public class InventoryData : BaseDatabaseDataHelper public Dictionary Skins { get; set; } = []; // Key: UniqueId } -public abstract class BaseGameItemInfo +public class BaseGameItemInfo { public uint UniqueId { get; set; } public ulong TemplateId { get; set; } diff --git a/GameServer/Game/Inventory/InventoryManager.cs b/GameServer/Game/Inventory/InventoryManager.cs index 9717d1a..584c538 100644 --- a/GameServer/Game/Inventory/InventoryManager.cs +++ b/GameServer/Game/Inventory/InventoryManager.cs @@ -13,7 +13,7 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) public async ValueTask AddWeaponItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1) { if (genre != ItemTypeEnum.TYPE_WEAPON) return null; - var weaponData = GameData.WeaponData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular); + var weaponData = GameData.WeaponData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level); if (weaponData == null) return null; var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level); @@ -50,7 +50,7 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) public async ValueTask AddSkinItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1) { if (genre != ItemTypeEnum.TYPE_CARD_SKIN) return null; - var skinData = GameData.CardSkinData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular); + var skinData = GameData.CardSkinData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level); if (skinData == null) return null; var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level); @@ -82,4 +82,58 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level); return InventoryData.Skins.Values.FirstOrDefault(x => x.TemplateId == templateId); } + + public async ValueTask AddArItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1) + { + if (genre != ItemTypeEnum.TYPE_AR) return null; + var arData = GameData.ArItemData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level); + if (arData == null) return null; + + var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level); + if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null; + var arInfo = new BaseGameItemInfo + { + TemplateId = templateId, + UniqueId = InventoryData.NextUniqueUid++, + Flag = ItemFlagEnum.FLAG_READED, + ItemCount = 1 + }; + InventoryData.Items[arInfo.UniqueId] = arInfo; + return arInfo; + } + + public async ValueTask AddManifestationItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1) + { + if (genre != ItemTypeEnum.TYPE_MANIFESTATION) return null; + var manifestData = GameData.ManifestationData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level); + if (manifestData == null) return null; + + var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level); + if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null; + var manifestInfo = new BaseGameItemInfo + { + TemplateId = templateId, + UniqueId = InventoryData.NextUniqueUid++, + Flag = ItemFlagEnum.FLAG_READED, + ItemCount = 1 + }; + InventoryData.Items[manifestInfo.UniqueId] = manifestInfo; + return manifestInfo; + } + + public BaseGameItemInfo? GetNormalItem(uint uniqueId) + { + return InventoryData.Items.GetValueOrDefault(uniqueId); + } + + public BaseGameItemInfo? GetNormalItemByTemplateId(ulong templateId) + { + return InventoryData.Items.Values.FirstOrDefault(x => x.TemplateId == templateId); + } + + public BaseGameItemInfo? GetNormalItemGDPL(ItemTypeEnum genre, uint detail, uint particular, uint level) + { + var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level); + return InventoryData.Items.Values.FirstOrDefault(x => x.TemplateId == templateId); + } } \ No newline at end of file diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index 893fbd0..73e206f 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -52,6 +52,14 @@ public class PlayerInstance(PlayerGameData data) { await InventoryManager.AddWeaponItem((ItemTypeEnum)weapon.Genre, weapon.Detail, weapon.Particular, weapon.Level); } + foreach (var ar in GameData.ArItemData.Values) + { + await InventoryManager.AddArItem((ItemTypeEnum)ar.Genre, ar.Detail, ar.Particular, ar.Level); + } + foreach (var manifest in GameData.ManifestationData.Values) + { + await InventoryManager.AddManifestationItem((ItemTypeEnum)manifest.Genre, manifest.Detail, manifest.Particular, manifest.Level); + } foreach (var card in GameData.CardData.Values) { await CharacterManager.AddCharacter((ItemTypeEnum)card.Genre, card.Detail, card.Particular, card.Level); @@ -168,6 +176,7 @@ public class PlayerInstance(PlayerGameData data) }, }; + foreach (var item in InventoryManager.InventoryData.Items.Values) proto.Items.Add(item.ToProto()); foreach (var weapon in InventoryManager.InventoryData.Weapons.Values) proto.Items.Add(weapon.ToProto()); foreach (var skin in InventoryManager.InventoryData.Skins.Values) proto.Items.Add(skin.ToProto()); foreach (var chara in CharacterManager.CharacterData.Characters) proto.Items.Add(chara.ToProto()); diff --git a/GameServer/Server/CallGS/Handlers/Scene/ChangeMainScene.cs b/GameServer/Server/CallGS/Handlers/Scene/ChangeMainScene.cs new file mode 100644 index 0000000..874b264 --- /dev/null +++ b/GameServer/Server/CallGS/Handlers/Scene/ChangeMainScene.cs @@ -0,0 +1,13 @@ +namespace MikuSB.GameServer.Server.CallGS.Handlers.Scene; + +// Response:{sErr:true or false} +[CallGSApi("ChangeMainScene")] +public class ChangeMainScene : ICallGSHandler +{ + public async Task Handle(Connection connection, string param, ushort seqNo) + { + string rsp = $"{{\"sErr\":false}}"; + // TODO change scene with ExtraSync + await CallGSRouter.SendScript(connection, "ChangeMainScene", rsp); + } +} \ No newline at end of file