diff --git a/Assets/ResWork/Table/Export/RandomBag.json b/Assets/ResWork/Table/Export/RandomBag.json index 385676d07..c7b013477 100644 --- a/Assets/ResWork/Table/Export/RandomBag.json +++ b/Assets/ResWork/Table/Export/RandomBag.json @@ -1 +1 @@ -[{"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330001", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330002", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330003", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330004", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330005", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330006", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330007", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330008", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330009", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330101", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330102", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330103", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330104", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330105", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330106", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330107", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330108", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330109", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.33", "n_DropCount": "100"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.33", "n_DropCount": "200"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.34", "n_DropCount": "300"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "400"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "500"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "600"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "700"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400001", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400002", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400003", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400004", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400005", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400006", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400007", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400008", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400009", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400010", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400011", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400012", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400013", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400014", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "1", "e_ItemType": "Weapon", "n_ItemId": "10101001", "f_DropRate": "0.01", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "2", "e_ItemType": "Weapon", "n_ItemId": "10101006", "f_DropRate": "0.001", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "3", "e_ItemType": "Weapon", "n_ItemId": "10101011", "f_DropRate": "0.0001", "n_DropCount": "1"}] \ No newline at end of file +[{"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330001", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330002", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330003", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330004", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330005", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330006", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330007", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330008", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900001", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330009", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330101", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330102", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "1", "e_ItemType": "Option", "n_ItemId": "330103", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330104", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330105", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "2", "e_ItemType": "Option", "n_ItemId": "330106", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330107", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330108", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9900002", "n_ItemGrade": "3", "e_ItemType": "Option", "n_ItemId": "330109", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.33", "n_DropCount": "100"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.33", "n_DropCount": "200"}, {"n_DropIndex": "9800001", "n_ItemGrade": "1", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.34", "n_DropCount": "300"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "400"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "500"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "600"}, {"n_DropIndex": "9800001", "n_ItemGrade": "2", "e_ItemType": "Goods", "n_ItemId": "472", "f_DropRate": "0.25", "n_DropCount": "700"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400001", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400002", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400003", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "3", "e_ItemType": "Goods", "n_ItemId": "400004", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400005", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400006", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400007", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "4", "e_ItemType": "Goods", "n_ItemId": "400008", "f_DropRate": "0.25", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400009", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400010", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "5", "e_ItemType": "Goods", "n_ItemId": "400011", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400012", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400013", "f_DropRate": "0.33", "n_DropCount": "1"}, {"n_DropIndex": "9800001", "n_ItemGrade": "6", "e_ItemType": "Goods", "n_ItemId": "400014", "f_DropRate": "0.34", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "1", "e_ItemType": "Weapon", "n_ItemId": "10101001", "f_DropRate": "0.01", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "2", "e_ItemType": "Weapon", "n_ItemId": "10101006", "f_DropRate": "0.001", "n_DropCount": "1"}, {"n_DropIndex": "9700001", "n_ItemGrade": "3", "e_ItemType": "Weapon", "n_ItemId": "10101011", "f_DropRate": "0.0001", "n_DropCount": "1"}, {"n_DropIndex": "7011", "n_ItemGrade": "1", "e_ItemType": "Shop", "n_ItemId": "1", "f_DropRate": "0", "n_DropCount": "100"}, {"n_DropIndex": "7011", "n_ItemGrade": "1", "e_ItemType": "Shop", "n_ItemId": "3", "f_DropRate": "0", "n_DropCount": "50"}, {"n_DropIndex": "7011", "n_ItemGrade": "1", "e_ItemType": "Shop", "n_ItemId": "2", "f_DropRate": "0", "n_DropCount": "999"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 5b3a24e82..44aaeb78d 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/UI/Shop/ShopPackagePopup.cs b/Assets/Script/UI/Shop/ShopPackagePopup.cs index 4ee3af91e..25197130b 100644 --- a/Assets/Script/UI/Shop/ShopPackagePopup.cs +++ b/Assets/Script/UI/Shop/ShopPackagePopup.cs @@ -21,5 +21,8 @@ public class ShopPackagePopup : uScrollViewMgr images[0].sprite = m_Data.Get_Icon(); images[1].enabled = m_Data.n_PriceItemID > 0; if (images[1].enabled) images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_PriceItemID); + + var items = table_randombag.Ins.Get_DataList(m_Data.n_RandomBagID); + Set_ScrollView(items); } } \ No newline at end of file