Sancaros/PSO2SERVER
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增固定长度结构

Browse Source 
修正部分数据包结构
This commit is contained in:
Sancaros 2024-12-07 13:42:43 +08:00
parent 8e6f344974
commit cd81d27f38
12 changed files with 668 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Server/Database/ServerEf.cs
View File

@ -3,7 +3,9 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity;
using System.IO;
using System.Runtime.InteropServices;
using MySql.Data.EntityFramework;
using PSO2SERVER.Models;
using PSO2SERVER.Protocol;
using static PSO2SERVER.Models.CharacterStruct;
@ -110,11 +112,47 @@ namespace PSO2SERVER.Database
}
}
public byte[] Unk4 { get; set; } = new byte[152];
public byte[] Unk4 { get; set; } = new byte[148];
public virtual Account Account { get; set; }
public byte[] Fulldata { get; set; }
public byte[] fulldata { get; set; }
public PSO2Items[] EquipedItems { get; set; } = new PSO2Items[10];
public byte[] EquipedItemsBinary
{
get
{
PacketWriter w = new PacketWriter();
foreach (var item in EquipedItems)
{
w.WriteStruct(item);
}
return w.ToArray();
}
set
{
// 每个PSO2Items的大小（包含uuid、ItemId、Items）
int itemSize = Marshal.SizeOf(typeof(PSO2Items));
// 计算字节数组中包含多少个PSO2Items对象
int itemCount = value.Length / itemSize;
// 创建一个新的数组来存储这些对象
EquipedItems = new PSO2Items[itemCount];
// 逐个反序列化
for (int i = 0; i < itemCount; i++)
{
// 提取对应的字节块
byte[] itemBytes = new byte[itemSize];
Array.Copy(value, i * itemSize, itemBytes, 0, itemSize);
// 使用Helper.ByteArrayToStructure来反序列化每个PSO2Items对象
EquipedItems[i] = Helper.ByteArrayToStructure<PSO2Items>(itemBytes);
}
}
}
public byte[] BuildCharacterByteArray()
{
@ -141,11 +179,13 @@ namespace PSO2SERVER.Database
writer.WriteStruct(Jobs);
// 序列化 Unk4
writer.Write(Unk4);
writer.WriteBytes(0, 148);
// 最后返回字节流
return writer.ToArray();
}
public virtual Account Account { get; set; }
}
public class NPC

6
Server/Models/block.cs → Server/Models/BlockInfo.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace PSO2SERVER.Models
{
public class Block
public class BlockInfo
{
public uint unk1 { get; set; }
public byte unk2 { get; set; }
@ -17,8 +17,8 @@ namespace PSO2SERVER.Models
public uint unk7 { get; set; }
public ushort unk8 { get; set; }
public ushort block_id { get; set; }
public string block_name { get; set; }
public byte[] ip { get; set; } = new byte[4];
public string block_name { get; set; }// 0x20
public Ipv4Addr ip { get; set; } = new Ipv4Addr(new byte[] { 127, 0, 0, 1 });
public ushort port { get; set; }
public ushort unk10 { get; set; }
public ushort unk11 { get; set; }

399
Server/Models/FixedTypes.cs Normal file
View File

@ -0,0 +1,399 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PSO2SERVER.Models
{
public class FixedVec<T>
{
private List<T> _data;
private int _capacity;
public FixedVec(int size)
{
if (size <= 0)
throw new ArgumentException("Size must be greater than zero.", nameof(size));
_data = new List<T>(size);
_capacity = size;
}
public FixedVec(int size, T defaultValue)
{
if (size <= 0)
throw new ArgumentException("Size must be greater than zero.", nameof(size));
_data = new List<T>(size);
_capacity = size;
for (int i = 0; i < size; i++)
{
_data.Add(defaultValue);
}
}
public int Capacity => _capacity;
public int Length => _data.Count;
public void Add(T item)
{
if (_data.Count >= _capacity)
throw new InvalidOperationException("FixedVec is full.");
_data.Add(item);
}
public void Insert(int index, T item)
{
if (index < 0 || index > _data.Count)
throw new ArgumentOutOfRangeException(nameof(index));
if (_data.Count >= _capacity)
throw new InvalidOperationException("FixedVec is full.");
_data.Insert(index, item);
}
public void RemoveAt(int index)
{
if (index < 0 || index >= _data.Count)
throw new ArgumentOutOfRangeException(nameof(index));
_data.RemoveAt(index);
}
public void RemoveLast()
{
if (_data.Count == 0)
throw new InvalidOperationException("FixedVec is empty.");
_data.RemoveAt(_data.Count - 1);
}
public void Clear()
{
_data.Clear();
}
public T this[int index]
{
get
{
if (index < 0 || index >= _data.Count)
throw new IndexOutOfRangeException();
return _data[index];
}
set
{
if (index < 0 || index >= _data.Count)
throw new IndexOutOfRangeException();
_data[index] = value;
}
}
public override string ToString()
{
return $"[{string.Join(", ", _data)}]";
}
}
public class FixedSortedList<T> where T : IComparable<T>
{
private List<T> _list;
private int _capacity;
public FixedSortedList(int capacity)
{
if (capacity <= 0)
throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity));
_list = new List<T>();
_capacity = capacity;
}
public int Capacity => _capacity;
public int Count => _list.Count;
// 添加元素
public void Add(T item)
{
if (_list.Count >= _capacity)
throw new InvalidOperationException("List is full.");
_list.Add(item);
_list.Sort(); // 自动排序
}
// 获取元素
public T Get(int index)
{
if (index < 0 || index >= _list.Count)
throw new ArgumentOutOfRangeException(nameof(index));
return _list[index];
}
// 清空列表
public void Clear()
{
_list.Clear();
}
public override string ToString()
{
return $"[{string.Join(", ", _list)}]";
}
}
public class FixedHashSet<T>
{
private HashSet<T> _set;
private int _capacity;
public FixedHashSet(int capacity)
{
if (capacity <= 0)
throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity));
_set = new HashSet<T>();
_capacity = capacity;
}
public int Capacity => _capacity;
public int Count => _set.Count;
// 添加元素
public bool Add(T item)
{
if (_set.Count >= _capacity)
throw new InvalidOperationException("HashSet is full.");
return _set.Add(item);
}
// 判断元素是否存在
public bool Contains(T item)
{
return _set.Contains(item);
}
// 清空集合
public void Clear()
{
_set.Clear();
}
public override string ToString()
{
return $"[{string.Join(", ", _set)}]";
}
}
public class FixedString
{
private string[] _array;
private int _capacity;
public FixedString(int capacity)
{
if (capacity <= 0)
throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity));
_array = new string[capacity];
_capacity = capacity;
}
public int Capacity => _capacity;
public int Count { get; private set; } = 0;
// 获取或设置指定索引的字符串
public string 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(string item)
{
if (Count >= _capacity)
throw new InvalidOperationException("Array is full.");
_array[Count++] = item;
}
// 将数组转换为字节数组
public byte[] ToBytes()
{
List<byte> byteList = new List<byte>();
foreach (var str in _array.Take(Count))
{
byte[] stringBytes = System.Text.Encoding.UTF8.GetBytes(str);
byteList.AddRange(stringBytes);
}
return byteList.ToArray();
}
// 清空数组
public void Clear()
{
Array.Clear(_array, 0, _capacity);
Count = 0;
}
public override string ToString()
{
return $"[{string.Join(", ", _array.Take(Count))}]";
}
}
public class FixedInt
{
private int[] _array;
private int _capacity;
public FixedInt(int capacity)
{
if (capacity <= 0)
throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity));
_array = new int[capacity];
_capacity = capacity;
}
public int Capacity => _capacity;
public int Count { get; private set; } = 0;
// 获取或设置指定索引的整数
public int 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(int 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<byte> byteList = new List<byte>();
foreach (var num in _array.Take(Count))
{
byte[] intBytes = BitConverter.GetBytes(num);
byteList.AddRange(intBytes);
}
return byteList.ToArray();
}
public override string ToString()
{
return $"[{string.Join(", ", _array.Take(Count))}]";
}
}
public class FixedUlong
{
private ulong[] _array;
private int _capacity;
public FixedUlong(int capacity)
{
if (capacity <= 0)
throw new ArgumentException("Capacity must be greater than zero.", nameof(capacity));
_array = new ulong[capacity];
_capacity = capacity;
}
public int Capacity => _capacity;
public int Count { get; private set; } = 0;
// 获取或设置指定索引的 ulong 数值
public ulong 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;
}
}
// 添加 ulong 数值
public void Add(ulong 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<byte> byteList = new List<byte>();
foreach (var num in _array.Take(Count))
{
byte[] ulongBytes = BitConverter.GetBytes(num);
byteList.AddRange(ulongBytes);
}
return byteList.ToArray();
}
public override string ToString()
{
return $"[{string.Join(", ", _array.Take(Count))}]";
}
}
}

30
Server/Models/PSO2Item.cs
View File

@ -1,4 +1,5 @@
using System;
using PSO2SERVER.Protocol;
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
@ -23,14 +24,6 @@ namespace PSO2SERVER.Models
public ushort Subid;
}
[StructLayout(LayoutKind.Sequential)]
public struct PSO2Items
{
public ulong uuid;
public ItemId id;
public Items data;
}
[StructLayout(LayoutKind.Explicit)]
public struct Items
{
@ -50,6 +43,25 @@ namespace PSO2SERVER.Models
//public PSO2ItemNone None;
}
[StructLayout(LayoutKind.Sequential)]
public struct PSO2Items
{
public ulong uuid;
public ItemId id;
public Items data;
public byte[] ToByteArray()
{
using (var pkt = new PacketWriter())
{
pkt.Write(uuid);
pkt.WriteStruct(id);
pkt.WriteStruct(data);
return pkt.ToArray();
}
}
}
[StructLayout(LayoutKind.Sequential)]
public unsafe struct PSO2ItemNone
{

76
Server/Network/Ipv4Addr.cs Normal file
View File

@ -0,0 +1,76 @@
using System;
public struct Ipv4Addr : IEquatable<Ipv4Addr>
{
private byte[] octets;
// 构造函数
public Ipv4Addr(byte[] octets)
{
if (octets == null || octets.Length != 4)
throw new ArgumentException("IPv4 address must have exactly 4 octets.");
this.octets = octets;
}
// 允许访问 octets 数组
public byte[] Octets => octets;
// 重写 Equals 方法
public override bool Equals(object obj)
{
return obj is Ipv4Addr other && Equals(other);
}
// 实现 IEquatable<T> 接口
public bool Equals(Ipv4Addr other)
{
for (int i = 0; i < 4; i++)
{
if (this.octets[i] != other.octets[i])
return false;
}
return true;
}
// 重写 GetHashCode 方法
public override int GetHashCode()
{
int hash = 17;
foreach (var octet in octets)
{
hash = hash * 31 + octet;
}
return hash;
}
// 提供一个用于显示的字符串格式
public override string ToString()
{
return string.Join(".", octets);
}
// 静态方法来解析字符串形式的 IPv4 地址
public static Ipv4Addr Parse(string ipString)
{
var parts = ipString.Split('.');
if (parts.Length != 4)
throw new ArgumentException("Invalid IPv4 address format.");
var octets = new byte[4];
for (int i = 0; i < 4; i++)
{
octets[i] = byte.Parse(parts[i]);
}
return new Ipv4Addr(octets);
}
// 重载 == 和 != 操作符
public static bool operator ==(Ipv4Addr left, Ipv4Addr right)
{
return left.Equals(right);
}
public static bool operator !=(Ipv4Addr left, Ipv4Addr right)
{
return !(left == right);
}
}

28
Server/Protocol/Handlers/11-ClientHandler/11-05-CharacterCreate.cs
View File

@ -25,7 +25,7 @@ namespace PSO2SERVER.Protocol.Handlers
public LooksParam Looks { get; set; }
public uint Unk3 { get; set; }
public JobParam Jobs { get; set; }
public byte[] unk4 { get; set; } = new byte[152]; // 152 字节的字节数组
public byte[] unk4 { get; set; } = new byte[148]; // 148 字节的字节数组
public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size)
{
@ -48,6 +48,29 @@ namespace PSO2SERVER.Protocol.Handlers
Jobs = reader.ReadStruct<JobParam>();
unk4 = reader.ReadBytes(unk4.Length);
// 创建一个 Consumable 类型的物品
PSO2ItemConsumable consumableItem = new PSO2ItemConsumable
{
amount = 10,
};
PSO2Items[] items = new PSO2Items[10];
for (var i = 0; i < 10; i++)
{
items[i] = new PSO2Items
{
uuid = (ulong)i,
id = new ItemId
{
ItemType = 3,
Id = 1,
Subid = 0,
},
data = new Items { Consumable = consumableItem }
};
}
var newCharacter = new Character
{
CharacterID = 0,
@ -61,9 +84,10 @@ namespace PSO2SERVER.Protocol.Handlers
Unk3 = (int)Unk3,
Jobs = Jobs,
Unk4 = unk4,
EquipedItems = items,
Account = context._account,
fulldata = data
Fulldata = data
};
// Add to database

20
Server/Protocol/Handlers/11-ClientHandler/11-64-AllBlocksListRequest.cs Normal file
View File

@ -0,0 +1,20 @@
using System;
using PSO2SERVER.Models;
using PSO2SERVER.Protocol.Packets;
using static PSO2SERVER.Protocol.Handlers.CharacterNewNameRequest;
namespace PSO2SERVER.Protocol.Handlers
{
[PacketHandlerAttr(0x11, 0x64)]
public class AllBlocksListRequest : PacketHandler
{
public FixedVec<BlockInfo> Blocks { get; set; } = new FixedVec<BlockInfo> (200);
public uint unk { get; set; }
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);
}
}
}

3
Server/Protocol/Packets/03-ServerPacket/03-04-LoadingScreenTransitionPacket.cs
View File

@ -16,7 +16,8 @@ namespace PSO2SERVER.Protocol.Packets
public override byte[] Build()
{
return new byte[0];
var pkt = new PacketWriter();
return pkt.ToArray();
}
public override PacketHeader GetHeader()

3
Server/Protocol/Packets/03-ServerPacket/03-23-LoadingScreenRemovePacket.cs
View File

@ -12,7 +12,8 @@ namespace PSO2SERVER.Protocol.Packets
public override byte[] Build()
{
return new byte[0];
var pkt = new PacketWriter();
return pkt.ToArray();
}
public override PacketHeader GetHeader()

10
Server/Protocol/Packets/08-SpawnPacket/08-04-CharacterSpawnPacket.cs
View File

@ -42,7 +42,7 @@ namespace PSO2SERVER.Protocol.Packets
public byte unk9 { get; set; }
public ushort unk10 { get; set; }
public Character _character { get; set; }
//public uint unk11 { get; set; }
public uint unk11 { get; set; }
/// Set to `1` if the player is a GM.
public uint gm_flag { get; set; }
public string nickname { get; set; }
@ -87,12 +87,12 @@ namespace PSO2SERVER.Protocol.Packets
pkt.Write(unk10);
// Character data.
pkt.Write(_character.BuildCharacterByteArray());
//pkt.Write(unk11);
pkt.Write(unk11);
pkt.Write(gm_flag);
pkt.WriteFixedLengthUtf16(_character.Account.Nickname, 0x10);
for (var i = 0; i < 0x60; i++)
pkt.Write((byte)0);
pkt.Write(unk12);
//for (var i = 0; i < 0x60; i++)
// pkt.Write((byte)0);
//pkt.Write(unk12);
//pkt.Write((ushort)0); // 0x46
//pkt.Write((uint)602); // 0x48

99
Server/Protocol/Packets/11-ClientPacket/11-03-CharacterListPacket.cs
View File

@ -71,50 +71,83 @@ namespace PSO2SERVER.Protocol.Packets
{
Characters.Add(ch);
// 创建一个 Consumable 类型的物品
PSO2ItemConsumable consumableItem = new PSO2ItemConsumable
{
amount = 10,
};
//// 创建一个 Consumable 类型的物品
//PSO2ItemConsumable consumableItem = new PSO2ItemConsumable
//{
// amount = 10,
//};
PSO2Items[] items = new PSO2Items[10];
//PSO2Items[] items = new PSO2Items[10];
for (var i = 0; i < 10; i++)
{
items[i] = new PSO2Items
{
uuid = (ulong)i,
id = new ItemId
{
ItemType = 3,
Id = 1,
Subid = 0,
},
data = new Items { Consumable = consumableItem }
};
}
//for (var i = 0; i < 10; i++)
//{
// items[i] = new PSO2Items
// {
// uuid = (ulong)i,
// id = new ItemId
// {
// ItemType = 3,
// Id = 1,
// Subid = 0,
// },
// data = new Items { Consumable = consumableItem }
// };
//}
EquippedItems.Add(items);
EquippedItems.Add(ch.EquipedItems);
}
}
var pkt = new PacketWriter();
var writer = new PacketWriter();
writer.Write((uint)Characters.Count()); // 写入玩家数量
writer.Write((uint)0);
pkt.Write((uint)Characters.Count()); // 写入玩家数量
pkt.Write((uint)0);
foreach (var ch in Characters)
{
writer.Write((uint)0);
writer.Write(ch.BuildCharacterByteArray());//4
pkt.Write((uint)0);
pkt.Write(ch.BuildCharacterByteArray());//4
}
return writer.ToArray();
pkt.Write((uint)EquippedItems.Count()); // 写入物品数量
foreach (var itemsArray in EquippedItems)
{
foreach (var item in itemsArray)
{
byte[] itemBytes = item.ToByteArray(); // Assume PSO2Items has a ToByteArray method
pkt.Write(itemBytes); // Write the item bytes
}
}
// Write PlayTimes
foreach (var playTime in PlayTimes)
{
pkt.Write(playTime);
}
// Write DeletionFlags
foreach (var flag in DeletionFlags)
{
pkt.Write(flag.flag);
pkt.Write(flag.timestamp);
}
// Write TransferFlags
foreach (var flag in TransferFlags)
{
pkt.Write(flag.flag);
pkt.Write(flag.timestamp);
}
// Write AccountAccessory
pkt.Write(AccountAccessory);
// Write LoginSurvey
pkt.Write(LoginSurvey);
// Write Ad
pkt.Write(Ad);
pkt.WriteBytes(0, 2);
return pkt.ToArray();
}
public override PacketHeader GetHeader()

5
Server/Server.csproj
View File

@ -165,8 +165,9 @@
<Compile Include="ConsoleSystem.cs" />
<Compile Include="Crypto\KeyLoader.cs" />
<Compile Include="Logger.cs" />
<Compile Include="Models\Block.cs" />
<Compile Include="Models\BlockInfo.cs" />
<Compile Include="Models\CharacterAddtionStruct.cs" />
<Compile Include="Models\FixedTypes.cs" />
<Compile Include="Models\Flags.cs" />
<Compile Include="Models\Mission.cs" />
<Compile Include="Models\NetInterface.cs" />
@ -178,11 +179,13 @@
<Compile Include="Models\Quest.cs" />
<Compile Include="Models\RevealedRegions.cs" />
<Compile Include="Models\Time.cs" />
<Compile Include="Network\Ipv4Addr.cs" />
<Compile Include="Network\PortChecker.cs" />
<Compile Include="Object\ObjectManager.cs" />
<Compile Include="Protocol\Handlers\0B-QuestHandler\0B-20-AcceptQuest.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-14-BlockLogin.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-90-CharacterUndeletionRequest.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-64-AllBlocksListRequest.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-DC-CharacterSurvey.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-EB-NicknameCheckRequest - 复制.cs" />
<Compile Include="Protocol\Handlers\11-ClientHandler\11-52-CreateCharacterInviteNickname.cs" />