mirror of
https://github.com/EpinelPS/EpinelPS.git
synced 2025-12-15 08:24:52 +01:00
commit code from airplane
This commit is contained in:
@@ -21,22 +21,10 @@ namespace nksrv.LobbyServer.Msgs.Team
|
||||
// NOTE: Keep this in sync with EnterLobbyServer code
|
||||
if (user.Characters.Count > 0)
|
||||
{
|
||||
var team1 = new NetUserTeamData();
|
||||
team1.Type = 1;
|
||||
team1.LastContentsTeamNumber = 1;
|
||||
|
||||
var team1Sub = new NetTeamData();
|
||||
team1Sub.TeamNumber = 1;
|
||||
|
||||
// TODO: Save this properly. Right now return first 5 characters as a squad.
|
||||
for (int i = 1; i < 6; i++)
|
||||
foreach (var item in user.UserTeams)
|
||||
{
|
||||
var character = user.Characters[i - 1];
|
||||
team1Sub.Slots.Add(new NetTeamSlot() { Slot = i, Value = character.Csn });
|
||||
response.TypeTeams.Add(item.Value);
|
||||
}
|
||||
team1.Teams.Add(team1Sub);
|
||||
|
||||
response.TypeTeams.Add(team1);
|
||||
}
|
||||
WriteData(response);
|
||||
}
|
||||
|
||||
@@ -15,11 +15,24 @@ namespace nksrv.LobbyServer.Msgs.Team
|
||||
var req = await ReadData<ReqSetTeam>();
|
||||
var user = GetUser();
|
||||
|
||||
// TODO is this right
|
||||
var response = new ResSetTeam();
|
||||
response.Type = req.Type;
|
||||
response.Teams.AddRange(req.Teams.ToArray());
|
||||
|
||||
// TODO
|
||||
// Add team data to user data
|
||||
var teamData = new NetUserTeamData() { LastContentsTeamNumber = req.ContentsId, Type = req.Type };
|
||||
teamData.Teams.AddRange(req.Teams);
|
||||
|
||||
if (user.UserTeams.ContainsKey(req.Type))
|
||||
{
|
||||
user.UserTeams[req.Type] = teamData;
|
||||
}
|
||||
else
|
||||
{
|
||||
user.UserTeams.Add(req.Type, teamData);
|
||||
}
|
||||
JsonDb.Save();
|
||||
|
||||
WriteData(response);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user