diff --git a/Assets/ResWork/Table/Export/WaveRewardList.json b/Assets/ResWork/Table/Export/WaveRewardList.json new file mode 100644 index 000000000..fd0497327 --- /dev/null +++ b/Assets/ResWork/Table/Export/WaveRewardList.json @@ -0,0 +1 @@ +[{"n_Difficult": "난이도", "n_Score": "필요 점수", "n_RewardID": "달성 보상 ID", "n_RewardAmount": "달성 보상 수량"}, {"n_Difficult": "1", "n_Score": "50", "n_RewardID": "1", "n_RewardAmount": "1"}, {"n_Difficult": "1", "n_Score": "100", "n_RewardID": "1", "n_RewardAmount": "2"}, {"n_Difficult": "1", "n_Score": "150", "n_RewardID": "1", "n_RewardAmount": "3"}, {"n_Difficult": "1", "n_Score": "200", "n_RewardID": "1", "n_RewardAmount": "4"}, {"n_Difficult": "1", "n_Score": "250", "n_RewardID": "1", "n_RewardAmount": "5"}, {"n_Difficult": "1", "n_Score": "300", "n_RewardID": "1", "n_RewardAmount": "6"}, {"n_Difficult": "2", "n_Score": "350", "n_RewardID": "1", "n_RewardAmount": "7"}, {"n_Difficult": "2", "n_Score": "400", "n_RewardID": "1", "n_RewardAmount": "8"}, {"n_Difficult": "2", "n_Score": "450", "n_RewardID": "1", "n_RewardAmount": "9"}, {"n_Difficult": "2", "n_Score": "500", "n_RewardID": "1", "n_RewardAmount": "10"}, {"n_Difficult": "2", "n_Score": "550", "n_RewardID": "1", "n_RewardAmount": "11"}, {"n_Difficult": "2", "n_Score": "600", "n_RewardID": "1", "n_RewardAmount": "12"}, {"n_Difficult": "3", "n_Score": "650", "n_RewardID": "1", "n_RewardAmount": "13"}, {"n_Difficult": "3", "n_Score": "700", "n_RewardID": "1", "n_RewardAmount": "14"}, {"n_Difficult": "3", "n_Score": "750", "n_RewardID": "1", "n_RewardAmount": "15"}, {"n_Difficult": "3", "n_Score": "800", "n_RewardID": "1", "n_RewardAmount": "16"}, {"n_Difficult": "3", "n_Score": "850", "n_RewardID": "1", "n_RewardAmount": "17"}, {"n_Difficult": "3", "n_Score": "900", "n_RewardID": "1", "n_RewardAmount": "18"}, {"n_Difficult": "3", "n_Score": "950", "n_RewardID": "1", "n_RewardAmount": "19"}, {"n_Difficult": "3", "n_Score": "1000", "n_RewardID": "1", "n_RewardAmount": "20"}, {"n_Difficult": "4", "n_Score": "1050", "n_RewardID": "1", "n_RewardAmount": "21"}, {"n_Difficult": "4", "n_Score": "1100", "n_RewardID": "1", "n_RewardAmount": "22"}, {"n_Difficult": "4", "n_Score": "1150", "n_RewardID": "1", "n_RewardAmount": "23"}, {"n_Difficult": "4", "n_Score": "1200", "n_RewardID": "1", "n_RewardAmount": "24"}, {"n_Difficult": "4", "n_Score": "1250", "n_RewardID": "1", "n_RewardAmount": "25"}, {"n_Difficult": "4", "n_Score": "1300", "n_RewardID": "1", "n_RewardAmount": "26"}, {"n_Difficult": "4", "n_Score": "1350", "n_RewardID": "1", "n_RewardAmount": "27"}, {"n_Difficult": "5", "n_Score": "1400", "n_RewardID": "1", "n_RewardAmount": "28"}, {"n_Difficult": "5", "n_Score": "1450", "n_RewardID": "1", "n_RewardAmount": "29"}, {"n_Difficult": "5", "n_Score": "1500", "n_RewardID": "1", "n_RewardAmount": "30"}, {"n_Difficult": "5", "n_Score": "1550", "n_RewardID": "1", "n_RewardAmount": "31"}, {"n_Difficult": "5", "n_Score": "1600", "n_RewardID": "1", "n_RewardAmount": "32"}, {"n_Difficult": "5", "n_Score": "1650", "n_RewardID": "1", "n_RewardAmount": "33"}, {"n_Difficult": "5", "n_Score": "1700", "n_RewardID": "1", "n_RewardAmount": "34"}, {"n_Difficult": "6", "n_Score": "1750", "n_RewardID": "1", "n_RewardAmount": "35"}, {"n_Difficult": "6", "n_Score": "1800", "n_RewardID": "1", "n_RewardAmount": "36"}, {"n_Difficult": "6", "n_Score": "1850", "n_RewardID": "1", "n_RewardAmount": "37"}, {"n_Difficult": "6", "n_Score": "1900", "n_RewardID": "1", "n_RewardAmount": "38"}, {"n_Difficult": "6", "n_Score": "1950", "n_RewardID": "1", "n_RewardAmount": "39"}, {"n_Difficult": "6", "n_Score": "2000", "n_RewardID": "1", "n_RewardAmount": "40"}, {"n_Difficult": "6", "n_Score": "2050", "n_RewardID": "1", "n_RewardAmount": "41"}, {"n_Difficult": "6", "n_Score": "2100", "n_RewardID": "1", "n_RewardAmount": "42"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/WaveRewardList.json.meta b/Assets/ResWork/Table/Export/WaveRewardList.json.meta new file mode 100644 index 000000000..16e731e12 --- /dev/null +++ b/Assets/ResWork/Table/Export/WaveRewardList.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef5964c7852acc54a9a737787e5c4e87 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 2446789c0..37bba2aee 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 06b03051f..4d9415847 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -70,6 +70,7 @@ GameObject: - component: {fileID: 1945925107405883718} - component: {fileID: -4383278693134355230} - component: {fileID: 3149704813866008907} + - component: {fileID: 7536875836770088219} - component: {fileID: 5575382242414862395} m_Layer: 0 m_Name: Tables @@ -893,6 +894,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: 6127a32d96327a14ea696f3467d84c4c, type: 3} +--- !u!114 &7536875836770088219 +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: a5af673acf0403040bff9192c6b056e5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_json: {fileID: 4900000, guid: ef5964c7852acc54a9a737787e5c4e87, type: 3} + MaxDiff: 0 --- !u!114 &5575382242414862395 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Table/Dungeon/table_waverewardlist.cs b/Assets/Script/Table/Dungeon/table_waverewardlist.cs new file mode 100644 index 000000000..af117472a --- /dev/null +++ b/Assets/Script/Table/Dungeon/table_waverewardlist.cs @@ -0,0 +1,66 @@ +using CodeStage.AntiCheat.ObscuredTypes; +using Newtonsoft.Json; +using System.Collections.Generic; + +public class WaveRewardListTableData : TableDataBase +{ + protected ObscuredInt _Difficult; + public int n_Difficult + { + get { return _Difficult; } + set { _Difficult = value; _Difficult.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Score; + public int n_Score + { + get { return _Score; } + set { _Score = value; _Score.RandomizeCryptoKey(); } + } + + protected ObscuredInt _RewardID; + public int n_RewardID + { + get { return _RewardID; } + set { _RewardID = value; _RewardID.RandomizeCryptoKey(); } + } + + protected ObscuredInt _RewardAmount; + public int n_RewardAmount + { + get { return _RewardAmount; } + set { _RewardAmount = value; _RewardAmount.RandomizeCryptoKey(); } + } + +} + +public class table_waverewardlist : table_missionbase +{ + public static table_waverewardlist Ins; + List tableDatas; + Dictionary> dic_Datas = new Dictionary>(); + public int MaxDiff; + + protected override void Awake() + { + base.Awake(); + Ins = this; + } + + protected override void Start() + { + tableDatas = JsonConvert.DeserializeObject>(json_last); + for (int i = 0; i < tableDatas.Count; i++) + { + var data = tableDatas[i]; + if (!dic_Datas.ContainsKey(data.n_Difficult)) + dic_Datas.Add(data.n_Difficult, new List()); + dic_Datas[data.n_Difficult].Add(data); + } + MaxDiff = tableDatas[tableDatas.Count - 1].n_Difficult; + base.Start(); + } + + public List Get_DataList() { return tableDatas; } + public List Get_DataList(int diff) { return dic_Datas[diff]; } +} \ No newline at end of file diff --git a/Assets/Script/Table/Dungeon/table_waverewardlist.cs.meta b/Assets/Script/Table/Dungeon/table_waverewardlist.cs.meta new file mode 100644 index 000000000..ba4fb06ba --- /dev/null +++ b/Assets/Script/Table/Dungeon/table_waverewardlist.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a5af673acf0403040bff9192c6b056e5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: