diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 0635a2a74..933e84c47 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -31,6 +31,8 @@ handlers.aaTest = function(args) { + log.info("Lv. " + args.Lv + ", Grade : " + GetRandomGachaGrade(args.Lv)); + //var now = new Date(); //log.info(now.getFullYear()); //log.info(now.getMonth()); @@ -910,6 +912,55 @@ handlers.Save_PC_LimitLvUp = function(args) else return Get_Return(1); // PC 레벨 부족 } +handlers.Save_PC_LimitSlotOptionChange = function(args) +{ + var readonlydata = Get_UserReadOnlyData(); + var error = Get_Error(readonlydata, args.Token); + if (error < 0) return Get_Return(error); + + var urod = Get_JsonUserData(readonlydata); + + // 열려 있는 슬롯이 있는 지 확인 + var OpenSlotCount = 0; + var LockCount = 0; + var limittable = Get_BreakingLimitTable(); + var lst = urod.LimitSlot[args.Preset]; + for (var i = 0; i < lst.length; i++) + { + var limitdata = limittable.find(f=>f.n_limitSlotMagic == i + 1); + var isOpen = limitdata.n_LimitLv <= urod.PC.LLv; + if (limitdata.n_LimitLv <= urod.PC.LLv) + { + if (lst[i].Lock == 0) ++OpenSlotCount; + else ++LockCount; + } + + } + log.info("OpenSlotCount : " + OpenSlotCount); + log.info("LockCount : " + LockCount); + if (OpenSlotCount == 0) return Get_Return(2); + + var global = Get_GlobalValueTable(); + var matdata = global.find(f => f.s_ID == "n_BreakingLimitSlotMaterialID"); + if (!matdata) return Get_Return(3); // 설정 누락 + + var price = 10 * ((1 + LockCount) * LockCount / 2 + 1); + if (Use_Item(Get_MissionTable(), urod, matdata.n_Value, price)) + { + var rtnAdd = []; // [{ slot, randombagid, optionlv }] + // 슬롯만큼 for문 돌리기 + var limitslotmagicrateTable = Get_LimitSlotMagicRateTable(); + var randombaTable = Get_RandomBagTable(); + var enchantgradeTable = Get_EnchantGradeTable(); + + var grade = GetRandomGachaGrade(urod.PC.LLv); + // 랜덤백에서 아이템 id 얻기 + // 인챈트그레이드에서 옵션 레벨 얻기 + + Set_JsonUserData(urod); + return Get_Return(0, rtnAdd); + } +} /////////////////////////////////// 서버 처리 handlers.Write_UnityInApp = function(args) @@ -2203,8 +2254,1205 @@ function Get_BreakingLimitTable() "f_ALL_STAT_Multiplier": "0.18", "n_limitSlotMagic": "6" } -] + ] } +function Get_EnchantGradeTable() +{ + return [ + { + "n_EnchantGrade": "1", + "n_OptionLevelMin": "1", + "n_OptionLevelMax": "10", + "s_Color": "#999999" + }, + { + "n_EnchantGrade": "2", + "n_OptionLevelMin": "11", + "n_OptionLevelMax": "25", + "s_Color": "#00FF00" + }, + { + "n_EnchantGrade": "3", + "n_OptionLevelMin": "26", + "n_OptionLevelMax": "50", + "s_Color": "#87CEEB" + }, + { + "n_EnchantGrade": "4", + "n_OptionLevelMin": "51", + "n_OptionLevelMax": "80", + "s_Color": "#800080" + }, + { + "n_EnchantGrade": "5", + "n_OptionLevelMin": "81", + "n_OptionLevelMax": "125", + "s_Color": "#FFA500" + }, + { + "n_EnchantGrade": "6", + "n_OptionLevelMin": "126", + "n_OptionLevelMax": "180", + "s_Color": "#FFFF00" + }, + { + "n_EnchantGrade": "7", + "n_OptionLevelMin": "181", + "n_OptionLevelMax": "250", + "s_Color": "#8B0000" + }, + { + "n_EnchantGrade": "8", + "n_OptionLevelMin": "251", + "n_OptionLevelMax": "350", + "s_Color": "#FF0000" + }, + { + "n_EnchantGrade": "9", + "n_OptionLevelMin": "351", + "n_OptionLevelMax": "500", + "s_Color": "#FFD700" + } + ] +} +function Get_LimitSlotMagicRateTable() +{ + return [ + { + "n_NeedLimitLv": "1", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "5000000", + "n_GachaGradeRate2": "3500000", + "n_GachaGradeRate3": "1500000", + "n_GachaGradeRate4": "0", + "n_GachaGradeRate5": "0", + "n_GachaGradeRate6": "0", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "2", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "5000000", + "n_GachaGradeRate2": "3500000", + "n_GachaGradeRate3": "1500000", + "n_GachaGradeRate4": "0", + "n_GachaGradeRate5": "0", + "n_GachaGradeRate6": "0", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "3", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2882", + "n_GachaGradeRate5": "0", + "n_GachaGradeRate6": "0", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "4", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2882", + "n_GachaGradeRate5": "0", + "n_GachaGradeRate6": "0", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "5", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2782", + "n_GachaGradeRate5": "100", + "n_GachaGradeRate6": "0", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "6", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2782", + "n_GachaGradeRate5": "200", + "n_GachaGradeRate6": "100", + "n_GachaGradeRate7": "0", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "7", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2782", + "n_GachaGradeRate5": "300", + "n_GachaGradeRate6": "200", + "n_GachaGradeRate7": "100", + "n_GachaGradeRate8": "0", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "8", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "274482", + "n_GachaGradeRate5": "40000", + "n_GachaGradeRate6": "3000", + "n_GachaGradeRate7": "200", + "n_GachaGradeRate8": "10", + "n_GachaGradeRate9": "0" + }, + { + "n_NeedLimitLv": "9", + "n_DropIndex": "9900001", + "n_GachaGradeRate1": "4997764", + "n_GachaGradeRate2": "3498130", + "n_GachaGradeRate3": "1501224", + "n_GachaGradeRate4": "2782", + "n_GachaGradeRate5": "500", + "n_GachaGradeRate6": "400", + "n_GachaGradeRate7": "300", + "n_GachaGradeRate8": "200", + "n_GachaGradeRate9": "100" + } + ] +} +function GetRandomGachaGrade(limitLv) { + const table = Get_LimitSlotMagicRateTable(); + const data = table.find(row => parseInt(row.n_NeedLimitLv) === limitLv); + if (!data) return -1; + + // 유효한 등급(rate > 0)만 뽑기 + const rates = []; + for (let i = 1; i <= 9; i++) { + const key = `n_GachaGradeRate${i}`; + const rate = parseInt(data[key]); + if (rate > 0) { + rates.push({ grade: i, weight: rate }); + } + } + + // 총합 + const totalWeight = rates.reduce((sum, r) => sum + r.weight, 0); + if (totalWeight <= 0) return -1; + + // 랜덤 추첨 + let rand = Math.floor(Math.random() * totalWeight); + for (let i = 0; i < rates.length; i++) { + if (rand < rates[i].weight) return rates[i].grade; + rand -= rates[i].weight; + } + + return -1; +} + +function Get_RandomBagTable() +{ + return [ + { + "n_DropIndex": "9900001", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330001", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330002", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330003", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330004", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330005", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330006", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330007", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330008", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900001", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330009", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330101", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330102", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "1", + "e_ItemType": "Option", + "n_ItemId": "330103", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330104", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330105", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "2", + "e_ItemType": "Option", + "n_ItemId": "330106", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330107", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330108", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9900002", + "n_ItemGrade": "3", + "e_ItemType": "Option", + "n_ItemId": "330109", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "1", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.33", + "n_DropCount": "100", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "1", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.33", + "n_DropCount": "200", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "1", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.34", + "n_DropCount": "300", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "2", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.25", + "n_DropCount": "400", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "2", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.25", + "n_DropCount": "500", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "2", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.25", + "n_DropCount": "600", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "2", + "e_ItemType": "Goods", + "n_ItemId": "472", + "f_DropRate": "0.25", + "n_DropCount": "700", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "3", + "e_ItemType": "Goods", + "n_ItemId": "400001", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "3", + "e_ItemType": "Goods", + "n_ItemId": "400002", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "3", + "e_ItemType": "Goods", + "n_ItemId": "400003", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "3", + "e_ItemType": "Goods", + "n_ItemId": "400004", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "4", + "e_ItemType": "Goods", + "n_ItemId": "400005", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "4", + "e_ItemType": "Goods", + "n_ItemId": "400006", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "4", + "e_ItemType": "Goods", + "n_ItemId": "400007", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "4", + "e_ItemType": "Goods", + "n_ItemId": "400008", + "f_DropRate": "0.25", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "5", + "e_ItemType": "Goods", + "n_ItemId": "400009", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "5", + "e_ItemType": "Goods", + "n_ItemId": "400010", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "5", + "e_ItemType": "Goods", + "n_ItemId": "400011", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "6", + "e_ItemType": "Goods", + "n_ItemId": "400012", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "6", + "e_ItemType": "Goods", + "n_ItemId": "400013", + "f_DropRate": "0.33", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9800001", + "n_ItemGrade": "6", + "e_ItemType": "Goods", + "n_ItemId": "400014", + "f_DropRate": "0.34", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9700001", + "n_ItemGrade": "1", + "e_ItemType": "Weapon", + "n_ItemId": "10101001", + "f_DropRate": "0.01", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9700001", + "n_ItemGrade": "2", + "e_ItemType": "Weapon", + "n_ItemId": "10101006", + "f_DropRate": "0.001", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "9700001", + "n_ItemGrade": "3", + "e_ItemType": "Weapon", + "n_ItemId": "10101011", + "f_DropRate": "0.0001", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7001", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "100", + "exception": "광고" + }, + { + "n_DropIndex": "7001", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "1000", + "exception": "광고" + }, + { + "n_DropIndex": "7002", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "101", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "광고" + }, + { + "n_DropIndex": "7002", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "201", + "f_DropRate": "0", + "n_DropCount": "20", + "exception": "광고" + }, + { + "n_DropIndex": "7011", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "100", + "exception": "광고제거 패키지" + }, + { + "n_DropIndex": "7011", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "50", + "exception": "" + }, + { + "n_DropIndex": "7011", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "999", + "exception": "" + }, + { + "n_DropIndex": "7012", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "1000", + "exception": "젬 패키지" + }, + { + "n_DropIndex": "7012", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "50", + "exception": "" + }, + { + "n_DropIndex": "7012", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "9999", + "exception": "" + }, + { + "n_DropIndex": "7013", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "10000", + "exception": "젬 패키지2" + }, + { + "n_DropIndex": "7013", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "25", + "exception": "" + }, + { + "n_DropIndex": "7013", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "999999", + "exception": "" + }, + { + "n_DropIndex": "7101", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "601", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스1" + }, + { + "n_DropIndex": "7102", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "602", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스2" + }, + { + "n_DropIndex": "7103", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "603", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스3" + }, + { + "n_DropIndex": "7104", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "604", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스4" + }, + { + "n_DropIndex": "7105", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "605", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스5" + }, + { + "n_DropIndex": "7106", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "606", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스6" + }, + { + "n_DropIndex": "7107", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "607", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스7" + }, + { + "n_DropIndex": "7108", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "608", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스8" + }, + { + "n_DropIndex": "7109", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "609", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스9" + }, + { + "n_DropIndex": "7110", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "610", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "패스10" + }, + { + "n_DropIndex": "7201", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "100", + "exception": "광고 젬" + }, + { + "n_DropIndex": "7211", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "101", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7212", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "102", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7213", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "103", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7214", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "104", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7215", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "105", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7216", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "106", + "f_DropRate": "0", + "n_DropCount": "10", + "exception": "" + }, + { + "n_DropIndex": "7217", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "201", + "f_DropRate": "0", + "n_DropCount": "5", + "exception": "" + }, + { + "n_DropIndex": "7218", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "202", + "f_DropRate": "0", + "n_DropCount": "5", + "exception": "" + }, + { + "n_DropIndex": "7219", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "203", + "f_DropRate": "0", + "n_DropCount": "5", + "exception": "" + }, + { + "n_DropIndex": "7220", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "204", + "f_DropRate": "0", + "n_DropCount": "5", + "exception": "" + }, + { + "n_DropIndex": "7221", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "401", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7222", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "402", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7223", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "403", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7224", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "404", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7301", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "1", + "f_DropRate": "0", + "n_DropCount": "50", + "exception": "광고 젬" + }, + { + "n_DropIndex": "7311", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "1000", + "exception": "상점 보석1" + }, + { + "n_DropIndex": "7311", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "100", + "exception": "상점 첫 구매 보석1" + }, + { + "n_DropIndex": "7312", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "3000", + "exception": "상점 보석2" + }, + { + "n_DropIndex": "7312", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "300", + "exception": "상점 첫 구매 보석2" + }, + { + "n_DropIndex": "7313", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "5000", + "exception": "상점 보석3" + }, + { + "n_DropIndex": "7313", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "500", + "exception": "상점 첫 구매 보석3" + }, + { + "n_DropIndex": "7314", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "10000", + "exception": "상점 보석4" + }, + { + "n_DropIndex": "7314", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "1000", + "exception": "상점 첫 구매 보석4" + }, + { + "n_DropIndex": "7315", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "30000", + "exception": "상점 보석5" + }, + { + "n_DropIndex": "7315", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "3", + "f_DropRate": "0", + "n_DropCount": "3000", + "exception": "상점 첫 구매 보석5" + }, + { + "n_DropIndex": "7321", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "1000", + "exception": "광고 골드" + }, + { + "n_DropIndex": "7331", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "10000", + "exception": "상점 골드1" + }, + { + "n_DropIndex": "7332", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "100000", + "exception": "상점 골드2" + }, + { + "n_DropIndex": "7333", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "2", + "f_DropRate": "0", + "n_DropCount": "1000000", + "exception": "상점 골드3" + }, + { + "n_DropIndex": "7401", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "101", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7402", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "102", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7403", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "103", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7404", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "104", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7405", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "105", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7406", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "106", + "f_DropRate": "0", + "n_DropCount": "15", + "exception": "" + }, + { + "n_DropIndex": "7407", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "201", + "f_DropRate": "0", + "n_DropCount": "7", + "exception": "" + }, + { + "n_DropIndex": "7408", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "202", + "f_DropRate": "0", + "n_DropCount": "7", + "exception": "" + }, + { + "n_DropIndex": "7409", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "203", + "f_DropRate": "0", + "n_DropCount": "7", + "exception": "" + }, + { + "n_DropIndex": "7410", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "204", + "f_DropRate": "0", + "n_DropCount": "7", + "exception": "" + }, + { + "n_DropIndex": "7411", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "401", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7412", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "402", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7413", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "403", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + }, + { + "n_DropIndex": "7414", + "n_ItemGrade": "1", + "e_ItemType": "Shop", + "n_ItemId": "404", + "f_DropRate": "0", + "n_DropCount": "1", + "exception": "" + } + ] +} + function Get_PlayOCoupons() { var poc = JSON.parse(server.GetTitleInternalData("PlayO").Data.PlayO); diff --git a/Assets/ResWork/Table/Export/LimitSlotmagicRate.json b/Assets/ResWork/Table/Export/LimitSlotmagicRate.json index 88fd02313..7f7ee15d2 100644 --- a/Assets/ResWork/Table/Export/LimitSlotmagicRate.json +++ b/Assets/ResWork/Table/Export/LimitSlotmagicRate.json @@ -1 +1 @@ -[{"n_NeedLimitLv": "1", "n_DropIndex": "9900001", "n_GachaGradeRate1": "5000000", "n_GachaGradeRate2": "3500000", "n_GachaGradeRate3": "1500000", "n_GachaGradeRate4": "0", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "2", "n_DropIndex": "9900001", "n_GachaGradeRate1": "5000000", "n_GachaGradeRate2": "3500000", "n_GachaGradeRate3": "1500000", "n_GachaGradeRate4": "0", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "3", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2882", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "4", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2882", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "5", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "100", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}] \ No newline at end of file +[{"n_NeedLimitLv": "1", "n_DropIndex": "9900001", "n_GachaGradeRate1": "5000000", "n_GachaGradeRate2": "3500000", "n_GachaGradeRate3": "1500000", "n_GachaGradeRate4": "0", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "2", "n_DropIndex": "9900001", "n_GachaGradeRate1": "5000000", "n_GachaGradeRate2": "3500000", "n_GachaGradeRate3": "1500000", "n_GachaGradeRate4": "0", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "3", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2882", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "4", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2882", "n_GachaGradeRate5": "0", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "5", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "100", "n_GachaGradeRate6": "0", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "6", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "200", "n_GachaGradeRate6": "100", "n_GachaGradeRate7": "0", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "7", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "300", "n_GachaGradeRate6": "200", "n_GachaGradeRate7": "100", "n_GachaGradeRate8": "0", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "8", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "400", "n_GachaGradeRate6": "300", "n_GachaGradeRate7": "200", "n_GachaGradeRate8": "100", "n_GachaGradeRate9": "0"}, {"n_NeedLimitLv": "9", "n_DropIndex": "9900001", "n_GachaGradeRate1": "4997764", "n_GachaGradeRate2": "3498130", "n_GachaGradeRate3": "1501224", "n_GachaGradeRate4": "2782", "n_GachaGradeRate5": "500", "n_GachaGradeRate6": "400", "n_GachaGradeRate7": "300", "n_GachaGradeRate8": "200", "n_GachaGradeRate9": "100"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 5b839a478..08a9c9299 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/UI/PC/Limit/PCLimitUI_Right.cs b/Assets/Script/UI/PC/Limit/PCLimitUI_Right.cs index bf0cda481..6cc019325 100644 --- a/Assets/Script/UI/PC/Limit/PCLimitUI_Right.cs +++ b/Assets/Script/UI/PC/Limit/PCLimitUI_Right.cs @@ -37,6 +37,7 @@ public class PCLimitUI_Right : uScrollViewMgr m_Price.amount.text = NumberFormatter.FormatNumber(Get_Price()); var lv = Mathf.Max(1, sdata.Get_LimitLv()); + if (lv > 9) lv = 0; var Tdata = table_limitslotmagicrate.Ins.Get_Data_orNull(lv); m_ProtectMaxGrade = Tdata.MaxGrade;