diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 304dcacb8..965ef6ba1 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -91,12 +91,7 @@ messageinfo 엄청 느린 버그 - 무기, 방어구, 장신구, 스킬 - 장비뽑기는 챕터에 따라 레벨 증가, 스킬 x - 장비(100회), 스킬(200회) 마다 설정된 장비 중 하나 선택해서 획득 + - 50회마다 전설 등급 확정 - 10회마다 영웅 등급 확정 - 서버 데이터 및 뽑기 - - - 뽑기권 0개면 캐시만 노출 - - 뽑기권 부족하면 뽑을 수 있는 뽑기권 + 캐시 노출 - - 뽑기권 사용 가능하면 뽑기권만 노출 - - - 뽑기권은 탭마다 있음 \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GachaConfig.json b/Assets/ResWork/Table/Export/GachaConfig.json index f68e338a9..f5922d68e 100644 --- a/Assets/ResWork/Table/Export/GachaConfig.json +++ b/Assets/ResWork/Table/Export/GachaConfig.json @@ -1 +1 @@ -[{"n_ID": "10001", "n_Title": "290", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "401", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "40001", "n_PickupReward": "20001"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "402", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "40002", "n_PickupReward": "20002"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "403", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "40003", "n_PickupReward": "20003"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "", "b_StageLv": "False", "n_GachaPrice": "1000", "n_GachaGoodsID": "1", "n_GachaTicketID": "404", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "40004", "n_PickupReward": "20004"}] \ No newline at end of file +[{"n_ID": "10001", "n_Title": "290", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "401", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "30001", "n_PickupReward": "20001"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "402", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "40002", "n_PickupReward": "20002"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "", "b_StageLv": "True", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_GachaTicketID": "403", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "40003", "n_PickupReward": "20003"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "", "b_StageLv": "False", "n_GachaPrice": "1000", "n_GachaGoodsID": "1", "n_GachaTicketID": "404", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "40004", "n_PickupReward": "20004"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 469eeea28..7875ddf05 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/Table/Gacha/table_gachaconfig.cs b/Assets/Script/Table/Gacha/table_gachaconfig.cs index f71ba219b..ce89468c0 100644 --- a/Assets/Script/Table/Gacha/table_gachaconfig.cs +++ b/Assets/Script/Table/Gacha/table_gachaconfig.cs @@ -58,6 +58,8 @@ public class GachaConfigTableData : TableDataBase get { return _PickupReward; } set { _PickupReward = value; _PickupReward.RandomizeCryptoKey(); } } + + public Dictionary dic_randomgbag = new Dictionary(); } public class table_gachaconfig : table_missionbase @@ -78,6 +80,8 @@ public class table_gachaconfig : table_missionbase for (int i = 0; i < Get_DataList().Count; i++) { var temp = Get_DataList()[i]; + temp.dic_randomgbag.Add(1, temp.n_NormalRandombag); + temp.dic_randomgbag.Add(10, temp.n_Extra10_Randombag); dic_Data.Add(temp.n_ID, temp); } diff --git a/Assets/Script/UI/Gacha/GachaBase.cs b/Assets/Script/UI/Gacha/GachaBase.cs index 664ba74c4..f2d0a6c66 100644 --- a/Assets/Script/UI/Gacha/GachaBase.cs +++ b/Assets/Script/UI/Gacha/GachaBase.cs @@ -18,7 +18,7 @@ public class GachaBase : MonoBehaviour Set_UI(); } - void Set_UI() + public void Set_UI() { gacha_btns[0].Set(10, m_Data); gacha_btns[1].Set(1, m_Data); diff --git a/Assets/Script/UI/Gacha/GachaUI.cs b/Assets/Script/UI/Gacha/GachaUI.cs index c767d5add..e00c29d10 100644 --- a/Assets/Script/UI/Gacha/GachaUI.cs +++ b/Assets/Script/UI/Gacha/GachaUI.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; public class GachaUI : BotMenuBase @@ -26,11 +27,16 @@ public class GachaUI : BotMenuBase OnClick_Tab(); } + public void Set_Money() + { + Set_Money(table_GlobalValue.Ins.Get_Int("n_CashItemID"), + table_gachaconfig.Ins.Get_Data_orNull(dic_tab[m_Tab.Get_Index()]).n_GachaTicketID); + } + private void OnClick_Tab() { - var index = m_Tab.Get_Index(); - m_gachaBase.Set(dic_tab[index]); - Set_Money(table_GlobalValue.Ins.Get_Int("n_CashItemID"), table_gachaconfig.Ins.Get_Data_orNull(dic_tab[index]).n_GachaTicketID); + m_gachaBase.Set(dic_tab[m_Tab.Get_Index()]); + Set_Money(); } public void OnClick_Rate() diff --git a/Assets/Script/UI/Gacha/btn_gacha.cs b/Assets/Script/UI/Gacha/btn_gacha.cs index 28fa79216..ebd869579 100644 --- a/Assets/Script/UI/Gacha/btn_gacha.cs +++ b/Assets/Script/UI/Gacha/btn_gacha.cs @@ -1,4 +1,5 @@ using CodeStage.AntiCheat.ObscuredTypes; +using System.Collections.Generic; using TMPro; using UnityEngine; @@ -89,10 +90,17 @@ public class btn_gacha : MonoBehaviour { var sdata = ServerInfo.Ins.m_ServerData; var rateData = table_gacharate.Ins.Get_Data(m_Data.n_ID, m_Data.b_StageLv ? sdata.MapData_Get_MaxChapter() : 1); + List items = new List(); for (int i = 0; i < m_Count; i++) { var grade = rateData.Get_RandomGrade(); - Debug.Log(grade); + var item = table_gacharandombag.Ins.Get_RandomItemData(m_Data.dic_randomgbag[m_Count], grade); + items.Add(item); + sdata.Add_Item(item.itemid, item.amount); } + + ObtainItemUI.Ins.Set(items); + NewGameUI.Ins.m_GachaUI.Set_Money(); + NewGameUI.Ins.m_GachaUI.m_gachaBase.Set_UI(); } } \ No newline at end of file