diff --git a/ClientTester/EchoClientTester/Packet/PacketBody.cs b/ClientTester/EchoClientTester/Packet/PacketBody.cs index 80a343d..4ccef36 100644 --- a/ClientTester/EchoClientTester/Packet/PacketBody.cs +++ b/ClientTester/EchoClientTester/Packet/PacketBody.cs @@ -523,16 +523,12 @@ public class DamagePacket public enum PartyUpdateType { CREATE, - DELETE -} - -public enum UserPartyUpdateType -{ + DELETE, JOIN, LEAVE } -// UPDATE_PARTY +// UPDATE_PARTY - 파티 생성/삭제: LeaderId 사용 / 파티원 추가/제거: PlayerId 사용 [ProtoContract] public class UpdatePartyPacket { @@ -556,30 +552,18 @@ public class UpdatePartyPacket get; set; } -} -// UPDATE_USER_PARTY -[ProtoContract] -public class UpdateUserPartyPacket -{ - [ProtoMember(1)] - public int PartyId - { - get; - set; - } - - [ProtoMember(2)] + [ProtoMember(4)] public int PlayerId { get; set; } - [ProtoMember(3)] - public UserPartyUpdateType Type + [ProtoMember(5)] + public string PartyName { get; set; - } + } // CREATE일 때 사용 } diff --git a/ClientTester/EchoClientTester/Packet/PacketHeader.cs b/ClientTester/EchoClientTester/Packet/PacketHeader.cs index 1617c8f..c77f763 100644 --- a/ClientTester/EchoClientTester/Packet/PacketHeader.cs +++ b/ClientTester/EchoClientTester/Packet/PacketHeader.cs @@ -48,11 +48,8 @@ public enum PacketCode : ushort // 데미지 UI 전달 (서버 -> 클라) DAMAGE, - // 파티 (생성, 삭제) - UPDATE_PARTY, - - // 파티 유저 업데이트(추가 삭제) - UPDATE_USER_PARTY + // 파티 생성/삭제, 파티원 추가/제거 (서버 -> 클라) + UPDATE_PARTY } public class PacketHeader diff --git a/MMOTestServer/MMOserver/Packet/PacketBody.cs b/MMOTestServer/MMOserver/Packet/PacketBody.cs index a3440a7..65d3c3b 100644 --- a/MMOTestServer/MMOserver/Packet/PacketBody.cs +++ b/MMOTestServer/MMOserver/Packet/PacketBody.cs @@ -523,16 +523,12 @@ public class DamagePacket public enum PartyUpdateType { CREATE, - DELETE -} - -public enum UserPartyUpdateType -{ + DELETE, JOIN, LEAVE } -// UPDATE_PARTY +// UPDATE_PARTY - 파티 생성/삭제: LeaderId 사용 / 파티원 추가/제거: PlayerId 사용 [ProtoContract] public class UpdatePartyPacket { @@ -556,30 +552,18 @@ public class UpdatePartyPacket get; set; } -} -// UPDATE_USER_PARTY -[ProtoContract] -public class UpdateUserPartyPacket -{ - [ProtoMember(1)] - public int PartyId - { - get; - set; - } - - [ProtoMember(2)] + [ProtoMember(4)] public int PlayerId { get; set; } - [ProtoMember(3)] - public UserPartyUpdateType Type + [ProtoMember(5)] + public string PartyName { get; set; - } + } // CREATE일 때 사용 } diff --git a/MMOTestServer/MMOserver/Packet/PacketHeader.cs b/MMOTestServer/MMOserver/Packet/PacketHeader.cs index 204d965..3862e26 100644 --- a/MMOTestServer/MMOserver/Packet/PacketHeader.cs +++ b/MMOTestServer/MMOserver/Packet/PacketHeader.cs @@ -48,11 +48,8 @@ public enum PacketCode : ushort // 데미지 UI 전달 (서버 -> 클라) DAMAGE, - // 파티 (생성, 삭제) - UPDATE_PARTY, - - // 파티 유저 업데이트(추가 삭제) - UPDATE_USER_PARTY + // 파티 생성/삭제, 파티원 추가/제거 (서버 -> 클라) + UPDATE_PARTY } public class PacketHeader