From 12b68b9a5fabfb2620da96138f78466e7a359b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= <jyp0036@gmail.com>
Date: Tue, 27 Feb 2024 21:38:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../System/Datas/ConsumableItemData.cs        | 17 ++++++++++++++++
 .../System/Datas/ConsumableItemData.cs.meta   | 11 ++++++++++
 .../1_Script/System/Datas/ExcelDatas.cs       |  7 +++----
 .../Assets/1_Script/System/Datas/ShopData.cs  | 17 ++++++++++++++++
 .../1_Script/System/Datas/ShopData.cs.meta    | 11 ++++++++++
 .../1_Script/System/Datas/ShopItemData.cs     | 20 +++++++++++++++++++
 .../System/Datas/ShopItemData.cs.meta         | 11 ++++++++++
 7 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 Client/Assets/1_Script/System/Datas/ConsumableItemData.cs
 create mode 100644 Client/Assets/1_Script/System/Datas/ConsumableItemData.cs.meta
 create mode 100644 Client/Assets/1_Script/System/Datas/ShopData.cs
 create mode 100644 Client/Assets/1_Script/System/Datas/ShopData.cs.meta
 create mode 100644 Client/Assets/1_Script/System/Datas/ShopItemData.cs
 create mode 100644 Client/Assets/1_Script/System/Datas/ShopItemData.cs.meta

diff --git a/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs b/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs
new file mode 100644
index 00000000..08ad4b91
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs
@@ -0,0 +1,17 @@
+
+public class ConsumableItemData : Excel
+{
+    public long index;
+    public string name;
+    public eItemType item_type;
+    public long reward;
+    public override void toJson()
+    {
+    }
+}
+public enum eItemType
+{
+    exp = 1,
+    package,
+    random
+}
\ No newline at end of file
diff --git a/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs.meta b/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs.meta
new file mode 100644
index 00000000..cf50ae34
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ConsumableItemData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2f94afff9bca74d4f9340e99b5b92695
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/1_Script/System/Datas/ExcelDatas.cs b/Client/Assets/1_Script/System/Datas/ExcelDatas.cs
index f61e1434..eefb1b89 100644
--- a/Client/Assets/1_Script/System/Datas/ExcelDatas.cs
+++ b/Client/Assets/1_Script/System/Datas/ExcelDatas.cs
@@ -7,10 +7,9 @@ public class ExcelDatas
     public Dictionary<long, UnitData> unitData;
     public Dictionary<long, AIData> aiData;
     public Dictionary<long, EquipmentData> equipmentData;
-
-
-
-
+    public Dictionary<long, ShopData> shopData;
+    public Dictionary<long, ShopItemData> shopItemData;
+    public Dictionary<long, ConsumableItemData> consumableItemData;
 
     public IEnumerator<float> ToJson(Action action)
     {
diff --git a/Client/Assets/1_Script/System/Datas/ShopData.cs b/Client/Assets/1_Script/System/Datas/ShopData.cs
new file mode 100644
index 00000000..4bb8285b
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ShopData.cs
@@ -0,0 +1,17 @@
+
+public class ShopData : Excel
+{
+    public long index;
+    public string name;
+    public eShopType type;
+    public override void toJson()
+    {
+
+    }
+}
+public enum eShopType
+{
+    bigImage = 1,
+    smallBox,
+    smallRandom
+}
\ No newline at end of file
diff --git a/Client/Assets/1_Script/System/Datas/ShopData.cs.meta b/Client/Assets/1_Script/System/Datas/ShopData.cs.meta
new file mode 100644
index 00000000..db36b0dc
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ShopData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec3d9f2741df00e4c801af8f6e0f109a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/1_Script/System/Datas/ShopItemData.cs b/Client/Assets/1_Script/System/Datas/ShopItemData.cs
new file mode 100644
index 00000000..e66e607d
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ShopItemData.cs
@@ -0,0 +1,20 @@
+public class ShopItemData : Excel
+{
+    public long index;
+    public string name;
+    public long shop_index;
+    public eBuyType buy_type;
+    public int buy;
+    public long reward;
+    public override void toJson()
+    {
+        
+    }
+}
+
+public enum eBuyType
+{
+    gold = 1,
+    cash,
+    money
+}
\ No newline at end of file
diff --git a/Client/Assets/1_Script/System/Datas/ShopItemData.cs.meta b/Client/Assets/1_Script/System/Datas/ShopItemData.cs.meta
new file mode 100644
index 00000000..cc77ec6b
--- /dev/null
+++ b/Client/Assets/1_Script/System/Datas/ShopItemData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa470d7be4edc3e4ea259674ccb7ac85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: