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

新增皮肤报错fix

Browse Source
This commit is contained in:
Fang 2023-08-22 11:55:48 +08:00
parent 08553687ae
commit 017be0ef1c
24 changed files with 2372 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,8 +429,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=53001,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="UwtcA2Q=",
["num"]=20, ["num"]=20,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VAg="
}, },
@ -1568,16 +1568,6 @@ local act_gift = {
["cd"]=1, ["cd"]=1,
["value"]=1000 ["value"]=1000
}, },
[140403]={
["type"]=14,
["recharge_id"]=11,
["limit"]=1
},
[140404]={
["type"]=14,
["recharge_id"]=12,
["limit"]=1
},
[130002]={ [130002]={
["type"]=13, ["type"]=13,
["recharge_id"]=11, ["recharge_id"]=11,
@ -1685,9 +1675,479 @@ local act_gift = {
}, },
["limit"]=1, ["limit"]=1,
["value"]=1100 ["value"]=1100
},
[140403]={
["type"]=14,
["recharge_id"]=11,
["limit"]=1
},
[140404]={
["type"]=14,
["recharge_id"]=12,
["limit"]=1
},
[150102]={
["type"]=15,
["parameter_pro"]={
0,
10
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["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_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=30,
["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150202]={
["type"]=15,
["parameter_pro"]={
20,
30
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["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_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150302]={
["type"]=15,
["parameter_pro"]={
40,
50
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6800,
["num_for_nothing"]="UABcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150402]={
["type"]=15,
["parameter_pro"]={
60,
70
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6800,
["num_for_nothing"]="UABcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150502]={
["type"]=15,
["parameter_pro"]={
80,
90
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=7200,
["num_for_nothing"]="UQpcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160102]={
["type"]=16,
["parameter_pro"]={
0,
10
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["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_for_nothing"]="Vw==",
["id"]=38,
["id_for_nothing"]="VQA=",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160202]={
["type"]=16,
["parameter_pro"]={
20,
30
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["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_for_nothing"]="Vw==",
["id"]=38,
["id_for_nothing"]="VQA=",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160302]={
["type"]=16,
["parameter_pro"]={
40,
50
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6800,
["num_for_nothing"]="UABcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160402]={
["type"]=16,
["parameter_pro"]={
60,
70
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6800,
["num_for_nothing"]="UABcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160502]={
["type"]=16,
["parameter_pro"]={
80,
90
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=7200,
["num_for_nothing"]="UQpcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
} }
} }
local config = { local config = {
data=act_gift,count=56 data=act_gift,count=66
} }
return config return config

88
lua/app/config/arena_gift.lua
View File

@ -1,5 +1,5 @@
local arena_gift = { local arena_gift = {
[101]={ [1]={
["score"]=950, ["score"]=950,
["reward"]={ ["reward"]={
{ {
@ -12,7 +12,7 @@ local arena_gift = {
} }
} }
}, },
[102]={ [2]={
["score"]=1000, ["score"]=1000,
["reward"]={ ["reward"]={
{ {
@ -25,7 +25,7 @@ local arena_gift = {
} }
} }
}, },
[103]={ [3]={
["score"]=1050, ["score"]=1050,
["reward"]={ ["reward"]={
{ {
@ -38,7 +38,7 @@ local arena_gift = {
} }
} }
}, },
[104]={ [4]={
["score"]=1100, ["score"]=1100,
["reward"]={ ["reward"]={
{ {
@ -54,7 +54,7 @@ local arena_gift = {
54003 54003
} }
}, },
[105]={ [5]={
["score"]=1150, ["score"]=1150,
["reward"]={ ["reward"]={
{ {
@ -67,7 +67,7 @@ local arena_gift = {
} }
} }
}, },
[106]={ [6]={
["score"]=1200, ["score"]=1200,
["reward"]={ ["reward"]={
{ {
@ -83,7 +83,7 @@ local arena_gift = {
34003 34003
} }
}, },
[107]={ [7]={
["score"]=1250, ["score"]=1250,
["reward"]={ ["reward"]={
{ {
@ -96,7 +96,7 @@ local arena_gift = {
} }
} }
}, },
[108]={ [8]={
["score"]=1300, ["score"]=1300,
["reward"]={ ["reward"]={
{ {
@ -109,7 +109,7 @@ local arena_gift = {
} }
} }
}, },
[109]={ [9]={
["score"]=1350, ["score"]=1350,
["reward"]={ ["reward"]={
{ {
@ -122,7 +122,7 @@ local arena_gift = {
} }
} }
}, },
[110]={ [10]={
["score"]=1400, ["score"]=1400,
["reward"]={ ["reward"]={
{ {
@ -138,7 +138,7 @@ local arena_gift = {
24003 24003
} }
}, },
[111]={ [11]={
["score"]=1450, ["score"]=1450,
["reward"]={ ["reward"]={
{ {
@ -151,7 +151,7 @@ local arena_gift = {
} }
} }
}, },
[112]={ [12]={
["score"]=1500, ["score"]=1500,
["reward"]={ ["reward"]={
{ {
@ -164,7 +164,7 @@ local arena_gift = {
} }
} }
}, },
[113]={ [13]={
["score"]=1550, ["score"]=1550,
["reward"]={ ["reward"]={
{ {
@ -177,7 +177,7 @@ local arena_gift = {
} }
} }
}, },
[114]={ [14]={
["score"]=1600, ["score"]=1600,
["reward"]={ ["reward"]={
{ {
@ -190,7 +190,7 @@ local arena_gift = {
} }
} }
}, },
[115]={ [15]={
["score"]=1650, ["score"]=1650,
["reward"]={ ["reward"]={
{ {
@ -203,7 +203,7 @@ local arena_gift = {
} }
} }
}, },
[116]={ [16]={
["score"]=1700, ["score"]=1700,
["reward"]={ ["reward"]={
{ {
@ -216,7 +216,7 @@ local arena_gift = {
} }
} }
}, },
[117]={ [17]={
["score"]=1750, ["score"]=1750,
["reward"]={ ["reward"]={
{ {
@ -229,7 +229,7 @@ local arena_gift = {
} }
} }
}, },
[118]={ [18]={
["score"]=1800, ["score"]=1800,
["reward"]={ ["reward"]={
{ {
@ -242,7 +242,7 @@ local arena_gift = {
} }
} }
}, },
[119]={ [19]={
["score"]=1850, ["score"]=1850,
["reward"]={ ["reward"]={
{ {
@ -255,7 +255,7 @@ local arena_gift = {
} }
} }
}, },
[120]={ [20]={
["score"]=1900, ["score"]=1900,
["reward"]={ ["reward"]={
{ {
@ -268,7 +268,7 @@ local arena_gift = {
} }
} }
}, },
[121]={ [21]={
["score"]=1950, ["score"]=1950,
["reward"]={ ["reward"]={
{ {
@ -281,7 +281,7 @@ local arena_gift = {
} }
} }
}, },
[122]={ [22]={
["score"]=2000, ["score"]=2000,
["reward"]={ ["reward"]={
{ {
@ -294,7 +294,7 @@ local arena_gift = {
} }
} }
}, },
[123]={ [23]={
["score"]=2050, ["score"]=2050,
["reward"]={ ["reward"]={
{ {
@ -307,7 +307,7 @@ local arena_gift = {
} }
} }
}, },
[124]={ [24]={
["score"]=2100, ["score"]=2100,
["reward"]={ ["reward"]={
{ {
@ -320,7 +320,7 @@ local arena_gift = {
} }
} }
}, },
[125]={ [25]={
["score"]=2150, ["score"]=2150,
["reward"]={ ["reward"]={
{ {
@ -333,7 +333,7 @@ local arena_gift = {
} }
} }
}, },
[126]={ [26]={
["score"]=2200, ["score"]=2200,
["reward"]={ ["reward"]={
{ {
@ -346,7 +346,7 @@ local arena_gift = {
} }
} }
}, },
[127]={ [27]={
["score"]=2250, ["score"]=2250,
["reward"]={ ["reward"]={
{ {
@ -359,7 +359,7 @@ local arena_gift = {
} }
} }
}, },
[128]={ [28]={
["score"]=2300, ["score"]=2300,
["reward"]={ ["reward"]={
{ {
@ -372,7 +372,7 @@ local arena_gift = {
} }
} }
}, },
[129]={ [29]={
["score"]=2350, ["score"]=2350,
["reward"]={ ["reward"]={
{ {
@ -385,7 +385,7 @@ local arena_gift = {
} }
} }
}, },
[130]={ [30]={
["score"]=2400, ["score"]=2400,
["reward"]={ ["reward"]={
{ {
@ -398,7 +398,7 @@ local arena_gift = {
} }
} }
}, },
[131]={ [31]={
["score"]=2450, ["score"]=2450,
["reward"]={ ["reward"]={
{ {
@ -411,7 +411,7 @@ local arena_gift = {
} }
} }
}, },
[132]={ [32]={
["score"]=2500, ["score"]=2500,
["reward"]={ ["reward"]={
{ {
@ -424,7 +424,7 @@ local arena_gift = {
} }
} }
}, },
[133]={ [33]={
["score"]=2550, ["score"]=2550,
["reward"]={ ["reward"]={
{ {
@ -437,7 +437,7 @@ local arena_gift = {
} }
} }
}, },
[134]={ [34]={
["score"]=2600, ["score"]=2600,
["reward"]={ ["reward"]={
{ {
@ -450,7 +450,7 @@ local arena_gift = {
} }
} }
}, },
[135]={ [35]={
["score"]=2650, ["score"]=2650,
["reward"]={ ["reward"]={
{ {
@ -463,7 +463,7 @@ local arena_gift = {
} }
} }
}, },
[136]={ [36]={
["score"]=2700, ["score"]=2700,
["reward"]={ ["reward"]={
{ {
@ -476,7 +476,7 @@ local arena_gift = {
} }
} }
}, },
[137]={ [37]={
["score"]=2750, ["score"]=2750,
["reward"]={ ["reward"]={
{ {
@ -489,7 +489,7 @@ local arena_gift = {
} }
} }
}, },
[138]={ [38]={
["score"]=2800, ["score"]=2800,
["reward"]={ ["reward"]={
{ {
@ -502,7 +502,7 @@ local arena_gift = {
} }
} }
}, },
[139]={ [39]={
["score"]=2850, ["score"]=2850,
["reward"]={ ["reward"]={
{ {
@ -515,7 +515,7 @@ local arena_gift = {
} }
} }
}, },
[140]={ [40]={
["score"]=2900, ["score"]=2900,
["reward"]={ ["reward"]={
{ {
@ -528,7 +528,7 @@ local arena_gift = {
} }
} }
}, },
[141]={ [41]={
["score"]=2950, ["score"]=2950,
["reward"]={ ["reward"]={
{ {
@ -541,7 +541,7 @@ local arena_gift = {
} }
} }
}, },
[142]={ [42]={
["score"]=3000, ["score"]=3000,
["reward"]={ ["reward"]={
{ {
@ -554,7 +554,7 @@ local arena_gift = {
} }
} }
}, },
[143]={ [43]={
["score"]=3050, ["score"]=3050,
["reward"]={ ["reward"]={
{ {
@ -567,7 +567,7 @@ local arena_gift = {
} }
} }
}, },
[144]={ [44]={
["score"]=3100, ["score"]=3100,
["reward"]={ ["reward"]={
{ {

1622
lua/app/config/bounty_level.lua
View File

File diff suppressed because it is too large Load Diff

7
lua/app/config/bounty_time.lua
View File

@ -8,9 +8,14 @@ local bounty_time = {
["season"]=2, ["season"]=2,
["start_time"]="2023-8-1 00:00:00", ["start_time"]="2023-8-1 00:00:00",
["end_time"]="2023-9-1 00:00:00" ["end_time"]="2023-9-1 00:00:00"
},
[3]={
["season"]=3,
["start_time"]="2023-9-1 00:00:00",
["end_time"]="2023-10-1 00:00:00"
} }
} }
local config = { local config = {
data=bounty_time,count=2 data=bounty_time,count=3
} }
return config return config

48
lua/app/config/chapter_board.lua
View File

@ -16459,8 +16459,8 @@ local chapter_board = {
1 1
}, },
{ {
22, 0,
1 0
}, },
{ {
0, 0,
@ -16657,8 +16657,8 @@ local chapter_board = {
1 1
}, },
{ {
22, 0,
1 0
}, },
{ {
0, 0,
@ -17097,8 +17097,8 @@ local chapter_board = {
2 2
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -17125,8 +17125,8 @@ local chapter_board = {
1 1
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -17153,8 +17153,8 @@ local chapter_board = {
0 0
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -17295,8 +17295,8 @@ local chapter_board = {
2 2
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -17323,8 +17323,8 @@ local chapter_board = {
1 1
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -17351,8 +17351,8 @@ local chapter_board = {
0 0
}, },
{ {
0, 22,
0 2
}, },
{ {
22, 22,
@ -24575,8 +24575,8 @@ local chapter_board = {
0 0
}, },
{ {
1, 0,
0 1
}, },
{ {
0, 0,
@ -24591,8 +24591,8 @@ local chapter_board = {
2 2
}, },
{ {
1, 0,
0 1
}, },
{ {
1, 1,
@ -24631,8 +24631,8 @@ local chapter_board = {
5 5
}, },
{ {
0, 23,
0 5
}, },
{ {
27, 27,
@ -24647,8 +24647,8 @@ local chapter_board = {
3 3
}, },
{ {
0, 23,
0 5
}, },
{ {
23, 23,

3
lua/app/config/hero.lua
View File

@ -247,7 +247,8 @@ local hero = {
["is_show"]=1, ["is_show"]=1,
["collection_point"]=5, ["collection_point"]=5,
["skin"]={ ["skin"]={
14001 14001,
1400101
} }
}, },
[14002]={ [14002]={

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

@ -1439,9 +1439,10 @@ local item = {
} }
}, },
[44]={ [44]={
["type"]=9, ["type"]=12,
["qlt"]=5, ["parameter"]=1400101,
["icon"]="44" ["qlt"]=3,
["icon"]="1400101"
}, },
[45]={ [45]={
["type"]=10, ["type"]=10,

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

@ -449,14 +449,12 @@ local LocalizationGlobalConst =
ARENA_DESC_35 = "ARENA_DESC_35", ARENA_DESC_35 = "ARENA_DESC_35",
ARENA_DESC_36 = "ARENA_DESC_36", ARENA_DESC_36 = "ARENA_DESC_36",
ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC", ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC",
ACTIVITY_OVER_EDSC = "ACTIVITY_OVER_EDSC",
["ACTIVITY_OVER_EDSC"] = "ACTIVITY_OVER_EDSC", PART_IN_DESC = "PART_IN_DESC",
["PART_IN_DESC"] = "PART_IN_DESC", HERO_FUND_DESCC_1 = "HERO_FUND_DESCC_1",
HERO_FUND_DESCC_2 = "HERO_FUND_DESCC_2",
["HERO_FUND_DESCC_1"] = "HERO_FUND_DESCC_1", HERO_FUND_DESCC_3 = "HERO_FUND_DESCC_3",
["HERO_FUND_DESCC_2"] = "HERO_FUND_DESCC_2", HERO_FUND_DESCC_4 = "HERO_FUND_DESCC_4",
["HERO_FUND_DESCC_3"] = "HERO_FUND_DESCC_3",
["HERO_FUND_DESCC_4"] = "HERO_FUND_DESCC_4"
} }
return LocalizationGlobalConst return LocalizationGlobalConst

70
lua/app/config/skill.lua
View File

@ -4571,7 +4571,7 @@ local skill = {
["type"]="lethargy", ["type"]="lethargy",
["num"]=0, ["num"]=0,
["ratio"]=5000, ["ratio"]=5000,
["round"]=2 ["round"]=1
} }
}, },
["obj"]=2, ["obj"]=2,
@ -4694,7 +4694,71 @@ local skill = {
{ {
["type"]="lethargy", ["type"]="lethargy",
["num"]=0, ["num"]=0,
["ratio"]=5000, ["ratio"]=8000,
["round"]=2
}
},
["obj"]=2,
["effect_block"]={
1,
2,
4
},
["skill_position"]={
2,
0
},
["shake_time"]=200,
["shake_type"]=5,
["sound"]=34002200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300109,
["bullet_time"]={
1000,
3000,
400
},
["fx_self_mirror"]=400109
},
[3400224]={
["buff_id"]={
"lethargy"
},
["energy"]=10,
["link"]=1,
["position"]=3,
["method"]=1,
["skill_type"]=4,
["boardrange"]={
},
["battle_icon"]="23",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_green",
["num"]=13000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=13000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=24000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="lethargy",
["num"]=0,
["ratio"]=8000,
["round"]=2 ["round"]=2
} }
}, },
@ -27380,6 +27444,6 @@ local skill = {
} }
} }
local config = { local config = {
data=skill,count=984 data=skill,count=985
} }
return config return config

15
lua/app/config/skill_rogue.lua
View File

@ -2223,11 +2223,11 @@ local skill_rogue = {
["skill_position"]=2, ["skill_position"]=2,
["boardrange"]={ ["boardrange"]={
{ {
["type"]=1, ["type"]=3,
["range"]=2 ["range"]=2
}, },
{ {
["type"]=2, ["type"]=4,
["range"]=2 ["range"]=2
} }
}, },
@ -2277,11 +2277,11 @@ local skill_rogue = {
["skill_position"]=2, ["skill_position"]=2,
["boardrange"]={ ["boardrange"]={
{ {
["type"]=3, ["type"]=1,
["range"]=2 ["range"]=2
}, },
{ {
["type"]=4, ["type"]=2,
["range"]=2 ["range"]=2
} }
}, },
@ -2967,10 +2967,9 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["type"]=16, ["type"]=1,
["parameter"]={ ["parameter"]={
4, 3400224
3000
}, },
["skill_position"]=3, ["skill_position"]=3,
["icon"]="213" ["icon"]="213"
@ -3013,6 +3012,8 @@ local skill_rogue = {
["icon"]="215" ["icon"]="215"
}, },
[3400207]={ [3400207]={
["unlock"]=3400204,
["cover_unlock"]=3400204,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,

28
lua/app/config/skin.lua
View File

@ -23,6 +23,32 @@ local skin = {
["skin_point"]=0, ["skin_point"]=0,
["hero_id"]=14001 ["hero_id"]=14001
}, },
[1400101]={
["model_id"]="p0036",
["qlt"]=3,
["bonus"]={
{
["type"]="attr_skill_hurtp_red",
["num"]=1000
},
{
["type"]="attr_hpp_red",
["num"]=1000
}
},
["icon"]="skin_5",
["got"]=1,
["skin_point"]=10,
["hero_id"]=14001,
["item_id"]=44,
["skill_show"]={
14001011,
14001012,
14001013,
14001014,
14001015
}
},
[14002]={ [14002]={
["model_id"]="p0018", ["model_id"]="p0018",
["qlt"]=1, ["qlt"]=1,
@ -285,6 +311,6 @@ local skin = {
} }
} }
local config = { local config = {
data=skin,count=34 data=skin,count=35
} }
return config return config

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

@ -302,9 +302,83 @@ local skin_skill = {
["fx_bg"]=300148, ["fx_bg"]=300148,
["fx_self_mirror"]=400144, ["fx_self_mirror"]=400144,
["fx_bg_mirror"]=400148 ["fx_bg_mirror"]=400148
},
[14001011]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=2,
["sound_hit"]={
1000011
},
["name_act"]="attack01",
["fx_self"]=300045,
["fx_self_mirror"]=400078
},
[14001012]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=2,
["sound_hit"]={
1000012
},
["name_act"]="attack02",
["fx_self"]=300046,
["fx_self_mirror"]=400079
},
[14001013]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=4,
["sound_hit"]={
1000013
},
["name_act"]="attack03",
["fx_self"]=300047,
["fx_self_mirror"]=400080
},
[14001014]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000014
},
["name_act"]="attack04",
["fx_self"]=300048,
["fx_self_mirror"]=400081
},
[14001015]={
["skill_position"]={
2,
0
},
["shake_time"]=200,
["shake_type"]=6,
["sound"]=14001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300049,
["bullet_time"]={
1166,
3000,
200
},
["fx_self_mirror"]=400082
} }
} }
local config = { local config = {
data=skin_skill,count=20 data=skin_skill,count=25
} }
return config return config

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

@ -449,13 +449,12 @@ local localization_global =
["ARENA_DESC_35"] = "可能出<color=#ff8bf8>史诗</color>哦~", ["ARENA_DESC_35"] = "可能出<color=#ff8bf8>史诗</color>哦~",
["ARENA_DESC_36"] = "试试手气", ["ARENA_DESC_36"] = "试试手气",
["ONE_KEY_GET_DESC"] = "一键领取", ["ONE_KEY_GET_DESC"] = "一键领取",
["ACTIVITY_OVER_EDSC"] = "活动已结束", ["ACTIVITY_OVER_EDSC"] = "活动已结束",
["PART_IN_DESC"] = "参与", ["PART_IN_DESC"] = "参与",
["HERO_FUND_DESCC_1"] = "新活动月之祝福开启", ["HERO_FUND_DESCC_1"] = "新活动月之祝福开启",
["HERO_FUND_DESCC_2"] = "月之祝福标题", ["HERO_FUND_DESCC_2"] = "月之祝福",
["HERO_FUND_DESCC_3"] = "月之祝福描述", ["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。",
["HERO_FUND_DESCC_4"] = "月之祝福前往14天乐描述" ["HERO_FUND_DESCC_4"] = "新活动14日达标开启",
} }
return localization_global return localization_global

4
lua/app/config/strings/cn/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="流星追月链接<color=#3cff28>4</color>个元素或以上时，流星追月攻击将释放<color=#3cff28>2</color>次。" ["desc"]="流星追月链接<color=#3cff28>4</color>个元素或以上时，流星追月攻击将释放<color=#3cff28>2</color>次。"
}, },
[3400200]={ [3400200]={
["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>1</color>回合。"
}, },
[3400201]={ [3400201]={
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
}, },
[3400204]={ [3400204]={
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>80%</color>。" ["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>80%</color>，回合数<color=#3cff28>+1</color>。"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#fcff28>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。"

2
lua/app/config/strings/en/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="When Moonchaser links to <color=#3cff28>4</color> or more elements, it will be cast <color=#3cff28>2</color> times." ["desc"]="When Moonchaser links to <color=#3cff28>4</color> or more elements, it will be cast <color=#3cff28>2</color> times."
}, },
[3400200]={ [3400200]={
["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28>Drowsy</color> that lasts <color=#3cff28>2</color> turns." ["desc"]="Unlock Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28>Drowsy</color> that lasts <color=#3cff28>1</color> turns."
}, },
[3400201]={ [3400201]={
["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction." ["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction."

2
lua/app/config/strings/es/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Cuando Espada de Fantasía enlaza <color=#3cff28>4</color> o más elementos, lanzará <color=#3cff28>2</color> ataques." ["desc"]="Cuando Espada de Fantasía enlaza <color=#3cff28>4</color> o más elementos, lanzará <color=#3cff28>2</color> ataques."
}, },
[3400200]={ [3400200]={
["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un <color=#3cff28>50%</color> de chance de aplicar Dormido durante <color=#3cff28>2</color> rondas." ["desc"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un <color=#3cff28>50%</color> de chance de aplicar Dormido durante <color=#3cff28>1</color> rondas."
}, },
[3400201]={ [3400201]={
["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X." ["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X."

2
lua/app/config/strings/id/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Saat Pemburu Bulan menautkan <color=#3cff28>4</color> atau lebih banyak elemen, maka ATK Pemburu Bulan akan dilepaskan sebanyak <color=#3cff28>2</color> kali." ["desc"]="Saat Pemburu Bulan menautkan <color=#3cff28>4</color> atau lebih banyak elemen, maka ATK Pemburu Bulan akan dilepaskan sebanyak <color=#3cff28>2</color> kali."
}, },
[3400200]={ [3400200]={
["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28>Kantuk</color> selama <color=#3cff28>2</color> giliran." ["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28>Kantuk</color> selama <color=#3cff28>1</color> giliran."
}, },
[3400201]={ [3400201]={
["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X." ["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X."

2
lua/app/config/strings/ja/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="「ムーンチェイサー」は<color=#3cff28>4</color>つ以上の元素と繋がった時、ムーンチェイサーが<color=#3cff28>2</color>回発動する。" ["desc"]="「ムーンチェイサー」は<color=#3cff28>4</color>つ以上の元素と繋がった時、ムーンチェイサーが<color=#3cff28>2</color>回発動する。"
}, },
[3400200]={ [3400200]={
["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>2</color>ターン<color=#3cff28>昏睡</color>効果を付与する。" ["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28>昏睡</color>効果を付与する。"
}, },
[3400201]={ [3400201]={
["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。" ["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。"

2
lua/app/config/strings/ko/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="유성과 달의 숨바꼭질이 <color=#3cff28>4</color>개 또는 그 이상의 원소를 연결하면 스킬 공격을 <color=#3cff28>2</color>번 방출합니다." ["desc"]="유성과 달의 숨바꼭질이 <color=#3cff28>4</color>개 또는 그 이상의 원소를 연결하면 스킬 공격을 <color=#3cff28>2</color>번 방출합니다."
}, },
[3400200]={ [3400200]={
["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28> 수면</color>효과를 부여합니다." ["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28> 수면</color>효과를 부여합니다."
}, },
[3400201]={ [3400201]={
["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸합니다." ["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸합니다."

2
lua/app/config/strings/pt/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Ao conectar <color=#3cff28>4</color> ou mais elementos com a Disparada do Meteoro, esta habilidade é lançada <color=#3cff28>2</color> vezes." ["desc"]="Ao conectar <color=#3cff28>4</color> ou mais elementos com a Disparada do Meteoro, esta habilidade é lançada <color=#3cff28>2</color> vezes."
}, },
[3400200]={ [3400200]={
["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito <color=#3cff28>sono</color> por <color=#3cff28>2</color> turnos." ["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito <color=#3cff28>sono</color> por <color=#3cff28>1</color> turnos."
}, },
[3400201]={ [3400201]={
["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X." ["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X."

2
lua/app/config/strings/th/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="เมื่อดาวตกไล่ดวงจันทร์เชื่อมโยงธาตุ<color=#3cff28>4</color>อันหรือขึ้นไป การโจมตีของดาวตกไล่ดวงจันทร์จะปล่อย<color=#3cff28>2</color>ครั้ง" ["desc"]="เมื่อดาวตกไล่ดวงจันทร์เชื่อมโยงธาตุ<color=#3cff28>4</color>อันหรือขึ้นไป การโจมตีของดาวตกไล่ดวงจันทร์จะปล่อย<color=#3cff28>2</color>ครั้ง"
}, },
[3400200]={ [3400200]={
["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28>หลับ</color> <color=#3cff28>2</color>รอบ" ["desc"]="ปลดล็อคฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28>หลับ</color> <color=#3cff28>1</color>รอบ"
}, },
[3400201]={ [3400201]={
["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม<color=#3cff28>4</color>ช่องตามทิศทาง X" ["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม<color=#3cff28>4</color>ช่องตามทิศทาง X"

2
lua/app/config/strings/vi/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Sao Băng Siêu Tốc liên kết <color=#3cff28>4</color> Nguyên Tố trở lên, Sao Băng Siêu Tốc tấn công sẽ thi triển <color=#3cff28>2</color> lần." ["desc"]="Sao Băng Siêu Tốc liên kết <color=#3cff28>4</color> Nguyên Tố trở lên, Sao Băng Siêu Tốc tấn công sẽ thi triển <color=#3cff28>2</color> lần."
}, },
[3400200]={ [3400200]={
["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả <color=#3cff28>Ngủ Say</color>, <color=#3cff28>2</color> hiệp." ["desc"]="Mở khóa Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả <color=#3cff28>Ngủ Say</color>, <color=#3cff28>1</color> hiệp."
}, },
[3400201]={ [3400201]={
["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô." ["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô."

2
lua/app/config/strings/zh/skill_rogue.lua
View File

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="流星追月連接<color=#3cff28>4</color>個元素或以上時，流星追月攻擊將釋放<color=#3cff28>2</color>次。" ["desc"]="流星追月連接<color=#3cff28>4</color>個元素或以上時，流星追月攻擊將釋放<color=#3cff28>2</color>次。"
}, },
[3400200]={ [3400200]={
["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶<color=#3cff28>昏睡</color>效果，<color=#3cff28>1</color>回合。"
}, },
[3400201]={ [3400201]={
["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。" ["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。"

2
lua/app/module/tips/tips_manager.lua
View File

@ -48,7 +48,7 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp
return return
elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then elseif info.type == GConst.ItemConst.ITEM_TYPE.SKIN then
-- 英雄皮肤 -- 英雄皮肤
ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(rewardId), true, nil, rewardId) ModuleManager.HeroManager:showHeroDetailUI(DataManager.SkinData:getHeroIdBySkinId(info.parameter), true, nil, info.parameter)
return return
elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then elseif info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_BOX_ITEM or info.type == GConst.ItemConst.ITEM_TYPE.FIXED_BOX_ITEM then
self:showBoxItemTips(rewardId) self:showBoxItemTips(rewardId)