From 999a80e229220b4ef1d1a6e551899cd5497d0244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=9C?= <mskim@dragonflygame.com>
Date: Wed, 28 Feb 2024 11:08:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/SQL/RandomRewardData.cs | 12 +++++++-----
 Server/SQL/RewardData.cs       | 11 ++++++-----
 Server/SQL/ShopItemData.cs     | 12 +++++++-----
 Server/Service/Login.cs        |  7 ++++++-
 Server/System/Statics.cs       |  3 +++
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Server/SQL/RandomRewardData.cs b/Server/SQL/RandomRewardData.cs
index 71a0b59..6e72396 100644
--- a/Server/SQL/RandomRewardData.cs
+++ b/Server/SQL/RandomRewardData.cs
@@ -27,15 +27,17 @@ namespace Server.SQL
         {
             return randomRewardData.Values.ToList();
         }
-        public void init(sheet data)
+        public void init(Sheet data)
         {
             this.randomRewardData = new Dictionary<long, RandomRewardData>();
             foreach (var item in data.dicViewer)
             {
-                //RandomRewardData RandomRewardData = new RandomRewardData();
-                //RandomRewardData.index = item.Key;
-                //RandomRewardData.part = (int)item.Value["part"];
-                //this.RandomRewardData.Add(item.Key, RandomRewardData);
+                RandomRewardData randomRewardData = new RandomRewardData();
+                randomRewardData.index = item.Key;
+                randomRewardData.group = (int)item.Value["group"];
+                randomRewardData.reward = (long)item.Value["reward"];
+                randomRewardData.prob = (int)item.Value["prob"];
+                this.randomRewardData.Add(item.Key, randomRewardData);
             }
         }
     }
diff --git a/Server/SQL/RewardData.cs b/Server/SQL/RewardData.cs
index 3ccf279..ffb3ae7 100644
--- a/Server/SQL/RewardData.cs
+++ b/Server/SQL/RewardData.cs
@@ -37,15 +37,16 @@ namespace Server.SQL
         {
             return rewardData.Values.ToList();
         }
-        public void init(sheet data)
+        public void init(Sheet data)
         {
             this.rewardData = new Dictionary<long, RewardData>();
             foreach (var item in data.dicViewer)
             {
-                //RewardData RewardData = new RewardData();
-                //RewardData.index = item.Key;
-                //RewardData.part = (int)item.Value["part"];
-                //this.RewardData.Add(item.Key, RewardData);
+                RewardData rewardData = new RewardData();
+                rewardData.index = item.Key;
+                rewardData.buy_type = (eBuyType)item.Value["part"];
+                rewardData.return_item = (long)item.Value["return_item"];
+                this.rewardData.Add(item.Key, rewardData);
             }
         }
     }
diff --git a/Server/SQL/ShopItemData.cs b/Server/SQL/ShopItemData.cs
index f1ba7d9..7724d43 100644
--- a/Server/SQL/ShopItemData.cs
+++ b/Server/SQL/ShopItemData.cs
@@ -34,15 +34,17 @@ namespace Server.SQL
         {
             return shopItemData.Values.ToList();
         }
-        public void init(sheet data)
+        public void init(Sheet data)
         {
             this.shopItemData = new Dictionary<long, ShopItemData>();
             foreach (var item in data.dicViewer)
             {
-                //ShopItemData ShopItemData = new ShopItemData();
-                //ShopItemData.index = item.Key;
-                //ShopItemData.part = (int)item.Value["part"];
-                //this.ShopItemData.Add(item.Key, ShopItemData);
+                ShopItemData shopItemData = new ShopItemData();
+                shopItemData.index = item.Key;
+                shopItemData.buy_type = (eBuyType)item.Value["buy_type"];
+                shopItemData.buy = (int)item.Value["buy"];
+                shopItemData.reward = (long)item.Value["reward"];
+                this.shopItemData.Add(item.Key, shopItemData);
             }
         }
     }
diff --git a/Server/Service/Login.cs b/Server/Service/Login.cs
index 9f02356..d24e8f3 100644
--- a/Server/Service/Login.cs
+++ b/Server/Service/Login.cs
@@ -14,11 +14,11 @@ namespace Server.Service
         {
 
             User user;
+            #region 로그인
             List<DynamicData> dynamicDataList = Statics.dynamicDataSQL.Select();
             List<DeckUnitInfo> deckUnitInfoList = null;
             List<DeckInfo> deckInfoList = null;
             List<Equipment> equipmentList = null;
-
             if (req.uuid == "")
             {
                 //최초 메일 로그인
@@ -116,6 +116,11 @@ namespace Server.Service
                 equipmentList = new List<Equipment>();
                 #endregion
             }
+            #endregion
+
+            //#region 상점 아이템
+            //List<ShopItemData> shopItemDatas = Statics.shopItemExcel.getShopItemData();
+            //#endregion
 
             return makeResp(user, dynamicDataList, deckUnitInfoList, deckInfoList, equipmentList);
         }
diff --git a/Server/System/Statics.cs b/Server/System/Statics.cs
index 3e7910b..e6ea785 100644
--- a/Server/System/Statics.cs
+++ b/Server/System/Statics.cs
@@ -28,5 +28,8 @@ namespace Server.System
 
         //DATA
         public static EquipmentDataExcel equipmentExcel = new EquipmentDataExcel();
+        public static RandomRewardDataExcel randomRewardExcel = new RandomRewardDataExcel();
+        public static RewardDataExcel rewardExcel = new RewardDataExcel();
+        public static ShopItemDataExcel shopItemExcel = new ShopItemDataExcel();
     }
 }