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

重新整理角色参数

Browse Source
This commit is contained in:
Longfeng Qin 2024-12-10 23:08:39 +08:00
parent 391dd3d1b6
commit 78dcc9c2df
10 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Server/Client.cs
View File

@ -58,19 +58,32 @@ namespace PSO2SERVER
SendPacket(new ServerHelloPacket(0x03, 100, 68833280));
}
/// <summary>
/// Server
/// </summary>
public bool IsClosed { get; private set; }
public SocketClient Socket { get; private set; }
// Game properties, TODO Consider moving these somewhere else
/// <summary>
/// Game
/// </summary>
// TODO Consider moving these somewhere else
public Account _account { get; set; }
public Flags _flags { get; set; }
public Character Character { get; set; }
//public Zone.Zone CurrentZone { get; set; }
public Map CurrentZone;
public uint MovementTimestamp { get; internal set; }
public Flags _flags { get; set; }
public PSOPalette Palette { get; set; } = new PSOPalette();
public PlayerStats battle_stats { get; set; } = new PlayerStats();
/// <summary>
/// Party
/// </summary>
public Party.Party currentParty;
public PSOPalette Palette { get; set; } = new PSOPalette();
/// <summary>
/// Map
/// </summary>
public Map CurrentMap;
public PSOLocation CurrentLocation;
public PSOLocation LastLocation;
@ -141,7 +154,7 @@ namespace PSO2SERVER
{
// :(
Logger.Write("[BYE] 连接丢失. :(");
CurrentZone?.RemoveClient(this);
CurrentMap?.RemoveClient(this);
IsClosed = true;
}

2
Server/Protocol/Handlers/04-ObjectHandler/04-07-MovementHandlers.cs
View File

@ -134,7 +134,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c.Character == null || c == context || c.CurrentZone != context.CurrentZone)
if (c.Character == null || c == context || c.CurrentMap != context.CurrentMap)
continue;
//c.SendPacket(0x04, 0x07, flags, data);

2
Server/Protocol/Handlers/04-ObjectHandler/04-08-MovementActionHandler.cs
View File

@ -34,7 +34,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c == context || c.Character == null || c.CurrentZone != context.CurrentZone)
if (c == context || c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
//PacketWriter output = new PacketWriter();
//output.WriteStruct(new ObjectHeader((uint)context._account.AccountId, ObjectType.Accounts));

4
Server/Protocol/Handlers/04-ObjectHandler/04-14-ObjectInteract.cs
View File

@ -65,7 +65,7 @@ namespace PSO2SERVER.Protocol.Handlers
PSOObject srcObj;
if(pkt.Object1.ObjectType == ObjectType.Object)
{
srcObj = ObjectManager.Instance.getObjectByID(context.CurrentZone.Name, pkt.Object1.ID);
srcObj = ObjectManager.Instance.getObjectByID(context.CurrentMap.Name, pkt.Object1.ID);
}
else if(pkt.Object1.ObjectType == ObjectType.Player)
{
@ -83,7 +83,7 @@ namespace PSO2SERVER.Protocol.Handlers
//Logger.WriteInternal("[OBJ] {0} (ID {1}) <{2}> --> Ent {3} (ID {4})", srcObj.name, srcObj.Header.ID, command, (ObjectType)dstObject.ObjectType, dstObject.ID);
// TODO: Delete this code and do this COMPLETELY correctly!!!
if (pkt.Action == "Transfer" && context.CurrentZone.Name == "lobby")
if (pkt.Action == "Transfer" && context.CurrentMap.Name == "lobby")
{
// Try and get the teleport definition for the object...
using (var db = new ServerEf())

2
Server/Protocol/Handlers/04-ObjectHandler/04-3C-ActionUpdateHandler.cs
View File

@ -20,7 +20,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c == context || c.Character == null || c.CurrentZone != context.CurrentZone)
if (c == context || c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
//PacketWriter writer = new PacketWriter();
//writer.WriteStruct(new ObjectHeader((uint)c._account.AccountId, ObjectType.Accounts));

2
Server/Protocol/Handlers/04-ObjectHandler/04-71-MovementEndHandler.cs
View File

@ -30,7 +30,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c == context || c.Character == null || c.CurrentZone != context.CurrentZone)
if (c == context || c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
c.SendPacket(new MovementEndPacket(movData));

2
Server/Protocol/Handlers/07-ChatHandler/07-00-ChatHandler.cs
View File

@ -56,7 +56,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c.Character == null || c.CurrentZone != context.CurrentZone)
if (c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
c.SendPacket(new ChatPacket((uint)context._account.AccountId, channel, message));

2
Server/Protocol/Handlers/0E-PartyHandler/0E-28-PlayerIsBusyState.cs
View File

@ -15,7 +15,7 @@ namespace PSO2SERVER.Protocol.Handlers
//Logger.WriteHex(info, data);
foreach (var c in Server.Instance.Clients)
{
if (c.Character == null || c.CurrentZone != context.CurrentZone)
if (c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
c.SendPacket(new NewBusyStatePacket(context._account.AccountId, BusyState.Busy));

2
Server/Protocol/Handlers/0E-PartyHandler/0E-29-PlayerIsNotBusyState.cs
View File

@ -16,7 +16,7 @@ namespace PSO2SERVER.Protocol.Handlers
foreach (var c in Server.Instance.Clients)
{
if (c.Character == null || c.CurrentZone != context.CurrentZone)
if (c.Character == null || c.CurrentMap != context.CurrentMap)
continue;
c.SendPacket(new NewBusyStatePacket(context._account.AccountId, BusyState.NotBusy));

8
Server/Zone/Map.cs
View File

@ -125,9 +125,9 @@ namespace PSO2SERVER.Zone
c.SendPacket(new MapTransferPacket(zoneData, (uint)MapID, (uint)c._account.AccountId));
}
if (c.CurrentZone != null)
if (c.CurrentMap != null)
{
c.CurrentZone.RemoveClient(c);
c.CurrentMap.RemoveClient(c);
}
// 设置客户端的账户ID
@ -136,7 +136,7 @@ namespace PSO2SERVER.Zone
// Spawn Character
c.SendPacket(new CharacterSpawnPacket(c.Character, location, true, true));
c.CurrentLocation = location;
c.CurrentZone = this;
c.CurrentMap = this;
// Objects
foreach (PSOObject obj in Objects)
@ -174,7 +174,7 @@ namespace PSO2SERVER.Zone
if (!Clients.Contains(c))
return;
c.CurrentZone = null;
c.CurrentMap = null;
Clients.Remove(c);
foreach (Client other in Clients)