From 16806a40c8098af4aa548aed158ca7cef843180f Mon Sep 17 00:00:00 2001 From: Longfeng Qin Date: Sun, 22 Sep 2024 00:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=99=BB=E5=BD=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8C=85=20=E4=BF=AE=E6=AD=A3=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/Models/Mission.cs | 33 ++++ Server/Models/PSO2Item.cs | 73 +++++++++ Server/Packets/Handlers/--UNK.cs | 2 +- .../07-ChatHandler/07-00-ChatHandler.cs | 2 +- .../Handlers/07-ChatHandler/07-3D-UNK.cs | 16 ++ .../Handlers/0B-QuestHandler/0B-09-UNK.cs | 2 +- .../0B-CD-AcceptStoryQuestHandler.cs | 2 +- .../0E-19-ChatStatusHandler.cs | 2 +- .../0E-28-PlayerIsBusyState.cs | 2 +- .../0E-29-PlayerIsNotBusyState.cs | 2 +- .../Handlers/11-ClientHandler/11-00-Login.cs | 142 +++++++++++++++--- .../11-ClientHandler/11-05-CharacterCreate.cs | 2 +- .../11-ClientHandler/11-0B-KeyExchange.cs | 2 +- .../11-2D-SystemInformation.cs | 2 +- .../11-ClientHandler/11-3E-CharacterSpawn.cs | 2 +- .../11-ClientHandler/11-B0-Unk11B0Packet.cs | 16 ++ .../Handlers/19-UnkHandler/19-04-UNK.cs | 16 ++ .../19-UnkHandler/19-06-UNK - 复制.cs | 16 ++ .../19-1C-Unk191CPacketHandler.cs | 39 +++++ .../23-FlagHandler/23-02-SetFlagHandler.cs | 5 +- .../2B-00-SettingsRequest.cs | 2 +- .../4A-00-MissionListRequest.cs | 23 +++ .../4D-00-MissionPassInfoRequest.cs | 23 +++ .../4D-02-MissionPassRequest.cs | 23 +++ .../19-01-SystemMessagePacket.cs | 18 ++- .../21-0F-NewDefaultPAsPacket.cs | 9 +- .../4A-01-ARKSMissionListPacket.cs | 78 ++++++++++ .../4A-03-Unk4A03Packet.cs | 44 ++++++ Server/Packets/PacketReader.cs | 53 +++++-- Server/Server.csproj | 11 ++ 30 files changed, 602 insertions(+), 60 deletions(-) create mode 100644 Server/Models/Mission.cs create mode 100644 Server/Packets/Handlers/07-ChatHandler/07-3D-UNK.cs create mode 100644 Server/Packets/Handlers/11-ClientHandler/11-B0-Unk11B0Packet.cs create mode 100644 Server/Packets/Handlers/19-UnkHandler/19-04-UNK.cs create mode 100644 Server/Packets/Handlers/19-UnkHandler/19-06-UNK - 复制.cs create mode 100644 Server/Packets/Handlers/19-UnkHandler/19-1C-Unk191CPacketHandler.cs create mode 100644 Server/Packets/Handlers/4A-ARKSMisionsHandler/4A-00-MissionListRequest.cs create mode 100644 Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-00-MissionPassInfoRequest.cs create mode 100644 Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-02-MissionPassRequest.cs create mode 100644 Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-01-ARKSMissionListPacket.cs create mode 100644 Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-03-Unk4A03Packet.cs diff --git a/Server/Models/Mission.cs b/Server/Models/Mission.cs new file mode 100644 index 0000000..d1572eb --- /dev/null +++ b/Server/Models/Mission.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PSO2SERVER.Models +{ + public unsafe struct Unk2Struct + { + public fixed uint Unk[0x40]; // Fixed length array equivalent in C# + + } + + public class Mission + { + public uint MissionType; // Mission type. + public uint StartDate; // Mission start timestamp. + public uint EndDate; // Mission end timestamp. + public uint Id; // Mission ID. + public uint Unk5; + public uint CompletionDate; // Last completion timestamp. + public uint Unk7; + public uint Unk8; + public uint Unk9; + public uint Unk10; + public uint Unk11; + public uint Unk12; + public uint Unk13; + public uint Unk14; + public uint Unk15; + } +} diff --git a/Server/Models/PSO2Item.cs b/Server/Models/PSO2Item.cs index 2bccb12..8ddec27 100644 --- a/Server/Models/PSO2Item.cs +++ b/Server/Models/PSO2Item.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; +using System.Text; using static PSO2SERVER.Models.Character; namespace PSO2SERVER.Models @@ -136,6 +137,78 @@ namespace PSO2SERVER.Models } } + public struct Campaign + { + /// Campaign ID. + public uint Id; // 对应 Rust 的 u32 + + /// Start timestamp. + public TimeSpan StartDate; // 对应 Rust 的 Duration + + /// End timestamp. + public TimeSpan EndDate; // 对应 Rust 的 Duration + + /// Campaign title (固定长度 0x3E). + private const int TitleLength = 0x3E; + private byte[] titleBytes; + + public string Title + { + get => Encoding.ASCII.GetString(titleBytes).TrimEnd('\0'); + set + { + titleBytes = new byte[TitleLength]; + byte[] valueBytes = Encoding.ASCII.GetBytes(value); + Array.Copy(valueBytes, titleBytes, Math.Min(valueBytes.Length, TitleLength)); + } + } + + /// Campaign conditions (固定长度 0x102). + private const int ConditionsLength = 0x102; + private byte[] conditionsBytes; + + public string Conditions + { + get => Encoding.ASCII.GetString(conditionsBytes).TrimEnd('\0'); + set + { + conditionsBytes = new byte[ConditionsLength]; + byte[] valueBytes = Encoding.ASCII.GetBytes(value); + Array.Copy(valueBytes, conditionsBytes, Math.Min(valueBytes.Length, ConditionsLength)); + } + } + + // 从数据流中读取 Campaign + public static Campaign FromStream(Stream stream) + { + using (BinaryReader reader = new BinaryReader(stream, Encoding.ASCII, true)) + { + Campaign campaign = new Campaign + { + Id = reader.ReadUInt32(), + StartDate = TimeSpan.FromTicks(reader.ReadInt64()), + EndDate = TimeSpan.FromTicks(reader.ReadInt64()), + }; + campaign.titleBytes = reader.ReadBytes(TitleLength); + campaign.conditionsBytes = reader.ReadBytes(ConditionsLength); + return campaign; + } + } + + // 将 Campaign 写入数据流 + public void WriteToStream(Stream stream) + { + using (BinaryWriter writer = new BinaryWriter(stream, Encoding.ASCII, true)) + { + writer.Write(Id); + writer.Write(StartDate.Ticks); + writer.Write(EndDate.Ticks); + writer.Write(titleBytes); + writer.Write(conditionsBytes); + } + } + } + public enum ItemTypes { NoItem, diff --git a/Server/Packets/Handlers/--UNK.cs b/Server/Packets/Handlers/--UNK.cs index 9057d19..1f524a0 100644 --- a/Server/Packets/Handlers/--UNK.cs +++ b/Server/Packets/Handlers/--UNK.cs @@ -9,7 +9,7 @@ namespace PSO2SERVER.Packets.Handlers // { // public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) // { -// //var info = string.Format("[<--] 接收到的数据 (hex): "); +// //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); // //Logger.WriteHex(info, data); // } // } diff --git a/Server/Packets/Handlers/07-ChatHandler/07-00-ChatHandler.cs b/Server/Packets/Handlers/07-ChatHandler/07-00-ChatHandler.cs index 3033c4a..047f936 100644 --- a/Server/Packets/Handlers/07-ChatHandler/07-00-ChatHandler.cs +++ b/Server/Packets/Handlers/07-ChatHandler/07-00-ChatHandler.cs @@ -15,7 +15,7 @@ namespace PSO2SERVER.Packets.Handlers { if (context.Character == null) return; - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); var reader = new PacketReader(data, position, size); diff --git a/Server/Packets/Handlers/07-ChatHandler/07-3D-UNK.cs b/Server/Packets/Handlers/07-ChatHandler/07-3D-UNK.cs new file mode 100644 index 0000000..91cc08d --- /dev/null +++ b/Server/Packets/Handlers/07-ChatHandler/07-3D-UNK.cs @@ -0,0 +1,16 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x07, 0x3D)] + class _07_3D_UNK : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + } + } +} diff --git a/Server/Packets/Handlers/0B-QuestHandler/0B-09-UNK.cs b/Server/Packets/Handlers/0B-QuestHandler/0B-09-UNK.cs index 8ead6f2..c7f7b00 100644 --- a/Server/Packets/Handlers/0B-QuestHandler/0B-09-UNK.cs +++ b/Server/Packets/Handlers/0B-QuestHandler/0B-09-UNK.cs @@ -9,7 +9,7 @@ namespace PSO2SERVER.Packets.Handlers //{ // public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) // { - // //var info = string.Format("[<--] 接收到的数据 (hex): "); + // //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); // //Logger.WriteHex(info, data); // } //} diff --git a/Server/Packets/Handlers/0B-QuestHandler/0B-CD-AcceptStoryQuestHandler.cs b/Server/Packets/Handlers/0B-QuestHandler/0B-CD-AcceptStoryQuestHandler.cs index fb8d16a..5bf933b 100644 --- a/Server/Packets/Handlers/0B-QuestHandler/0B-CD-AcceptStoryQuestHandler.cs +++ b/Server/Packets/Handlers/0B-QuestHandler/0B-CD-AcceptStoryQuestHandler.cs @@ -10,7 +10,7 @@ namespace PSO2SERVER.Packets.Handlers { public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) { - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); var reader = new PacketReader(data); diff --git a/Server/Packets/Handlers/0E-PartyHandler/0E-19-ChatStatusHandler.cs b/Server/Packets/Handlers/0E-PartyHandler/0E-19-ChatStatusHandler.cs index 0a75208..319fd3b 100644 --- a/Server/Packets/Handlers/0E-PartyHandler/0E-19-ChatStatusHandler.cs +++ b/Server/Packets/Handlers/0E-PartyHandler/0E-19-ChatStatusHandler.cs @@ -9,7 +9,7 @@ namespace PSO2SERVER.Packets.Handlers { public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) { - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); var reader = new PacketReader(data); diff --git a/Server/Packets/Handlers/0E-PartyHandler/0E-28-PlayerIsBusyState.cs b/Server/Packets/Handlers/0E-PartyHandler/0E-28-PlayerIsBusyState.cs index 8ec6a9a..b0380b8 100644 --- a/Server/Packets/Handlers/0E-PartyHandler/0E-28-PlayerIsBusyState.cs +++ b/Server/Packets/Handlers/0E-PartyHandler/0E-28-PlayerIsBusyState.cs @@ -11,7 +11,7 @@ namespace PSO2SERVER.Packets.Handlers { if (context.Character == null) return; - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); foreach (var c in Server.Instance.Clients) { diff --git a/Server/Packets/Handlers/0E-PartyHandler/0E-29-PlayerIsNotBusyState.cs b/Server/Packets/Handlers/0E-PartyHandler/0E-29-PlayerIsNotBusyState.cs index dd5d254..1c6286c 100644 --- a/Server/Packets/Handlers/0E-PartyHandler/0E-29-PlayerIsNotBusyState.cs +++ b/Server/Packets/Handlers/0E-PartyHandler/0E-29-PlayerIsNotBusyState.cs @@ -11,7 +11,7 @@ namespace PSO2SERVER.Packets.Handlers { if (context.Character == null) return; - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); foreach (var c in Server.Instance.Clients) diff --git a/Server/Packets/Handlers/11-ClientHandler/11-00-Login.cs b/Server/Packets/Handlers/11-ClientHandler/11-00-Login.cs index 52e28d8..05c145d 100644 --- a/Server/Packets/Handlers/11-ClientHandler/11-00-Login.cs +++ b/Server/Packets/Handlers/11-ClientHandler/11-00-Login.cs @@ -4,41 +4,105 @@ using System.Text.RegularExpressions; using PSO2SERVER.Database; using PSO2SERVER.Packets.PSOPackets; using PSO2SERVER.Models; +using System.Text; +using System.Collections.Generic; namespace PSO2SERVER.Packets.Handlers { [PacketHandlerAttr(0x11, 0x00)] public class Login : PacketHandler { + public uint Unk1 { get; set; } + public uint Unk2 { get; set; } + public uint Unk3 { get; set; } + public byte[] VerId { get; set; } = new byte[0x20]; + public List Interfaces { get; set; } = new List(); + public byte[] Unk4 { get; set; } = new byte[0x90]; + public byte[] Unk5 { get; set; } = new byte[0x10]; + public Language TextLang { get; set; } + public Language VoiceLang { get; set; } + public Language TextLang2 { get; set; } + public Language LangLang { get; set; } + public string LanguageCode { get; set; } = new string('\0', 0x10); + public uint Unk6 { get; set; } + public uint Unk7 { get; set; } + public uint Magic1 { get; set; } + public byte[] Unk8 { get; set; } = new byte[0x20]; + public byte[] Unk9 { get; set; } = new byte[0x44]; + public string Username { get; set; } = new string('\0', 0x40); + public string Password { get; set; } = new string('\0', 0x40); + public uint Unk10 { get; set; } + public string Unk11 { get; set; } = string.Empty; + + public List ReadNetInterfaces(PacketReader reader, uint count) + { + var interfaces = new List(); + for (uint i = 0; i < count; i++) + { + var netInterface = new NetInterface(); + netInterface.ReadFromStream(reader); + interfaces.Add(netInterface); + } + return interfaces; + } + + public void ReadFromStream(PacketReader reader) + { + Unk1 = reader.ReadUInt32(); + Unk2 = reader.ReadUInt32(); + Unk3 = reader.ReadUInt32(); + VerId = reader.ReadBytes(0x20); + + var macCount = reader.ReadMagic(0x5E6, 107); + // Assuming Interfaces is populated somehow + // e.g. Interfaces = ReadNetInterfaces(reader); + Interfaces = ReadNetInterfaces(reader, macCount); + + // Read the fixed length fields + reader.BaseStream.Seek(0x14, SeekOrigin.Current); + Unk4 = reader.ReadBytes(0x90); + reader.BaseStream.Seek(0x10, SeekOrigin.Current); + Unk5 = reader.ReadBytes(0x10); + reader.BaseStream.Seek(0x10, SeekOrigin.Current); + TextLang = (Language)reader.ReadByte(); // Adjust based on actual type + VoiceLang = (Language)reader.ReadByte(); // Adjust based on actual type + TextLang2 = (Language)reader.ReadByte(); // Adjust based on actual type + LangLang = (Language)reader.ReadByte(); // Adjust based on actual type + reader.BaseStream.Seek(0x8, SeekOrigin.Current); + LanguageCode = Encoding.ASCII.GetString(reader.ReadBytes(0x10)).TrimEnd('\0'); + Unk6 = reader.ReadUInt32(); + Unk7 = reader.ReadUInt32(); + Magic1 = reader.ReadUInt32(); + Unk8 = reader.ReadBytes(0x20); + Unk9 = reader.ReadBytes(0x44); + + // Read Username and Password + reader.BaseStream.Seek(0x120, SeekOrigin.Current); + Username = Encoding.ASCII.GetString(reader.ReadBytes(0x40)).TrimEnd('\0'); + reader.BaseStream.Seek(0x20, SeekOrigin.Current); + Password = Encoding.ASCII.GetString(reader.ReadBytes(0x40)).TrimEnd('\0'); + Unk10 = reader.ReadUInt32(); + Unk11 = Encoding.ASCII.GetString(reader.ReadBytes(0x40)).TrimEnd('\0'); // Adjust size if needed + } + #region implemented abstract members of PacketHandler public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) { var reader = new PacketReader(data, position, size); - //var info = string.Format("[<--] 接收到的数据 (hex): "); + ReadFromStream(reader); + + //var info = string.Format("[<--] 接收到的数据 (hex): {0}字节", data.Length); //Logger.WriteHex(info, data); - reader.BaseStream.Seek(0x2C, SeekOrigin.Current); - - var macCount = reader.ReadMagic(0x5E6, 107); - reader.BaseStream.Seek(0x1C * macCount, SeekOrigin.Current); - - reader.BaseStream.Seek(0x280, SeekOrigin.Current); - - var username = reader.ReadFixedLengthAscii(0x60); - var password = reader.ReadFixedLengthAscii(0x60); - - //var username = "sancaros"; - //var password = "12345678"; - - //Logger.Write("用户名 {0} 密码 {1}", username, password); + //Logger.Write("用户名 {0} 密码 {1}", Username, Password); // What am I doing here even using (var db = new ServerEf()) { var users = from u in db.Account - where u.Username.ToLower().Equals(username.ToLower()) + where u.Username.ToLower().Equals(Username.ToLower()) select u; @@ -48,13 +112,13 @@ namespace PSO2SERVER.Packets.Handlers if (!users.Any()) { // Check if there is an empty field - if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password)) + if (string.IsNullOrWhiteSpace(Username) || string.IsNullOrWhiteSpace(Password)) { error = "用户名或密码为空."; user = null; } // Check for special characters - else if (!Regex.IsMatch(username, "^[a-zA-Z0-9 ]*$", RegexOptions.IgnoreCase)) + else if (!Regex.IsMatch(Username, "^[a-zA-Z0-9 ]*$", RegexOptions.IgnoreCase)) { error = "用户名不能包含特殊字符\n请只使用字母和数字."; user = null; @@ -64,9 +128,9 @@ namespace PSO2SERVER.Packets.Handlers // 直接插入新账户至数据库 user = new Account { - Username = username.ToLower(), - Password = BCrypt.Net.BCrypt.HashPassword(password), - Nickname = username.ToLower(), + Username = Username.ToLower(), + Password = BCrypt.Net.BCrypt.HashPassword(Password), + Nickname = Username.ToLower(), // Since we can't display the nickname prompt yet, just default it to the username SettingsIni = File.ReadAllText(ServerApp.ServerSettingsKey) }; @@ -80,15 +144,15 @@ namespace PSO2SERVER.Packets.Handlers { user = users.First(); - if(password != user.Password) + if (Password != user.Password) { - if(password == "") + if (Password == "") { error = "密码为空."; user = null; } else - if (!BCrypt.Net.BCrypt.Verify(password, user.Password)) + if (!BCrypt.Net.BCrypt.Verify(Password, user.Password)) { error = "密码错误."; user = null; @@ -98,7 +162,7 @@ namespace PSO2SERVER.Packets.Handlers context.SendPacket(new LoginDataPacket("Server AuthList 1", error, (user == null) ? (uint)0 : (uint)user.AccountId)); - // Mystery packet + //Mystery packet //var mystery = new PacketWriter(); //mystery.Write((uint)100); //context.SendPacket(0x11, 0x49, 0, mystery.ToArray()); @@ -123,4 +187,32 @@ namespace PSO2SERVER.Packets.Handlers #endregion } + public class NetInterface + { + /// + /// Interface status. + /// + public uint State { get; set; } + + /// + /// Interface MAC address. + /// + public string Mac { get; set; } = new string('\0', 0x18); // 以字符串形式存储 + + public void ReadFromStream(PacketReader reader) + { + State = reader.ReadUInt32(); + Mac = Encoding.ASCII.GetString(reader.ReadBytes(0x18)).TrimEnd('\0'); + } + } + public enum Language + { + Japanese = 0, + English = 1 + } + + public class SegaIDLoginPacket + { + + } } \ No newline at end of file diff --git a/Server/Packets/Handlers/11-ClientHandler/11-05-CharacterCreate.cs b/Server/Packets/Handlers/11-ClientHandler/11-05-CharacterCreate.cs index 8ff39f9..946dd1b 100644 --- a/Server/Packets/Handlers/11-ClientHandler/11-05-CharacterCreate.cs +++ b/Server/Packets/Handlers/11-ClientHandler/11-05-CharacterCreate.cs @@ -20,7 +20,7 @@ namespace PSO2SERVER.Packets.Handlers var reader = new PacketReader(data, position, size); - var info = string.Format("[<--] 接收到的数据 (hex): "); + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); Logger.WriteHex(info, data); reader.ReadBytes(12); // 12 unknown bytes diff --git a/Server/Packets/Handlers/11-ClientHandler/11-0B-KeyExchange.cs b/Server/Packets/Handlers/11-ClientHandler/11-0B-KeyExchange.cs index 1fbdb17..199785f 100644 --- a/Server/Packets/Handlers/11-ClientHandler/11-0B-KeyExchange.cs +++ b/Server/Packets/Handlers/11-ClientHandler/11-0B-KeyExchange.cs @@ -26,7 +26,7 @@ namespace PSO2SERVER.Packets.Handlers Array.Reverse(cryptedBlob); // Print the contents of cryptedBlob in hexadecimal format - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, cryptedBlob); //// Convert cryptedBlob to a hexadecimal string diff --git a/Server/Packets/Handlers/11-ClientHandler/11-2D-SystemInformation.cs b/Server/Packets/Handlers/11-ClientHandler/11-2D-SystemInformation.cs index f72cec8..df49e5e 100644 --- a/Server/Packets/Handlers/11-ClientHandler/11-2D-SystemInformation.cs +++ b/Server/Packets/Handlers/11-ClientHandler/11-2D-SystemInformation.cs @@ -20,7 +20,7 @@ namespace PSO2SERVER.Packets.Handlers var video_info = reader.ReadAscii(0x883D, 0x9F); //reader.BaseStream.Seek(8, SeekOrigin.Current); //var vram = reader.ReadAscii(0x883D, 0x9F); - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); //var windows_version = reader.ReadAscii(0x6C, 190); diff --git a/Server/Packets/Handlers/11-ClientHandler/11-3E-CharacterSpawn.cs b/Server/Packets/Handlers/11-ClientHandler/11-3E-CharacterSpawn.cs index e920551..5f5b483 100644 --- a/Server/Packets/Handlers/11-ClientHandler/11-3E-CharacterSpawn.cs +++ b/Server/Packets/Handlers/11-ClientHandler/11-3E-CharacterSpawn.cs @@ -25,7 +25,7 @@ namespace PSO2SERVER.Packets.Handlers { var reader = new PacketReader(data); - var info = string.Format("[<--] 接收到的数据 (hex): "); + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); Logger.WriteHex(info, data); reader.BaseStream.Seek(0x38, SeekOrigin.Begin); diff --git a/Server/Packets/Handlers/11-ClientHandler/11-B0-Unk11B0Packet.cs b/Server/Packets/Handlers/11-ClientHandler/11-B0-Unk11B0Packet.cs new file mode 100644 index 0000000..6c7a315 --- /dev/null +++ b/Server/Packets/Handlers/11-ClientHandler/11-B0-Unk11B0Packet.cs @@ -0,0 +1,16 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x11, 0xB0)] + class Unk11B0Packet : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + } + } +} diff --git a/Server/Packets/Handlers/19-UnkHandler/19-04-UNK.cs b/Server/Packets/Handlers/19-UnkHandler/19-04-UNK.cs new file mode 100644 index 0000000..bc3d8c1 --- /dev/null +++ b/Server/Packets/Handlers/19-UnkHandler/19-04-UNK.cs @@ -0,0 +1,16 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x19, 0x04)] + class _19_04_UNK : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + } + } +} diff --git a/Server/Packets/Handlers/19-UnkHandler/19-06-UNK - 复制.cs b/Server/Packets/Handlers/19-UnkHandler/19-06-UNK - 复制.cs new file mode 100644 index 0000000..40efe73 --- /dev/null +++ b/Server/Packets/Handlers/19-UnkHandler/19-06-UNK - 复制.cs @@ -0,0 +1,16 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x19, 0x06)] + class _19_06_UNK : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + } + } +} diff --git a/Server/Packets/Handlers/19-UnkHandler/19-1C-Unk191CPacketHandler.cs b/Server/Packets/Handlers/19-UnkHandler/19-1C-Unk191CPacketHandler.cs new file mode 100644 index 0000000..53f3179 --- /dev/null +++ b/Server/Packets/Handlers/19-UnkHandler/19-1C-Unk191CPacketHandler.cs @@ -0,0 +1,39 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x19, 0x1C)] + class Unk191CPacketHandler : PacketHandler + { + public struct Unk191CPacket + { + public uint Unk1; // 对应 Rust 的 u32 + public uint Unk2; // 对应 Rust 的 u32 + public uint Unk3; // 对应 Rust 的 u32 + public uint Unk4; // 对应 Rust 的 u32 + public float Unk5; // 对应 Rust 的 f32 + public float Unk6; // 对应 Rust 的 f32 + public float Unk7; // 对应 Rust 的 f32 + + // 可选：可以添加构造函数来初始化结构体 + public Unk191CPacket(uint unk1, uint unk2, uint unk3, uint unk4, float unk5, float unk6, float unk7) + { + Unk1 = unk1; + Unk2 = unk2; + Unk3 = unk3; + Unk4 = unk4; + Unk5 = unk5; + Unk6 = unk6; + Unk7 = unk7; + } + } + + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + } + } +} diff --git a/Server/Packets/Handlers/23-FlagHandler/23-02-SetFlagHandler.cs b/Server/Packets/Handlers/23-FlagHandler/23-02-SetFlagHandler.cs index 59d0a6f..db20870 100644 --- a/Server/Packets/Handlers/23-FlagHandler/23-02-SetFlagHandler.cs +++ b/Server/Packets/Handlers/23-FlagHandler/23-02-SetFlagHandler.cs @@ -23,12 +23,15 @@ namespace PSO2SERVER.Packets.Handlers if (context._account == null || context.Character == null) return; - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); var reader = new PacketReader(data); var flag = reader.ReadStruct(); + if(context._flags == null) + context._flags = new Flags(); + if (flag.flag_type == FlagType.Account) context._flags.Set((int)flag.id, (byte)flag.value); } diff --git a/Server/Packets/Handlers/2B-SettingHandler/2B-00-SettingsRequest.cs b/Server/Packets/Handlers/2B-SettingHandler/2B-00-SettingsRequest.cs index 02f30f7..26b29f0 100644 --- a/Server/Packets/Handlers/2B-SettingHandler/2B-00-SettingsRequest.cs +++ b/Server/Packets/Handlers/2B-SettingHandler/2B-00-SettingsRequest.cs @@ -9,7 +9,7 @@ namespace PSO2SERVER.Packets.Handlers { public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) { - //var info = string.Format("[<--] 接收到的数据 (hex): "); + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); //Logger.WriteHex(info, data); context.SendPacket(new LoadSettingsPacket(context._account.AccountId)); diff --git a/Server/Packets/Handlers/4A-ARKSMisionsHandler/4A-00-MissionListRequest.cs b/Server/Packets/Handlers/4A-ARKSMisionsHandler/4A-00-MissionListRequest.cs new file mode 100644 index 0000000..8e93046 --- /dev/null +++ b/Server/Packets/Handlers/4A-ARKSMisionsHandler/4A-00-MissionListRequest.cs @@ -0,0 +1,23 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x4A, 0x00)] + class MissionListRequest : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + if(context.Character == null) + return; + + //var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + //Logger.WriteHex(info, data); + + //Mission mission = new Mission(); + + //context.SendPacket(new ARKSMissionListPacket(mission)); + } + } +} diff --git a/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-00-MissionPassInfoRequest.cs b/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-00-MissionPassInfoRequest.cs new file mode 100644 index 0000000..741a863 --- /dev/null +++ b/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-00-MissionPassInfoRequest.cs @@ -0,0 +1,23 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x4D, 0x00)] + class MissionPassInfoRequest : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + if(context.Character == null) + return; + + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + + //Mission mission = new Mission(); + + //context.SendPacket(new ARKSMissionListPacket(mission)); + } + } +} diff --git a/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-02-MissionPassRequest.cs b/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-02-MissionPassRequest.cs new file mode 100644 index 0000000..7f1f820 --- /dev/null +++ b/Server/Packets/Handlers/4D-ClassicMissionPassHandler/4D-02-MissionPassRequest.cs @@ -0,0 +1,23 @@ +using System; +using PSO2SERVER.Models; +using PSO2SERVER.Packets.PSOPackets; + +namespace PSO2SERVER.Packets.Handlers +{ + [PacketHandlerAttr(0x4D, 0x02)] + class MissionPassRequest : PacketHandler + { + public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size) + { + if(context.Character == null) + return; + + var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length); + Logger.WriteHex(info, data); + + //Mission mission = new Mission(); + + //context.SendPacket(new ARKSMissionListPacket(mission)); + } + } +} diff --git a/Server/Packets/PSOPackets/19-LobbyPacket/19-01-SystemMessagePacket.cs b/Server/Packets/PSOPackets/19-LobbyPacket/19-01-SystemMessagePacket.cs index e76fe98..fa5fffa 100644 --- a/Server/Packets/PSOPackets/19-LobbyPacket/19-01-SystemMessagePacket.cs +++ b/Server/Packets/PSOPackets/19-LobbyPacket/19-01-SystemMessagePacket.cs @@ -5,17 +5,24 @@ namespace PSO2SERVER.Packets.PSOPackets { public class SystemMessagePacket : Packet { - public enum MessageType + public enum MessageType : UInt32 { GoldenTicker = 0, AdminMessage, AdminMessageInstant, SystemMessage, - GenericMessage + GenericMessage, + EventInformationYellow, + EventInformationGreen, + ImportantMessage, + PopupMessage, + Undefined = 0xFFFFFFFF, } private readonly string _message; + private string _unk; private readonly MessageType _type; + private uint _msg_num; public SystemMessagePacket(string message, MessageType type) { @@ -36,12 +43,7 @@ namespace PSO2SERVER.Packets.PSOPackets public override PacketHeader GetHeader() { - return new PacketHeader - { - Type = 0x19, - Subtype = 0x01, - Flags1 = 0x04 - }; + return new PacketHeader(0x19, 0x01, PacketFlags.PACKED); } #endregion diff --git a/Server/Packets/PSOPackets/21-PalettePacket/21-0F-NewDefaultPAsPacket.cs b/Server/Packets/PSOPackets/21-PalettePacket/21-0F-NewDefaultPAsPacket.cs index 51c45d1..11b8c32 100644 --- a/Server/Packets/PSOPackets/21-PalettePacket/21-0F-NewDefaultPAsPacket.cs +++ b/Server/Packets/PSOPackets/21-PalettePacket/21-0F-NewDefaultPAsPacket.cs @@ -8,6 +8,7 @@ namespace PSO2SERVER.Packets.PSOPackets { public class NewDefaultPAsPacket : Packet { + public uint[] Default { get; set; } = new uint[0x1A0]; // 默认大小为0x1A0 public NewDefaultPAsPacket() { @@ -17,8 +18,12 @@ namespace PSO2SERVER.Packets.PSOPackets public override byte[] Build() { - var pkt = new PacketWriter(); - return pkt.ToArray(); + var writer = new PacketWriter(); + foreach (var value in Default) + { + writer.Write(value); + } + return writer.ToArray(); } public override PacketHeader GetHeader() diff --git a/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-01-ARKSMissionListPacket.cs b/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-01-ARKSMissionListPacket.cs new file mode 100644 index 0000000..a5f77d3 --- /dev/null +++ b/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-01-ARKSMissionListPacket.cs @@ -0,0 +1,78 @@ +using PSO2SERVER.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PSO2SERVER.Packets.PSOPackets +{ + public class ARKSMissionListPacket : Packet + { + public struct MissionListPacket + { + public uint Unk1; // 对应 Rust 的 u32 + public List Missions; // 使用 List 替代 Vec + public uint DailyUpdate; // 对应 Rust 的 u32 + public uint WeeklyUpdate; // 对应 Rust 的 u32 + public uint TierUpdate; // 对应 Rust 的 u32 + + // 不使用构造函数，而是使用默认值 + public static MissionListPacket Create() + { + return new MissionListPacket + { + Missions = new List(), + Unk1 = 0, + DailyUpdate = 0, + WeeklyUpdate = 0, + TierUpdate = 0 + }; + } + } + + MissionListPacket pkt { get; set; } + + public ARKSMissionListPacket(Mission mission) + { + pkt = MissionListPacket.Create(); // 使用工厂方法初始化 pkt + // 初始化 pkt 或添加初始任务 + pkt.Missions.Add(mission); + } + + // 增加任务 + public void AddMission(Mission mission) + { + pkt.Missions.Add(mission); + } + + // 删除任务 + public bool RemoveMission(Mission mission) + { + return pkt.Missions.Remove(mission); + } + + // 更新任务 + public void UpdateMission(int index, Mission mission) + { + if (index >= 0 && index < pkt.Missions.Count) + { + pkt.Missions[index] = mission; + } + } + + #region implemented abstract members of Packet + + public override byte[] Build() + { + var writer = new PacketWriter(); + return writer.ToArray(); + } + + public override PacketHeader GetHeader() + { + return new PacketHeader(0x4A, 0x01, PacketFlags.None); + } + + #endregion + } +} \ No newline at end of file diff --git a/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-03-Unk4A03Packet.cs b/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-03-Unk4A03Packet.cs new file mode 100644 index 0000000..50546d7 --- /dev/null +++ b/Server/Packets/PSOPackets/4A-ARKSMissionPacket/4A-03-Unk4A03Packet.cs @@ -0,0 +1,44 @@ +using PSO2SERVER.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PSO2SERVER.Packets.PSOPackets +{ + public class Unk4A03Packet : Packet + { + public struct Unk4A03Packet_t + { + public uint Unk1; // 对应 Rust 的 u32 + public List Unk2; // 使用 List 替代 Vec + public List Unk3; // 使用 List 替代 Vec + public List Unk4; // 使用 List 替代 Vec + public uint Unk5; // 对应 Rust 的 u32 + } + + Unk4A03Packet_t pkt = new Unk4A03Packet_t(); + + public Unk4A03Packet(Mission mission, uint unk3, Unk2Struct unk4) + { + pkt.Unk2.Add(mission); + pkt.Unk3.Add(unk3); + pkt.Unk4.Add(unk4); + } + + #region implemented abstract members of Packet + + public override byte[] Build() + { + var writer = new PacketWriter(); + return writer.ToArray(); + } + + public override PacketHeader GetHeader() + { + return new PacketHeader(0x4A, 0x03, PacketFlags.None); + } + + #endregion + } +} \ No newline at end of file diff --git a/Server/Packets/PacketReader.cs b/Server/Packets/PacketReader.cs index e12e558..96cefd0 100644 --- a/Server/Packets/PacketReader.cs +++ b/Server/Packets/PacketReader.cs @@ -1,5 +1,6 @@ using PSO2SERVER.Models; using System; +using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using System.Text; @@ -26,8 +27,8 @@ namespace PSO2SERVER.Packets : base(new MemoryStream(bytes, (int) position, (int) size)) { _data = bytes; - _position = (int)position; - _size = (int)size; + _position = 0; + _size = (int)(size); } public uint ReadMagic(uint xor, uint sub) @@ -38,17 +39,22 @@ namespace PSO2SERVER.Packets // 示例方法：读取 ASCII 字符串 public string ReadAsciiForPosition(int start, int length) { - // 检查读取位置是否有效 - if (_position + length > _size) + try { - throw new ArgumentOutOfRangeException("读取超出数据边界"); + if (_position + length > _size) + { + throw new ArgumentOutOfRangeException(nameof(start), $"Reading beyond data boundary in {nameof(ReadAsciiForPosition)}"); + } + + var result = Encoding.ASCII.GetString(_data, _position, length); + _position += length; + return result; + } + catch (Exception ex) + { + Logger.WriteException(nameof(ReadAsciiForPosition), ex); + throw; } - - // 读取数据并更新当前位置 - var result = Encoding.ASCII.GetString(_data, _position, length); - _position += length; // 更新当前位置 - - return result; } public string ReadAscii(uint xor, uint sub) @@ -57,7 +63,7 @@ namespace PSO2SERVER.Packets if (magic == 0) { - return ""; + return string.Empty; } var charCount = magic - 1; var padding = 4 - (charCount & 3); @@ -119,6 +125,29 @@ namespace PSO2SERVER.Packets return Helper.ByteArrayToStructure(structBytes); } + public List ReadList() where T : struct + { + var count = ReadUInt32(); + var list = new List(); + for (int i = 0; i < count; i++) + { + list.Add(ReadStruct()); + } + return list; + } + public string ReadNullableString(uint xor, uint sub) + { + var magic = ReadMagic(xor, sub); + if (magic == 0) + { + return null; + } + + var charCount = magic - 1; + var data = ReadBytes((int)charCount); + return data?.Length > 0 ? Encoding.ASCII.GetString(data) : null; + } + public PSOLocation ReadEntityPosition() { PSOLocation pos = new PSOLocation() diff --git a/Server/Server.csproj b/Server/Server.csproj index 130f926..33b3e22 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -165,6 +165,7 @@ + @@ -185,6 +186,7 @@ + @@ -206,10 +208,19 @@ + + + + + + + + +