Save_Pet_Gacha (추가 작업 필요)

This commit is contained in:
Ino 2025-07-08 09:18:32 +09:00
parent 2b66d6de18
commit 37b09a94e2
8 changed files with 1363 additions and 33 deletions

View File

@ -1438,23 +1438,34 @@ handlers.Save_Pet_Gacha = function(args)
var urod = Get_JsonUserData(readonlydata); var urod = Get_JsonUserData(readonlydata);
var amount = args.Amount; var amount = args.Amount;
if (urod.AD) if (args.AD)
{ {
var curTime = Get_CurKoreaTime(); var curTime = Get_CurKoreaTime();
var adTime = new Date(urod.PetGachaADTime); var adTime = new Date(urod.PetData.PetGachaADTime);
if (adTime > curTime) return Get_Return(2); if (adTime > curTime) return Get_Return(2);
amount = 1; amount = 1;
urod.PetGachaADTime = new Date(curTime.getTime() + Get_GlobalValue_nValue("n_AddPetGachaADMinute") * 60000).toISOString(); urod.PetData.PetGachaADTime = new Date(curTime.getTime() + Get_GlobalValue_nValue("n_AddPetGachaADMinute") * 60000).toISOString();
} }
var table = Get_MissionTable(); var table = Get_MissionTable();
var price = amount * Get_GlobalValue_nValue("n_CostPerPetGacha"); var price = amount * Get_GlobalValue_nValue("n_CostPerPetGacha");
if (urod.AD || Use_Item(table, urod, 1, price)) if (args.AD || Use_Item(table, urod, 1, price))
{ {
var itemtable = Get_ItemTable();
var petlist = [];
for (let i = 0; i < amount; i++)
{
var petid = Get_RandomItemId(9000001, urod.PetData.GachaLv);
petlist.push(petid);
Add_Item(table, itemtable, urod, petid, 1);
}
Add_MissionCount(table, urod, "GACHA_PET", 0, amount);
Add_MissionCount(table, urod, "GACHA_PET_ACC", 0, amount);
Add_MissionCount(table, urod, "GACHA_ALL", 0, amount);
Set_JsonUserData(urod); Set_JsonUserData(urod);
return Get_Return(0); return Get_Return(0, { gem : price, adtime : urod.PetData.PetGachaADTime, pets : petlist });
} }
return Get_Return(1); return Get_Return(1);
} }
@ -12303,6 +12314,622 @@ function Get_RandomBagTable()
"f_DropRate": "0.0001", "f_DropRate": "0.0001",
"n_DropCount": "1" "n_DropCount": "1"
}, },
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50001",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50002",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50003",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50004",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50005",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50006",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50007",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50008",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50009",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50001",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50002",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50003",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50004",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50005",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50006",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50007",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50008",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50009",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50010",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50011",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50012",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50013",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50014",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50015",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50016",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50017",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50018",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50001",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50002",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50003",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50004",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50005",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50006",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50007",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50008",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50009",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50010",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50011",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50012",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50013",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50014",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50015",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50016",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50017",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50018",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50019",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50020",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50021",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50022",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50023",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50024",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50025",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50026",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50027",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50001",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50002",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50003",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50004",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50005",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50006",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50007",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50008",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50009",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50010",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50011",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50012",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50013",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50014",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50015",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50016",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50017",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50018",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50019",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50020",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50021",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50022",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50023",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50024",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50025",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50026",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50027",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50028",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50029",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50030",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50031",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50032",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50033",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50034",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{ {
"n_DropIndex": "7001", "n_DropIndex": "7001",
"n_ItemGrade": "1", "n_ItemGrade": "1",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -293,6 +293,622 @@
"f_DropRate": "0.0001", "f_DropRate": "0.0001",
"n_DropCount": "1" "n_DropCount": "1"
}, },
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50001",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50002",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50003",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50004",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50005",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50006",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50007",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50008",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "1",
"n_ItemId": "50009",
"f_DropRate": "0.111",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50001",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50002",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50003",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50004",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50005",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50006",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50007",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50008",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50009",
"f_DropRate": "0.07",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50010",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50011",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50012",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50013",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50014",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50015",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50016",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50017",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "2",
"n_ItemId": "50018",
"f_DropRate": "0.041",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50001",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50002",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50003",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50004",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50005",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50006",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50007",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50008",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50009",
"f_DropRate": "0.05",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50010",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50011",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50012",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50013",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50014",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50015",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50016",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50017",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50018",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50019",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50020",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50021",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50022",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50023",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50024",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50025",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50026",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "3",
"n_ItemId": "50027",
"f_DropRate": "0.0261",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50001",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50002",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50003",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50004",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50005",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50006",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50007",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50008",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50009",
"f_DropRate": "0.025",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50010",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50011",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50012",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50013",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50014",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50015",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50016",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50017",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50018",
"f_DropRate": "0.03",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50019",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50020",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50021",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50022",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50023",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50024",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50025",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50026",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50027",
"f_DropRate": "0.035",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50028",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50029",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50030",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50031",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50032",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50033",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{
"n_DropIndex": "9000001",
"n_ItemGrade": "4",
"n_ItemId": "50034",
"f_DropRate": "0.0271",
"n_DropCount": "1"
},
{ {
"n_DropIndex": "7001", "n_DropIndex": "7001",
"n_ItemGrade": "1", "n_ItemGrade": "1",

Binary file not shown.

View File

@ -72,7 +72,7 @@ public partial class ServerData
/// { ID, 0 갯수, 1 레벨 } /// { ID, 0 갯수, 1 레벨 }
/// </summary> /// </summary>
public Dictionary<string, List<ObscuredInt>> Pet = new Dictionary<string, List<ObscuredInt>>(); public Dictionary<string, List<ObscuredInt>> Pet = new Dictionary<string, List<ObscuredInt>>();
public DateTime PetGachaADTime; public SD_Pet PetData = new SD_Pet();
/// <summary> /// <summary>
/// { ID, 0 갯수, 1 레벨, 2 별 } /// { ID, 0 갯수, 1 레벨, 2 별 }
/// </summary> /// </summary>
@ -216,7 +216,7 @@ public partial class ServerData
temp.LimitSlot[item.Key].Add(item.Value[i].Get()); temp.LimitSlot[item.Key].Add(item.Value[i].Get());
} }
temp.Pet = DSUtil.Get_T_Dic(Pet); temp.Pet = DSUtil.Get_T_Dic(Pet);
temp.PetGachaADTime = PetGachaADTime; temp.PetData = PetData.Get();
temp.Relic = DSUtil.Get_T_Dic(Relic); temp.Relic = DSUtil.Get_T_Dic(Relic);
temp.Collection = DSUtil.Get_T_Dic(Collection); temp.Collection = DSUtil.Get_T_Dic(Collection);
temp.MobKill = DSUtil.Get_T_Dic(MobKill); temp.MobKill = DSUtil.Get_T_Dic(MobKill);
@ -267,7 +267,7 @@ public class ServerData_Read
public Dictionary<string, SD_PCAwakenData_Read> Awaken; public Dictionary<string, SD_PCAwakenData_Read> Awaken;
public Dictionary<string, List<SD_PCLimitSlotData_Read>> LimitSlot; public Dictionary<string, List<SD_PCLimitSlotData_Read>> LimitSlot;
public Dictionary<string, List<int>> Pet, Relic, Dungeon, Gacha; public Dictionary<string, List<int>> Pet, Relic, Dungeon, Gacha;
public DateTime PetGachaADTime; public SD_Pet_Read PetData;
public Dictionary<string, int> Collection; public Dictionary<string, int> Collection;
public Dictionary<string, double> MobKill; public Dictionary<string, double> MobKill;
public SD_Farm_Read Farm; public SD_Farm_Read Farm;
@ -318,7 +318,7 @@ public class ServerData_Read
temp.LimitSlot[item.Key].Add(item.Value[i].Get()); temp.LimitSlot[item.Key].Add(item.Value[i].Get());
} }
temp.Pet = DSUtil.Get_T_Dic(Pet); temp.Pet = DSUtil.Get_T_Dic(Pet);
temp.PetGachaADTime = PetGachaADTime; temp.PetData = PetData.Get();
temp.Relic = DSUtil.Get_T_Dic(Relic); temp.Relic = DSUtil.Get_T_Dic(Relic);
temp.Collection = DSUtil.Get_T_Dic(Collection); temp.Collection = DSUtil.Get_T_Dic(Collection);
temp.MobKill = DSUtil.Get_T_Dic(MobKill); temp.MobKill = DSUtil.Get_T_Dic(MobKill);
@ -768,7 +768,7 @@ public partial class ServerData
} }
public TimeSpan Get_PetGachaADTime() public TimeSpan Get_PetGachaADTime()
{ {
return PetGachaADTime - ServerInfo.ServerTime; return PetData.PetGachaADTime - ServerInfo.ServerTime;
} }
#endregion #endregion
#region #region
@ -2832,6 +2832,43 @@ public class SD_PCLimitSlotData_Read
return rtn; return rtn;
} }
} }
public class SD_Pet
{
public ObscuredInt GachaLv, GachaExp;
public DateTime PetGachaADTime;
public SD_Pet()
{
GachaLv = 1; GachaLv.RandomizeCryptoKey();
GachaExp = 0; GachaExp.RandomizeCryptoKey();
}
public SD_Pet_Read Get()
{
var temp = new SD_Pet_Read();
temp.GachaLv = GachaLv;
temp.GachaExp = GachaExp;
temp.PetGachaADTime = PetGachaADTime;
return temp;
}
}
public class SD_Pet_Read
{
public int GachaLv, GachaExp;
public DateTime PetGachaADTime;
public SD_Pet Get()
{
var temp = new SD_Pet();
temp.GachaLv = GachaLv; temp.GachaLv.RandomizeCryptoKey();
temp.GachaExp = GachaExp; temp.GachaExp.RandomizeCryptoKey();
temp.PetGachaADTime = PetGachaADTime;
return temp;
}
}
public class SD_Farm public class SD_Farm
{ {
public ObscuredInt MaxSlot; public ObscuredInt MaxSlot;
@ -2938,4 +2975,10 @@ public class SC_EnchantEquipItemResult
{ {
public int optionconfigid, Lv; public int optionconfigid, Lv;
} }
public class SC_PetGachaResult
{
public int gem;
public DateTime adtime;
public List<int> pets;
}
#endregion #endregion

View File

@ -1715,6 +1715,44 @@ public class ServerInfo : MyCoroutine
Set_Coroutine(() => { Save_Skill_Awaken(skillid, _act); }, 2f); Set_Coroutine(() => { Save_Skill_Awaken(skillid, _act); }, 2f);
}); });
} }
public void Save_Pet_Gacha(bool isad, int amount, Action<SC_PetGachaResult> _act)
{
NetWait.Ins.Set(true);
PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest
{
FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true,
FunctionParameter = new
{
Token = m_LoginInfo.EntityToken.EntityToken,
AD = isad,
Amount = amount,
}
},
result =>
{
if (result.Error == null)
{
NetWait.Ins.Set(false);
var str_result = result.FunctionResult.ToString();
var error = MyErrorCheck(str_result);
// (0 성공, 1 실패 (재화 부족), 2 실패 (광고 시간 남음))
switch (error)
{
case 0: _act?.Invoke(JsonConvert.DeserializeObject<SC_PetGachaResult>(str_result)); break;
case 1: ToastUI.Ins.Set(388); break;
case 2: ToastUI.Ins.Set(999900026); break;
}
}
else
Set_Coroutine(() => { Save_Pet_Gacha(isad, amount, _act); }, 2f);
},
fail =>
{
Set_Coroutine(() => { Save_Pet_Gacha(isad, amount, _act); }, 2f);
});
}
#endregion #endregion
#region #region

View File

@ -96,7 +96,6 @@ public class PetUI_Left : UI3DModel
case 0: // 광고 뽑기 case 0: // 광고 뽑기
var ts = sdata.Get_PetGachaADTime(); var ts = sdata.Get_PetGachaADTime();
if (ts.TotalSeconds > 0) return; if (ts.TotalSeconds > 0) return;
sdata.PetGachaADTime = ServerInfo.ServerTime.AddMinutes(table_GlobalValue.Ins.Get_Int("n_AddPetGachaADMinute"));
break; break;
case 1: // 뽑기1 case 1: // 뽑기1
m_Price = m_Amount * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha"); m_Price = m_Amount * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha");
@ -110,33 +109,40 @@ public class PetUI_Left : UI3DModel
m_Price.RandomizeCryptoKey(); m_Price.RandomizeCryptoKey();
if (index == 0) if (index == 0)
ADInfo.Ins.Show_AD(Send_Gamble); //ADInfo.Ins.Show_AD(() =>
//{
// sdata.PetData.PetGachaADTime = ServerInfo.ServerTime.AddMinutes(table_GlobalValue.Ins.Get_Int("n_AddPetGachaADMinute"));
// Send_Gamble();
//});
Send_Gamble();
else if (sdata.Check_ItemAmount(1, m_Price)) else if (sdata.Check_ItemAmount(1, m_Price))
Send_Gamble(); Send_Gamble();
} }
void Send_Gamble() void Send_Gamble()
{ {
var sdata = ServerInfo.Ins.m_ServerData; ServerInfo.Ins.Save_Pet_Gacha(m_Price == 0, m_Amount, result =>
if (m_Price > 0) sdata.Use_Item(1, m_Price);
var itemlst = new List<ItemSimpleData>();
var petlst = table_petlist.Ins.Get_DataList();
for (int i = 0; i < m_Amount; i++)
{ {
var temp = new ItemSimpleData(); var sdata = ServerInfo.Ins.m_ServerData;
temp.itemid = petlst[Random.Range(0, petlst.Count)].n_PetID; sdata.Use_Item(1, result.gem);
temp.amount = 1;
itemlst.Add(temp);
sdata.Add_Item(temp.itemid, 1);
}
sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, m_Amount); var itemlst = new List<ItemSimpleData>();
sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, m_Amount); for (int i = 0; i < result.pets.Count; i++)
sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, m_Amount); {
var temp = new ItemSimpleData();
temp.itemid = result.pets[i];
temp.amount = 1;
itemlst.Add(temp);
sdata.Add_Item(temp.itemid, 1);
}
ObtainItemUI.Ins.Set(itemlst); sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, m_Amount);
NewGameUI.Ins.m_PetUI.m_PetUI_Right.Set_Scroll(); sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, m_Amount);
Set_GambleUI(); sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, m_Amount);
ObtainItemUI.Ins.Set(itemlst);
NewGameUI.Ins.m_PetUI.m_PetUI_Right.Set_Scroll();
Set_GambleUI();
});
} }
} }