diff --git a/nksrv/LobbyServer/Msgs/GetGacha.cs b/nksrv/LobbyServer/Msgs/GetGacha.cs index 9479b04..4e58404 100644 --- a/nksrv/LobbyServer/Msgs/GetGacha.cs +++ b/nksrv/LobbyServer/Msgs/GetGacha.cs @@ -13,9 +13,12 @@ namespace nksrv.LobbyServer.Msgs { protected override async Task HandleAsync() { - var req = ReadData(); + var req = await ReadData(); + var user = GetUser(); var response = new ResGetGachaData(); + if (user.GachaTutorialPlayCount > 0) + response.Gacha.Add(new NetUserGachaData() { GachaType = 3, PlayCount = 1 }); WriteData(response); } } diff --git a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs b/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs index 5081aaf..54fd771 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs @@ -12,9 +12,14 @@ namespace nksrv.LobbyServer.Msgs.Inventory { protected override async Task HandleAsync() { - var req = ReadData(); + var req = await ReadData(); + var user = GetUser(); var response = new ResGetInventoryData(); + foreach (var item in user.Items) + { + response.Items.Add(new NetUserItemData() { Tid = item.ItemType, Count = 1 }); + } // TODO implement diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs b/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs index bdd7b66..32146ba 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs @@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger { protected override async Task HandleAsync() { - var req = ReadData(); + var req = await ReadData(); // TODO: save these things var response = new ResGetMessages(); diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs b/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs index 3701176..f48bb6c 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs @@ -7,7 +7,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost { protected override async Task HandleAsync() { - var req = ReadData(); + var req = await ReadData(); // TODO: save these things var response = new ResGetRecycleRoomData(); diff --git a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs b/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs index 31b4d47..deab9e6 100644 --- a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs +++ b/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs @@ -27,8 +27,8 @@ namespace nksrv.LobbyServer.Msgs.User response.SynchroLv = 1; response.OutpostBattleLevel = user.OutpostBattleLevel; response.OutpostBattleTime = new NetOutpostBattleTime() { MaxBattleTime = 864000000000, MaxOverBattleTime = 12096000000000, BattleTime = battleTimeMs }; - response.CommanderRoomJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 10, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.CommanderRoom }; - response.LobbyJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 10, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.Lobby }; + response.CommanderRoomJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.CommanderRoom }; + response.LobbyJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.Lobby }; // Add default slot data if (user.RepresentationTeamData.Slots.Count == 0) @@ -51,6 +51,11 @@ namespace nksrv.LobbyServer.Msgs.User { response.Character.Add(new NetUserCharacterData() { Default = new() { Csn = item.Csn, Skill1Lv = item.Skill1Lvl, Skill2Lv = item.Skill2Lvl, CostumeId = item.CostumeId, Lv = item.Level, Grade = item.Grade, Tid = item.Tid, UltiSkillLv = item.UltimateLevel } }); } + foreach (var item in user.Items) + { + response.Items.Add(new NetUserItemData() { Count = 1, Tid = item.ItemType}); + } + // Add squad data if there are characters if (user.Characters.Count > 0) diff --git a/nksrv/LobbyServer/Msgs/User/GetUser.cs b/nksrv/LobbyServer/Msgs/User/GetUser.cs index 8dcd06e..ea9131a 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUser.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUser.cs @@ -40,8 +40,9 @@ namespace nksrv.LobbyServer.Msgs.User int tutorialVersion = item == 1020101 ? 1 : 0; // TODO response.User.Tutorials.Add(new NetTutorialData() { GroupId = groupId, LastClearedTid = item, LastClearedVersion = tutorialVersion }); } - response.CommanderRoomJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 8989001, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.CommanderRoom }; - response.LobbyJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 8989001, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.Lobby }; + response.CommanderRoomJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.CommanderRoom }; + response.LobbyJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.Lobby }; + WriteData(response); } }