From 453775ea9a4ed5a8e08fd1b37c874943dc62fa85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= <jyp0036@gmail.com>
Date: Sat, 9 Mar 2024 19:23:19 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=A0?=
 =?UTF-8?q?=EA=B7=9C=EC=9C=A0=EC=A0=80=20=EC=97=AC=EB=B6=80=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=20=EB=B0=8F=20=EC=9C=A0=EB=8B=9B=20count=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/Manager/ItemManager.cs |  1 +
 Server/Service/Login.cs       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

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<DynamicData> dynamicDataList = Statics.dynamicDataSQL.Select();
             List<DeckInfo> 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<ShopItemData> 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<DynamicData> dynamic_data,  List<DeckInfo> deck_info, ItemManager itemManager)
+        private string makeResp(User user, List<DynamicData> dynamicData,  List<DeckInfo> 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<DynamicData> dynamic_data;
         public List<DeckUnitInfo> deck_unit;
         public List<DeckInfo> deck_info;