Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
This commit is contained in:
xiekaidong
commit
f0a047f491
@ -4,15 +4,15 @@ local avatar = {
|
||||
},
|
||||
[2001]={
|
||||
["hero"]=22001,
|
||||
["unlock"]=1
|
||||
["unlock"]=true
|
||||
},
|
||||
[3001]={
|
||||
["hero"]=32001,
|
||||
["unlock"]=1
|
||||
["unlock"]=true
|
||||
},
|
||||
[4001]={
|
||||
["hero"]=42001,
|
||||
["unlock"]=1
|
||||
["unlock"]=true
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
local avatar_frame = {
|
||||
[1000]={
|
||||
["unlock"]=1
|
||||
["unlock"]=true
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -376,7 +376,10 @@ local item = {
|
||||
["icon"]="14001"
|
||||
},
|
||||
[14002]={
|
||||
|
||||
["type"]=5,
|
||||
["parameter"]=14002,
|
||||
["qlt"]=4,
|
||||
["icon"]="14002"
|
||||
},
|
||||
[22001]={
|
||||
["type"]=5,
|
||||
@ -404,9 +407,9 @@ local item = {
|
||||
},
|
||||
[24002]={
|
||||
["type"]=5,
|
||||
["parameter"]=24001,
|
||||
["parameter"]=24002,
|
||||
["qlt"]=4,
|
||||
["icon"]="24001"
|
||||
["icon"]="24002"
|
||||
},
|
||||
[32001]={
|
||||
["type"]=5,
|
||||
@ -434,9 +437,9 @@ local item = {
|
||||
},
|
||||
[34002]={
|
||||
["type"]=5,
|
||||
["parameter"]=34001,
|
||||
["parameter"]=34002,
|
||||
["qlt"]=4,
|
||||
["icon"]="34001"
|
||||
["icon"]="34002"
|
||||
},
|
||||
[42001]={
|
||||
["type"]=5,
|
||||
@ -464,9 +467,9 @@ local item = {
|
||||
},
|
||||
[44002]={
|
||||
["type"]=5,
|
||||
["parameter"]=44001,
|
||||
["parameter"]=44002,
|
||||
["qlt"]=4,
|
||||
["icon"]="44001"
|
||||
["icon"]="44002"
|
||||
},
|
||||
[52001]={
|
||||
["type"]=5,
|
||||
@ -494,9 +497,9 @@ local item = {
|
||||
},
|
||||
[54002]={
|
||||
["type"]=5,
|
||||
["parameter"]=54001,
|
||||
["parameter"]=54002,
|
||||
["qlt"]=4,
|
||||
["icon"]="54001"
|
||||
["icon"]="54002"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
|
||||
@ -18,10 +18,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[205]={
|
||||
@ -43,10 +43,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[305]={
|
||||
@ -68,10 +68,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[405]={
|
||||
@ -93,10 +93,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[505]={
|
||||
@ -118,10 +118,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[605]={
|
||||
@ -143,15 +143,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[705]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=3433227539,
|
||||
["hp"]=3433227538,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -168,15 +168,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[805]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=4291534423,
|
||||
["hp"]=4291534422,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -193,15 +193,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[905]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=5364418029,
|
||||
["hp"]=5364418027,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -218,15 +218,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1005]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=6705522537,
|
||||
["hp"]=6705522533,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -243,15 +243,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1105]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=8381903171,
|
||||
["hp"]=8381903166,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -268,15 +268,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1205]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=10477378964,
|
||||
["hp"]=10477378957,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -293,15 +293,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1305]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=13096723705,
|
||||
["hp"]=13096723696,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -318,15 +318,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1405]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=16370904631,
|
||||
["hp"]=16370904620,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -343,15 +343,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1505]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=20463630789,
|
||||
["hp"]=20463630775,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -368,15 +368,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1605]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=25579538487,
|
||||
["hp"]=25579538468,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -393,15 +393,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1705]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=31974423109,
|
||||
["hp"]=31974423085,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -418,15 +418,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1805]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=39968028886,
|
||||
["hp"]=39968028856,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -443,15 +443,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[1905]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=49960036108,
|
||||
["hp"]=49960036070,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -468,15 +468,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2005]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=62450045135,
|
||||
["hp"]=62450045087,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -493,15 +493,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2105]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=78062556418,
|
||||
["hp"]=78062556358,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -518,15 +518,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2205]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=97578195523,
|
||||
["hp"]=97578195447,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -543,15 +543,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2305]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=121972744404,
|
||||
["hp"]=121972744308,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -568,15 +568,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2405]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=152465930505,
|
||||
["hp"]=152465930385,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -593,15 +593,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2505]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=190582413132,
|
||||
["hp"]=190582412981,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -618,15 +618,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2605]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=238228016415,
|
||||
["hp"]=238228016226,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -643,15 +643,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2705]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=297785020519,
|
||||
["hp"]=297785020282,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -668,15 +668,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2805]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=372231275648,
|
||||
["hp"]=372231275352,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -693,15 +693,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[2905]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=465289094561,
|
||||
["hp"]=465289094190,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -718,15 +718,15 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
},
|
||||
[3005]={
|
||||
["monster_base"]=20003,
|
||||
["hp"]=581611368201,
|
||||
["hp"]=581611367737,
|
||||
["atk"]=10000000000,
|
||||
["atk_times"]=0,
|
||||
["skill"]={
|
||||
@ -743,10 +743,10 @@ local monster_dungeon_gold = {
|
||||
2000
|
||||
},
|
||||
["monster_hp_skin"]={
|
||||
"1",
|
||||
"2",
|
||||
"3",
|
||||
"4"
|
||||
"skin_01",
|
||||
"skin_02",
|
||||
"skin_03",
|
||||
"skin_04"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3881,7 +3881,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -3906,7 +3906,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -3931,7 +3931,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -3956,7 +3956,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -3989,7 +3989,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=40000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -4032,12 +4032,18 @@ local skill = {
|
||||
}
|
||||
}
|
||||
},
|
||||
["condition_rel"]={
|
||||
{
|
||||
1,
|
||||
1
|
||||
}
|
||||
},
|
||||
["combo_position"]=3,
|
||||
["effect_type"]=2,
|
||||
["trigger"]=7,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="dmg_addition_blue_add",
|
||||
["type"]="dmg_addition_green_add",
|
||||
["num"]=5000,
|
||||
["ratio"]=10000,
|
||||
["round"]=1
|
||||
@ -4058,12 +4064,18 @@ local skill = {
|
||||
}
|
||||
}
|
||||
},
|
||||
["condition_rel"]={
|
||||
{
|
||||
1,
|
||||
1
|
||||
}
|
||||
},
|
||||
["effect_type"]=2,
|
||||
["trigger"]=5,
|
||||
["trigger"]=3,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="imprison",
|
||||
["num"]=0,
|
||||
["num"]=1,
|
||||
["ratio"]=10000,
|
||||
["round"]=2
|
||||
}
|
||||
@ -4084,7 +4096,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_blue",
|
||||
["type"]="hurt_green",
|
||||
["num"]=40000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5079,7 +5091,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5104,7 +5116,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5129,7 +5141,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5154,7 +5166,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=10000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5184,7 +5196,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=40000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -5235,7 +5247,7 @@ local skill = {
|
||||
["trigger"]=1,
|
||||
["effect"]={
|
||||
{
|
||||
["type"]="hurt_green",
|
||||
["type"]="hurt_blue",
|
||||
["num"]=40000,
|
||||
["ratio"]=10000,
|
||||
["round"]=0
|
||||
@ -8977,9 +8989,9 @@ local skill = {
|
||||
},
|
||||
["obj"]=2,
|
||||
["cd"]=1,
|
||||
["cd_start"]=40,
|
||||
["cd_start"]=39,
|
||||
["shake_time"]=200,
|
||||
["shake_type"]=600,
|
||||
["shake_type"]=6,
|
||||
["sound_hit"]={
|
||||
10063
|
||||
},
|
||||
|
||||
@ -141,7 +141,7 @@ local skill_rogue = {
|
||||
["desc"]="舞步消散使用时本次普攻伤害提升<color=#3cff28>10%</color>。"
|
||||
},
|
||||
[1200103]={
|
||||
["desc"]="<color=#acae16>Combo</color>:舞步消散对冰霜敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:舞步消散对冰霜敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[1200104]={
|
||||
["desc"]="舞步消散纵向可额外消除<color=#3cff28>4</color>格。"
|
||||
@ -162,7 +162,7 @@ local skill_rogue = {
|
||||
["desc"]="巨剑旋风可附加灼烧效果，<color=#3cff28>2</color>回合。"
|
||||
},
|
||||
[1300102]={
|
||||
["desc"]="<color=#acae16>Combo</color>:巨剑旋风对流血敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:巨剑旋风对流血敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[1300103]={
|
||||
["desc"]="巨剑旋风技能伤害提升。"
|
||||
@ -186,7 +186,7 @@ local skill_rogue = {
|
||||
["desc"]="炎拳沿横向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[1300202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:炎拳对禁锢敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:炎拳对禁锢敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[1300203]={
|
||||
["desc"]="炎拳的灼烧概率提高到<color=#3cff28>100%</color>。"
|
||||
@ -213,7 +213,7 @@ local skill_rogue = {
|
||||
["desc"]="钢铁重击附加眩晕效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[1400103]={
|
||||
["desc"]="<color=#acae16>Combo</color>:钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。"
|
||||
},
|
||||
[1400104]={
|
||||
["desc"]="钢铁重击附加的眩晕，回合数<color=#3cff28>+1</color>。"
|
||||
@ -234,7 +234,7 @@ local skill_rogue = {
|
||||
["desc"]="熊猫爆竹可附加灼烧效果，<color=#3cff28>2</color>回合。"
|
||||
},
|
||||
[1400202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:熊猫爆竹对<color=#3cff28>冻结</color>敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:熊猫爆竹对<color=#3cff28>冻结</color>敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[1400203]={
|
||||
["desc"]="熊猫爆竹横向可额外消除<color=#3cff28>4</color>个格。"
|
||||
@ -243,7 +243,7 @@ local skill_rogue = {
|
||||
["desc"]="潘达普攻时有<color=#3cff28>10%</color>概率附加灼烧效果，<color=#3cff28>2</color>回合。"
|
||||
},
|
||||
[1400205]={
|
||||
["desc"]="<color=#acae16>Combo</color>:熊猫爆竹命中<color=#3cff28>冻结</color>敌人时，为团队附加<color=#3cff28>亢奋</color>效果，<color=#3cff28>3</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:熊猫爆竹命中<color=#3cff28>冻结</color>敌人时，为团队附加<color=#3cff28>亢奋</color>效果，<color=#3cff28>3</color>回合。"
|
||||
},
|
||||
[1400206]={
|
||||
["desc"]="潘达攻击提升<color=#3cff28>15%</color>。"
|
||||
@ -261,7 +261,7 @@ local skill_rogue = {
|
||||
["desc"]="拔刀斩纵向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[2200103]={
|
||||
["desc"]="<color=#acae16>Combo</color>:拔刀斩对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:拔刀斩对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[2200104]={
|
||||
["desc"]="刀妹攻击提升<color=#3cff28>15%</color>。"
|
||||
@ -285,7 +285,7 @@ local skill_rogue = {
|
||||
["desc"]="旋风骨技能伤害提升。"
|
||||
},
|
||||
[2300103]={
|
||||
["desc"]="<color=#acae16>Combo</color>:旋风骨对易伤敌人有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:旋风骨对易伤敌人有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[2300104]={
|
||||
["desc"]="旋风骨附加的流血效果，回合数<color=#3cff28>+1</color>。"
|
||||
@ -330,7 +330,7 @@ local skill_rogue = {
|
||||
["desc"]="巨剑轰击沿X方向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[2400102]={
|
||||
["desc"]="<color=#acae16>Combo</color>:巨剑轰击对冻结敌人伤害大幅增加，并有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:巨剑轰击对冻结敌人伤害大幅增加，并有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[2400103]={
|
||||
["desc"]="巨剑轰击附加眩晕效果的概率提高到<color=#3cff28>70%</color>。"
|
||||
@ -378,7 +378,7 @@ local skill_rogue = {
|
||||
["desc"]="长枪突刺可恢复一定量生命。"
|
||||
},
|
||||
[3200102]={
|
||||
["desc"]="<color=#acae16>Combo</color>:长枪突刺对中毒敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:长枪突刺对中毒敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[3200103]={
|
||||
["desc"]="长枪突刺伤害提升。"
|
||||
@ -432,7 +432,7 @@ local skill_rogue = {
|
||||
["desc"]="狼袭瞬杀伤害提升。"
|
||||
},
|
||||
[3300204]={
|
||||
["desc"]="<color=#acae16>Combo</color>:狼袭瞬杀对中毒敌人有<color=#3cff28>50%</color>概率附加中毒效果，<color=#3cff28>2</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:狼袭瞬杀对中毒敌人有<color=#3cff28>50%</color>概率附加中毒效果，<color=#3cff28>2</color>回合。"
|
||||
},
|
||||
[3300205]={
|
||||
["desc"]="狼袭瞬杀附加的中毒效果，伤害提升。"
|
||||
@ -474,7 +474,7 @@ local skill_rogue = {
|
||||
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[3400202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:美丽梦魇对<color=#3cff28>虚弱</color>敌人伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:美丽梦魇对<color=#3cff28>虚弱</color>敌人伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[3400203]={
|
||||
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
|
||||
@ -483,7 +483,7 @@ local skill_rogue = {
|
||||
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>100%</color>。"
|
||||
},
|
||||
[3400205]={
|
||||
["desc"]="<color=#acae16>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>回合。"
|
||||
},
|
||||
[3400206]={
|
||||
["desc"]="梦魔攻击提升<color=#3cff28>15%</color>。"
|
||||
@ -507,7 +507,7 @@ local skill_rogue = {
|
||||
["desc"]="元素链接随机消除元素<color=#3cff28>+2</color>。"
|
||||
},
|
||||
[4200105]={
|
||||
["desc"]="<color=#acae16>Combo</color>:元素链接对冰霜敌人有<color=#3cff28>20%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:元素链接对冰霜敌人有<color=#3cff28>20%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[4200106]={
|
||||
["desc"]="冰心攻击提升<color=#3cff28>15%</color>。"
|
||||
@ -522,7 +522,7 @@ local skill_rogue = {
|
||||
["desc"]="霜冻冰晶横向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[4300102]={
|
||||
["desc"]="<color=#acae16>Combo</color>:霜冻冰晶对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:霜冻冰晶对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[4300103]={
|
||||
["desc"]="霜冻冰晶附加的冰霜效果，回合数<color=#3cff28>+1</color>。"
|
||||
@ -531,7 +531,7 @@ local skill_rogue = {
|
||||
["desc"]="霜冻冰晶伤害提升。"
|
||||
},
|
||||
[4300105]={
|
||||
["desc"]="<color=#acae16>Combo</color>:霜冻冰晶对冰霜敌人有50%概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:霜冻冰晶对冰霜敌人有50%概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[4300106]={
|
||||
["desc"]="霜冻冰晶后为团队附加冰盾效果，<color=#3cff28>2</color>回合。"
|
||||
@ -546,7 +546,7 @@ local skill_rogue = {
|
||||
["desc"]="腐败利刃附加的腐败效果，回合数<color=#3cff28>+1</color>."
|
||||
},
|
||||
[4300202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:腐败利刃对易伤敌人附加冰霜效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:腐败利刃对易伤敌人附加冰霜效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[4300203]={
|
||||
["desc"]="腐败利刃使用时本次普攻伤害提升<color=#3cff28>15%</color>。"
|
||||
@ -570,7 +570,7 @@ local skill_rogue = {
|
||||
["desc"]="冰霜剑舞附加的冰霜效果，回合数<color=#3cff28>+1</color>"
|
||||
},
|
||||
[4400102]={
|
||||
["desc"]="<color=#acae16>Combo</color>:冰霜剑舞对灼烧敌人伤害增加<color=#3cff28>50%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:冰霜剑舞对灼烧敌人伤害增加<color=#3cff28>50%</color>。"
|
||||
},
|
||||
[4400103]={
|
||||
["desc"]="冰霜剑舞随机消除元素<color=#3cff28>+3</color>"
|
||||
@ -666,7 +666,7 @@ local skill_rogue = {
|
||||
["desc"]="灵魂爆破横向可额外消除<color=#3cff28>4</color>格。"
|
||||
},
|
||||
[5300202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:灵魂爆破对冰霜敌人有<color=#3cff28>50%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:灵魂爆破对冰霜敌人有<color=#3cff28>50%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
|
||||
},
|
||||
[5300203]={
|
||||
["desc"]="灵魂爆破伤害提升。"
|
||||
@ -714,7 +714,7 @@ local skill_rogue = {
|
||||
["desc"]="幻影连击伤害提升。"
|
||||
},
|
||||
[5400202]={
|
||||
["desc"]="<color=#acae16>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成<color=#3cff28>50%</color>伤害。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成<color=#3cff28>50%</color>伤害。"
|
||||
},
|
||||
[5400203]={
|
||||
["desc"]="幻影连击释放后将为团队附加<color=#3cff28>反击</color>效果，<color=#3cff28>2</color>回合。"
|
||||
@ -729,7 +729,7 @@ local skill_rogue = {
|
||||
["desc"]="幻影连击附加的<color=#3cff28>反击</color>效果，回合数<color=#3cff28>+1</color>。"
|
||||
},
|
||||
[5400207]={
|
||||
["desc"]="<color=#acae16>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成伤害提高至<color=#3cff28>100%</color>。"
|
||||
["desc"]="<color=#fcff28>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成伤害提高至<color=#3cff28>100%</color>。"
|
||||
}
|
||||
}
|
||||
local config = {
|
||||
|
||||
@ -103,8 +103,8 @@ local task_daily_challenge = {
|
||||
{
|
||||
["type"]=1,
|
||||
["type_for_nothing"]="Vw==",
|
||||
["id"]=14001,
|
||||
["id_for_nothing"]="VwxcA2Q=",
|
||||
["id"]=6,
|
||||
["id_for_nothing"]="UA==",
|
||||
["num"]=1,
|
||||
["num_for_nothing"]="Vw=="
|
||||
},
|
||||
@ -133,8 +133,8 @@ local task_daily_challenge = {
|
||||
{
|
||||
["type"]=1,
|
||||
["type_for_nothing"]="Vw==",
|
||||
["id"]=14001,
|
||||
["id_for_nothing"]="VwxcA2Q=",
|
||||
["id"]=6,
|
||||
["id_for_nothing"]="UA==",
|
||||
["num"]=1,
|
||||
["num_for_nothing"]="Vw=="
|
||||
},
|
||||
@ -182,8 +182,8 @@ local task_daily_challenge = {
|
||||
{
|
||||
["type"]=1,
|
||||
["type_for_nothing"]="Vw==",
|
||||
["id"]=14001,
|
||||
["id_for_nothing"]="VwxcA2Q=",
|
||||
["id"]=6,
|
||||
["id_for_nothing"]="UA==",
|
||||
["num"]=1,
|
||||
["num_for_nothing"]="Vw=="
|
||||
},
|
||||
@ -213,8 +213,8 @@ local task_daily_challenge = {
|
||||
{
|
||||
["type"]=1,
|
||||
["type_for_nothing"]="Vw==",
|
||||
["id"]=14001,
|
||||
["id_for_nothing"]="VwxcA2Q=",
|
||||
["id"]=6,
|
||||
["id_for_nothing"]="UA==",
|
||||
["num"]=1,
|
||||
["num_for_nothing"]="Vw=="
|
||||
},
|
||||
|
||||
@ -36,4 +36,50 @@ function GameSettingManager:onExchangeCdkey(result)
|
||||
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CDKEY_FINISH, result.status)
|
||||
end
|
||||
|
||||
function GameSettingManager:showSupport(objectId)
|
||||
if not objectId then
|
||||
objectId = DataManager.PlayerData:getAcountId() or ""
|
||||
end
|
||||
local url = "https://perfeggs.aihelp.net/webchatv3/#/appKey/perfeggs_app_b666f90daa2a40edab1e043f72869374/domain/perfeggs.aihelp.net/appId/perfeggs_platform_4f3578be7390d5e8264ddee5002e76ac/?mode=showAllFAQSections&showConversationMoment=1&conversationIntent=1&alwaysShowHumanSupportButtonInBotPage=true&sdkVersion=3.2.0"
|
||||
local platform = "Android"
|
||||
if Platform:isIosPlatform() then
|
||||
platform = "IOS"
|
||||
end
|
||||
-- 繁体，日语和韩语跳对应的语言,其他语言跳英文
|
||||
local language = "&language="
|
||||
local currLanguage = I18N:getCurLanguage()
|
||||
if currLanguage == GConst.LANGUAGE.CHINESE_TC then
|
||||
language = language .. "zh-TW"
|
||||
elseif currLanguage == GConst.LANGUAGE.CHINESE then
|
||||
language = language .. "zh-CN"
|
||||
elseif currLanguage == GConst.LANGUAGE.JAPANESE then
|
||||
language = language .. "ja"
|
||||
elseif currLanguage == GConst.LANGUAGE.KOREAN then
|
||||
language = language .. "ko"
|
||||
else
|
||||
language = language .. "en"
|
||||
end
|
||||
local userId = string.format('&userId=%s', objectId)
|
||||
-- local userName = string.format('&userName=%s',
|
||||
-- DataManager.PlayerData:getName() -- 用户名
|
||||
-- )
|
||||
local applicationIdentifier = string.format('&applicationIdentifier=%s', Platform:getIdentifier())
|
||||
local applicationVersion = string.format('&applicationVersion=%s', Platform:getClientVersion())
|
||||
local applicationName = string.format('&applicationName=Knights Combo')
|
||||
local deviceModel = string.format('&deviceModel=%s', DeviceHelper:getDeviceModel())
|
||||
local osVersion = string.format('&osVersion=%s',DeviceHelper:getOSVersion())
|
||||
local networkType = string.format('&networkType=%s',DeviceHelper:getNetworkType())
|
||||
local customData = string.format('&customData={"UserID":"%s","GameName":"Knights Combo","GameVersion":"%s","DeviceModel":"%s","Platform":"%s","OSversion":"%s","ApplicationIdentifier":"%s","NetworkType":"%s"}',
|
||||
objectId, -- 用户名
|
||||
Platform:getClientVersion(), --应用版本
|
||||
DeviceHelper:getDeviceModel(), -- 机型
|
||||
platform, -- 安卓还是苹果
|
||||
DeviceHelper:getOSVersion(), -- OS 版本
|
||||
Platform:getIdentifier(), -- 应用包名
|
||||
DeviceHelper:getNetworkType() -- 网络类型
|
||||
)
|
||||
local tempStr = applicationIdentifier .. applicationVersion .. applicationName .. deviceModel .. osVersion .. networkType
|
||||
GFunc.openUrl(CS.System.Uri(url .. language .. userId .. tempStr .. customData).AbsoluteUri)
|
||||
end
|
||||
|
||||
return GameSettingManager
|
||||
@ -43,6 +43,7 @@ function GameSettingUI:_display()
|
||||
|
||||
self:initLoginBtn()
|
||||
self:initCDKeyBtn()
|
||||
self:initSupportBtn()
|
||||
self:refreshMusic()
|
||||
self:refreshVoice()
|
||||
end
|
||||
@ -125,12 +126,21 @@ function GameSettingUI:initAppleLoginBtn()
|
||||
end
|
||||
|
||||
function GameSettingUI:initCDKeyBtn()
|
||||
self.uiMap["game_setting_ui.bg.cdkey_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.CDKEY_NAME))
|
||||
self.uiMap["game_setting_ui.bg.cdkey_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CDKEY_NAME))
|
||||
self.uiMap["game_setting_ui.bg.cdkey_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.CDKEY_EXCHANGE))
|
||||
self.uiMap["game_setting_ui.bg.cdkey_btn"]:addClickListener(function()
|
||||
ModuleManager.GameSettingManager:showCDKeyUI()
|
||||
end)
|
||||
end
|
||||
|
||||
function GameSettingUI:initSupportBtn()
|
||||
self.uiMap["game_setting_ui.bg.support_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUPPORT_DESC_1))
|
||||
self.uiMap["game_setting_ui.bg.support_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUPPORT_DESC_2))
|
||||
self.uiMap["game_setting_ui.bg.support_btn"]:addClickListener(function()
|
||||
ModuleManager.GameSettingManager:showSupport()
|
||||
end)
|
||||
end
|
||||
|
||||
function GameSettingUI:_addListeners()
|
||||
self.uiMap["game_setting_ui.bg.close_btn"]:addClickListener(function()
|
||||
self:closeUI()
|
||||
|
||||
@ -1,11 +1,5 @@
|
||||
local DungeonData = class("DungeonData", BaseData)
|
||||
|
||||
-- 副本展示权重(由上到下排列)
|
||||
local DUNGEON_SHOW_WEIGHT = {
|
||||
[1] = ModuleManager.MODULE_KEY.DUNGEON_SHARDS,
|
||||
[2] = ModuleManager.MODULE_KEY.DUNGEON_GOLD,
|
||||
}
|
||||
|
||||
-- 所有活动副本数据
|
||||
|
||||
function DungeonData:ctor()
|
||||
@ -116,17 +110,52 @@ end
|
||||
|
||||
-- 返回已开启的副本
|
||||
function DungeonData:getOpenDungeons()
|
||||
if self.dungeonStage == nil then
|
||||
self.dungeonStage = {}
|
||||
for module, entity in pairs(self.dataDungeons) do
|
||||
local openStage = ConfigManager:getConfig("func_open")[module].stage
|
||||
self.dungeonStage[module] = openStage
|
||||
end
|
||||
table.sort(self.dungeonStage, function(a, b)
|
||||
return a < b
|
||||
end)
|
||||
end
|
||||
|
||||
local openDungeons = {}
|
||||
for idx, moduleKey in pairs(DUNGEON_SHOW_WEIGHT) do
|
||||
if self:isOpen(moduleKey) then
|
||||
table.insert(openDungeons, moduleKey)
|
||||
table.foreach(self.dungeonStage, function(module, s)
|
||||
if self:isOpen(module) and self:isActive(module) then
|
||||
table.insert(openDungeons, module)
|
||||
end
|
||||
end)
|
||||
table.foreach(self.dungeonStage, function(module, s)
|
||||
if self:isOpen(module) and not self:isActive(module) then
|
||||
table.insert(openDungeons, module)
|
||||
end
|
||||
end)
|
||||
|
||||
-- 碎片和金币顺序特殊处理：策划要求，同时开启时，金币在碎片之上
|
||||
if self:isActive(ModuleManager.MODULE_KEY.DUNGEON_GOLD) and self:isActive(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) then
|
||||
local idxGold,idxShards = 0,0
|
||||
for idx, module in pairs(openDungeons) do
|
||||
if module == ModuleManager.MODULE_KEY.DUNGEON_GOLD then
|
||||
idxGold = idx
|
||||
end
|
||||
if module == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then
|
||||
idxShards = idx
|
||||
end
|
||||
end
|
||||
if idxGold > idxShards then
|
||||
local temp = openDungeons[idxShards]
|
||||
openDungeons[idxShards] = openDungeons[idxGold]
|
||||
openDungeons[idxGold] = temp
|
||||
end
|
||||
end
|
||||
|
||||
if EDITOR_MODE then
|
||||
Logger.logHighlight("已开启副本:")
|
||||
Logger.printTable(openDungeons)
|
||||
end
|
||||
return table.revert(openDungeons)
|
||||
return openDungeons
|
||||
end
|
||||
|
||||
-- 是否在活动副本时间内
|
||||
|
||||
@ -83,24 +83,15 @@ function DungeonShardsEntity:getBoardShowRewardIcon()
|
||||
end
|
||||
|
||||
function DungeonShardsEntity:getFirstRewardNum(id)
|
||||
local count = 0
|
||||
for index, reward in ipairs(ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward) do
|
||||
count = count + GFunc.getRewardNum(reward)
|
||||
end
|
||||
return count
|
||||
local cfg = ConfigManager:getConfig("chapter_dungeon_shards")[id]
|
||||
return cfg.times_a + cfg.times_b
|
||||
end
|
||||
|
||||
function DungeonShardsEntity:getPassRewardNum(id)
|
||||
local count = 0
|
||||
local pass = ConfigManager:getConfig("chapter_dungeon_shards")[id].pass_reward
|
||||
local wave = ConfigManager:getConfig("chapter_dungeon_shards")[id].wave_reward
|
||||
for index, reward in ipairs(pass) do
|
||||
count = count + GFunc.getRewardNum(reward)
|
||||
end
|
||||
for index, reward in ipairs(wave) do
|
||||
count = count + GFunc.getRewardNum(reward)
|
||||
end
|
||||
return count
|
||||
local cfg = ConfigManager:getConfig("chapter_dungeon_shards")[id]
|
||||
local pass = cfg.times_d
|
||||
local wave = cfg.times_c * #cfg.monster
|
||||
return pass + wave
|
||||
end
|
||||
|
||||
return DungeonShardsEntity
|
||||
Loading…
x
Reference in New Issue
Block a user