From 933926276cb92975d146750727eb58764381a084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= <jyp0036@gmail.com>
Date: Fri, 15 Dec 2023 22:24:31 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EB=B9=84=20=EC=9E=A5=EC=B0=A9=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B0=98=20=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/SQL/DeckUnitInfo.cs |  8 ++++++++
 Server/SQL/Equipment.cs    |  1 +
 Server/Service/Login.cs    | 10 +++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

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<DeckUnitInfo>
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<Equipment>
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<DynamicData> dynamicDataList = dynamicDataSQL.Select();
             List<DeckUnitInfo> deckUnitInfoList = null;
             List<DeckInfo> deckInfoList = null;
             List<Equipment> 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<DeckUnitInfo> deck_unit, List<DeckInfo> deck_info, List<Equipment> equipment)
+        private string makeResp(User user, List<DynamicData> dynamic_data,  List<DeckUnitInfo> deck_unit, List<DeckInfo> deck_info, List<Equipment> 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<DynamicData> dynamic_data;
         public List<DeckUnitInfo> deck_unit;
         public List<DeckInfo> deck_info;
         public List<Equipment> equipment;