diff --git a/Server/SQL/DeckUnitInfo.cs b/Server/SQL/DeckUnitInfo.cs index 0dd3ed9..5e82ed5 100644 --- a/Server/SQL/DeckUnitInfo.cs +++ b/Server/SQL/DeckUnitInfo.cs @@ -11,6 +11,14 @@ namespace Server.SQL public int id { get; set; } public int unit_id { get; set; } public int user_id { get; set; } + public int equip0 { get; set; } + public int equip1 { get; set; } + public int equip2 { get; set; } + public int equip3 { get; set; } + public int equip4 { get; set; } + public int equip5 { get; set; } + public int level { get; set; } + public int exp { get; set; } } public class DeckUnitInfoSQL : SQL diff --git a/Server/SQL/Equipment.cs b/Server/SQL/Equipment.cs index 8ceddb0..a123dff 100644 --- a/Server/SQL/Equipment.cs +++ b/Server/SQL/Equipment.cs @@ -13,6 +13,7 @@ namespace Server.SQL public int user_id { get; set; } public int equip_unit { get; set; } public int rand_stats { get; set; } + public int equipment_data_id { get; set; } } public class EquipmentrSQL : SQL diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index 58fda59..271c28b 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -10,14 +10,16 @@ namespace Server.Service public override string Process() { UserSQL userSql = new UserSQL(); + DynamicDataSQL dynamicDataSQL = new DynamicDataSQL(); DeckUnitInfoSQL deckUnitInfoSQL = new DeckUnitInfoSQL(); DeckInfoSQL deckInfoSQL = new DeckInfoSQL(); EquipmentrSQL equipmentrSQL = new EquipmentrSQL(); User user; + List dynamicDataList = dynamicDataSQL.Select(); List deckUnitInfoList = null; List deckInfoList = null; List equipmentList = null; - Console.WriteLine(req.uuid); + if (req.uuid == "") { //최초 메일 로그인 @@ -116,7 +118,7 @@ namespace Server.Service - return makeResp(user, deckUnitInfoList, deckInfoList, equipmentList); + return makeResp(user, dynamicDataList, deckUnitInfoList, deckInfoList, equipmentList); } public override Protocol ProtocolValue() => Protocol.Login; @@ -127,11 +129,12 @@ namespace Server.Service return req; } - private string makeResp(User user, List deck_unit, List deck_info, List equipment) + private string makeResp(User user, List dynamic_data, List deck_unit, List deck_info, List equipment) { LoginResp resp = new LoginResp(); resp.nickname = user.nickname; resp.uuid = user.uuid; + resp.dynamic_data = dynamic_data; resp.deck_unit = deck_unit; resp.deck_info = deck_info; resp.equipment = equipment; @@ -158,6 +161,7 @@ namespace Server.Service { public string uuid; public string nickname; + public List dynamic_data; public List deck_unit; public List deck_info; public List equipment;