diff --git a/Assets/Editor/GetServerTables.cs b/Assets/Editor/GetServerTables.cs index ac49cecea..c207e93ce 100644 --- a/Assets/Editor/GetServerTables.cs +++ b/Assets/Editor/GetServerTables.cs @@ -21,6 +21,7 @@ public class GetServerTables Get_ServerTable("OptionConfig", new List { "e_OptionType", "f_ExtraValue1", "f_ExtraValue2", "f_ExtraValue3", "f_ExtraValue4" }); Get_ServerTable("CollectionList", new List { "e_FirstRewardType", "n_FirstRewardValue", "n_FirstRewardCount", "e_RepeatRewardType", "n_RepeatRewardValue", "n_RepeatRewardCount" }); Get_ServerTable("GachaConfig", new List { "n_Title", "s_Banner" }); + Get_ServerTable("BattleMapConfig", new List { "s_Scene", "s_BGM", "n_MapName", "n_MapDesc", "s_MapIcon", "n_Portals" }); } static void Get_ServerTable(string path, List except) diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index f9ae9c960..ec4adced2 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -1764,27 +1764,42 @@ handlers.Save_Collection_GetAll = function(args) return Get_Return(1); } +function Add_Gacha(urod, id, count) +{ + if (!urod.Gacha[id]) urod.Gacha[id] = [0, 0]; + urod.Gacha[id][0] = Add_Amount(urod.Gacha[id][0], count); + urod.Gacha[id][1] = Add_Amount(urod.Gacha[id][1], count); +} +function Get_GachaCount(urod, id) +{ + if (urod.Gacha[id]) return urod.Gacha[id][1]; + return 0; +} handlers.Save_Gacha = function(args) { var readonlydata = Get_UserReadOnlyData(); var error = Get_Error(readonlydata, args.Token); if (error < 0) return Get_Return(error); + var m_Count = args.Count; + var urod = Get_JsonUserData(readonlydata); var table = Get_MissionTable(); + var itemtable = Get_ItemTable(); + var gachatable = Get_GachaConfigTable(); var gachaData = Get_GachaConfigTable().find(f=>f.n_ID == args.GachaID); var gachaType = 0; - if (Check_ItemAmount(urod, gachaData.n_GachaTicketID, args.Count)) + if (Check_ItemAmount(urod, gachaData.n_GachaTicketID, m_Count)) { // 뽑기권이 충분하면 뽑기권만 gachaType = 1; - Use_Item(table, urod, gachaData.n_GachaTicketID, args.Count); + Use_Item(table, urod, gachaData.n_GachaTicketID, m_Count); } else if (Get_ItemAmount(urod, gachaData.n_GachaTicketID) > 0) { var ticketAmount = Get_ItemAmount(urod, gachaData.n_GachaTicketID); - var remaincount = args.Count - ticketAmount; + var remaincount = m_Count - ticketAmount; var needgem = parseInt(remaincount * gachaData.n_GachaPrice); if (Check_ItemAmount(urod, gachaData.n_GachaGoodsID, needgem)) { @@ -1795,7 +1810,7 @@ handlers.Save_Gacha = function(args) } else { - var need = args.Count * gachaData.n_GachaPrice; + var need = m_Count * gachaData.n_GachaPrice; if (Check_ItemAmount(urod, gachaData.n_GachaGoodsID, need)) { gachaType = 1; @@ -1803,10 +1818,113 @@ handlers.Save_Gacha = function(args) } } - if (gachaType == 1) + if (gachaType > 0) { var items = []; + var grades = []; + let gachalv = 1; + + if (gachaData.b_StageLv) + { + var battlemapdatas = Get_BattleMapTable().filter(f=>f.n_Chapter > 0); + var mapdata = urod.MapData; + var maxchapter = 1; + for (var i = 1; i < battlemapdatas.length; i++) + { + var temp = battlemapdatas[i]; + var key1map = mapdata[temp.n_MapID]; + var diff = 1; + if (key1map && key1map[diff] && key1map[diff].Clear > 0) + maxchapter = temp.n_Chapter; + } + gachalv = maxchapter; + } + + var rateData = Get_GachaRateTable().find(f=>f.n_ID == gachaData.n_ID && f.n_GachaLevel == gachalv); + var grades = []; + var benefit1Count = Get_GlobalValue_nValue("n_Benefit1Count"); + var benefit2Count = Get_GlobalValue_nValue("n_Benefit2Count"); + var benefit1Grade = Get_GlobalValue_nValue("n_Benefit1Grade"); + var benefit2Grade = Get_GlobalValue_nValue("n_Benefit2Grade"); + var benefit1 = false; + var benefit2 = false; + var rdnbagid = m_Count == 1 ? gachaData.n_NormalRandombag : gachaData.n_Extra10_Randombag; + for (var i = 0; i < m_Count; i++) + { + var grade = Get_GachaRandomGrade(rateData); + grades.push(grade); + var itemid = Get_GachaRandomItemID(rdnbagid, grade); + items.push(itemid); + + Add_Gacha(urod, gachaData.n_ID, 1); + var gachaCount = Get_GachaCount(urod, gachaData.n_ID); + if (!benefit1 && gachaCount >= benefit1Count && gachaCount % benefit1Count == 0) benefit1 = true; + if (!benefit2 && gachaCount >= benefit2Count && gachaCount % benefit2Count == 0) benefit2 = true; + } + + // gachacount 가 10일 때마다 4등급 아이템 하나가 포함되어야 함 + if (benefit1) + { + var existgrade1 = false; + for (var i = 0; i < grades.length; i++) + { + if (!existgrade1 && grades[i] == benefit1Grade) + existgrade1 = true; + } + + if (!existgrade1) + { + for (var i = grades.length - 1; i > 0 ; i--) + { + if (grades[i] < benefit1Grade) + { + items[i] = Get_GachaRandomItemID(rdnbagid, benefit1Grade); + break; + } + } + } + } + + // gachacount 가 50일 때마다 5등급 아이템 하나가 포함되어야 함 + if (benefit2) + { + var existgrade2 = false; + for (var i = 0; i < grades.length; i++) + { + if (!existgrade2 && grades[i] == benefit2Grade) + existgrade2 = true; + } + + if (!existgrade2) + { + for (var i = grades.length - 1; i >= 0; i--) + { + if (grades[i] < benefit2Grade) + { + items[i] = Get_GachaRandomItemID(rdnbagid, benefit2Grade); + break; + } + } + } + } + + for (var i = 0; i < items.length; i++) + Add_Item(table, itemtable, urod, items[i], 1); + + Add_MissionCount(table, urod, "GACHA_ALL", 0, m_Count); + if (gachaData.isSkillGacha) + { + Add_MissionCount(table, urod, "GACHA_SKILL", 0, m_Count); + Add_MissionCount(table, urod, "GACHA_SKILL_ACC", 0, m_Count); + } + else + { + Add_MissionCount(table, urod, "GACHA_EQUIP", 0, m_Count); + Add_MissionCount(table, urod, "GACHA_EQUIP_ACC", 0, m_Count); + } + + Set_JsonUserData(urod); return Get_Return(0, { gacha : items }); } return Get_Return(1); @@ -21950,6 +22068,96 @@ function Get_CollectionTable() ] } +function Get_BattleMapTable() +{ + return [ + { + "n_MapID": "-99", + "n_Chapter": "-99", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "-1", + "n_Chapter": "-1", + "e_MapType": "Lobby", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "0", + "n_Chapter": "0", + "e_MapType": "MyFarm", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "1", + "n_Chapter": "1", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "2", + "n_Chapter": "2", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "3", + "n_Chapter": "3", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "4", + "n_Chapter": "4", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "5", + "n_Chapter": "5", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "1001", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d1_Mimic", + "n_TicketID": "501" + }, + { + "n_MapID": "1002", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d2_Maze", + "n_TicketID": "502" + }, + { + "n_MapID": "1003", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d3_Nightmare", + "n_TicketID": "503" + }, + { + "n_MapID": "1004", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d4_Wave", + "n_TicketID": "0" + } + ] +} + function Get_GachaConfigTable() { return [ @@ -21999,7 +22207,44 @@ function Get_GachaConfigTable() } ] } +function Get_GachaRateTable() +{ + return [{"n_ID": "10001", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "2", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "3", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "4", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "5", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10004", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}]; +} +function Get_GachaRandomGrade(rateData) +{ + // 유효한 등급(rate > 0)만 뽑기 + const rates = []; + for (let i = 1; i <= 9; i++) { + const key = `n_Grade${i}`; + const rate = parseInt(rateData[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_GachaRandomBagTable() +{ + return [{"n_ID": "20001", "n_RewardID": "10101026", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10101027", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10101028", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10101029", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10101030", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10102026", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10102027", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10102028", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10102029", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10102030", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10103026", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10103027", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10103028", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10103029", "n_Grade": "0"}, {"n_ID": "20001", "n_RewardID": "10103030", "n_Grade": "0"}, {"n_ID": "30001", "n_RewardID": "10101001", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10101002", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10101003", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10101004", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10101005", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10101006", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10101007", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10101008", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10101009", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10101010", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10101011", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10101012", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10101013", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10101014", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10101015", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10101016", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10101017", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10101018", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10101019", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10101020", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10101021", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10101022", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10101023", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10101024", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10101025", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10101026", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10101027", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10101028", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10101029", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10101030", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10101031", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10101032", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10101033", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10101034", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10101035", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10102001", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10102002", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10102003", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10102004", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10102005", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10102006", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10102007", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10102008", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10102009", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10102010", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10102011", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10102012", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10102013", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10102014", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10102015", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10102016", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10102017", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10102018", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10102019", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10102020", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10102021", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10102022", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10102023", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10102024", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10102025", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10102026", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10102027", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10102028", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10102029", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10102030", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10102031", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10102032", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10102033", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10102034", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10102035", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10103001", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10103002", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10103003", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10103004", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10103005", "n_Grade": "1"}, {"n_ID": "30001", "n_RewardID": "10103006", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10103007", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10103008", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10103009", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10103010", "n_Grade": "2"}, {"n_ID": "30001", "n_RewardID": "10103011", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10103012", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10103013", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10103014", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10103015", "n_Grade": "3"}, {"n_ID": "30001", "n_RewardID": "10103016", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10103017", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10103018", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10103019", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10103020", "n_Grade": "4"}, {"n_ID": "30001", "n_RewardID": "10103021", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10103022", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10103023", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10103024", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10103025", "n_Grade": "5"}, {"n_ID": "30001", "n_RewardID": "10103026", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10103027", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10103028", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10103029", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10103030", "n_Grade": "6"}, {"n_ID": "30001", "n_RewardID": "10103031", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10103032", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10103033", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10103034", "n_Grade": "7"}, {"n_ID": "30001", "n_RewardID": "10103035", "n_Grade": "7"}, {"n_ID": "20002", "n_RewardID": "10201011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10201012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10202011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10202012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10203011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10203012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10301011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10301012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10302011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10302012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10303011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10303012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10401011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10401012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10402011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10402012", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10403011", "n_Grade": "0"}, {"n_ID": "20002", "n_RewardID": "10403012", "n_Grade": "0"}, {"n_ID": "30002", "n_RewardID": "10201001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10201001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10201002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10201003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10201004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10201005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10201006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10201007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10201008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10201009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10201010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10201011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10201012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10201013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10201014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10202001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10202002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10202003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10202004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10202005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10202006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10202007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10202008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10202009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10202010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10202011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10202012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10202013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10202014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10203001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10203002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10203003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10203004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10203005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10203006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10203007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10203008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10203009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10203010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10203011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10203012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10203013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10203014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10301001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10301002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10301003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10301004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10301005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10301006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10301007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10301008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10301009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10301010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10301011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10301012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10301013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10301014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10302001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10302002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10302003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10302004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10302005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10302006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10302007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10302008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10302009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10302010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10302011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10302012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10302013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10302014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10303001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10303002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10303003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10303004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10303005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10303006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10303007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10303008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10303009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10303010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10303011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10303012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10303013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10303014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10401001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10401002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10401003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10401004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10401005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10401006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10401007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10401008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10401009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10401010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10401011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10401012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10401013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10401014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10402001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10402002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10402003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10402004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10402005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10402006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10402007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10402008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10402009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10402010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10402011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10402012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10402013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10402014", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10403001", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10403002", "n_Grade": "1"}, {"n_ID": "30002", "n_RewardID": "10403003", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10403004", "n_Grade": "2"}, {"n_ID": "30002", "n_RewardID": "10403005", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10403006", "n_Grade": "3"}, {"n_ID": "30002", "n_RewardID": "10403007", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10403008", "n_Grade": "4"}, {"n_ID": "30002", "n_RewardID": "10403009", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10403010", "n_Grade": "5"}, {"n_ID": "30002", "n_RewardID": "10403011", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10403012", "n_Grade": "6"}, {"n_ID": "30002", "n_RewardID": "10403013", "n_Grade": "7"}, {"n_ID": "30002", "n_RewardID": "10403014", "n_Grade": "7"}, {"n_ID": "20003", "n_RewardID": "10500011", "n_Grade": "0"}, {"n_ID": "20003", "n_RewardID": "10500012", "n_Grade": "0"}, {"n_ID": "20003", "n_RewardID": "10600011", "n_Grade": "0"}, {"n_ID": "20003", "n_RewardID": "10600012", "n_Grade": "0"}, {"n_ID": "30003", "n_RewardID": "10500001", "n_Grade": "1"}, {"n_ID": "30003", "n_RewardID": "10500002", "n_Grade": "1"}, {"n_ID": "30003", "n_RewardID": "10500003", "n_Grade": "2"}, {"n_ID": "30003", "n_RewardID": "10500004", "n_Grade": "2"}, {"n_ID": "30003", "n_RewardID": "10500005", "n_Grade": "3"}, {"n_ID": "30003", "n_RewardID": "10500006", "n_Grade": "3"}, {"n_ID": "30003", "n_RewardID": "10500007", "n_Grade": "4"}, {"n_ID": "30003", "n_RewardID": "10500008", "n_Grade": "4"}, {"n_ID": "30003", "n_RewardID": "10500009", "n_Grade": "5"}, {"n_ID": "30003", "n_RewardID": "10500010", "n_Grade": "5"}, {"n_ID": "30003", "n_RewardID": "10500011", "n_Grade": "6"}, {"n_ID": "30003", "n_RewardID": "10500012", "n_Grade": "6"}, {"n_ID": "30003", "n_RewardID": "10500013", "n_Grade": "7"}, {"n_ID": "30003", "n_RewardID": "10500014", "n_Grade": "7"}, {"n_ID": "30003", "n_RewardID": "10600001", "n_Grade": "1"}, {"n_ID": "30003", "n_RewardID": "10600002", "n_Grade": "1"}, {"n_ID": "30003", "n_RewardID": "10600003", "n_Grade": "2"}, {"n_ID": "30003", "n_RewardID": "10600004", "n_Grade": "2"}, {"n_ID": "30003", "n_RewardID": "10600005", "n_Grade": "3"}, {"n_ID": "30003", "n_RewardID": "10600006", "n_Grade": "3"}, {"n_ID": "30003", "n_RewardID": "10600007", "n_Grade": "4"}, {"n_ID": "30003", "n_RewardID": "10600008", "n_Grade": "4"}, {"n_ID": "30003", "n_RewardID": "10600009", "n_Grade": "5"}, {"n_ID": "30003", "n_RewardID": "10600010", "n_Grade": "5"}, {"n_ID": "30003", "n_RewardID": "10600011", "n_Grade": "6"}, {"n_ID": "30003", "n_RewardID": "10600012", "n_Grade": "6"}, {"n_ID": "30003", "n_RewardID": "10600013", "n_Grade": "7"}, {"n_ID": "30003", "n_RewardID": "10600014", "n_Grade": "7"}, {"n_ID": "20004", "n_RewardID": "701022", "n_Grade": "0"}, {"n_ID": "20004", "n_RewardID": "701023", "n_Grade": "0"}, {"n_ID": "20004", "n_RewardID": "701024", "n_Grade": "0"}, {"n_ID": "20004", "n_RewardID": "702014", "n_Grade": "0"}, {"n_ID": "20004", "n_RewardID": "702015", "n_Grade": "0"}, {"n_ID": "20004", "n_RewardID": "702016", "n_Grade": "0"}, {"n_ID": "30004", "n_RewardID": "701001", "n_Grade": "1"}, {"n_ID": "30004", "n_RewardID": "701002", "n_Grade": "1"}, {"n_ID": "30004", "n_RewardID": "701003", "n_Grade": "1"}, {"n_ID": "30004", "n_RewardID": "701004", "n_Grade": "2"}, {"n_ID": "30004", "n_RewardID": "701005", "n_Grade": "2"}, {"n_ID": "30004", "n_RewardID": "701006", "n_Grade": "2"}, {"n_ID": "30004", "n_RewardID": "701007", "n_Grade": "3"}, {"n_ID": "30004", "n_RewardID": "701008", "n_Grade": "3"}, {"n_ID": "30004", "n_RewardID": "701009", "n_Grade": "3"}, {"n_ID": "30004", "n_RewardID": "701010", "n_Grade": "4"}, {"n_ID": "30004", "n_RewardID": "701011", "n_Grade": "4"}, {"n_ID": "30004", "n_RewardID": "701012", "n_Grade": "4"}, {"n_ID": "30004", "n_RewardID": "701013", "n_Grade": "5"}, {"n_ID": "30004", "n_RewardID": "701014", "n_Grade": "5"}, {"n_ID": "30004", "n_RewardID": "701015", "n_Grade": "5"}, {"n_ID": "30004", "n_RewardID": "701016", "n_Grade": "6"}, {"n_ID": "30004", "n_RewardID": "701017", "n_Grade": "6"}, {"n_ID": "30004", "n_RewardID": "701018", "n_Grade": "6"}, {"n_ID": "30004", "n_RewardID": "701019", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "701020", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "701021", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "701022", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "701023", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "701024", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "702001", "n_Grade": "1"}, {"n_ID": "30004", "n_RewardID": "702002", "n_Grade": "1"}, {"n_ID": "30004", "n_RewardID": "702003", "n_Grade": "2"}, {"n_ID": "30004", "n_RewardID": "702004", "n_Grade": "2"}, {"n_ID": "30004", "n_RewardID": "702005", "n_Grade": "3"}, {"n_ID": "30004", "n_RewardID": "702006", "n_Grade": "3"}, {"n_ID": "30004", "n_RewardID": "702007", "n_Grade": "4"}, {"n_ID": "30004", "n_RewardID": "702008", "n_Grade": "4"}, {"n_ID": "30004", "n_RewardID": "702009", "n_Grade": "5"}, {"n_ID": "30004", "n_RewardID": "702010", "n_Grade": "5"}, {"n_ID": "30004", "n_RewardID": "702011", "n_Grade": "6"}, {"n_ID": "30004", "n_RewardID": "702012", "n_Grade": "6"}, {"n_ID": "30004", "n_RewardID": "702013", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "702014", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "702015", "n_Grade": "7"}, {"n_ID": "30004", "n_RewardID": "702016", "n_Grade": "7"}] +} +function Get_GachaRandomItemID(bagid, grade) +{ + var lst = Get_GachaRandomBagTable().filter(f=>f.n_ID == bagid && f.n_Grade == grade); + return lst[Math.floor(Math.random() * lst.length)].n_RewardID; +} diff --git a/Assets/ResWork/Table/Server/server_BattleMapConfig.txt b/Assets/ResWork/Table/Server/server_BattleMapConfig.txt new file mode 100644 index 000000000..e1b0e52f7 --- /dev/null +++ b/Assets/ResWork/Table/Server/server_BattleMapConfig.txt @@ -0,0 +1,86 @@ +[ + { + "n_MapID": "-99", + "n_Chapter": "-99", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "-1", + "n_Chapter": "-1", + "e_MapType": "Lobby", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "0", + "n_Chapter": "0", + "e_MapType": "MyFarm", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "1", + "n_Chapter": "1", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "2", + "n_Chapter": "2", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "3", + "n_Chapter": "3", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "4", + "n_Chapter": "4", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "5", + "n_Chapter": "5", + "e_MapType": "Stage", + "e_Dungeon": "None", + "n_TicketID": "0" + }, + { + "n_MapID": "1001", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d1_Mimic", + "n_TicketID": "501" + }, + { + "n_MapID": "1002", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d2_Maze", + "n_TicketID": "502" + }, + { + "n_MapID": "1003", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d3_Nightmare", + "n_TicketID": "503" + }, + { + "n_MapID": "1004", + "n_Chapter": "0", + "e_MapType": "Dungeon", + "e_Dungeon": "d4_Wave", + "n_TicketID": "0" + } +] \ No newline at end of file diff --git a/Assets/ResWork/Table/Server/server_BattleMapConfig.txt.meta b/Assets/ResWork/Table/Server/server_BattleMapConfig.txt.meta new file mode 100644 index 000000000..8f0b4c3cc --- /dev/null +++ b/Assets/ResWork/Table/Server/server_BattleMapConfig.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 122e4218e68ad484bae752905bcaba34 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 2753641f5..ff20b8450 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 38a83115c..c1c9d67c6 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -401,7 +401,7 @@ public partial class ServerData for (int i = 1; i < lst.Count; i++) { if (MapData_isClearChaper(lst[i].n_MapID, 1)) - maxchapter = lst[i].n_MapID; + maxchapter = lst[i].n_Chapter; } return maxchapter; }