From 21d69423592daf2497b9a7ad955f5322ebc9385b Mon Sep 17 00:00:00 2001 From: Longfeng Qin Date: Mon, 9 Dec 2024 04:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=A9=E5=93=81=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Models/CharacterAdditionalStruct.cs | 2 +- Server/Models/CharacterStruct.cs | 2 +- Server/Models/FixedTypes.cs | 575 +++++++++++++- Server/Models/ItemAttributes.cs | 730 +++++++++++++++++- Server/Program.cs | 53 ++ .../11-64-AllBlocksListRequest.cs | 2 +- 6 files changed, 1317 insertions(+), 47 deletions(-) diff --git a/Server/Models/CharacterAdditionalStruct.cs b/Server/Models/CharacterAdditionalStruct.cs index f450d79..bd347eb 100644 --- a/Server/Models/CharacterAdditionalStruct.cs +++ b/Server/Models/CharacterAdditionalStruct.cs @@ -135,7 +135,7 @@ namespace PSO2SERVER.Models Hovering = 11 } - public enum RaceFlags : ushort + public enum Race : ushort { Unknown = 0xFFFF, Human = 0, diff --git a/Server/Models/CharacterStruct.cs b/Server/Models/CharacterStruct.cs index d13eeea..e5ef4ce 100644 --- a/Server/Models/CharacterStruct.cs +++ b/Server/Models/CharacterStruct.cs @@ -13,7 +13,7 @@ namespace PSO2SERVER.Models public unsafe struct LooksParam { public RunAnimation running_animation; - public RaceFlags race; + public Race race; public Gender gender; public ushort Muscule; public Figure Body; diff --git a/Server/Models/FixedTypes.cs b/Server/Models/FixedTypes.cs index 118f020..a81edd7 100644 --- a/Server/Models/FixedTypes.cs +++ b/Server/Models/FixedTypes.cs @@ -1,17 +1,21 @@ -using System; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Collections; +using System.Xml.Linq; namespace PSO2SERVER.Models { - public class FixedVec + public class FixedList : IEnumerable { private List _data; private int _capacity; - public FixedVec(int size) + public FixedList(int size) { if (size <= 0) throw new ArgumentException("Size must be greater than zero.", nameof(size)); @@ -19,7 +23,7 @@ namespace PSO2SERVER.Models _data = new List(size); _capacity = size; } - public FixedVec(int size, T defaultValue) + public FixedList(int size, T defaultValue) { if (size <= 0) throw new ArgumentException("Size must be greater than zero.", nameof(size)); @@ -39,7 +43,7 @@ namespace PSO2SERVER.Models public void Add(T item) { if (_data.Count >= _capacity) - throw new InvalidOperationException("FixedVec is full."); + throw new InvalidOperationException("FixedList is full."); _data.Add(item); } @@ -49,7 +53,7 @@ namespace PSO2SERVER.Models throw new ArgumentOutOfRangeException(nameof(index)); if (_data.Count >= _capacity) - throw new InvalidOperationException("FixedVec is full."); + throw new InvalidOperationException("FixedList is full."); _data.Insert(index, item); } @@ -64,7 +68,7 @@ namespace PSO2SERVER.Models public void RemoveLast() { if (_data.Count == 0) - throw new InvalidOperationException("FixedVec is empty."); + throw new InvalidOperationException("FixedList is empty."); _data.RemoveAt(_data.Count - 1); } @@ -93,9 +97,51 @@ namespace PSO2SERVER.Models { return $"[{string.Join(", ", _data)}]"; } + + // 实现 IEnumerable 接口 + public IEnumerator GetEnumerator() + { + return _data.GetEnumerator(); + } + + // 非泛型版本的 GetEnumerator + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + // JSON 序列化和反序列化的自定义处理 + public class FixedListConverter : JsonConverter> + { + // 读取 JSON 转换为 FixedList + public override FixedList ReadJson(JsonReader reader, Type objectType, FixedList existingValue, bool hasExistingValue, JsonSerializer serializer) + { + var list = serializer.Deserialize>(reader); + var fixedList = new FixedList(list.Count); + + // 将 list 中的元素添加到 FixedList 中 + foreach (var item in list) + { + fixedList.Add(item); + } + + return fixedList; + } + + // 将 FixedList 转换为 JSON + public override void WriteJson(JsonWriter writer, FixedList value, JsonSerializer serializer) + { + var list = new List(value.Length); + for (int i = 0; i < value.Length; i++) + { + list.Add(value[i]); + } + serializer.Serialize(writer, list); + } + } } - public class FixedSortedList where T : IComparable + public class FixedSortedList : IEnumerable where T : IComparable { private List _list; private int _capacity; @@ -141,9 +187,22 @@ namespace PSO2SERVER.Models { return $"[{string.Join(", ", _list)}]"; } + + // 实现 IEnumerable 接口 + public IEnumerator GetEnumerator() + { + return _list.GetEnumerator(); + } + + // 非泛型版本的 GetEnumerator + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } - public class FixedHashSet + public class FixedHashSet : IEnumerable { private HashSet _set; private int _capacity; @@ -185,6 +244,18 @@ namespace PSO2SERVER.Models { return $"[{string.Join(", ", _set)}]"; } + // 实现 IEnumerable 接口 + public IEnumerator GetEnumerator() + { + return _set.GetEnumerator(); + } + + // 非泛型版本的 GetEnumerator + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + } public class FixedString @@ -396,4 +467,490 @@ namespace PSO2SERVER.Models return $"[{string.Join(", ", _array.Take(Count))}]"; } } + //public class FixedByte + //{ + // private byte[] _array; + // private int _capacity; + + // public FixedByte(int capacity) + // { + // if (capacity <= 0) + // throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + // _array = new byte[capacity]; + // _capacity = capacity; + // Count = 0; // 初始化 Count 为 0 + // } + + // public int Capacity => _capacity; + + // // Count 现在是只读属性 + // public int Count { get; private set; } + + // // 获取或设置指定索引的字节 + // public byte this[int index] + // { + // get + // { + // if (index < 0 || index >= Count) + // throw new ArgumentOutOfRangeException(nameof(index)); + + // return _array[index]; + // } + // set + // { + // if (index < 0 || index >= Count) + // throw new ArgumentOutOfRangeException(nameof(index)); + + // _array[index] = value; + // } + // } + + // // 添加字节 + // public void Add(byte item) + // { + // if (Count >= _capacity) + // throw new InvalidOperationException("Array is full."); + + // _array[Count++] = item; + // } + + // // 清空数组 + // public void Clear() + // { + // Array.Clear(_array, 0, _capacity); + // Count = 0; + // } + + // // 将字节数组转换为字节数组（仅返回已使用的部分） + // public byte[] ToBytes() + // { + // return _array.Take(Count).ToArray(); + // } + + // public override string ToString() + // { + // return $"[{string.Join(", ", _array.Take(Count))}]"; + // } + + // // JSON 序列化和反序列化的自定义处理 + // public class FixedByteConverter : JsonConverter + // { + // public override FixedByte ReadJson(JsonReader reader, Type objectType, FixedByte existingValue, bool hasExistingValue, JsonSerializer serializer) + // { + // // 确保是 JSON 数组格式 + // if (reader.TokenType == JsonToken.StartArray) + // { + // // 反序列化为字节数组 + // var byteArray = serializer.Deserialize(reader); + // var fixedByte = new FixedByte(byteArray.Length); + + // // 使用 Add 方法填充字节 + // foreach (var byteValue in byteArray) + // { + // fixedByte.Add(byteValue); + // } + + // return fixedByte; + // } + // else + // { + // throw new JsonSerializationException("Expected a JSON array."); + // } + // } + + // public override void WriteJson(JsonWriter writer, FixedByte value, JsonSerializer serializer) + // { + // // 序列化时直接写入字节数组 + // serializer.Serialize(writer, value.ToBytes()); + // } + // } + //} + + public class FixedDouble + { + private double[] _array; + private int _capacity; + + public FixedDouble(int capacity) + { + if (capacity <= 0) + throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + _array = new double[capacity]; + _capacity = capacity; + } + + public int Capacity => _capacity; + public int Count { get; private set; } = 0; + + // 获取或设置指定索引的 double 类型数值 + public double this[int index] + { + get + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + return _array[index]; + } + set + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + _array[index] = value; + } + } + + // 添加 double 类型数值 + public void Add(double item) + { + if (Count >= _capacity) + throw new InvalidOperationException("Array is full."); + + _array[Count++] = item; + } + + // 清空数组 + public void Clear() + { + Array.Clear(_array, 0, _capacity); + Count = 0; + } + + // 将数组转换为字节数组 + public byte[] ToBytes() + { + List byteList = new List(); + foreach (var num in _array.Take(Count)) + { + byte[] doubleBytes = BitConverter.GetBytes(num); + byteList.AddRange(doubleBytes); + } + return byteList.ToArray(); + } + + public override string ToString() + { + return $"[{string.Join(", ", _array.Take(Count))}]"; + } + } + public class FixedFloat + { + private float[] _array; + private int _capacity; + + public FixedFloat(int capacity) + { + if (capacity <= 0) + throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + _array = new float[capacity]; + _capacity = capacity; + } + + public int Capacity => _capacity; + public int Count { get; private set; } = 0; + + // 获取或设置指定索引的 float 类型数值 + public float this[int index] + { + get + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + return _array[index]; + } + set + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + _array[index] = value; + } + } + + // 添加 float 类型数值 + public void Add(float item) + { + if (Count >= _capacity) + throw new InvalidOperationException("Array is full."); + + _array[Count++] = item; + } + + // 清空数组 + public void Clear() + { + Array.Clear(_array, 0, _capacity); + Count = 0; + } + + // 将数组转换为字节数组 + public byte[] ToBytes() + { + List byteList = new List(); + foreach (var num in _array.Take(Count)) + { + byte[] floatBytes = BitConverter.GetBytes(num); + byteList.AddRange(floatBytes); + } + return byteList.ToArray(); + } + + public override string ToString() + { + return $"[{string.Join(", ", _array.Take(Count))}]"; + } + } + public class FixedLong + { + private long[] _array; + private int _capacity; + + public FixedLong(int capacity) + { + if (capacity <= 0) + throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + _array = new long[capacity]; + _capacity = capacity; + } + + public int Capacity => _capacity; + public int Count { get; private set; } = 0; + + // 获取或设置指定索引的 long 类型数值 + public long this[int index] + { + get + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + return _array[index]; + } + set + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + _array[index] = value; + } + } + + // 添加 long 类型数值 + public void Add(long item) + { + if (Count >= _capacity) + throw new InvalidOperationException("Array is full."); + + _array[Count++] = item; + } + + // 清空数组 + public void Clear() + { + Array.Clear(_array, 0, _capacity); + Count = 0; + } + + // 将数组转换为字节数组 + public byte[] ToBytes() + { + List byteList = new List(); + foreach (var num in _array.Take(Count)) + { + byte[] longBytes = BitConverter.GetBytes(num); + byteList.AddRange(longBytes); + } + return byteList.ToArray(); + } + + public override string ToString() + { + return $"[{string.Join(", ", _array.Take(Count))}]"; + } + } + public class FixedUShort + { + private ushort[] _array; + private int _capacity; + + public FixedUShort(int capacity) + { + if (capacity <= 0) + throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + _array = new ushort[capacity]; + _capacity = capacity; + } + + public int Capacity => _capacity; + public int Count { get; private set; } = 0; + + // 获取或设置指定索引的 ushort 类型数值 + public ushort this[int index] + { + get + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + return _array[index]; + } + set + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + _array[index] = value; + } + } + + // 添加 ushort 类型数值 + public void Add(ushort item) + { + if (Count >= _capacity) + throw new InvalidOperationException("Array is full."); + + _array[Count++] = item; + } + + // 清空数组 + public void Clear() + { + Array.Clear(_array, 0, _capacity); + Count = 0; + } + + // 将数组转换为字节数组 + public byte[] ToBytes() + { + List byteList = new List(); + foreach (var num in _array.Take(Count)) + { + byte[] ushortBytes = BitConverter.GetBytes(num); + byteList.AddRange(ushortBytes); + } + return byteList.ToArray(); + } + + public override string ToString() + { + return $"[{string.Join(", ", _array.Take(Count))}]"; + } + + public class FixedUShortConverter : JsonConverter + { + public override FixedUShort ReadJson(JsonReader reader, Type objectType, FixedUShort existingValue, bool hasExistingValue, JsonSerializer serializer) + { + // 确保我们读取的是一个 JSON 数组 + if (reader.TokenType != JsonToken.StartArray) + throw new JsonSerializationException("Expected StartArray token."); + + JArray array = JArray.Load(reader); + var fixedUShort = new FixedUShort(array.Count); // 创建一个合适容量的 FixedUShort 对象 + + foreach (var item in array) + { + // 将每个元素添加到 FixedUShort 对象中 + if (item.Type == JTokenType.Integer) + { + fixedUShort.Add((ushort)item); + } + else + { + throw new JsonSerializationException("Expected ushort values in the array."); + } + } + + return fixedUShort; + } + + public override void WriteJson(JsonWriter writer, FixedUShort value, JsonSerializer serializer) + { + writer.WriteStartArray(); + for (int i = 0; i < value.Count; i++) + { + writer.WriteValue(value[i]); + } + writer.WriteEndArray(); + } + } + + } + + public class FixedShort + { + private short[] _array; + private int _capacity; + + public FixedShort(int capacity) + { + if (capacity <= 0) + throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity)); + + _array = new short[capacity]; + _capacity = capacity; + } + + public int Capacity => _capacity; + public int Count { get; private set; } = 0; + + // 获取或设置指定索引的 ushort 类型数值 + public short this[int index] + { + get + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + return _array[index]; + } + set + { + if (index < 0 || index >= Count) + throw new ArgumentOutOfRangeException(nameof(index)); + + _array[index] = value; + } + } + + // 添加 ushort 类型数值 + public void Add(short item) + { + if (Count >= _capacity) + throw new InvalidOperationException("Array is full."); + + _array[Count++] = item; + } + + // 清空数组 + public void Clear() + { + Array.Clear(_array, 0, _capacity); + Count = 0; + } + + // 将数组转换为字节数组 + public byte[] ToBytes() + { + List byteList = new List(); + foreach (var num in _array.Take(Count)) + { + byte[] ushortBytes = BitConverter.GetBytes(num); + byteList.AddRange(ushortBytes); + } + return byteList.ToArray(); + } + + public override string ToString() + { + return $"[{string.Join(", ", _array.Take(Count))}]"; + } + } + } diff --git a/Server/Models/ItemAttributes.cs b/Server/Models/ItemAttributes.cs index 5395015..e08c2ec 100644 --- a/Server/Models/ItemAttributes.cs +++ b/Server/Models/ItemAttributes.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Linq; using System.Security.AccessControl; @@ -8,18 +9,22 @@ using UltimateOrb; namespace PSO2SERVER.Models { - // Enum for ItemAttributes - public enum ItemAttributes + // 表示 JSON 的根对象 + public class ItemAttributesRootObject { - PC, - Vita + [JsonProperty("PC")] + public ItemAttributesPC PC { get; set; } + [JsonProperty("VITA")] + public ItemAttributesVita VITA { get; set; } } // Base class for ItemAttributes [Serializable] - public class ItemAttributesBase + public abstract class ItemAttributesBase { + [JsonProperty("unk1")] public uint Unk1 { get; set; } + [JsonProperty("unk2")] public UInt128 Unk2 { get; set; } } @@ -27,25 +32,46 @@ namespace PSO2SERVER.Models [Serializable] public class ItemAttributesPC : ItemAttributesBase { + [JsonProperty("weapons")] public List Weapons { get; set; } = new List(); + [JsonProperty("human_costumes")] public List HumanCostumes { get; set; } = new List(); + [JsonProperty("cast_parts")] public List CastParts { get; set; } = new List(); + [JsonProperty("consumables")] public List Consumables { get; set; } = new List(); + [JsonProperty("data5")] public List Data5 { get; set; } = new List(); + [JsonProperty("data6")] public List Data6 { get; set; } = new List(); + [JsonProperty("data7")] public List Data7 { get; set; } = new List(); + [JsonProperty("data8")] public List Data8 { get; set; } = new List(); + [JsonProperty("data9")] public List Data9 { get; set; } = new List(); + [JsonProperty("data10")] public List Data10 { get; set; } = new List(); + [JsonProperty("data11")] public List Data11 { get; set; } = new List(); + [JsonProperty("data12")] public List Data12 { get; set; } = new List(); + [JsonProperty("data13")] public List Data13 { get; set; } = new List(); + [JsonProperty("data14")] public List Data14 { get; set; } = new List(); + [JsonProperty("data15")] public List Data15 { get; set; } = new List(); + [JsonProperty("data16")] public List Data16 { get; set; } = new List(); + [JsonProperty("data17")] public List Data17 { get; set; } = new List(); - public List Data18 { get; set; } = new List(); // Fixed length can be manually handled + [JsonProperty("data18")] + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList Data18 { get; set; } = new FixedList(406); + [JsonProperty("data19")] public List Data19 { get; set; } = new List(); + [JsonProperty("data20")] public List Data20 { get; set; } = new List(); } @@ -53,131 +79,560 @@ namespace PSO2SERVER.Models [Serializable] public class ItemAttributesVita : ItemAttributesBase { + [JsonProperty("weapons")] public List Weapons { get; set; } = new List(); + [JsonProperty("human_costumes")] public List HumanCostumes { get; set; } = new List(); + [JsonProperty("cast_parts")] public List CastParts { get; set; } = new List(); + [JsonProperty("consumables")] public List Consumables { get; set; } = new List(); + [JsonProperty("data5")] public List Data5 { get; set; } = new List(); + [JsonProperty("data6")] public List Data6 { get; set; } = new List(); + [JsonProperty("data7")] public List Data7 { get; set; } = new List(); + [JsonProperty("data8")] public List Data8 { get; set; } = new List(); + [JsonProperty("data9")] public List Data9 { get; set; } = new List(); + [JsonProperty("data10")] public List Data10 { get; set; } = new List(); + [JsonProperty("data11")] public List Data11 { get; set; } = new List(); + [JsonProperty("data12")] public List Data12 { get; set; } = new List(); + [JsonProperty("data13")] public List Data13 { get; set; } = new List(); + [JsonProperty("data14")] public List Data14 { get; set; } = new List(); + [JsonProperty("data15")] public List Data15 { get; set; } = new List(); + [JsonProperty("data16")] public List Data16 { get; set; } = new List(); + [JsonProperty("data17")] public List Data17 { get; set; } = new List(); - public List Data18 { get; set; } = new List(); // Fixed length can be manually handled + [JsonProperty("data18")] + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList Data18 { get; set; } = new FixedList(406); + [JsonProperty("data19")] public List Data19 { get; set; } = new List(); + [JsonProperty("data20")] public List Data20 { get; set; } = new List(); } + // Abstract base class that holds the common functionality of the Item, irrespective of the platform + [Serializable] + public class ItemAttr + { + public ItemAttributesBase Attributes { get; set; } + + // Constructor to initialize an item with platform-specific attributes + public ItemAttr(ItemAttributesBase attributes) + { + Attributes = attributes; + } + + // Method to display item attributes + public void DisplayAttributes() + { + switch (Attributes) + { + case ItemAttributesPC pcAttributes: + Console.WriteLine("PC Version Item Attributes:"); + Console.WriteLine($"Weapons Count: {pcAttributes.Weapons.Count}"); + // Add further attribute display logic for PC + break; + + case ItemAttributesVita vitaAttributes: + Console.WriteLine("Vita Version Item Attributes:"); + Console.WriteLine($"Weapons Count: {vitaAttributes.Weapons.Count}"); + // Add further attribute display logic for Vita + break; + + default: + Console.WriteLine("Unknown ItemAttributes"); + break; + } + } + } + // Example of a simple class, could be for one of the referenced types [Serializable] public class WeaponAttrs { // Item category + [JsonProperty("id")] public ushort Id { get; set; } // Item ID + [JsonProperty("subid")] public ushort Subid { get; set; } + + [JsonProperty("unk1")] public byte Unk1 { get; set; } + + [JsonProperty("priority")] public byte Priority { get; set; } + + [JsonProperty("unk2")] public byte Unk2 { get; set; } + + [JsonProperty("priority2")] public byte Priority2 { get; set; } // Item rarity in stars + [JsonProperty("rarity")] public byte Rarity { get; set; } + + [JsonProperty("flags")] public ushort Flags { get; set; } + + [JsonProperty("unk3")] public byte Unk3 { get; set; } + + [JsonProperty("icon_list")] public ushort IconList { get; set; } + + [JsonProperty("icon_index")] public ushort IconIndex { get; set; } // Range damage + [JsonProperty("range_dmg")] public ushort RangeDmg { get; set; } + + [JsonProperty("unk4")] public byte Unk4 { get; set; } // Melee damage + [JsonProperty("melee_dmg")] public ushort MeleeDmg { get; set; } + + [JsonProperty("unk5")] public byte Unk5 { get; set; } + + [JsonProperty("unk6")] public uint Unk6 { get; set; } // Force damage and equipable genders - public GenderDmg GenderForceDmg { get; set; } + [JsonProperty("force_dmg")] + public uint ForceDmg { get; set; } - public byte[] Unk8 { get; set; } = new byte[4]; + [JsonProperty("gender")] + public string Gender { get; set; } + + [JsonProperty("unk8")] + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList Unk8 { get; set; } = new FixedList(0x04); // Equipable races - public RaceFlags Race { get; set; } + [JsonProperty("race")] + public string Race { get; set; } + + [JsonProperty("flags2")] public byte Flags2 { get; set; } // Equipable classes - public ClassFlags Class { get; set; } + [JsonProperty("class")] + public string Class { get; set; } // Required stat value + [JsonProperty("req_stat")] public ushort ReqStat { get; set; } // Required stat type - public StatType ReqStatType { get; set; } + [JsonProperty("req_stat_type")] + public string ReqStatType { get; set; } + [JsonProperty("unk9")] public byte Unk9 { get; set; } + + [JsonProperty("model")] public ushort Model { get; set; } + + [JsonProperty("unk10")] public uint Unk10 { get; set; } + + [JsonProperty("unk11")] public ushort Unk11 { get; set; } + + [JsonProperty("affix_flag")] public ushort AffixFlag { get; set; } + + [JsonProperty("unk12")] public ushort Unk12 { get; set; } } [Serializable] public class HumanCostume { - // Properties specific to HumanCostume + /// + /// Item category. + /// + [JsonProperty("id")] + public ushort Id { get; set; } + + /// + /// Item ID. + /// + [JsonProperty("subid")] + public ushort Subid { get; set; } + [JsonProperty("unk1")] + public ushort Unk1 { get; set; } + [JsonProperty("unk2")] + public ushort Unk2 { get; set; } + /// + /// Item rarity in stars. + /// + [JsonProperty("rarity")] + public byte Rarity { get; set; } + [JsonProperty("flags")] + public ushort Flags { get; set; } + [JsonProperty("unk3")] + public byte Unk3 { get; set; } + [JsonProperty("icon_list")] + public ushort IconList { get; set; } + [JsonProperty("icon_index")] + public ushort IconIndex { get; set; } + /// + /// Equipable genders. + /// + [JsonProperty("gender_flags")] + [JsonConverter(typeof(GenderFlagsConverter))] + public GenderFlags GenderFlags { get; set; } + [JsonProperty("color_flags")] + public byte ColorFlags { get; set; } + /// + /// Equipable races. + /// + [JsonProperty("race_flags")] + [JsonConverter(typeof(RaceFlagsConverter))] + public RaceFlags RaceFlags { get; set; } + [JsonProperty("unk4")] + public byte Unk4 { get; set; } + [JsonProperty("model")] + public ushort Model { get; set; } + [JsonProperty("unk5")] + [JsonConverter(typeof(FixedUShort.FixedUShortConverter))] + public FixedUShort Unk5 { get; set; } = new FixedUShort(3); } [Serializable] public class CastPart { - // Properties specific to CastPart + /// + /// Item category. + /// + [JsonProperty("id")] + public ushort Id { get; set; } + + /// + /// Item ID. + /// + [JsonProperty("subid")] + public ushort Subid { get; set; } + [JsonProperty("unk1")] + public ushort Unk1 { get; set; } + [JsonProperty("unk2")] + public ushort Unk2 { get; set; } + /// + /// Item rarity in stars. + /// + /// [JsonProperty("")] + [JsonProperty("rarity")] + public byte Rarity { get; set; } + [JsonProperty("flags")] + public ushort Flags { get; set; } + [JsonProperty("unk3")] + public byte Unk3 { get; set; } + [JsonProperty("icon_list")] + public ushort IconList { get; set; } + [JsonProperty("icon_index")] + public ushort IconIndex { get; set; } + [JsonProperty("gender_flags")] + public byte GenderFlags { get; set; } + [JsonProperty("unk4")] + public byte Unk4 { get; set; } + [JsonProperty("race_flags")] + public byte RaceFlags { get; set; } + [JsonProperty("unk5")] + public byte Unk5 { get; set; } + [JsonProperty("unk6")] + public ushort Unk6 { get; set; } + [JsonProperty("model")] + public ushort Model { get; set; } + + // 默认构造函数 + public CastPart() + { + // 如果需要初始化某些属性，可以在这里进行 + } } [Serializable] public class Consumable { - // Properties specific to Consumable + [JsonProperty("id")] + public ushort Id { get; set; } + + [JsonProperty("subid")] + public ushort Subid { get; set; } + + [JsonProperty("unk1")] + public ushort Unk1 { get; set; } + + [JsonProperty("unk2")] + public ushort Unk2 { get; set; } + + [JsonProperty("rarity")] + public byte Rarity { get; set; } + + [JsonProperty("flags")] + public ushort Flags { get; set; } + + [JsonProperty("unk3")] + public byte Unk3 { get; set; } + + [JsonProperty("icon_list")] + public ushort IconList { get; set; } + + [JsonProperty("icon_index")] + public ushort IconIndex { get; set; } + + [JsonProperty("max_qty")] + public byte MaxQty { get; set; } + + [JsonProperty("unk4")] + public byte[] Unk4 { get; set; } = new byte[3]; + + [JsonProperty("unk5")] + public uint Unk5 { get; set; } } [Serializable] public class Data5 { - // Properties specific to Data5 + [JsonProperty("id")] + public ushort Id { get; set; } + + [JsonProperty("subid")] + public ushort Subid { get; set; } + + [JsonProperty("unk1")] + public ushort Unk1 { get; set; } + + [JsonProperty("unk2")] + public ushort Unk2 { get; set; } + + [JsonProperty("unk6")] + public byte Unk6 { get; set; } + + [JsonProperty("unk3")] + public byte Unk3 { get; set; } + + [JsonProperty("unk4")] + public byte Unk4 { get; set; } + + [JsonProperty("unk5")] + public byte Unk5 { get; set; } + + [JsonProperty("icon_list")] + public ushort IconList { get; set; } + + [JsonProperty("icon_index")] + public ushort IconIndex { get; set; } + + [JsonProperty("unk")] + public byte[] Unk { get; set; } = new byte[0x30]; // Fixed length of 0x30 bytes + } + + [Serializable] + public class Unit + { + /// + /// Item category. + /// + [JsonProperty("id")] + public ushort Id { get; set; } + + /// + /// Item ID. + /// + [JsonProperty("subid")] + public ushort Subid { get; set; } + + [JsonProperty("unk1")] + public ushort Unk1 { get; set; } + + [JsonProperty("unk2")] + public ushort Unk2 { get; set; } + + /// + /// Item rarity in stars. + /// + [JsonProperty("rarity")] + public byte Rarity { get; set; } + + [JsonProperty("flags")] + public ushort Flags { get; set; } + + [JsonProperty("unk3")] + public byte Unk3 { get; set; } + + [JsonProperty("icon_list")] + public ushort IconList { get; set; } + + [JsonProperty("icon_index")] + public ushort IconIndex { get; set; } + + /// + /// Unit stats. + /// + [JsonProperty("stats")] + public UnitRes Stats { get; set; } + + /// + /// Required stat type. + /// + [JsonProperty("req_stat_type")] + public StatType ReqStatType { get; set; } + + [JsonProperty("unk4")] + public byte Unk4 { get; set; } + + [JsonProperty("unk5")] + public byte Unk5 { get; set; } + + [JsonProperty("unk6")] + public ushort Unk6 { get; set; } + + [JsonProperty("unk7")] + public ushort Unk7 { get; set; } + + [JsonProperty("unk8")] + public ushort Unk8 { get; set; } + + [JsonProperty("unk9")] + public ushort Unk9 { get; set; } + + /// + /// Required stat value. + /// + [JsonProperty("req_stat")] + public ushort ReqStat { get; set; } + + /// + /// Unit attack values. + /// + [JsonProperty("atk")] + public UnitAtk Atk { get; set; } + + [JsonProperty("unk10")] + public byte Unk10 { get; set; } + + [JsonProperty("unk11")] + public byte Unk11 { get; set; } + + [JsonProperty("unk12")] + public byte Unk12 { get; set; } + + [JsonProperty("unk13")] + public ushort Unk13 { get; set; } + + [JsonProperty("unk14")] + public uint Unk14 { get; set; } + + [JsonProperty("unk15")] + public uint Unk15 { get; set; } + } + + public class Data7 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x38); + } + public class Data8 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x10); + } + public class Data9 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x3C); + } + public class Data10 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x24); + } + public class Data11 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x10); + } + public class Data12 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x24); + } + public class Data13 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x50); + } + public class Data14 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x7C); + } + public class Data15 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x10); + } + public class Data16 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x12); + } + public class Data17 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x5A); + } + public class Data18 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x08); + } + public class ShortData + { + public List unk { get; set; } = new List(); + } + public class Data19 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x54); + } + public class Data19Vita + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x2C); + } + public class Data20 + { + [JsonConverter(typeof(FixedList.FixedListConverter))] + public FixedList unk { get; set; } = new FixedList(0x1C); } - // More data types (e.g., Data7, Data8, etc.) need to be created similarly - public class Unit { } - public class Data7 { } - public class Data8 { } - public class Data9 { } - public class Data10 { } - public class Data11 { } - public class Data12 { } - public class Data13 { } - public class Data14 { } - public class Data15 { } - public class Data16 { } - public class Data17 { } - public class ShortData { } - public class Data19 { } - public class Data19Vita { } - public class Data20 { } public struct GenderDmg { /// Force damage. public ushort force_dmg; /// Equipable genders. - public Gender gender; + public GenderFlags gender; } public enum StatType @@ -208,4 +663,209 @@ namespace PSO2SERVER.Models { public static StatType Default => StatType.MELPwr; } + + public class UnitRes + { + /// + /// TEC resistance. + /// + [JsonProperty("tec_res")] + public byte TecRes { get; set; } + + /// + /// TEC defence. + /// + [JsonProperty("tec_def")] + public ushort TecDef { get; set; } + + /// + /// RNG defence. + /// + [JsonProperty("rng_def")] + public ushort RngDef { get; set; } + + /// + /// MEL defence. + /// + [JsonProperty("mel_def")] + public ushort MelDef { get; set; } + + /// + /// Additional HP. + /// + [JsonProperty("hp")] + public ushort Hp { get; set; } + + /// + /// Additional PP. + /// + [JsonProperty("pp")] + public byte Pp { get; set; } + + /// + /// Dark resistance. + /// + [JsonProperty("dark_res")] + public byte DarkRes { get; set; } + + /// + /// Light resistance. + /// + [JsonProperty("light_res")] + public byte LightRes { get; set; } + + /// + /// Wind resistance. + /// + [JsonProperty("wind_res")] + public byte WindRes { get; set; } + + /// + /// Lightning resistance. + /// + [JsonProperty("lightning_res")] + public byte LightningRes { get; set; } + + /// + /// Ice resistance. + /// + [JsonProperty("ice_res")] + public byte IceRes { get; set; } + + /// + /// Fire resistance. + /// + [JsonProperty("fire_res")] + public byte FireRes { get; set; } + + /// + /// RNG resistance. + /// + [JsonProperty("rng_res")] + public byte RngRes { get; set; } + + /// + /// MEL resistance. + /// + [JsonProperty("mel_res")] + public byte MelRes { get; set; } + } + + public class UnitAtk + { + /// + /// Additional MEL attack. + /// + [JsonProperty("mel_atk")] + public ushort MelAtk { get; set; } + + /// + /// Additional RNG attack. + /// + [JsonProperty("rng_atk")] + public ushort RngAtk { get; set; } + + /// + /// Additional TEC attack. + /// + [JsonProperty("tec_atk")] + public ushort TecAtk { get; set; } + + /// + /// Additional DEX. + /// + [JsonProperty("dex")] + public ushort Dex { get; set; } + + [JsonProperty("unk_atk")] + public byte UnkAtk { get; set; } + } + + public class GenderFlagsConverter : JsonConverter + { + public override GenderFlags ReadJson(JsonReader reader, Type objectType, GenderFlags existingValue, bool hasExistingValue, JsonSerializer serializer) + { + var value = reader.Value as string; + if (value != null) + { + GenderFlags genderFlags = GenderFlags.NONE; + + // 按 '|' 分割字符串 + var flags = value.Split('|'); + foreach (var flag in flags) + { + var trimmedFlag = flag.Trim(); + if (Enum.TryParse(trimmedFlag, out var parsedFlag)) + { + genderFlags |= parsedFlag; + } + } + return genderFlags; + } + + return GenderFlags.NONE; + } + + public override void WriteJson(JsonWriter writer, GenderFlags value, JsonSerializer serializer) + { + writer.WriteValue(value.ToString()); + } + } + + [Flags] + /// Equipable genders. + public enum GenderFlags : byte + { + NONE = 0, + /// Males can equip. + MALE = 1 << 0, + /// Females can equip. + FEMALE = 1 << 1, + } + + public class RaceFlagsConverter : JsonConverter + { + public override RaceFlags ReadJson(JsonReader reader, Type objectType, RaceFlags existingValue, bool hasExistingValue, JsonSerializer serializer) + { + var value = reader.Value as string; + if (value != null) + { + RaceFlags raceFlags = RaceFlags.NONE; + + // 按 '|' 分割字符串 + var flags = value.Split('|'); + foreach (var flag in flags) + { + var trimmedFlag = flag.Trim(); + if (Enum.TryParse(trimmedFlag, out var parsedFlag)) + { + raceFlags |= parsedFlag; + } + } + return raceFlags; + } + + return RaceFlags.NONE; + } + + public override void WriteJson(JsonWriter writer, RaceFlags value, JsonSerializer serializer) + { + writer.WriteValue(value.ToString()); + } + } + + [Flags] + /// Equipable races. + public enum RaceFlags : byte + { + NONE = 0, + /// Humans can equip. + HUMAN = 1 << 0, + /// Newmans can equip. + NEWMAN = 1 << 1, + /// CASTs can equip. + CAST = 1 << 2, + /// Deumans can equip. + DEUMAN = 1 << 3, + } } diff --git a/Server/Program.cs b/Server/Program.cs index 762c516..9c7624b 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -17,6 +17,7 @@ using Google.Protobuf.Compiler; using Newtonsoft.Json; using PSO2SERVER.Zone; using PSO2SERVER.Json; +using PSO2SERVER.Models; namespace PSO2SERVER { @@ -117,6 +118,58 @@ namespace PSO2SERVER Logger.Write($"map_event is_active: {map_event.is_active}"); Logger.Write($"map_event objName: {map_event.data.objName}"); + string jsonFilePath3 = "data\\item_attrs.json"; + + // Ensure the file exists + if (File.Exists(jsonFilePath3)) + { + try + { + // Read the JSON file + string json3 = File.ReadAllText(jsonFilePath3); + + // Deserialize the JSON data into ItemAttributesPC + ItemAttributesRootObject Attributes = JsonConvert.DeserializeObject(json3); + + // 输出 PC 的属性 + Logger.Write($"PC unk1: {Attributes.PC.Unk1}"); + + // 输出武器列表 + Logger.Write($"Weapons Count: {Attributes.PC.Weapons.Count}"); + foreach (var weapon in Attributes.PC.Weapons) + { + Logger.Write($"Weapon ID: {weapon.Id}, Range Damage: {weapon.RangeDmg}, Gender: {weapon.Gender}"); + Logger.Write($"weapon.Unk8 Length: {weapon.Unk8.Length}"); + foreach (var un8 in weapon.Unk8) + { + Logger.Write($"Weapon un8: {un8}"); + + } + } + + + // 输出武器列表 + Logger.Write($"Data17 Count: {Attributes.PC.Data17.Count}"); + foreach (var data17 in Attributes.PC.Data17) + { + Logger.Write($"data17.unk Length: {data17.unk.Length}"); + foreach (var value in data17.unk) + { + + Logger.Write($"data17 value:{value}"); + } + } + } + catch (Exception ex) + { + Logger.Write($"错误：读取或反序列化 JSON 文件时发生异常: {ex.Message}"); + } + } + else + { + Logger.Write("JSON 文件不存在。"); + } + try { for (var i = 0; i < args.Length; i++) diff --git a/Server/Protocol/Handlers/11-ClientHandler/11-64-AllBlocksListRequest.cs b/Server/Protocol/Handlers/11-ClientHandler/11-64-AllBlocksListRequest.cs index d4df3d4..cd8e86c 100644 --- a/Server/Protocol/Handlers/11-ClientHandler/11-64-AllBlocksListRequest.cs +++ b/Server/Protocol/Handlers/11-ClientHandler/11-64-AllBlocksListRequest.cs @@ -8,7 +8,7 @@ namespace PSO2SERVER.Protocol.Handlers [PacketHandlerAttr(0x11, 0x64)] public class AllBlocksListRequest : PacketHandler { - public FixedVec Blocks { get; set; } = new FixedVec (200); + public FixedList Blocks { get; set; } = new FixedList (200); public uint unk { get; set; } public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size)