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-11-30 16:18:27 +08:00
parent d1d7a73b5d
commit d6fd7b75b7
5 changed files with 107 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Server/Models/Character.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using PSO2SERVER.Protocol;
using PSO2SERVER.Database;
@ -88,8 +88,10 @@ namespace PSO2SERVER.Models
[StructLayout(LayoutKind.Sequential)]
public struct JobEntry
{
/// Main level.
public ushort level;
public ushort level2; // Usually the same as the above, what is this used for?
public ushort level2; // SubClass level
/// Current EXP.
public uint exp;
}
@ -124,18 +126,6 @@ namespace PSO2SERVER.Models
;
}
[StructLayout(LayoutKind.Sequential)]
public unsafe struct JobParam
{
public ClassType mainClass;//1
public ClassType subClass;//1
public ushort unk2;//2
public ClassTypeField enabledClasses;//2
public ushort unk3;//2
public Entries entries; //TODO: Make this a fixed array 24 * 8
public fixed ushort unk_maxlevel[15];//30
}
public enum RunAnimation : ushort
{
Walking = 9,
@ -158,6 +148,12 @@ namespace PSO2SERVER.Models
Female,
}
[StructLayout(LayoutKind.Sequential)]
public struct Figure
{
public ushort x, y, z; // Great naming, SEGA
}
public struct AccessoryData
{
public sbyte Value1;
@ -179,12 +175,6 @@ namespace PSO2SERVER.Models
public ushort hue, saturation, value;
}
[StructLayout(LayoutKind.Sequential)]
public struct Figure
{
public ushort x, y, z; // Great naming, SEGA
}
[StructLayout(LayoutKind.Sequential)]
public unsafe struct LooksParam
{
@ -262,11 +252,23 @@ namespace PSO2SERVER.Models
public sbyte EyebrowThickness;
}
// Probably more info than this
[Key]
public int Id { get; set; }
[StructLayout(LayoutKind.Sequential)]
public unsafe struct JobParam
{
public ClassType mainClass;//1
public ClassType subClass;//1
public ushort unk2;//2
public ClassTypeField enabledClasses;//2
public ushort unk3;//2
public Entries entries; //TODO: Make this a fixed array 24 * 8
public fixed ushort unk_maxlevel[15];//30
}
// Probably more info than this
[Key, Column(Order = 1)]
public int CharacterID { get; set; }
[Key, Column(Order = 2)]
public int AccountID { get; set; }
public uint Unk1 { get; set; }
public uint VoiceType { get; set; }
@ -311,7 +313,7 @@ namespace PSO2SERVER.Models
public JobParam Jobs { get; set; }
public string Unk4 { get; set; }
public string NickName { get; set; }
public virtual Account Account { get; set; }
}

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

@ -4,6 +4,7 @@ using PSO2SERVER.Models;
using PSO2SERVER.Protocol.Packets;
using PSO2SERVER.Database;
using System.Linq;
using static PSO2SERVER.Models.Character;
namespace PSO2SERVER.Protocol.Handlers
{
@ -11,6 +12,22 @@ namespace PSO2SERVER.Protocol.Handlers
public class CharacterCreate : PacketHandler
{
#region implemented abstract members of PacketHandler
public struct CharacterCreatePacket
{
public uint CharacterID;
public uint AccountID;
public uint Unk1;
public uint VoiceType;
public ushort Unk2;
public short VoicePitch;
public string Name;
public uint Unk3;
public LooksParam Looks;
public JobParam Jobs;
public string NickName;
}
private CharacterCreatePacket packet = new CharacterCreatePacket();
public override void HandlePacket(Client context, byte flags, byte[] data, uint position, uint size)
{
@ -21,34 +38,32 @@ namespace PSO2SERVER.Protocol.Handlers
var info = string.Format("[<--] 接收到的数据 (hex): {0} 字节", data.Length);
Logger.WriteHex(info, data);
reader.ReadUInt32();//CharacterID 未预设的空值
reader.ReadUInt32();//AccountID 未预设的空值
packet.CharacterID = reader.ReadUInt32();
packet.AccountID = reader.ReadUInt32();
packet.Unk1 = reader.ReadUInt32();//Unk1
packet.VoiceType = reader.ReadUInt32(); // VoiceType
packet.Unk2 = reader.ReadUInt16(); // 5 unknown bytes
packet.VoicePitch = reader.ReadInt16(); // VoiceData
packet.Name = reader.ReadFixedLengthUtf16(16);
packet.Unk3 = reader.ReadUInt32();
packet.Looks = reader.ReadStruct<Character.LooksParam>();
packet.Jobs = reader.ReadStruct<Character.JobParam>();
packet.NickName = reader.ReadFixedLengthUtf16(16);
reader.BaseStream.Seek(0x56, SeekOrigin.Current); // Padding
var unk1 = reader.ReadUInt32();//Unk1
var VoiceType = reader.ReadUInt32(); // VoiceType
var unk2 = reader.ReadUInt16(); // 5 unknown bytes
var VoicePitch = reader.ReadInt16(); // VoiceData
var name = reader.ReadFixedLengthUtf16(16);
reader.BaseStream.Seek(0x4, SeekOrigin.Current); // Padding
var looks = reader.ReadStruct<Character.LooksParam>();
var jobs = reader.ReadStruct<Character.JobParam>();
Logger.WriteStructBinary(info, jobs);
Logger.WriteInternal("[CHR] {0} 创建了名为 {1} 的新角色.", context._account.Username, name);
var newCharacter = new Character
{
CharacterID = 0,
AccountID = context._account.AccountId,
Unk1 = unk1,
VoiceType = VoiceType,
Unk2 = unk2,
VoicePitch = VoicePitch,
Name = name,
Jobs = jobs,
Looks = looks,
Unk1 = packet.Unk1,
VoiceType = packet.VoiceType,
Unk2 = packet.Unk2,
VoicePitch = packet.VoicePitch,
Name = packet.Name,
Unk3 = packet.Unk3,
Jobs = packet.Jobs,
Looks = packet.Looks,
NickName = packet.NickName,
Account = context._account
};
@ -68,7 +83,7 @@ namespace PSO2SERVER.Protocol.Handlers
newCharacter.CharacterID = 1;
}
//Logger.Write("newCharacter.CharacterId {0} {1}", newCharacter.CharacterId, context._account.AccountId);
Logger.Write("New character data: {0}, {1}, {2}, {3}, {4}", newCharacter.CharacterID, newCharacter.Name, newCharacter.VoiceType, newCharacter.VoicePitch, newCharacter.AccountID);
db.Characters.Add(newCharacter);
db.Entry(newCharacter.Account).State = EntityState.Modified;
@ -80,9 +95,6 @@ namespace PSO2SERVER.Protocol.Handlers
// Set Account ID
context.SendPacket(new CharacterCreateResponsePacket(CharacterCreateResponsePacket.CharacterCreationStatus.Success, (uint)context._account.AccountId));
// Spawn
context.SendPacket(new NoPayloadPacket(0x11, 0x3E));
}
#endregion

2
Server/Protocol/PacketWriter.cs
View File

@ -161,7 +161,7 @@ namespace PSO2SERVER.Protocol
public unsafe void WriteStruct<T>(T structure) where T : struct
{
int size = Marshal.SizeOf(structure);
//Logger.Write($"Writing {size} bytes of structure: {structure}");
//Logger.Write($"写入 {size} 字节,结构体: {structure}");
var strArr = new byte[size];

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

@ -6,7 +6,7 @@ namespace PSO2SERVER.Protocol.Packets
{
public class CharacterSpawnPacket : Packet
{
public enum CharacterSpawnType
public enum CharacterSpawnType : byte
{
/// Spawned character is not related to the receiver.
Other = 0x27,
@ -17,7 +17,7 @@ namespace PSO2SERVER.Protocol.Packets
}
private readonly Character _character;
public bool IsItMe = true;
public byte IsItMe = (byte)CharacterSpawnType.Myself;
public uint IsGM = 0;
public PSOLocation Position;
@ -30,7 +30,7 @@ namespace PSO2SERVER.Protocol.Packets
public CharacterSpawnPacket(Character character, PSOLocation locatiion, bool isme, uint isgm)
{
_character = character;
IsItMe = isme;
IsItMe = isme ? (byte)CharacterSpawnType.Myself : (byte)CharacterSpawnType.Other;
Position = locatiion;
IsGM = isgm;
}
@ -55,27 +55,37 @@ namespace PSO2SERVER.Protocol.Packets
writer.Write((uint)1); // 0x4C
writer.Write((uint)53); // 0x50
writer.Write((uint)0); // 0x54
writer.Write((uint)(IsItMe ? CharacterSpawnType.Myself : CharacterSpawnType.Other)); // 0x58
writer.Write((ushort)559); // 0x5C
writer.Write((ushort)306); // 0x5E
// Character
// Character spawn type.
writer.Write(IsItMe); // 0x58
writer.Write((byte)0x00);
writer.Write((ushort)0x00);
////writer.Write((ushort)0x022F); // 0x5C
//writer.Write((byte)0x2F); // 0x5C
//writer.Write((byte)0x02);
////writer.Write((ushort)0x0132); // 0x5E
//writer.Write((byte)0x32);
//writer.Write((byte)0x01);
// Character data.
writer.Write((uint)_character.AccountID); // player ID copy
writer.Write((uint)_character.CharacterID); // "char array ugggghhhhh" according to PolarisLegacy
writer.Write((uint)0); // "voiceParam_unknown4"
writer.Write((uint)0); // "voiceParam_unknown8"
writer.Write(_character.Unk1);//4
writer.Write(_character.VoiceType);//4
writer.Write(_character.Unk2);//2
writer.Write(_character.VoicePitch);//2
writer.Write((uint)0);//4
writer.WriteFixedLengthUtf16(_character.Name, 16);
writer.Write((uint)0); // 0x90
writer.WriteStruct(_character.Looks);
writer.WriteStruct(_character.Jobs);
//writer.WriteFixedLengthUtf16(_character.Account.Nickname, 16); // Nickname, maybe not 16 chars?
writer.WriteFixedLengthUtf16("", 32); // title?
writer.Write((uint)0); // 0x204
writer.Write(IsGM); // gmflag?
writer.WriteFixedLengthUtf16(_character.Account.Nickname, 16); // Nickname, maybe not 16 chars?
for (var i = 0; i < 64; i++)
writer.Write((byte)0);
//writer.Write((uint)0); // 0x204
//writer.Write(IsGM); // gmflag?
//for (var i = 0; i < 60; i++)
// writer.Write((byte)0);
return writer.ToArray();
}

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

@ -25,11 +25,11 @@ namespace PSO2SERVER.Protocol.Packets
// CK注:额外的数据可能是当前设备，游戏时间等。
//所有这些数据目前都是未知的。
private int _PlayerId;
private int AccountId;
public CharacterListPacket(int PlayerId)
public CharacterListPacket(int AccountId)
{
_PlayerId = PlayerId;
this.AccountId = AccountId;
}
#region implemented abstract members of Packet
@ -41,24 +41,24 @@ namespace PSO2SERVER.Protocol.Packets
using (var db = new ServerEf())
{
var chars = db.Characters
.Where(w => w.Account.AccountId == _PlayerId)
.Where(w => w.Account.AccountId == AccountId)
.OrderBy(o => o.CharacterID) // TODO: 按照最后游玩的角色排序
.Select(s => s);
writer.Write((uint)chars.Count()); // 写入玩家数量
writer.Write((uint)_PlayerId);
writer.Write((uint)AccountId);
foreach (var ch in chars)
{
writer.Write((uint)ch.AccountID);
writer.Write((uint)ch.CharacterID);
writer.Write((uint)ch.AccountID);//4
writer.Write((uint)ch.CharacterID);//4
writer.Write(ch.Unk1);
writer.Write(ch.VoiceType);
writer.Write(ch.Unk2);
writer.Write(ch.VoicePitch);
writer.Write((uint)0);
writer.Write(ch.Unk1);//4
writer.Write(ch.VoiceType);//4
writer.Write(ch.Unk2);//2
writer.Write(ch.VoicePitch);//2
writer.Write((uint)0);//4
writer.WriteFixedLengthUtf16(ch.Name, 16);
//Logger.WriteInternal("[CHR] 新增名为 {0} 的新角色.", ch.Name);
@ -66,9 +66,10 @@ namespace PSO2SERVER.Protocol.Packets
writer.WriteStruct(ch.Looks);
writer.WriteStruct(ch.Jobs);
writer.WriteFixedLengthUtf16(ch.NickName, 16);
for (var i = 0; i < 0x94; i++)
writer.Write((byte)0); //TODO:解析这个是什么
for (var i = 0; i < 116; i++)
writer.Write((byte)0);
}
}