diff --git a/Assets/ResWork/Table/Export/ShopPackage.json b/Assets/ResWork/Table/Export/ShopPackage.json deleted file mode 100644 index 749503a48..000000000 --- a/Assets/ResWork/Table/Export/ShopPackage.json +++ /dev/null @@ -1 +0,0 @@ -[{"ID": "201", "Item1": "Gem,0,100", "Item2": "Food,101,10", "Item3": "Food,105,10", "Item4": "Food,102,10", "Item5": "Food,106,10", "Item6": "None,0,0", "info": "empty", "exception": "sss"}, {"ID": "202", "Item1": "mClover,0,10", "Item2": "Gem,0,2000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": "sss"}, {"ID": "203", "Item1": "ADRemove,0,1", "Item2": "Food,101,30", "Item3": "Food,105,30", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": "sss"}, {"ID": "204", "Item1": "Gem,0,3000", "Item2": "Weapon,21,1", "Item3": "Fairy,21,1", "Item4": "Food,102,30", "Item5": "Food,106,30", "Item6": "Food,110,30", "info": "empty", "exception": ""}, {"ID": "205", "Item1": "Gem,0,3000", "Item2": "Ring,21,1", "Item3": "Neck,21,1", "Item4": "Food,103,30", "Item5": "Food,107,30", "Item6": "Food,111,30", "info": "empty", "exception": ""}, {"ID": "206", "Item1": "Gem,0,3000", "Item2": "Boots,21,1", "Item3": "Pet,21,1", "Item4": "Food,104,30", "Item5": "Food,108,30", "Item6": "Food,112,30", "info": "empty", "exception": ""}, {"ID": "207", "Item1": "AllGambleTicket,0,1500", "Item2": "Food,109,60", "Item3": "Food,113,60", "Item4": "Food,117,60", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "208", "Item1": "WeaponTicket,0,1500", "Item2": "Food,110,60", "Item3": "Food,114,60", "Item4": "Food,118,60", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_weapon", "exception": ""}, {"ID": "209", "Item1": "RingTicket,0,1500", "Item2": "Food,111,60", "Item3": "Food,115,60", "Item4": "Food,119,60", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_ring", "exception": ""}, {"ID": "210", "Item1": "NeckTicket,0,1500", "Item2": "Food,112,60", "Item3": "Food,116,60", "Item4": "Food,120,60", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_neck", "exception": ""}, {"ID": "211", "Item1": "BootsTicket,0,1500", "Item2": "Food,101,90", "Item3": "Food,105,90", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_boots", "exception": ""}, {"ID": "212", "Item1": "FairyTicket,0,1500", "Item2": "Food,102,90", "Item3": "Food,106,90", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_fairy", "exception": ""}, {"ID": "213", "Item1": "MagicTicket,0,1500", "Item2": "Food,103,90", "Item3": "Food,107,90", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_magic", "exception": ""}, {"ID": "214", "Item1": "PetTicket,0,1500", "Item2": "Food,104,90", "Item3": "Food,108,90", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "chest_pet", "exception": ""}, {"ID": "215", "Item1": "Inven,49,100", "Item2": "Inven,50,50", "Item3": "Inven,51,10", "Item4": "Inven,3,10", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "216", "Item1": "Inven,49,300", "Item2": "Inven,50,150", "Item3": "Inven,51,30", "Item4": "Inven,3,100", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "217", "Item1": "Inven,49,500", "Item2": "Inven,50,250", "Item3": "Inven,51,50", "Item4": "Inven,3,1000", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "218", "Item1": "PC,15,1", "Item2": "Gem,0,30000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "sticker13", "exception": ""}, {"ID": "219", "Item1": "PC,17,1", "Item2": "Gem,0,30000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "sticker02", "exception": ""}, {"ID": "220", "Item1": "mClover,0,1000", "Item2": "Gem,0,10000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "221", "Item1": "MemoryField,0,1", "Item2": "MemoryForest,0,2", "Item3": "MemoryDungeon,0,1", "Item4": "MemoryWitchGrade,0,1", "Item5": "MemoryPetBattle,0,5", "Item6": "None,0,0", "info": "empty", "exception": ""}, {"ID": "222", "Item1": "PC,13,1", "Item2": "Gem,0,30000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "sticker11", "exception": ""}, {"ID": "223", "Item1": "PC,16,1", "Item2": "Gem,0,30000", "Item3": "None,0,0", "Item4": "None,0,0", "Item5": "None,0,0", "Item6": "None,0,0", "info": "sticker14", "exception": ""}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/ShopPackage.json.meta b/Assets/ResWork/Table/Export/ShopPackage.json.meta deleted file mode 100644 index 5f7a533a2..000000000 --- a/Assets/ResWork/Table/Export/ShopPackage.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: edb9fe441678123419c175f2c8c19d81 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 3c3faebea..5b3a24e82 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/Table/table_shoppackage.txt b/Assets/ResWork/Table/table_shoppackage.txt deleted file mode 100644 index 46644b3c6..000000000 --- a/Assets/ResWork/Table/table_shoppackage.txt +++ /dev/null @@ -1,29 +0,0 @@ -{ -"version" : 1, -"table_shoppackage" : -[ -{"ID":201,"Item1":"Gem,0,100","Item2":"Food,101,10","Item3":"Food,105,10","Item4":"Food,102,10","Item5":"Food,106,10","Item6":"None,0,0","info":"empty"}, -{"ID":202,"Item1":"mClover,0,10","Item2":"Gem,0,2000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":203,"Item1":"ADRemove,0,1","Item2":"Food,101,30","Item3":"Food,105,30","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":204,"Item1":"Gem,0,3000","Item2":"Weapon,21,1","Item3":"Fairy,21,1","Item4":"Food,102,30","Item5":"Food,106,30","Item6":"Food,110,30","info":"empty"}, -{"ID":205,"Item1":"Gem,0,3000","Item2":"Ring,21,1","Item3":"Neck,21,1","Item4":"Food,103,30","Item5":"Food,107,30","Item6":"Food,111,30","info":"empty"}, -{"ID":206,"Item1":"Gem,0,3000","Item2":"Boots,21,1","Item3":"Pet,21,1","Item4":"Food,104,30","Item5":"Food,108,30","Item6":"Food,112,30","info":"empty"}, -{"ID":207,"Item1":"AllGambleTicket,0,1500","Item2":"Food,109,60","Item3":"Food,113,60","Item4":"Food,117,60","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":208,"Item1":"WeaponTicket,0,1500","Item2":"Food,110,60","Item3":"Food,114,60","Item4":"Food,118,60","Item5":"None,0,0","Item6":"None,0,0","info":"chest_weapon"}, -{"ID":209,"Item1":"RingTicket,0,1500","Item2":"Food,111,60","Item3":"Food,115,60","Item4":"Food,119,60","Item5":"None,0,0","Item6":"None,0,0","info":"chest_ring"}, -{"ID":210,"Item1":"NeckTicket,0,1500","Item2":"Food,112,60","Item3":"Food,116,60","Item4":"Food,120,60","Item5":"None,0,0","Item6":"None,0,0","info":"chest_neck"}, -{"ID":211,"Item1":"BootsTicket,0,1500","Item2":"Food,101,90","Item3":"Food,105,90","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"chest_boots"}, -{"ID":212,"Item1":"FairyTicket,0,1500","Item2":"Food,102,90","Item3":"Food,106,90","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"chest_fairy"}, -{"ID":213,"Item1":"MagicTicket,0,1500","Item2":"Food,103,90","Item3":"Food,107,90","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"chest_magic"}, -{"ID":214,"Item1":"PetTicket,0,1500","Item2":"Food,104,90","Item3":"Food,108,90","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"chest_pet"}, -{"ID":215,"Item1":"Inven,49,100","Item2":"Inven,50,50","Item3":"Inven,51,10","Item4":"Inven,3,10","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":216,"Item1":"Inven,49,300","Item2":"Inven,50,150","Item3":"Inven,51,30","Item4":"Inven,3,100","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":217,"Item1":"Inven,49,500","Item2":"Inven,50,250","Item3":"Inven,51,50","Item4":"Inven,3,1000","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":218,"Item1":"PC,15,1","Item2":"Gem,0,30000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"sticker13"}, -{"ID":219,"Item1":"PC,17,1","Item2":"Gem,0,30000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"sticker02"}, -{"ID":220,"Item1":"mClover,0,1000","Item2":"Gem,0,10000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"empty"}, -{"ID":221,"Item1":"MemoryField,0,1","Item2":"MemoryForest,0,2","Item3":"MemoryDungeon,0,1","Item4":"MemoryWitchGrade,0,1","Item5":"MemoryPetBattle,0,5","Item6":"None,0,0","info":"empty"}, -{"ID":222,"Item1":"PC,13,1","Item2":"Gem,0,30000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"sticker11"}, -{"ID":223,"Item1":"PC,16,1","Item2":"Gem,0,30000","Item3":"None,0,0","Item4":"None,0,0","Item5":"None,0,0","Item6":"None,0,0","info":"sticker14"} -] -} diff --git a/Assets/ResWork/Table/table_shoppackage.txt.meta b/Assets/ResWork/Table/table_shoppackage.txt.meta deleted file mode 100644 index 1f2c2af0e..000000000 --- a/Assets/ResWork/Table/table_shoppackage.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7eefae88b6999994b86c6c77a27bec40 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/Table/table_shoppackage.xls b/Assets/ResWork/Table/table_shoppackage.xls deleted file mode 100644 index 69be6669f..000000000 Binary files a/Assets/ResWork/Table/table_shoppackage.xls and /dev/null differ diff --git a/Assets/ResWork/Table/table_shoppackage.xls.meta b/Assets/ResWork/Table/table_shoppackage.xls.meta deleted file mode 100644 index 8835df4e2..000000000 --- a/Assets/ResWork/Table/table_shoppackage.xls.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a34d3f8b44fbf3f4f9bf5caf525fbcf1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Title/Tables.prefab b/Assets/ResWork/UIPrefabs/Title/Tables.prefab index c607a88a9..a4fd2e5c1 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -60,7 +60,6 @@ GameObject: - component: {fileID: 9156396385659421691} - component: {fileID: 2436553746457918179} - component: {fileID: 4055146139003032682} - - component: {fileID: 2932769238564568299} - component: {fileID: 8336571791487988917} - component: {fileID: 6191931672819062764} - component: {fileID: 3622786898951503231} @@ -763,19 +762,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: f86ac94e849d21e4cae89b9190ae265c, type: 3} ---- !u!114 &2932769238564568299 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043163894663193716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f76a35026c834fa488cc969c533c6f02, type: 3} - m_Name: - m_EditorClassIdentifier: - m_json: {fileID: 4900000, guid: 7eefae88b6999994b86c6c77a27bec40, type: 3} --- !u!114 &8336571791487988917 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Table/table_shoppackage.cs b/Assets/Script/Table/table_shoppackage.cs deleted file mode 100644 index 82061de32..000000000 --- a/Assets/Script/Table/table_shoppackage.cs +++ /dev/null @@ -1,50 +0,0 @@ -using MiniJSON; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ShopPackgeTableData : TableDataBase -{ - public List itemdata = new List(); -} - -public class table_shoppackage : MonoBehaviour -{ - public static table_shoppackage Ins; - - public TextAsset m_json; - - private List list_Data = new List(); - - private void Awake() - { - Ins = this; - - Dictionary jsonData = Json.Deserialize(m_json.text) as Dictionary; - - // ["items"]은 items.txt 안의 items를 가리킨다. 툴 우측 하단 파일 종류란에서 설정 가능. - List obj = jsonData[GetType().Name] as List; - - foreach (object objt in obj) - { - var temp = new ShopPackgeTableData(); - Dictionary json = objt as Dictionary; - - temp.ID = int.Parse(json["ID"].ToString()); - for (int i = 0; i < 6; i++) - { - var split = json[DSUtil.Format("Item{0}", i + 1)].ToString().Split(','); - temp.itemdata.Add(new ItemSimpleData - { - itemid = int.Parse(split[1]), - amount = double.Parse(split[2]), - }); - } - - list_Data.Add(temp); - } - } - - public List Get_DataList() { return list_Data; } - public ShopPackgeTableData Get_Data(int _id) { return list_Data.Find(f => f.ID == _id) as ShopPackgeTableData; } -} \ No newline at end of file diff --git a/Assets/Script/Table/table_shoppackage.cs.meta b/Assets/Script/Table/table_shoppackage.cs.meta deleted file mode 100644 index 017787161..000000000 --- a/Assets/Script/Table/table_shoppackage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f76a35026c834fa488cc969c533c6f02 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: