diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index a5ee74e8a..e34ae7fa9 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -66,4 +66,3 @@ messageinfo 엄청 느린 버그 - 랭킹 15분마다 갱신 - 시작 시 입장권 차감 - - 랭킹 UI 통합(랭킹 및 랭킹 보상이 기본) diff --git a/Assets/ResWork/Table/Export/RankRewardList.json b/Assets/ResWork/Table/Export/RankRewardList.json index 949343933..7bf646886 100644 --- a/Assets/ResWork/Table/Export/RankRewardList.json +++ b/Assets/ResWork/Table/Export/RankRewardList.json @@ -1 +1 @@ -[{"n_MinRank": "최소 순위", "n_MaxRank": "최대 순위", "n_RewardID": "달성 보상 ID", "n_RewardAmount": "달성 보상 수량"}, {"n_MinRank": "1", "n_MaxRank": "1", "n_RewardID": "2", "n_RewardAmount": "1"}, {"n_MinRank": "2", "n_MaxRank": "2", "n_RewardID": "2", "n_RewardAmount": "2"}, {"n_MinRank": "3", "n_MaxRank": "3", "n_RewardID": "2", "n_RewardAmount": "3"}, {"n_MinRank": "4", "n_MaxRank": "10", "n_RewardID": "2", "n_RewardAmount": "4"}, {"n_MinRank": "11", "n_MaxRank": "20", "n_RewardID": "2", "n_RewardAmount": "5"}, {"n_MinRank": "21", "n_MaxRank": "50", "n_RewardID": "2", "n_RewardAmount": "6"}, {"n_MinRank": "51", "n_MaxRank": "99999999", "n_RewardID": "2", "n_RewardAmount": "7"}] \ No newline at end of file +[{"e_Dungeon": "던전 타입", "n_MinRank": "최소 순위", "n_MaxRank": "최대 순위", "n_RewardID": "달성 보상 ID", "n_RewardAmount": "달성 보상 수량"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "1", "n_MaxRank": "1", "n_RewardID": "2", "n_RewardAmount": "1"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "2", "n_MaxRank": "2", "n_RewardID": "2", "n_RewardAmount": "2"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "3", "n_MaxRank": "3", "n_RewardID": "2", "n_RewardAmount": "3"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "4", "n_MaxRank": "10", "n_RewardID": "2", "n_RewardAmount": "4"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "11", "n_MaxRank": "20", "n_RewardID": "2", "n_RewardAmount": "5"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "21", "n_MaxRank": "50", "n_RewardID": "2", "n_RewardAmount": "6"}, {"e_Dungeon": "d2_Maze", "n_MinRank": "51", "n_MaxRank": "99999999", "n_RewardID": "2", "n_RewardAmount": "7"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "1", "n_MaxRank": "1", "n_RewardID": "1", "n_RewardAmount": "1"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "2", "n_MaxRank": "2", "n_RewardID": "1", "n_RewardAmount": "2"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "3", "n_MaxRank": "3", "n_RewardID": "1", "n_RewardAmount": "3"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "4", "n_MaxRank": "10", "n_RewardID": "1", "n_RewardAmount": "4"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "11", "n_MaxRank": "20", "n_RewardID": "1", "n_RewardAmount": "5"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "21", "n_MaxRank": "50", "n_RewardID": "1", "n_RewardAmount": "6"}, {"e_Dungeon": "d3_Nightmare", "n_MinRank": "51", "n_MaxRank": "99999999", "n_RewardID": "1", "n_RewardAmount": "7"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index b5af73624..d98dcc322 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/Table/Rank/table_rankrewardlist.cs b/Assets/Script/Table/Rank/table_rankrewardlist.cs index 2b5a1b78b..16948f6b7 100644 --- a/Assets/Script/Table/Rank/table_rankrewardlist.cs +++ b/Assets/Script/Table/Rank/table_rankrewardlist.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; [Serializable] public class RankRewardListTableData : TableDataBase { + public eDungeon e_Dungeon; + protected ObscuredInt _MinRank; public int n_MinRank { @@ -40,6 +42,7 @@ public class table_rankrewardlist : table_missionbase { public static table_rankrewardlist Ins; List tableDatas; + Dictionary> dic_datas = new Dictionary>(); protected override void Awake() { @@ -50,8 +53,14 @@ public class table_rankrewardlist : table_missionbase protected override void Start() { tableDatas = JsonConvert.DeserializeObject>(json_last); + for (int i = 0; i < tableDatas.Count; i++) + { + if (!dic_datas.ContainsKey(tableDatas[i].e_Dungeon)) + dic_datas.Add(tableDatas[i].e_Dungeon, new List()); + dic_datas[tableDatas[i].e_Dungeon].Add(tableDatas[i]); + } base.Start(); } - public List Get_DataList() { return tableDatas; } + public List Get_DataList(eDungeon dungeon) { return dic_datas[dungeon]; } } \ No newline at end of file diff --git a/Assets/Script/UI/Rank/RankingUI_Reward.cs b/Assets/Script/UI/Rank/RankingUI_Reward.cs index 7af0a8a03..db476c5fe 100644 --- a/Assets/Script/UI/Rank/RankingUI_Reward.cs +++ b/Assets/Script/UI/Rank/RankingUI_Reward.cs @@ -3,6 +3,6 @@ public class RankingUI_Reward : uScrollViewMgr public void Set(eDungeon dungeon) { gameObject.SetActive(true); - Set_ScrollView(table_rankrewardlist.Ins.Get_DataList()); + Set_ScrollView(table_rankrewardlist.Ins.Get_DataList(dungeon)); } } \ No newline at end of file