puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-lua into dev_20230829

Browse Source
This commit is contained in:
xiekaidong 2023-08-28 18:36:05 +08:00
commit d23ea152e2
26 changed files with 1562 additions and 1938 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

666
lua/app/config/act_gift.lua
View File

@ -1678,7 +1678,7 @@ local act_gift = {
}, },
[140403]={ [140403]={
["type"]=14, ["type"]=14,
["recharge_id"]=11, ["recharge_id"]=10,
["limit"]=1 ["limit"]=1
}, },
[140404]={ [140404]={
@ -1702,29 +1702,21 @@ local act_gift = {
["num"]=6000, ["num"]=6000,
["num_for_nothing"]="UAhcAw==" ["num_for_nothing"]="UAhcAw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1001, ["id"]=1001,
["id_for_nothing"]="VwhcAg==", ["id_for_nothing"]="VwhcAg==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1002, ["id"]=1002,
["id_for_nothing"]="VwhcAQ==", ["id_for_nothing"]="VwhcAQ==",
["num"]=30, ["num"]=5,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Uw=="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -1738,7 +1730,7 @@ local act_gift = {
20, 20,
30 30
}, },
["recharge_id"]=5, ["recharge_id"]=7,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
@ -1748,21 +1740,13 @@ local act_gift = {
["num"]=6000, ["num"]=6000,
["num_for_nothing"]="UAhcAw==" ["num_for_nothing"]="UAhcAw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1001, ["id"]=1001,
["id_for_nothing"]="VwhcAg==", ["id_for_nothing"]="VwhcAg==",
["num"]=20, ["num"]=60,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1784,39 +1768,31 @@ local act_gift = {
40, 40,
50 50
}, },
["recharge_id"]=5, ["recharge_id"]=8,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6800, ["num"]=10000,
["num_for_nothing"]="UABcAw==" ["num_for_nothing"]="VwhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1002, ["id"]=1002,
["id_for_nothing"]="VwhcAQ==", ["id_for_nothing"]="VwhcAQ==",
["num"]=20, ["num"]=60,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1003, ["id"]=1003,
["id_for_nothing"]="VwhcAA==", ["id_for_nothing"]="VwhcAA==",
["num"]=30, ["num"]=40,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Ugg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -1830,31 +1806,23 @@ local act_gift = {
60, 60,
70 70
}, },
["recharge_id"]=5, ["recharge_id"]=8,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6800, ["num"]=10000,
["num_for_nothing"]="UABcAw==" ["num_for_nothing"]="VwhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1002, ["id"]=1002,
["id_for_nothing"]="VwhcAQ==", ["id_for_nothing"]="VwhcAQ==",
["num"]=20, ["num"]=60,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1876,39 +1844,269 @@ local act_gift = {
80, 80,
90 90
}, },
["recharge_id"]=5, ["recharge_id"]=12,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=7200, ["num"]=16000,
["num_for_nothing"]="UQpcAw==" ["num_for_nothing"]="Vw5cA2U="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=1002,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VwhcAQ==",
["num"]=50, ["num"]=40,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1003, ["id"]=1003,
["id_for_nothing"]="VwhcAA==", ["id_for_nothing"]="VwhcAA==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1004, ["id"]=1004,
["id_for_nothing"]="VwhcBw==", ["id_for_nothing"]="VwhcBw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150602]={
["type"]=15,
["parameter_pro"]={
100,
110
},
["recharge_id"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=16000,
["num_for_nothing"]="Vw5cA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150702]={
["type"]=15,
["parameter_pro"]={
120,
130
},
["recharge_id"]=13,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=24000,
["num_for_nothing"]="VAxcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150802]={
["type"]=15,
["parameter_pro"]={
140,
150
},
["recharge_id"]=13,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=24000,
["num_for_nothing"]="VAxcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150902]={
["type"]=15,
["parameter_pro"]={
160,
170
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1006,
["id_for_nothing"]="VwhcBQ==",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[151002]={
["type"]=15,
["parameter_pro"]={
180,
190
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1006,
["id_for_nothing"]="VwhcBQ==",
["num"]=80,
["num_for_nothing"]="Xgg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -1922,39 +2120,31 @@ local act_gift = {
0, 0,
10 10
}, },
["recharge_id"]=5, ["recharge_id"]=7,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6000, ["num"]=12000,
["num_for_nothing"]="UAhcAw==" ["num_for_nothing"]="VwpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=38, ["id"]=38,
["id_for_nothing"]="VQA=", ["id_for_nothing"]="VQA=",
["num"]=15, ["num"]=60,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=39, ["id"]=39,
["id_for_nothing"]="VQE=", ["id_for_nothing"]="VQE=",
["num"]=15, ["num"]=5,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="Uw=="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -1968,39 +2158,31 @@ local act_gift = {
20, 20,
30 30
}, },
["recharge_id"]=5, ["recharge_id"]=10,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6000, ["num"]=12000,
["num_for_nothing"]="UAhcAw==" ["num_for_nothing"]="VwpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=38, ["id"]=38,
["id_for_nothing"]="VQA=", ["id_for_nothing"]="VQA=",
["num"]=15, ["num"]=60,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=39, ["id"]=39,
["id_for_nothing"]="VQE=", ["id_for_nothing"]="VQE=",
["num"]=20, ["num"]=40,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="Ugg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -2014,39 +2196,31 @@ local act_gift = {
40, 40,
50 50
}, },
["recharge_id"]=5, ["recharge_id"]=12,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6800, ["num"]=20000,
["num_for_nothing"]="UABcAw==" ["num_for_nothing"]="VAhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=39, ["id"]=39,
["id_for_nothing"]="VQE=", ["id_for_nothing"]="VQE=",
["num"]=10, ["num"]=60,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=40, ["id"]=40,
["id_for_nothing"]="Ugg=", ["id_for_nothing"]="Ugg=",
["num"]=15, ["num"]=40,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="Ugg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -2060,39 +2234,31 @@ local act_gift = {
60, 60,
70 70
}, },
["recharge_id"]=5, ["recharge_id"]=12,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=6800, ["num"]=20000,
["num_for_nothing"]="UABcAw==" ["num_for_nothing"]="VAhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=39, ["id"]=39,
["id_for_nothing"]="VQE=", ["id_for_nothing"]="VQE=",
["num"]=15, ["num"]=60,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=40, ["id"]=40,
["id_for_nothing"]="Ugg=", ["id_for_nothing"]="Ugg=",
["num"]=20, ["num"]=40,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="Ugg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -2106,39 +2272,269 @@ local act_gift = {
80, 80,
90 90
}, },
["recharge_id"]=5, ["recharge_id"]=14,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=7200, ["num"]=32000,
["num_for_nothing"]="UQpcAw==" ["num_for_nothing"]="VQpcA2U="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=39,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VQE=",
["num"]=50, ["num"]=40,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=40, ["id"]=40,
["id_for_nothing"]="Ugg=", ["id_for_nothing"]="Ugg=",
["num"]=15, ["num"]=60,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=41, ["id"]=41,
["id_for_nothing"]="Ugk=", ["id_for_nothing"]="Ugk=",
["num"]=15, ["num"]=60,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160602]={
["type"]=16,
["parameter_pro"]={
100,
110
},
["recharge_id"]=14,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=32000,
["num_for_nothing"]="VQpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160702]={
["type"]=16,
["parameter_pro"]={
120,
130
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=48000,
["num_for_nothing"]="UgBcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160802]={
["type"]=16,
["parameter_pro"]={
140,
150
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=48000,
["num_for_nothing"]="UgBcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160902]={
["type"]=16,
["parameter_pro"]={
160,
170
},
["recharge_id"]=17,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80000,
["num_for_nothing"]="XghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=43,
["id_for_nothing"]="Ugs=",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[161002]={
["type"]=16,
["parameter_pro"]={
180,
190
},
["recharge_id"]=17,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80000,
["num_for_nothing"]="XghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=43,
["id_for_nothing"]="Ugs=",
["num"]=80,
["num_for_nothing"]="Xgg="
} }
}, },
["time_type"]=1, ["time_type"]=1,
@ -2148,6 +2544,6 @@ local act_gift = {
} }
} }
local config = { local config = {
data=act_gift,count=66 data=act_gift,count=76
} }
return config return config

475
lua/app/config/activity_herofund.lua
View File

@ -1,6 +1,6 @@
local activity_herofund = { local activity_herofund = {
[1]={ [1]={
["exp"]=30, ["exp"]=0,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -14,8 +14,8 @@ local activity_herofund = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44003, ["id"]=44003,
["id_for_nothing"]="UgxcA2Y=", ["id_for_nothing"]="UgxcA2Y=",
["num"]=1, ["num"]=3,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VQ=="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
@ -27,16 +27,8 @@ local activity_herofund = {
} }
}, },
[2]={ [2]={
["exp"]=60, ["exp"]=30,
["reward"]={ ["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
@ -44,44 +36,52 @@ local activity_herofund = {
["num"]=1500, ["num"]=1500,
["num_for_nothing"]="Vw1cAw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=3000, ["num"]=4000,
["num_for_nothing"]="VQhcAw==" ["num_for_nothing"]="UghcAw=="
} }
}, },
[3]={ [3]={
["exp"]=90, ["exp"]=60,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=8, ["id"]=3,
["id_for_nothing"]="Xg==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=10,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=15,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw0="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=2, ["num"]=20,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VAg="
} }
}, },
[4]={ [4]={
["exp"]=120, ["exp"]=90,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -108,22 +108,49 @@ local activity_herofund = {
} }
}, },
[5]={ [5]={
["exp"]=150, ["exp"]=120,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=10, ["id"]=1,
["id_for_nothing"]="Vwg=", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=1500,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=11, ["id"]=1,
["id_for_nothing"]="Vwk=", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=2000,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[6]={
["exp"]=150,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=2,
["num_for_nothing"]="VA=="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
@ -134,17 +161,36 @@ local activity_herofund = {
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
}, },
[6]={ [7]={
["exp"]=180, ["exp"]=180,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=3,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VQ==",
["num"]=1000, ["num"]=10,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[8]={
["exp"]=210,
["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
@ -152,71 +198,25 @@ local activity_herofund = {
["num"]=1500, ["num"]=1500,
["num_for_nothing"]="Vw1cAw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=3000, ["num"]=4000,
["num_for_nothing"]="VQhcAw==" ["num_for_nothing"]="UghcAw=="
}
},
[7]={
["exp"]=210,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=8,
["id_for_nothing"]="Xg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=9,
["id_for_nothing"]="Xw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=9,
["id_for_nothing"]="Xw==",
["num"]=2,
["num_for_nothing"]="VA=="
}
},
[8]={
["exp"]=240,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[9]={ [9]={
["exp"]=270, ["exp"]=240,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -243,7 +243,7 @@ local activity_herofund = {
} }
}, },
[10]={ [10]={
["exp"]=300, ["exp"]=270,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -270,7 +270,7 @@ local activity_herofund = {
} }
}, },
[11]={ [11]={
["exp"]=330, ["exp"]=300,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -297,124 +297,116 @@ local activity_herofund = {
} }
}, },
[12]={ [12]={
["exp"]=330,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
[13]={
["exp"]=360, ["exp"]=360,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1500,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1500, ["num"]=2000,
["num_for_nothing"]="Vw1cAw==" ["num_for_nothing"]="VAhcAw=="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=3000, ["num"]=4000,
["num_for_nothing"]="VQhcAw==" ["num_for_nothing"]="UghcAw=="
} }
}, },
[13]={ [14]={
["exp"]=390, ["exp"]=390,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=8, ["id"]=3,
["id_for_nothing"]="Xg==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=10,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=15,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw0="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=2, ["num"]=20,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VAg="
} }
}, },
[14]={ [15]={
["exp"]=420, ["exp"]=420,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=13, ["id"]=44003,
["id_for_nothing"]="Vws=", ["id_for_nothing"]="UgxcA2Y=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=13, ["id"]=44003,
["id_for_nothing"]="Vws=", ["id_for_nothing"]="UgxcA2Y=",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=13, ["id"]=44003,
["id_for_nothing"]="Vws=", ["id_for_nothing"]="UgxcA2Y=",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}
},
[15]={
["exp"]=450,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=11,
["id_for_nothing"]="Vwk=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
}, },
[16]={ [16]={
["exp"]=480, ["exp"]=450,
["reward"]={ ["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
@ -422,51 +414,59 @@ local activity_herofund = {
["num"]=1500, ["num"]=1500,
["num_for_nothing"]="Vw1cAw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=3000, ["num"]=4000,
["num_for_nothing"]="VQhcAw==" ["num_for_nothing"]="UghcAw=="
} }
}, },
[17]={ [17]={
["exp"]=510, ["exp"]=480,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=8, ["id"]=3,
["id_for_nothing"]="Xg==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=10,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=1, ["num"]=15,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw0="
}, },
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=9, ["id"]=3,
["id_for_nothing"]="Xw==", ["id_for_nothing"]="VQ==",
["num"]=2, ["num"]=20,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VAg="
} }
}, },
[18]={ [18]={
["exp"]=540, ["exp"]=510,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=2,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA==",
["num"]=20, ["num"]=30,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VQg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -486,34 +486,7 @@ local activity_herofund = {
} }
}, },
[19]={ [19]={
["exp"]=570, ["exp"]=540,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
[20]={
["exp"]=600,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -539,8 +512,35 @@ local activity_herofund = {
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
}, },
[20]={
["exp"]=570,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[21]={ [21]={
["exp"]=630, ["exp"]=600,
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -567,16 +567,8 @@ local activity_herofund = {
} }
}, },
[22]={ [22]={
["exp"]=660, ["exp"]=630,
["reward"]={ ["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
@ -584,17 +576,52 @@ local activity_herofund = {
["num"]=1500, ["num"]=1500,
["num_for_nothing"]="Vw1cAw==" ["num_for_nothing"]="Vw1cAw=="
}, },
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={ ["reward_pro_max"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=3000, ["num"]=4000,
["num_for_nothing"]="VQhcAw==" ["num_for_nothing"]="UghcAw=="
}
},
[23]={
["exp"]=660,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
} }
} }
} }
local config = { local config = {
data=activity_herofund,count=22 data=activity_herofund,count=23
} }
return config return config

2
lua/app/config/arena_board.lua
View File

@ -20227,7 +20227,7 @@ local arena_board = {
}, },
{ {
35, 35,
35 0
}, },
{ {
35, 35,

1824
lua/app/config/chapter_dungeon_armor.lua
View File

File diff suppressed because it is too large Load Diff

166
lua/app/config/chapter_dungeon_equip.lua
View File

@ -58,7 +58,7 @@ local chapter_dungeon_equip = {
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -191,13 +191,13 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1001,
["num"]=1, ["num"]=1,
["weight"]=80 ["weight"]=90
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=10
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -205,12 +205,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -278,13 +278,13 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1001,
["num"]=1, ["num"]=1,
["weight"]=60 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=40 ["weight"]=15
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -365,13 +365,13 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1001,
["num"]=1, ["num"]=1,
["weight"]=35 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=65 ["weight"]=20
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -384,7 +384,7 @@ local chapter_dungeon_equip = {
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -452,19 +452,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1001,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=60
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=70 ["weight"]=30
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=10
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -472,12 +472,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -545,19 +545,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1001, ["id"]=1001,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=45
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=65 ["weight"]=40
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=30 ["weight"]=15
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -565,7 +565,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
@ -634,17 +634,23 @@ local chapter_dungeon_equip = {
} }
}, },
["rand_drop"]={ ["rand_drop"]={
{
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=30
},
{ {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=40 ["weight"]=50
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=60 ["weight"]=20
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -657,7 +663,7 @@ local chapter_dungeon_equip = {
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -725,13 +731,13 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=60
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=70 ["weight"]=30
}, },
{ {
["type"]=1, ["type"]=1,
@ -745,12 +751,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -818,19 +824,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1002, ["id"]=1002,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=45
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=65 ["weight"]=40
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=15
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -838,7 +844,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
@ -907,17 +913,23 @@ local chapter_dungeon_equip = {
} }
}, },
["rand_drop"]={ ["rand_drop"]={
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=30
},
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=55 ["weight"]=50
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=45 ["weight"]=20
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -925,12 +937,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -998,19 +1010,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=30 ["weight"]=67
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=60 ["weight"]=25
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=8
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1018,12 +1030,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -1091,19 +1103,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1003, ["id"]=1003,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=57
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=80 ["weight"]=30
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=13
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1111,7 +1123,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
@ -1180,17 +1192,23 @@ local chapter_dungeon_equip = {
} }
}, },
["rand_drop"]={ ["rand_drop"]={
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=46
},
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=60 ["weight"]=36
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=40 ["weight"]=18
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1198,12 +1216,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -1271,19 +1289,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=30 ["weight"]=66
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=55 ["weight"]=30
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=4
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1291,12 +1309,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -1372,19 +1390,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=53
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=70 ["weight"]=38
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=9
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1392,12 +1410,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=1,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -1465,19 +1483,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=43
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=65 ["weight"]=42
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=15
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1485,7 +1503,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
@ -1558,19 +1576,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=40
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=60 ["weight"]=40
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=30 ["weight"]=20
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1578,7 +1596,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
@ -1651,19 +1669,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=37
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=53 ["weight"]=38
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=40 ["weight"]=25
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1671,12 +1689,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={ ["bao_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,
@ -1744,19 +1762,19 @@ local chapter_dungeon_equip = {
["type"]=1, ["type"]=1,
["id"]=1004, ["id"]=1004,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=34
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1005, ["id"]=1005,
["num"]=1, ["num"]=1,
["weight"]=45 ["weight"]=36
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=1006, ["id"]=1006,
["num"]=1, ["num"]=1,
["weight"]=50 ["weight"]=30
} }
}, },
["rand_drop_num"]=10, ["rand_drop_num"]=10,
@ -1769,7 +1787,7 @@ local chapter_dungeon_equip = {
["weight"]=100 ["weight"]=100
} }
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=3,
["item_show"]={ ["item_show"]={
{ {
["type"]=1, ["type"]=1,

11
lua/app/config/fx.lua
View File

@ -2003,6 +2003,10 @@ local fx = {
["bind"]="root", ["bind"]="root",
["bg"]=1 ["bg"]=1
}, },
[300150]={
["res"]="sfx_p0036_b05",
["bind"]="root"
},
[400000]={ [400000]={
["res"]="sfx_p0012_b01", ["res"]="sfx_p0012_b01",
["bind"]="root", ["bind"]="root",
@ -2754,9 +2758,14 @@ local fx = {
["bind"]="root", ["bind"]="root",
["flip"]=1, ["flip"]=1,
["bg"]=1 ["bg"]=1
},
[400150]={
["res"]="sfx_p0036_b05",
["bind"]="root",
["flip"]=1
} }
} }
local config = { local config = {
data=fx,count=647 data=fx,count=649
} }
return config return config

206
lua/app/config/item.lua
View File

@ -1562,7 +1562,8 @@ local item = {
4, 4,
5, 5,
6, 6,
7 7,
8
} }
}, },
[1002]={ [1002]={
@ -1571,14 +1572,14 @@ local item = {
["icon"]="1002", ["icon"]="1002",
["get_way_type"]=1, ["get_way_type"]=1,
["get_way"]={ ["get_way"]={
6,
7,
5,
8,
4,
9, 9,
3, 8,
10 10,
6,
11,
5,
4,
3
} }
}, },
[1003]={ [1003]={
@ -1587,14 +1588,15 @@ local item = {
["icon"]="1003", ["icon"]="1003",
["get_way_type"]=1, ["get_way_type"]=1,
["get_way"]={ ["get_way"]={
9,
10,
8,
11,
12, 12,
13,
11,
14,
10,
9,
8,
7, 7,
6, 6
13
} }
}, },
[1004]={ [1004]={
@ -1603,18 +1605,18 @@ local item = {
["icon"]="1004", ["icon"]="1004",
["get_way_type"]=1, ["get_way_type"]=1,
["get_way"]={ ["get_way"]={
13,
14,
12,
15, 15,
11,
16, 16,
10,
17, 17,
18, 18,
19, 19,
14,
20, 20,
10 13,
12,
11,
10,
9
} }
}, },
[1005]={ [1005]={
@ -1623,12 +1625,12 @@ local item = {
["icon"]="1005", ["icon"]="1005",
["get_way_type"]=1, ["get_way_type"]=1,
["get_way"]={ ["get_way"]={
16,
17, 17,
18, 18,
16,
19, 19,
15,
20, 20,
15,
14, 14,
13, 13,
12 12
@ -1674,21 +1676,21 @@ local item = {
["icon"]="1008", ["icon"]="1008",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
25,
31,
19, 19,
13, 13,
25,
7, 7,
31, 29,
30,
35,
36,
23, 23,
24, 24,
17, 17,
18, 18,
29,
30,
11, 11,
12, 12
35,
36
} }
}, },
[1009]={ [1009]={
@ -1697,22 +1699,22 @@ local item = {
["icon"]="1009", ["icon"]="1009",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
31,
37, 37,
43,
31,
25, 25,
19, 19,
43,
13, 13,
35,
36,
41, 41,
42, 42,
47,
48,
35,
36,
29, 29,
30, 30,
23, 23,
24, 24,
47,
48,
17, 17,
18 18
} }
@ -1723,22 +1725,22 @@ local item = {
["icon"]="1010", ["icon"]="1010",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
43,
49, 49,
55,
43,
37, 37,
31, 31,
55,
25, 25,
47,
48,
53, 53,
54, 54,
59,
60,
47,
48,
41, 41,
42, 42,
35, 35,
36, 36,
59,
60,
29, 29,
30 30
} }
@ -1772,7 +1774,7 @@ local item = {
55, 55,
49, 49,
59, 59,
60, 54,
53, 53,
54 54
} }
@ -1803,21 +1805,21 @@ local item = {
["icon"]="1020", ["icon"]="1020",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
26,
32,
20, 20,
14, 14,
26,
8, 8,
32, 29,
30,
35,
36,
23, 23,
24, 24,
17, 17,
18, 18,
29,
30,
11, 11,
12, 12
35,
36
} }
}, },
[1015]={ [1015]={
@ -1826,22 +1828,22 @@ local item = {
["icon"]="1021", ["icon"]="1021",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
32,
38, 38,
44,
32,
26, 26,
20, 20,
44,
14, 14,
35,
36,
41, 41,
42, 42,
47,
48,
35,
36,
29, 29,
30, 30,
23, 23,
24, 24,
47,
48,
17, 17,
18 18
} }
@ -1852,22 +1854,22 @@ local item = {
["icon"]="1022", ["icon"]="1022",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
44,
50, 50,
56,
44,
38, 38,
32, 32,
56,
26, 26,
47,
48,
53, 53,
54, 54,
59,
60,
47,
48,
41, 41,
42, 42,
35, 35,
36, 36,
59,
60,
29, 29,
30 30
} }
@ -1901,7 +1903,7 @@ local item = {
56, 56,
50, 50,
59, 59,
60, 54,
53, 53,
54 54
} }
@ -1932,21 +1934,21 @@ local item = {
["icon"]="1014", ["icon"]="1014",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
27,
33,
21, 21,
15, 15,
27,
9, 9,
33, 29,
30,
35,
36,
23, 23,
24, 24,
17, 17,
18, 18,
29,
30,
11, 11,
12, 12
35,
36
} }
}, },
[1021]={ [1021]={
@ -1955,22 +1957,22 @@ local item = {
["icon"]="1015", ["icon"]="1015",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
33,
39, 39,
45,
33,
27, 27,
21, 21,
45,
15, 15,
35,
36,
41, 41,
42, 42,
47,
48,
35,
36,
29, 29,
30, 30,
23, 23,
24, 24,
47,
48,
17, 17,
18 18
} }
@ -1981,22 +1983,22 @@ local item = {
["icon"]="1016", ["icon"]="1016",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
45,
51, 51,
57,
45,
39, 39,
33, 33,
57,
27, 27,
47,
48,
53, 53,
54, 54,
59,
60,
47,
48,
41, 41,
42, 42,
35, 35,
36, 36,
59,
60,
29, 29,
30 30
} }
@ -2030,7 +2032,7 @@ local item = {
57, 57,
51, 51,
59, 59,
60, 54,
53, 53,
54 54
} }
@ -2061,21 +2063,21 @@ local item = {
["icon"]="1026", ["icon"]="1026",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
28,
34,
22, 22,
16, 16,
28,
10, 10,
34, 29,
30,
35,
36,
23, 23,
24, 24,
17, 17,
18, 18,
29,
30,
11, 11,
12, 12
35,
36
} }
}, },
[1027]={ [1027]={
@ -2084,22 +2086,22 @@ local item = {
["icon"]="1027", ["icon"]="1027",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
34,
40, 40,
46,
34,
28, 28,
22, 22,
46,
16, 16,
35,
36,
41, 41,
42, 42,
47,
48,
35,
36,
29, 29,
30, 30,
23, 23,
24, 24,
47,
48,
17, 17,
18 18
} }
@ -2110,22 +2112,22 @@ local item = {
["icon"]="1028", ["icon"]="1028",
["get_way_type"]=2, ["get_way_type"]=2,
["get_way"]={ ["get_way"]={
46,
52, 52,
58,
46,
40, 40,
34, 34,
58,
28, 28,
47,
48,
53, 53,
54, 54,
59,
60,
47,
48,
41, 41,
42, 42,
35, 35,
36, 36,
59,
60,
29, 29,
30 30
} }
@ -2159,7 +2161,7 @@ local item = {
58, 58,
52, 52,
59, 59,
60, 54,
53, 53,
54 54
} }

6
lua/app/config/localization/localization_global_const.lua
View File

@ -463,9 +463,9 @@ local LocalizationGlobalConst =
ARENA_DESC_42 = "ARENA_DESC_42", ARENA_DESC_42 = "ARENA_DESC_42",
EQUIP_DESC_26 = "EQUIP_DESC_26", EQUIP_DESC_26 = "EQUIP_DESC_26",
EQUIP_DESC_27 = "EQUIP_DESC_27", EQUIP_DESC_27 = "EQUIP_DESC_27",
["SEIZED_DESC_1"] ="SEIZED_DESC_1", SEIZED_DESC_1 = "SEIZED_DESC_1",
["SEIZED_DESC_2"] ="SEIZED_DESC_2", SEIZED_DESC_2 = "SEIZED_DESC_2",
["SEIZED_DESC_3"]= "SEIZED_DESC_3", SEIZED_DESC_3 = "SEIZED_DESC_3",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

4
lua/app/config/skin_skill.lua
View File

@ -369,13 +369,13 @@ local skin_skill = {
["sound"]=14001200, ["sound"]=14001200,
["sound_delay"]=0.0, ["sound_delay"]=0.0,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=300049, ["fx_self"]=300150,
["bullet_time"]={ ["bullet_time"]={
1166, 1166,
3000, 3000,
200 200
}, },
["fx_self_mirror"]=400082 ["fx_self_mirror"]=400150
} }
} }
local config = { local config = {

6
lua/app/config/strings/cn/global.lua
View File

@ -463,9 +463,9 @@ local localization_global =
["ARENA_DESC_42"] = "未领取奖励", ["ARENA_DESC_42"] = "未领取奖励",
["EQUIP_DESC_26"] = "武器直升{0}级礼包", ["EQUIP_DESC_26"] = "武器直升{0}级礼包",
["EQUIP_DESC_27"] = "防具直升{0}级礼包", ["EQUIP_DESC_27"] = "防具直升{0}级礼包",
["SEIZED_DESC_1"] ="检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。", ["SEIZED_DESC_1"] = "检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。",
["SEIZED_DESC_2"] ="联系客服", ["SEIZED_DESC_2"] = "联系客服",
["SEIZED_DESC_3"]= "删除账号", ["SEIZED_DESC_3"] = "删除账号",
} }
return localization_global return localization_global

3
lua/app/config/strings/en/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "Unclaimed Rewards", ["ARENA_DESC_42"] = "Unclaimed Rewards",
["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack", ["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack",
["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack", ["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack",
["SEIZED_DESC_1"] = "Detected abnormality on your account. Please contact customer service or delete the account and continue playing with a new account.",
["SEIZED_DESC_2"] = "Customer Service",
["SEIZED_DESC_3"] = "Delete Account",
} }
return localization_global return localization_global

3
lua/app/config/strings/es/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "Recompensas no colectadas", ["ARENA_DESC_42"] = "Recompensas no colectadas",
["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}", ["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}",
["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}", ["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}",
["SEIZED_DESC_1"] = "Se ha detectado una anomalía en tu cuenta. Por favor contacta con Atención al Cliente, o elimina la cuenta actual y crear una nueva para continuar el juego.",
["SEIZED_DESC_2"] = "Atención al Cliente",
["SEIZED_DESC_3"] = "Eliminar Cuenta",
} }
return localization_global return localization_global

3
lua/app/config/strings/id/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "Hadiah yang belum diklaim", ["ARENA_DESC_42"] = "Hadiah yang belum diklaim",
["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}", ["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}",
["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}", ["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}",
["SEIZED_DESC_1"] = "Telah terdeteksi kondisi tidak normal pada akunmuu. Silakan hubungi layanan pelanggan atau hapus akun, dan gunakan akun baru untuk melanjutkan permainan.",
["SEIZED_DESC_2"] = "Hubungi Layanan Pelanggan",
["SEIZED_DESC_3"] = "Hapus Akun",
} }
return localization_global return localization_global

3
lua/app/config/strings/ja/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "未受取の報酬", ["ARENA_DESC_42"] = "未受取の報酬",
["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック", ["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック",
["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック", ["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック",
["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。",
["SEIZED_DESC_2"] = "サポートセンターに連絡する",
["SEIZED_DESC_3"] = "アカウントを削除する",
} }
return localization_global return localization_global

3
lua/app/config/strings/ko/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "미수령 보상", ["ARENA_DESC_42"] = "미수령 보상",
["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지", ["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지",
["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지", ["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지",
["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.",
["SEIZED_DESC_2"] = "고객 서비스 문의",
["SEIZED_DESC_3"] = "계정 삭제",
} }
return localization_global return localization_global

3
lua/app/config/strings/pt/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "Recompensas não coletadas", ["ARENA_DESC_42"] = "Recompensas não coletadas",
["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}", ["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}",
["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}", ["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}",
["SEIZED_DESC_1"] = "Foi detectada alguma anormalidade com sua conta. Entre em contato com o atendimento ao cliente ou exclua a conta atual e crie uma nova conta para continuar jogando.",
["SEIZED_DESC_2"] = "Atendimento ao Cliente",
["SEIZED_DESC_3"] = "Excluir Conta",
} }
return localization_global return localization_global

3
lua/app/config/strings/th/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ", ["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ",
["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล", ["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล",
["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล", ["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล",
["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ",
["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า",
["SEIZED_DESC_3"] = "ลบบัญชี",
} }
return localization_global return localization_global

3
lua/app/config/strings/vi/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "Chưa nhận quà", ["ARENA_DESC_42"] = "Chưa nhận quà",
["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}", ["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}",
["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}", ["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}",
["SEIZED_DESC_1"] = "Đã phát hiện tài khoản có bất thường, vui lòng liên hệ CSKH hoặc xóa TK và sử dụng TK mới để tiếp tục trò chơi.",
["SEIZED_DESC_2"] = "Liên hệ CSKH",
["SEIZED_DESC_3"] = "Xóa TK",
} }
return localization_global return localization_global

3
lua/app/config/strings/zh/global.lua
View File

@ -462,6 +462,9 @@ local localization_global =
["ARENA_DESC_42"] = "未領取獎勵", ["ARENA_DESC_42"] = "未領取獎勵",
["EQUIP_DESC_26"] = "武器直升{0}級禮包", ["EQUIP_DESC_26"] = "武器直升{0}級禮包",
["EQUIP_DESC_27"] = "防具直升{0}級禮包", ["EQUIP_DESC_27"] = "防具直升{0}級禮包",
["SEIZED_DESC_1"] = "檢測到你的賬號存在異常，請聯繫客服或刪除賬號使用新建賬號繼續遊戲。",
["SEIZED_DESC_2"] = "聯繫客服",
["SEIZED_DESC_3"] = "刪除賬號",
} }
return localization_global return localization_global

2
lua/app/module/equip/equip_manager.lua
View File

@ -24,7 +24,7 @@ end
-- 请求触发装备升级礼包 -- 请求触发装备升级礼包
function EquipManager:reqEquipUpgradeGift(heroId, part) function EquipManager:reqEquipUpgradeGift(heroId, part)
if DataManager.EquipData:getGiftId(heroId, part) ~= nil then if DataManager.EquipData:getCanShowGiftId(heroId, part) ~= nil then
return return
end end

4
lua/app/ui/arena/arena_grading_reward_ui.lua
View File

@ -33,9 +33,12 @@ function ArenaGradingRewardUI:onLoadRootComplete()
self.scrollrectComp = uiMap["arena_grading_reward_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) self.scrollrectComp = uiMap["arena_grading_reward_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.scrollrectContent = uiMap["arena_grading_reward_ui.scrollrect.viewport.content"] self.scrollrectContent = uiMap["arena_grading_reward_ui.scrollrect.viewport.content"]
self.bannerCanvas = uiMap["arena_grading_reward_ui.banner"]:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS)
self.btnClose = uiMap["arena_grading_reward_ui.banner.btn_close"] self.btnClose = uiMap["arena_grading_reward_ui.banner.btn_close"]
self.txTips = uiMap["arena_grading_reward_ui.banner.tx_tips"] self.txTips = uiMap["arena_grading_reward_ui.banner.tx_tips"]
self.bannerCanvas.overrideSorting = true
self.bannerCanvas.sortingOrder = self:getUIOrder() + GConst.UI_EFFECT_ORDER.LEVEL5
local cfg = DataManager.ArenaData:getGradingRewardCfg() local cfg = DataManager.ArenaData:getGradingRewardCfg()
self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_39)) self.txTips:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_39))
@ -43,6 +46,7 @@ function ArenaGradingRewardUI:onLoadRootComplete()
return "app/ui/arena/cell/arena_grading_reward_cell" return "app/ui/arena/cell/arena_grading_reward_cell"
end) end)
self.scrollrectComp:addRefreshCallback(function(index, cell) self.scrollrectComp:addRefreshCallback(function(index, cell)
cell:setUI(self)
cell:refresh(index) cell:refresh(index)
end) end)
self.scrollrectComp:clearCells() self.scrollrectComp:clearCells()

17
lua/app/ui/arena/cell/arena_grading_reward_cell.lua
View File

@ -1,5 +1,8 @@
local ArenaGradingRewardCell = class("ArenaGradingRewardCell", BaseCell) local ArenaGradingRewardCell = class("ArenaGradingRewardCell", BaseCell)
-- 光效
local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b01.prefab"
local COMMON_GRADING_POSY = 265 local COMMON_GRADING_POSY = 265
local UNLOCK_GRADING_POSY = 375 local UNLOCK_GRADING_POSY = 375
@ -22,6 +25,7 @@ function ArenaGradingRewardCell:init()
self.commonReward = uiMap["arena_grading_reward_cell.common_reward"] self.commonReward = uiMap["arena_grading_reward_cell.common_reward"]
self.txDesc = uiMap["arena_grading_reward_cell.common_reward.tx_desc"] self.txDesc = uiMap["arena_grading_reward_cell.common_reward.tx_desc"]
self.maskReward = uiMap["arena_grading_reward_cell.common_reward.mask"] self.maskReward = uiMap["arena_grading_reward_cell.common_reward.mask"]
self.rootEffect = uiMap["arena_grading_reward_cell.common_reward.root_effect"]
self.rewards = {} self.rewards = {}
for i = 1, 4 do for i = 1, 4 do
table.insert(self.rewards, uiMap["arena_grading_reward_cell.common_reward.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)) table.insert(self.rewards, uiMap["arena_grading_reward_cell.common_reward.rewards.reward_cell_" .. i]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL))
@ -42,6 +46,10 @@ function ArenaGradingRewardCell:init()
end) end)
end end
function ArenaGradingRewardCell:setUI(root)
self.uiRoot = root
end
function ArenaGradingRewardCell:refresh(id) function ArenaGradingRewardCell:refresh(id)
self.id = id self.id = id
local cfg = DataManager.ArenaData:getGradingRewardCfg()[self.id] local cfg = DataManager.ArenaData:getGradingRewardCfg()[self.id]
@ -135,10 +143,19 @@ function ArenaGradingRewardCell:refresh(id)
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6)) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6))
end end
self.rootEffect:removeAllChildren()
if canGet and not isReceived then
EffectManager:loadUIEffectAsync(EFFECT_LIGHT, self.uiRoot, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj)
obj:setAnchoredPosition(0, 0)
obj:play()
end)
end
for idx, reward in ipairs(self.rewards) do for idx, reward in ipairs(self.rewards) do
if cfg.reward[idx] then if cfg.reward[idx] then
reward:setVisible(true) reward:setVisible(true)
reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived) reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived)
reward:showLight(canGet and not isReceived, self.uiRoot)
else else
reward:setVisible(false) reward:setVisible(false)
end end

17
lua/app/ui/common/cell/reward_cell.lua
View File

@ -1,5 +1,7 @@
local RewardCell = class("RewardCell", BaseCell) local RewardCell = class("RewardCell", BaseCell)
local EFFECT_LIGHT = "assets/prefabs/effects/ui/vfx_ui_arena_gift_b02.prefab"
function RewardCell:init() function RewardCell:init()
local uiMap = self:getUIMap() local uiMap = self:getUIMap()
self.icon = uiMap["reward_cell.item_bg.icon"] self.icon = uiMap["reward_cell.item_bg.icon"]
@ -19,6 +21,8 @@ function RewardCell:init()
-- 皮肤 -- 皮肤
self.skin = uiMap["reward_cell.skin"] self.skin = uiMap["reward_cell.skin"]
self.skinQlt = uiMap["reward_cell.skin.img_qlt"] self.skinQlt = uiMap["reward_cell.skin.img_qlt"]
-- 特效
self.rootEffect = uiMap["reward_cell.root_effect"]
self:hideFrameAnimation() self:hideFrameAnimation()
self.baseObject:addClickListener(function() self.baseObject:addClickListener(function()
@ -127,6 +131,8 @@ function RewardCell:_refreshItem(info, count)
self.matchImg:setVisible(false) self.matchImg:setVisible(false)
self.skin:setVisible(false) self.skin:setVisible(false)
end end
self:showLight(false)
end end
function RewardCell:setNumTx(str) function RewardCell:setNumTx(str)
@ -202,4 +208,15 @@ function RewardCell:showLock(show)
self.lock:setVisible(show == true) self.lock:setVisible(show == true)
end end
-- 展示光效
function RewardCell:showLight(show, ui)
self.rootEffect:removeAllChildren()
if show and ui ~= nil then
EffectManager:loadUIEffectAsync(EFFECT_LIGHT, ui, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj)
obj:setAnchoredPosition(0, 0)
obj:play()
end)
end
end
return RewardCell return RewardCell

2
lua/app/ui/dungeon/item_get_ui.lua
View File

@ -128,7 +128,7 @@ function ItemGetUI:checkShowPanelGift()
self.panelMain:setAnchoredPositionY(COMMON_MAIN_POSY) self.panelMain:setAnchoredPositionY(COMMON_MAIN_POSY)
self.btnClose:setAnchoredPositionY(COMMON_CLOSE_POSY) self.btnClose:setAnchoredPositionY(COMMON_CLOSE_POSY)
self.giftId = DataManager.EquipData:getGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart()) self.giftId = DataManager.EquipData:getCanShowGiftId(self.equipEntity:getHeroId(), self.equipEntity:getPart())
if self.giftId == nil then if self.giftId == nil then
return return
end end

5
lua/app/userdata/arena/arena_data.lua
View File

@ -455,7 +455,7 @@ end
-- 是否有入口红点 -- 是否有入口红点
function ArenaData:hasEntranceRedDot() function ArenaData:hasEntranceRedDot()
return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() or self:hasGradingRewardRedDot()
end end
-- 广告宝箱 ---------------------------------------------------------------------- -- 广告宝箱 ----------------------------------------------------------------------
@ -571,7 +571,8 @@ function ArenaData:getGradingRewardProgressByScore(id, score)
local prog = 0.5 local prog = 0.5
if score > point then if score > point then
prog = prog + ((score - point) / (rangeMax - point)) local half = ((score - point) / (rangeMax - point)) * 0.5
prog = prog + half
end end
return prog return prog
end end

60
lua/app/userdata/equip/equip_data.lua
View File

@ -172,7 +172,7 @@ end
-- 获取所有存在的该类型礼包 -- 获取所有存在的该类型礼包
function EquipData:getGiftIdsByType(actType) function EquipData:getGiftIdsByType(actType)
local ids = {} local ids = {}
for id, trigger in pairs(self.gifts) do for id, data in pairs(self.gifts) do
local cfg = DataManager.ShopData:getActGiftConfig()[id] local cfg = DataManager.ShopData:getActGiftConfig()[id]
if cfg and actType == cfg.type and self:getGiftRemainTime(id) > 0 then if cfg and actType == cfg.type and self:getGiftRemainTime(id) > 0 then
table.insert(ids, id) table.insert(ids, id)
@ -183,8 +183,28 @@ function EquipData:getGiftIdsByType(actType)
return ids return ids
end end
-- 获取当前存在的对应礼包 -- 获取可以展示的礼包
function EquipData:getGiftId(heroId, part) function EquipData:getCanShowGiftId(heroId, part)
local giftId = self:getEquipGiftId(heroId, part)
if not self:hasGiftData(giftId) then
return nil
end
if self:getGiftRemainTime(giftId) > 0 then
return giftId
end
return nil
end
-- 当前是否存在礼包数据
function EquipData:hasGiftData(giftId)
return self.gifts[giftId] ~= nil
end
-- 获取装备对应的礼包id
function EquipData:getEquipGiftId(heroId, part)
local giftType local giftType
if part == GConst.EquipConst.PART_TYPE.WEAPON then if part == GConst.EquipConst.PART_TYPE.WEAPON then
giftType = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT giftType = PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT
@ -198,7 +218,7 @@ function EquipData:getGiftId(heroId, part)
local level = DataManager.EquipData:getEquip(heroId, part):getLevel() local level = DataManager.EquipData:getEquip(heroId, part):getLevel()
for idx, id in pairs(self:getGiftIdsByType(giftType)) do for idx, id in pairs(self:getGiftIdsByType(giftType)) do
if self:meetGiftLevelRange(id, level) and self:getGiftRemainTime(id) > 0 then if self:meetGiftLevelRange(id, level) then
return id return id
end end
end end
@ -218,18 +238,41 @@ end
-- 获取礼包剩余时间 -- 获取礼包剩余时间
function EquipData:getGiftRemainTime(giftId) function EquipData:getGiftRemainTime(giftId)
-- 没有礼包
if self.gifts[giftId] == nil then if self.gifts[giftId] == nil then
return 0 return 0
end end
local cfg = DataManager.ShopData:getActGiftConfig()[giftId] -- 在冷却中
if cfg == nil then if self:isGiftCooling(giftId) then
return 0 return 0
end end
local duration = cfg.limit_time * 60 * 60 return (self.gifts[giftId].expire_at // 1000) - Time:getServerTime()
end
return (self.gifts[giftId] // 1000) + duration - Time:getServerTime() -- 礼包是否在冷却时间中
function EquipData:isGiftCooling(giftId)
local giftData = DataManager.ShopData:getActGiftDetailData(PayManager.PURCHARSE_TYPE.ACT_GIFT, giftId)
if giftData then
local latestBuyTime = giftData.latest_buy_at // 1000
local cfg = DataManager.ShopData:getActGiftConfig()[giftId]
if latestBuyTime > 0 then
-- 购买冷却
local cdTime = (cfg.cd or 0) * 3600
if latestBuyTime + cdTime > Time:getServerTime() then
return true
end
elseif self:hasGiftData(giftId) then
-- 到期冷却
if self.gifts[giftId].cd_end_at // 1000 < Time:getServerTime() then
return true
end
end
end
return false
end end
-- 获取礼包显示的标题 -- 获取礼包显示的标题
@ -255,7 +298,6 @@ end
-- 购买礼包成功 -- 购买礼包成功
function EquipData:onBuyGiftSuccess(giftId) function EquipData:onBuyGiftSuccess(giftId)
Logger.logHighlight("购买装备礼包成功："..giftId) Logger.logHighlight("购买装备礼包成功："..giftId)
self.gifts[giftId] = nil
self:setDirty() self:setDirty()
end end