From 8bcb27b3ad4c376356f7e75a5ae080e70ffc065f Mon Sep 17 00:00:00 2001 From: Kyle Belanger Date: Sat, 2 Dec 2023 05:54:49 -0500 Subject: [PATCH] Working team setup --- AscNet.Common/MsgPack/Types.cs | 2 +- AscNet.GameServer/Handlers/FightModule.cs | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/AscNet.Common/MsgPack/Types.cs b/AscNet.Common/MsgPack/Types.cs index b75561f..e177d42 100644 --- a/AscNet.Common/MsgPack/Types.cs +++ b/AscNet.Common/MsgPack/Types.cs @@ -2351,7 +2351,7 @@ namespace AscNet.Common.MsgPack { public Int32 TeamId { get; set; } public Int32 CaptainPos { get; set; } - public Dictionary TeamData { get; set; } + public Dictionary TeamData { get; set; } public Int32 FirstFightPos { get; set; } public String TeamName { get; set; } } diff --git a/AscNet.GameServer/Handlers/FightModule.cs b/AscNet.GameServer/Handlers/FightModule.cs index ee97001..7ed7802 100644 --- a/AscNet.GameServer/Handlers/FightModule.cs +++ b/AscNet.GameServer/Handlers/FightModule.cs @@ -33,7 +33,7 @@ namespace AscNet.GameServer.Handlers [MessagePackObject(true)] public class Operation - { + { public bool? MoveOperated { get; set; } public int MoveOperation { get; set; } public int CameraRotationX { get; set; } @@ -119,7 +119,7 @@ namespace AscNet.GameServer.Handlers public dynamic? EpisodeFightResults { get; set; } public dynamic? CustomData { get; set; } } - + [MessagePackObject(true)] public class FightSettleRequest { @@ -191,6 +191,18 @@ namespace AscNet.GameServer.Handlers [RequestPacketHandler("TeamSetTeamRequest")] public static void HandleTeamSetTeamRequestHandler(Session session, Packet.Request packet) { + TeamSetTeamRequest req = MessagePackSerializer.Deserialize(packet.Content); + + session.player.TeamGroups[(int)session.player.PlayerData.CurrTeamId] = new() + { + CaptainPos = req.TeamData.CaptainPos, + FirstFightPos = req.TeamData.FirstFightPos, + TeamId = req.TeamData.TeamId, + TeamType = 1, + TeamName = req.TeamData.TeamName, + TeamData = req.TeamData.TeamData + }; + session.SendResponse(new TeamSetTeamResponse(), packet.Id); }