diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index c182509b3..d2d4d22b4 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -95,4 +95,3 @@ messageinfo 엄청 느린 버그 - 10회마다 영웅 등급 확정 - 서버 데이터 및 뽑기 - 테이블(GachaRandombag) - - 확률 UI \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GachaRandomBag.json b/Assets/ResWork/Table/Export/GachaRandomBag.json new file mode 100644 index 000000000..1866d4720 --- /dev/null +++ b/Assets/ResWork/Table/Export/GachaRandomBag.json @@ -0,0 +1 @@ +[{"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10101001"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10101002"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10101003"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10101004"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10101005"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10101006"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10101007"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10101008"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10101009"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10101010"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10101011"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10101012"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10101013"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10101014"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10101015"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10101016"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10101017"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10101018"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10101019"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10101020"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10101021"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10101022"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10101023"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10101024"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10101025"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10101026"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10101027"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10101028"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10101029"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10101030"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10101031"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10101032"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10101033"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10101034"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10101035"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10102001"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10102002"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10102003"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10102004"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10102005"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10102006"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10102007"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10102008"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10102009"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10102010"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10102011"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10102012"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10102013"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10102014"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10102015"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10102016"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10102017"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10102018"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10102019"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10102020"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10102021"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10102022"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10102023"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10102024"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10102025"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10102026"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10102027"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10102028"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10102029"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10102030"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10102031"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10102032"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10102033"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10102034"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10102035"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10103001"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10103002"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10103003"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10103004"}, {"n_ID": "30001", "n_Grade": "1", "e_RewardType": "Weapon", "n_RewardID": "10103005"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10103006"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10103007"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10103008"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10103009"}, {"n_ID": "30001", "n_Grade": "2", "e_RewardType": "Weapon", "n_RewardID": "10103010"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10103011"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10103012"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10103013"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10103014"}, {"n_ID": "30001", "n_Grade": "3", "e_RewardType": "Weapon", "n_RewardID": "10103015"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10103016"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10103017"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10103018"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10103019"}, {"n_ID": "30001", "n_Grade": "4", "e_RewardType": "Weapon", "n_RewardID": "10103020"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10103021"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10103022"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10103023"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10103024"}, {"n_ID": "30001", "n_Grade": "5", "e_RewardType": "Weapon", "n_RewardID": "10103025"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10103026"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10103027"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10103028"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10103029"}, {"n_ID": "30001", "n_Grade": "6", "e_RewardType": "Weapon", "n_RewardID": "10103030"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10103031"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10103032"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10103033"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10103034"}, {"n_ID": "30001", "n_Grade": "7", "e_RewardType": "Weapon", "n_RewardID": "10103035"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GachaRandomBag.json.meta b/Assets/ResWork/Table/Export/GachaRandomBag.json.meta new file mode 100644 index 000000000..ff7290023 --- /dev/null +++ b/Assets/ResWork/Table/Export/GachaRandomBag.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6947f4944152d040af786d6f912482f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/Export/GachaRateTable.json b/Assets/ResWork/Table/Export/GachaRateTable.json index d86af7b7f..358fce240 100644 --- a/Assets/ResWork/Table/Export/GachaRateTable.json +++ b/Assets/ResWork/Table/Export/GachaRateTable.json @@ -1 +1 @@ -[{"n_ID": "10001", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "2", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10004", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}] \ No newline at end of file +[{"n_ID": "10001", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "2", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "3", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "4", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "5", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10004", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index f7ee2ee71..772e622a9 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Title/Tables.prefab b/Assets/ResWork/UIPrefabs/Title/Tables.prefab index c80e365ff..3a0af86b9 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -72,6 +72,7 @@ GameObject: - component: {fileID: 5575382242414862395} - component: {fileID: 491739550810814342} - component: {fileID: 8426369912554284191} + - component: {fileID: 7080635587077051208} m_Layer: 0 m_Name: Tables m_TagString: Untagged @@ -920,3 +921,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: dbebb73bbeb46ba4fb9b288a10b00ba0, type: 3} +--- !u!114 &7080635587077051208 +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: ebc111ca7f3af824fa7b86fe2b30e1dd, type: 3} + m_Name: + m_EditorClassIdentifier: + m_json: {fileID: 4900000, guid: d6947f4944152d040af786d6f912482f, type: 3} diff --git a/Assets/Script/Table/Gacha/table_gacharandombag.cs b/Assets/Script/Table/Gacha/table_gacharandombag.cs new file mode 100644 index 000000000..fa1c43e42 --- /dev/null +++ b/Assets/Script/Table/Gacha/table_gacharandombag.cs @@ -0,0 +1,65 @@ +using CodeStage.AntiCheat.ObscuredTypes; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using Random = UnityEngine.Random; + +[Serializable] +public class GachaRandomBagTableData : TableDataBase +{ + ObscuredInt _ID; + public int n_ID + { + get { return _ID; } + set { _ID = value; _ID.RandomizeCryptoKey(); } + } // 랜덤백 고유 ID + + ObscuredInt _Grade; + public int n_Grade + { + get { return _Grade; } + set { _Grade = value; _Grade.RandomizeCryptoKey(); } + } // 아이템 등급 + + ObscuredInt _RewardID; + public int n_RewardID + { + get { return _RewardID; } + set { _RewardID = value; _RewardID.RandomizeCryptoKey(); } + } +} + +public class table_gacharandombag : table_missionbase +{ + public static table_gacharandombag Ins; + List tableDatas; + // (n_ID, n_Grade) + Dictionary<(int, int), List> dic_ItemData = new Dictionary<(int, int), List>(); + + protected override void Awake() + { + base.Awake(); + Ins = this; + } + + protected override void Start() + { + tableDatas = JsonConvert.DeserializeObject>(json_last); + for (int i = 0; i < Get_DataList().Count; i++) + { + var temp = Get_DataList()[i]; + + if (!dic_ItemData.ContainsKey((temp.n_ID, temp.n_Grade))) + dic_ItemData.Add((temp.n_ID, temp.n_Grade), new List()); + dic_ItemData[(temp.n_ID, temp.n_Grade)].Add(new ItemSimpleData { itemid = temp.n_RewardID, amount = 1 }); + } + + base.Start(); + } + + public ItemSimpleData Get_RandomItemData(int index, int grade) + { + return dic_ItemData[(index, grade)][Random.Range(0, dic_ItemData[(index, grade)].Count)]; + } + public List Get_DataList() { return tableDatas; } +} \ No newline at end of file diff --git a/Assets/Script/Table/Gacha/table_gacharandombag.cs.meta b/Assets/Script/Table/Gacha/table_gacharandombag.cs.meta new file mode 100644 index 000000000..5ff9667e9 --- /dev/null +++ b/Assets/Script/Table/Gacha/table_gacharandombag.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ebc111ca7f3af824fa7b86fe2b30e1dd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: