diff --git a/Server/Manager/ItemManager.cs b/Server/Manager/ItemManager.cs index 3532ce4..f8083a7 100644 --- a/Server/Manager/ItemManager.cs +++ b/Server/Manager/ItemManager.cs @@ -80,6 +80,7 @@ namespace Server.Manager { DeckUnitInfo deckUnitInfo = new DeckUnitInfo(); deckUnitInfo.user_id = user.id; + deckUnitInfo.count = 1; deckUnitInfo.unit_data_id = unitDataId; box.Add(deckUnitInfo); } diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs index ca3f40b..fd2e1ea 100644 --- a/Server/Service/Login.cs +++ b/Server/Service/Login.cs @@ -16,6 +16,7 @@ namespace Server.Service { User user; + bool newUser = false; #region 로그인 List dynamicDataList = Statics.dynamicDataSQL.Select(); List deckInfoList = null; @@ -50,6 +51,7 @@ namespace Server.Service throw new RuntimeException("Not User", Error.nodata); } #region 신규유저 생성 + newUser = true; user = new User(); user.mail = req.mail; user.uuid = Guid.NewGuid().ToString(); @@ -89,11 +91,7 @@ namespace Server.Service } #endregion - //#region 상점 아이템 - //List shopItemDatas = Statics.shopItemExcel.getShopItemData(); - //#endregion - - return makeResp(user, dynamicDataList, deckInfoList, itemManager); + return makeResp(user, dynamicDataList, deckInfoList, itemManager, newUser); } public override Protocol ProtocolValue() => Protocol.Login; @@ -104,16 +102,17 @@ namespace Server.Service return req; } - private string makeResp(User user, List dynamic_data, List deck_info, ItemManager itemManager) + private string makeResp(User user, List dynamicData, List deckInfo, ItemManager itemManager, bool newUser) { LoginResp resp = new LoginResp(); resp.nickname = user.nickname; resp.uuid = user.uuid; resp.gold = (ulong)user.gold; resp.cash = (ulong)(user.free_cash + user.pay_cash); - resp.dynamic_data = dynamic_data; + resp.new_user = newUser; + resp.dynamic_data = dynamicData; resp.deck_unit = itemManager.box.deckUnitInfo; - resp.deck_info = deck_info; + resp.deck_info = deckInfo; resp.equipment = itemManager.box.equipment; resp.consumableItem = itemManager.box.consumableItem; resp.etcItem = itemManager.box.etcItem; @@ -142,6 +141,7 @@ namespace Server.Service public string nickname; public ulong gold; public ulong cash; + public bool new_user; public List dynamic_data; public List deck_unit; public List deck_info;