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 unitData; public Dictionary aiData; public Dictionary equipmentData; - - - - + public Dictionary shopData; + public Dictionary shopItemData; + public Dictionary consumableItemData; public IEnumerator 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: