diff --git a/lua/app/config/battle_exp.lua b/lua/app/config/battle_exp.lua index 989d4dbf..aa700348 100644 --- a/lua/app/config/battle_exp.lua +++ b/lua/app/config/battle_exp.lua @@ -1,15 +1,15 @@ local battle_exp = { [1]={ - ["exp"]=1 + ["exp"]=10000 }, [2]={ - ["exp"]=1 + ["exp"]=10000 }, [3]={ - ["exp"]=1 + ["exp"]=10000 }, [4]={ - ["exp"]=1 + ["exp"]=10000 }, [5]={ ["exp"]=10000 diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index cd69d1c7..71f8d7b8 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -832,9 +832,61 @@ local fx = { ["bind"]="root" }, [300092]={ + ["res"]="sfx_c1_p35001_02", + ["bind"]="root" + }, + [300093]={ + ["res"]="sfx_c1_p35001_03", + ["bind"]="root" + }, + [300094]={ + ["res"]="sfx_c1_p35001_04", + ["bind"]="root" + }, + [300095]={ ["res"]="sfx_c1_p35001_05", ["bind"]="root" }, + [300096]={ + ["res"]="sfx_c1_p55002_01", + ["bind"]="root" + }, + [300097]={ + ["res"]="sfx_c1_p55002_02", + ["bind"]="root" + }, + [300098]={ + ["res"]="sfx_c1_p55002_03", + ["bind"]="root" + }, + [300099]={ + ["res"]="sfx_c1_p55002_04", + ["bind"]="root" + }, + [300100]={ + ["res"]="sfx_c1_p55002_05", + ["bind"]="root" + }, + [300101]={ + ["res"]="sfx_c1_p26001_01", + ["bind"]="root" + }, + [300102]={ + ["res"]="sfx_c1_p26001_02", + ["bind"]="root" + }, + [300103]={ + ["res"]="sfx_c1_p26001_03", + ["bind"]="root" + }, + [300104]={ + ["res"]="sfx_c1_p26001_04", + ["bind"]="root" + }, + [300105]={ + ["res"]="sfx_c1_p26001_05", + ["bind"]="root" + }, [400001]={ ["res"]="sfx_c1_p45002_01", ["bind"]="root", @@ -1261,12 +1313,77 @@ local fx = { ["flip"]=1 }, [400092]={ + ["res"]="sfx_c1_p35001_02", + ["bind"]="root", + ["flip"]=1 + }, + [400093]={ + ["res"]="sfx_c1_p35001_03", + ["bind"]="root", + ["flip"]=1 + }, + [400094]={ + ["res"]="sfx_c1_p35001_04", + ["bind"]="root", + ["flip"]=1 + }, + [400095]={ ["res"]="sfx_c1_p35001_05", ["bind"]="root", ["flip"]=1 + }, + [400096]={ + ["res"]="sfx_c1_p55002_01", + ["bind"]="root", + ["flip"]=1 + }, + [400097]={ + ["res"]="sfx_c1_p55002_02", + ["bind"]="root", + ["flip"]=1 + }, + [400098]={ + ["res"]="sfx_c1_p55002_03", + ["bind"]="root", + ["flip"]=1 + }, + [400099]={ + ["res"]="sfx_c1_p55002_04", + ["bind"]="root", + ["flip"]=1 + }, + [400100]={ + ["res"]="sfx_c1_p55002_05", + ["bind"]="root", + ["flip"]=1 + }, + [400101]={ + ["res"]="sfx_c1_p26001_01", + ["bind"]="root", + ["flip"]=1 + }, + [400102]={ + ["res"]="sfx_c1_p26001_02", + ["bind"]="root", + ["flip"]=1 + }, + [400103]={ + ["res"]="sfx_c1_p26001_03", + ["bind"]="root", + ["flip"]=1 + }, + [400104]={ + ["res"]="sfx_c1_p26001_04", + ["bind"]="root", + ["flip"]=1 + }, + [400105]={ + ["res"]="sfx_c1_p26001_05", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=291 +data=fx,count=317 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 7bce9697..0f4f3f6d 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -908,6 +908,8 @@ local LocalizationGlobalConst = SUMMON_DESCR_6 = "SUMMON_DESCR_6", SUMMON_DESCR_7 = "SUMMON_DESCR_7", SUMMON_DESCR_8 = "SUMMON_DESCR_8", + SEVEN_DAY_DESC_3 = "SEVEN_DAY_DESC_3", + SEVEN_DAY_DESC_4 = "SEVEN_DAY_DESC_4", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index d15f2d68..f9c41f88 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -273,7 +273,7 @@ local skill = { }, ["fx_self"]=300010, ["bullet_time"]={ - 627, + 726, 3000, 400 }, @@ -4176,7 +4176,8 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300101, + ["fx_self_mirror"]=400101 }, [2600111]={ ["position"]=2, @@ -4204,7 +4205,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300102, + ["fx_self_mirror"]=400102 }, [2600112]={ ["position"]=2, @@ -4232,7 +4234,8 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300103, + ["fx_self_mirror"]=400103 }, [2600113]={ ["position"]=2, @@ -4260,7 +4263,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300104, + ["fx_self_mirror"]=400104 }, [2600120]={ ["energy"]=10, @@ -4312,12 +4316,13 @@ local skill = { "suffer02", "suffer03" }, + ["fx_self"]=300105, ["bullet_time"]={ 3102, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400105 }, [2600121]={ ["energy"]=10, @@ -4369,12 +4374,13 @@ local skill = { "suffer02", "suffer03" }, + ["fx_self"]=300105, ["bullet_time"]={ 3102, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400105 }, [2600122]={ ["energy"]=10, @@ -4435,12 +4441,13 @@ local skill = { "suffer02", "suffer03" }, + ["fx_self"]=300105, ["bullet_time"]={ 3102, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400105 }, [2600123]={ ["energy"]=10, @@ -4501,12 +4508,13 @@ local skill = { "suffer02", "suffer03" }, + ["fx_self"]=300105, ["bullet_time"]={ 3102, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400105 }, [2600124]={ ["position"]=2, @@ -5149,8 +5157,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300091, - ["fx_self_mirror"]=400091 + ["fx_self"]=300092, + ["fx_self_mirror"]=400092 }, [3500112]={ ["position"]=3, @@ -5178,8 +5186,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300091, - ["fx_self_mirror"]=400091 + ["fx_self"]=300093, + ["fx_self_mirror"]=400093 }, [3500113]={ ["position"]=3, @@ -5207,8 +5215,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=300091, - ["fx_self_mirror"]=400091 + ["fx_self"]=300094, + ["fx_self_mirror"]=400094 }, [3500120]={ ["buff_id"]={ @@ -5279,13 +5287,13 @@ local skill = { "suffer03", "suffer03" }, - ["fx_self"]=300092, + ["fx_self"]=300095, ["bullet_time"]={ 1485, 3000, 300 }, - ["fx_self_mirror"]=400092 + ["fx_self_mirror"]=400095 }, [3500121]={ ["buff_id"]={ @@ -5356,13 +5364,13 @@ local skill = { "suffer03", "suffer03" }, - ["fx_self"]=300092, + ["fx_self"]=300095, ["bullet_time"]={ 1485, 3000, 300 }, - ["fx_self_mirror"]=400092 + ["fx_self_mirror"]=400095 }, [3500122]={ ["buff_id"]={ @@ -5433,13 +5441,13 @@ local skill = { "suffer03", "suffer03" }, - ["fx_self"]=300092, + ["fx_self"]=300095, ["bullet_time"]={ 1485, 3000, 300 }, - ["fx_self_mirror"]=400092 + ["fx_self_mirror"]=400095 }, [3500123]={ ["buff_id"]={ @@ -5510,13 +5518,13 @@ local skill = { "suffer03", "suffer03" }, - ["fx_self"]=300092, + ["fx_self"]=300095, ["bullet_time"]={ 1485, 3000, 300 }, - ["fx_self_mirror"]=400092 + ["fx_self_mirror"]=400095 }, [3500124]={ ["position"]=3, @@ -6324,11 +6332,7 @@ local skill = { ["round"]=1 } }, - ["obj"]=2, - ["skill_position"]={ - 1, - 120 - } + ["obj"]=2 }, [4300125]={ ["position"]=4, @@ -6360,11 +6364,7 @@ local skill = { ["round"]=1 } }, - ["obj"]=2, - ["skill_position"]={ - 1, - 120 - } + ["obj"]=2 }, [4300126]={ ["position"]=4, @@ -6396,11 +6396,7 @@ local skill = { ["round"]=2 } }, - ["obj"]=2, - ["skill_position"]={ - 1, - 120 - } + ["obj"]=2 }, [4400110]={ ["position"]=4, @@ -6612,7 +6608,7 @@ local skill = { ["effect"]={ { ["type"]="dmg_addition_blue_add", - ["num"]=5000, + ["num"]=3000, ["ratio"]=10000, ["round"]=1 } @@ -6644,7 +6640,7 @@ local skill = { ["effect"]={ { ["type"]="dmg_addition_blue_add", - ["num"]=8000, + ["num"]=5000, ["ratio"]=10000, ["round"]=1 } @@ -6657,7 +6653,7 @@ local skill = { { { ["type"]="state", - ["attr"]="burn", + ["attr"]="normal_attack_dec", ["op"]=">", ["v"]=0, ["side"]=2 @@ -6672,16 +6668,16 @@ local skill = { }, ["combo_position"]=4, ["effect_type"]=2, - ["trigger"]=7, + ["trigger"]=6, ["effect"]={ { - ["type"]="dmg_addition_blue_add", - ["num"]=12000, - ["ratio"]=10000, + ["type"]="frozen", + ["num"]=0, + ["ratio"]=5000, ["round"]=1 } }, - ["obj"]=1 + ["obj"]=2 }, [4400126]={ ["position"]=4, @@ -8439,7 +8435,8 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300096, + ["fx_self_mirror"]=400096 }, [5500211]={ ["position"]=5, @@ -8467,7 +8464,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300097, + ["fx_self_mirror"]=400097 }, [5500212]={ ["position"]=5, @@ -8495,7 +8493,8 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300098, + ["fx_self_mirror"]=400098 }, [5500213]={ ["position"]=5, @@ -8523,7 +8522,8 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self_mirror"]=100000 + ["fx_self"]=300099, + ["fx_self_mirror"]=400099 }, [5500220]={ ["buff_id"]={ @@ -8601,12 +8601,13 @@ local skill = { ["name_hit"]={ "suffer03" }, + ["fx_self"]=300100, ["bullet_time"]={ 2244, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400100 }, [5500221]={ ["buff_id"]={ @@ -8684,12 +8685,13 @@ local skill = { ["name_hit"]={ "suffer03" }, + ["fx_self"]=300100, ["bullet_time"]={ 2244, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400100 }, [5500222]={ ["buff_id"]={ @@ -8767,12 +8769,13 @@ local skill = { ["name_hit"]={ "suffer03" }, + ["fx_self"]=300100, ["bullet_time"]={ 2244, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400100 }, [5500223]={ ["buff_id"]={ @@ -8850,12 +8853,13 @@ local skill = { ["name_hit"]={ "suffer03" }, + ["fx_self"]=300100, ["bullet_time"]={ 2244, 3000, 400 }, - ["fx_self_mirror"]=100000 + ["fx_self_mirror"]=400100 }, [5500224]={ ["position"]=5, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 4c233c73..f501101f 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -5318,7 +5318,7 @@ local skill_rogue = { 53001 } }, - [3400141]={ + [3500141]={ ["universal"]=2, ["limit_times"]=1, ["weight"]=3000, @@ -5338,7 +5338,7 @@ local skill_rogue = { ["icon_base"]="4", ["entry"]=0 }, - [3400142]={ + [3500142]={ ["universal"]=2, ["limit_times"]=1, ["weight"]=3000, @@ -5358,7 +5358,7 @@ local skill_rogue = { ["icon_base"]="4", ["entry"]=1 }, - [3400143]={ + [3500143]={ ["universal"]=2, ["limit_times"]=1, ["weight"]=3000, @@ -5378,7 +5378,7 @@ local skill_rogue = { ["icon_base"]="4", ["entry"]=2 }, - [3400144]={ + [3500144]={ ["universal"]=3, ["limit_times"]=1, ["weight"]=3000, @@ -6399,6 +6399,12 @@ local skill_rogue = { ["type"]=12, ["skill_position"]=4, ["effect"]={ + { + ["type"]="add_skill", + ["num"]=4400124, + ["ratio"]=10000, + ["round"]=1 + }, { ["type"]="add_skill", ["num"]=4400125, @@ -6414,7 +6420,8 @@ local skill_rogue = { 16001, 15002, 14001, - 13001 + 13001, + 44001 } }, [4400141]={ diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index c5dac409..904134e3 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -908,6 +908,8 @@ local localization_global = ["SUMMON_DESCR_6"] = "召唤英雄，可获得", ["SUMMON_DESCR_7"] = "每周折扣限购：{0}/{1}", ["SUMMON_DESCR_8"] = "{0}% 折扣", + ["SEVEN_DAY_DESC_3"] = "每日解锁", + ["SEVEN_DAY_DESC_4"] = "超值礼包！", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index 8bd3eb63..a80415dc 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -1,399 +1,399 @@ local hero = { [13001]={ ["name"]="熔芯", - ["skill_1"]="[技能1]伤害提升5%", - ["skill_2"]="[技能2]子弹穿透+1", - ["skill_3"]="[技能1]伤害提升5%", - ["skill_4"]="[技能2]子弹穿透+1", + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", ["skill_5"]="[技能1]伤害提升5%", - ["skill_6"]="[技能2]子弹穿透+1", - ["skill_7"]="[技能1]伤害提升5%", - ["skill_8"]="[技能2]子弹穿透+1", - ["skill_9"]="[技能1]伤害提升5%", - ["skill_10"]="[技能2]子弹穿透+1", - ["skill_11"]="[技能1]伤害提升5%", - ["skill_12"]="[技能2]子弹穿透+1", - ["skill_13"]="[技能1]伤害提升5%", - ["skill_14"]="[技能2]子弹穿透+1", - ["skill_15"]="[技能1]伤害提升5%" + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [14001]={ ["name"]="过热小莫", - ["skill_1"]="[技能1]爆炸伤害+15%", - ["skill_2"]="[技能4]触发需要攻击次数-1", - ["skill_3"]="[技能1]爆炸伤害+15%", - ["skill_4"]="[技能4]触发需要攻击次数-1", - ["skill_5"]="[技能1]爆炸伤害+15%", - ["skill_6"]="[技能4]触发需要攻击次数-1", - ["skill_7"]="[技能1]爆炸伤害+15%", - ["skill_8"]="[技能4]触发需要攻击次数-1", - ["skill_9"]="[技能1]爆炸伤害+15%", - ["skill_10"]="[技能4]触发需要攻击次数-1", - ["skill_11"]="[技能1]爆炸伤害+15%", - ["skill_12"]="[技能4]触发需要攻击次数-1", - ["skill_13"]="[技能1]爆炸伤害+15%", - ["skill_14"]="[技能4]触发需要攻击次数-1", - ["skill_15"]="[技能1]爆炸伤害+15%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [15001]={ ["name"]="火花姬", - ["skill_1"]="[技能4]范围伤害+10%", - ["skill_2"]="[技能1]击退概率提升5%", - ["skill_3"]="[技能4]范围伤害+10%", - ["skill_4"]="[技能1]击退概率提升5%", - ["skill_5"]="[技能4]范围伤害+10%", - ["skill_6"]="[技能1]击退概率提升5%", - ["skill_7"]="[技能4]范围伤害+10%", - ["skill_8"]="[技能1]击退概率提升5%", - ["skill_9"]="[技能4]范围伤害+10%", - ["skill_10"]="[技能1]击退概率提升5%", - ["skill_11"]="[技能4]范围伤害+10%", - ["skill_12"]="[技能1]击退概率提升5%", - ["skill_13"]="[技能4]范围伤害+10%", - ["skill_14"]="[技能1]击退概率提升5%", - ["skill_15"]="[技能4]范围伤害+10%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [15002]={ ["name"]="废铁老爹", - ["skill_1"]="[技能3]暴击伤害提升0.5%", - ["skill_2"]="[技能1]相邻水系角色攻击+4%", - ["skill_3"]="[技能3]暴击伤害提升0.5%", - ["skill_4"]="[技能1]相邻水系角色攻击+4%", - ["skill_5"]="[技能3]暴击伤害提升0.5%", - ["skill_6"]="[技能1]相邻水系角色攻击+4%", - ["skill_7"]="[技能3]暴击伤害提升0.5%", - ["skill_8"]="[技能1]相邻水系角色攻击+4%", - ["skill_9"]="[技能3]暴击伤害提升0.5%", - ["skill_10"]="[技能1]相邻水系角色攻击+4%", - ["skill_11"]="[技能3]暴击伤害提升0.5%", - ["skill_12"]="[技能1]相邻水系角色攻击+4%", - ["skill_13"]="[技能3]暴击伤害提升0.5%", - ["skill_14"]="[技能1]相邻水系角色攻击+4%", - ["skill_15"]="[技能3]暴击伤害提升0.5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [16001]={ ["name"]="血祭修女", - ["skill_1"]="[技能1]击退概率提升5%", - ["skill_2"]="[技能4]伤害降低少15%", - ["skill_3"]="[技能1]击退概率提升5%", - ["skill_4"]="[技能4]伤害降低少15%", - ["skill_5"]="[技能1]击退概率提升5%", - ["skill_6"]="[技能4]伤害降低少15%", - ["skill_7"]="[技能1]击退概率提升5%", - ["skill_8"]="[技能4]伤害降低少15%", - ["skill_9"]="[技能1]击退概率提升5%", - ["skill_10"]="[技能4]伤害降低少15%", - ["skill_11"]="[技能1]击退概率提升5%", - ["skill_12"]="[技能4]伤害降低少15%", - ["skill_13"]="[技能1]击退概率提升5%", - ["skill_14"]="[技能4]伤害降低少15%", - ["skill_15"]="[技能1]击退概率提升5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [23001]={ ["name"]="甲虫武士", - ["skill_1"]="[技能1]相邻水系角色攻击+4%", - ["skill_2"]="[技能4]伤害不再降低", - ["skill_3"]="[技能1]相邻水系角色攻击+4%", - ["skill_4"]="[技能4]伤害不再降低", - ["skill_5"]="[技能1]相邻水系角色攻击+4%", - ["skill_6"]="[技能4]伤害不再降低", - ["skill_7"]="[技能1]相邻水系角色攻击+4%", - ["skill_8"]="[技能4]伤害不再降低", - ["skill_9"]="[技能1]相邻水系角色攻击+4%", - ["skill_10"]="[技能4]伤害不再降低", - ["skill_11"]="[技能1]相邻水系角色攻击+4%", - ["skill_12"]="[技能4]伤害不再降低", - ["skill_13"]="[技能1]相邻水系角色攻击+4%", - ["skill_14"]="[技能4]伤害不再降低", - ["skill_15"]="[技能1]相邻水系角色攻击+4%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [24001]={ ["name"]="平底锅战神", - ["skill_1"]="[技能4]伤害降低少15%", - ["skill_2"]="[技能4]减速效果+5%", - ["skill_3"]="[技能4]伤害降低少15%", - ["skill_4"]="[技能4]减速效果+5%", - ["skill_5"]="[技能4]伤害降低少15%", - ["skill_6"]="[技能4]减速效果+5%", - ["skill_7"]="[技能4]伤害降低少15%", - ["skill_8"]="[技能4]减速效果+5%", - ["skill_9"]="[技能4]伤害降低少15%", - ["skill_10"]="[技能4]减速效果+5%", - ["skill_11"]="[技能4]伤害降低少15%", - ["skill_12"]="[技能4]减速效果+5%", - ["skill_13"]="[技能4]伤害降低少15%", - ["skill_14"]="[技能4]减速效果+5%", - ["skill_15"]="[技能4]伤害降低少15%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [25001]={ ["name"]="科技狼人", - ["skill_1"]="[技能4]伤害不再降低", - ["skill_2"]="[技能2]范围+5%", - ["skill_3"]="[技能4]伤害不再降低", - ["skill_4"]="[技能2]范围+5%", - ["skill_5"]="[技能4]伤害不再降低", - ["skill_6"]="[技能2]范围+5%", - ["skill_7"]="[技能4]伤害不再降低", - ["skill_8"]="[技能2]范围+5%", - ["skill_9"]="[技能4]伤害不再降低", - ["skill_10"]="[技能2]范围+5%", - ["skill_11"]="[技能4]伤害不再降低", - ["skill_12"]="[技能2]范围+5%", - ["skill_13"]="[技能4]伤害不再降低", - ["skill_14"]="[技能2]范围+5%", - ["skill_15"]="[技能4]伤害不再降低" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [25002]={ ["name"]="电锤狂战", - ["skill_1"]="[技能4]减速效果+5%", - ["skill_2"]="[技能2]子弹穿透+1", - ["skill_3"]="[技能4]减速效果+5%", - ["skill_4"]="[技能2]子弹穿透+1", - ["skill_5"]="[技能4]减速效果+5%", - ["skill_6"]="[技能2]子弹穿透+1", - ["skill_7"]="[技能4]减速效果+5%", - ["skill_8"]="[技能2]子弹穿透+1", - ["skill_9"]="[技能4]减速效果+5%", - ["skill_10"]="[技能2]子弹穿透+1", - ["skill_11"]="[技能4]减速效果+5%", - ["skill_12"]="[技能2]子弹穿透+1", - ["skill_13"]="[技能4]减速效果+5%", - ["skill_14"]="[技能2]子弹穿透+1", - ["skill_15"]="[技能4]减速效果+5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [26001]={ ["name"]="闪送雷神", - ["skill_1"]="[技能2]范围+5%", - ["skill_2"]="[技能4]触发需要攻击次数-1", - ["skill_3"]="[技能2]范围+5%", - ["skill_4"]="[技能4]触发需要攻击次数-1", - ["skill_5"]="[技能2]范围+5%", - ["skill_6"]="[技能4]触发需要攻击次数-1", - ["skill_7"]="[技能2]范围+5%", - ["skill_8"]="[技能4]触发需要攻击次数-1", - ["skill_9"]="[技能2]范围+5%", - ["skill_10"]="[技能4]触发需要攻击次数-1", - ["skill_11"]="[技能2]范围+5%", - ["skill_12"]="[技能4]触发需要攻击次数-1", - ["skill_13"]="[技能2]范围+5%", - ["skill_14"]="[技能4]触发需要攻击次数-1", - ["skill_15"]="[技能2]范围+5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [33001]={ ["name"]="荒野镖客", - ["skill_1"]="[技能2]子弹穿透+1", - ["skill_2"]="[技能1]伤害提升5%", - ["skill_3"]="[技能2]子弹穿透+1", - ["skill_4"]="[技能1]伤害提升5%", - ["skill_5"]="[技能2]子弹穿透+1", - ["skill_6"]="[技能1]伤害提升5%", - ["skill_7"]="[技能2]子弹穿透+1", - ["skill_8"]="[技能1]伤害提升5%", - ["skill_9"]="[技能2]子弹穿透+1", + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", ["skill_10"]="[技能1]伤害提升5%", - ["skill_11"]="[技能2]子弹穿透+1", - ["skill_12"]="[技能1]伤害提升5%", - ["skill_13"]="[技能2]子弹穿透+1", - ["skill_14"]="[技能1]伤害提升5%", - ["skill_15"]="[技能2]子弹穿透+1" + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [34001]={ ["name"]="光合特工", - ["skill_1"]="[技能4]触发需要攻击次数-1", - ["skill_2"]="[技能1]爆炸伤害+15%", - ["skill_3"]="[技能4]触发需要攻击次数-1", - ["skill_4"]="[技能1]爆炸伤害+15%", - ["skill_5"]="[技能4]触发需要攻击次数-1", - ["skill_6"]="[技能1]爆炸伤害+15%", - ["skill_7"]="[技能4]触发需要攻击次数-1", - ["skill_8"]="[技能1]爆炸伤害+15%", - ["skill_9"]="[技能4]触发需要攻击次数-1", - ["skill_10"]="[技能1]爆炸伤害+15%", - ["skill_11"]="[技能4]触发需要攻击次数-1", - ["skill_12"]="[技能1]爆炸伤害+15%", - ["skill_13"]="[技能4]触发需要攻击次数-1", - ["skill_14"]="[技能1]爆炸伤害+15%", - ["skill_15"]="[技能4]触发需要攻击次数-1" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [35001]={ ["name"]="树懒镖师", - ["skill_1"]="[技能1]伤害提升5%", - ["skill_2"]="[技能4]范围伤害+10%", - ["skill_3"]="[技能1]伤害提升5%", - ["skill_4"]="[技能4]范围伤害+10%", + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", ["skill_5"]="[技能1]伤害提升5%", - ["skill_6"]="[技能4]范围伤害+10%", - ["skill_7"]="[技能1]伤害提升5%", - ["skill_8"]="[技能4]范围伤害+10%", - ["skill_9"]="[技能1]伤害提升5%", - ["skill_10"]="[技能4]范围伤害+10%", - ["skill_11"]="[技能1]伤害提升5%", - ["skill_12"]="[技能4]范围伤害+10%", - ["skill_13"]="[技能1]伤害提升5%", - ["skill_14"]="[技能4]范围伤害+10%", - ["skill_15"]="[技能1]伤害提升5%" + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [35002]={ ["name"]="快递仙人", - ["skill_1"]="[技能1]爆炸伤害+15%", - ["skill_2"]="[技能3]暴击伤害提升0.5%", - ["skill_3"]="[技能1]爆炸伤害+15%", - ["skill_4"]="[技能3]暴击伤害提升0.5%", - ["skill_5"]="[技能1]爆炸伤害+15%", - ["skill_6"]="[技能3]暴击伤害提升0.5%", - ["skill_7"]="[技能1]爆炸伤害+15%", - ["skill_8"]="[技能3]暴击伤害提升0.5%", - ["skill_9"]="[技能1]爆炸伤害+15%", - ["skill_10"]="[技能3]暴击伤害提升0.5%", - ["skill_11"]="[技能1]爆炸伤害+15%", - ["skill_12"]="[技能3]暴击伤害提升0.5%", - ["skill_13"]="[技能1]爆炸伤害+15%", - ["skill_14"]="[技能3]暴击伤害提升0.5%", - ["skill_15"]="[技能1]爆炸伤害+15%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [43001]={ ["name"]="气泡柴犬", - ["skill_1"]="[技能4]范围伤害+10%", - ["skill_2"]="[技能1]击退概率提升5%", - ["skill_3"]="[技能4]范围伤害+10%", - ["skill_4"]="[技能1]击退概率提升5%", - ["skill_5"]="[技能4]范围伤害+10%", - ["skill_6"]="[技能1]击退概率提升5%", - ["skill_7"]="[技能4]范围伤害+10%", - ["skill_8"]="[技能1]击退概率提升5%", - ["skill_9"]="[技能4]范围伤害+10%", - ["skill_10"]="[技能1]击退概率提升5%", - ["skill_11"]="[技能4]范围伤害+10%", - ["skill_12"]="[技能1]击退概率提升5%", - ["skill_13"]="[技能4]范围伤害+10%", - ["skill_14"]="[技能1]击退概率提升5%", - ["skill_15"]="[技能4]范围伤害+10%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [44001]={ ["name"]="海的女儿", - ["skill_1"]="[技能3]暴击伤害提升0.5%", - ["skill_2"]="[技能1]相邻水系角色攻击+4%", - ["skill_3"]="[技能3]暴击伤害提升0.5%", - ["skill_4"]="[技能1]相邻水系角色攻击+4%", - ["skill_5"]="[技能3]暴击伤害提升0.5%", - ["skill_6"]="[技能1]相邻水系角色攻击+4%", - ["skill_7"]="[技能3]暴击伤害提升0.5%", - ["skill_8"]="[技能1]相邻水系角色攻击+4%", - ["skill_9"]="[技能3]暴击伤害提升0.5%", - ["skill_10"]="[技能1]相邻水系角色攻击+4%", - ["skill_11"]="[技能3]暴击伤害提升0.5%", - ["skill_12"]="[技能1]相邻水系角色攻击+4%", - ["skill_13"]="[技能3]暴击伤害提升0.5%", - ["skill_14"]="[技能1]相邻水系角色攻击+4%", - ["skill_15"]="[技能3]暴击伤害提升0.5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [45001]={ ["name"]="外卖天使", - ["skill_1"]="[技能1]击退概率提升5%", - ["skill_2"]="[技能4]伤害降低少15%", - ["skill_3"]="[技能1]击退概率提升5%", - ["skill_4"]="[技能4]伤害降低少15%", - ["skill_5"]="[技能1]击退概率提升5%", - ["skill_6"]="[技能4]伤害降低少15%", - ["skill_7"]="[技能1]击退概率提升5%", - ["skill_8"]="[技能4]伤害降低少15%", - ["skill_9"]="[技能1]击退概率提升5%", - ["skill_10"]="[技能4]伤害降低少15%", - ["skill_11"]="[技能1]击退概率提升5%", - ["skill_12"]="[技能4]伤害降低少15%", - ["skill_13"]="[技能1]击退概率提升5%", - ["skill_14"]="[技能4]伤害降低少15%", - ["skill_15"]="[技能1]击退概率提升5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [45002]={ ["name"]="冰鲜队长", - ["skill_1"]="[技能1]相邻水系角色攻击+4%", - ["skill_2"]="[技能4]伤害不再降低", - ["skill_3"]="[技能1]相邻水系角色攻击+4%", - ["skill_4"]="[技能4]伤害不再降低", - ["skill_5"]="[技能1]相邻水系角色攻击+4%", - ["skill_6"]="[技能4]伤害不再降低", - ["skill_7"]="[技能1]相邻水系角色攻击+4%", - ["skill_8"]="[技能4]伤害不再降低", - ["skill_9"]="[技能1]相邻水系角色攻击+4%", - ["skill_10"]="[技能4]伤害不再降低", - ["skill_11"]="[技能1]相邻水系角色攻击+4%", - ["skill_12"]="[技能4]伤害不再降低", - ["skill_13"]="[技能1]相邻水系角色攻击+4%", - ["skill_14"]="[技能4]伤害不再降低", - ["skill_15"]="[技能1]相邻水系角色攻击+4%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [53001]={ ["name"]="圣盾卫士", - ["skill_1"]="[技能4]伤害降低少15%", - ["skill_2"]="[技能4]减速效果+5%", - ["skill_3"]="[技能4]伤害降低少15%", - ["skill_4"]="[技能4]减速效果+5%", - ["skill_5"]="[技能4]伤害降低少15%", - ["skill_6"]="[技能4]减速效果+5%", - ["skill_7"]="[技能4]伤害降低少15%", - ["skill_8"]="[技能4]减速效果+5%", - ["skill_9"]="[技能4]伤害降低少15%", - ["skill_10"]="[技能4]减速效果+5%", - ["skill_11"]="[技能4]伤害降低少15%", - ["skill_12"]="[技能4]减速效果+5%", - ["skill_13"]="[技能4]伤害降低少15%", - ["skill_14"]="[技能4]减速效果+5%", - ["skill_15"]="[技能4]伤害降低少15%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [54001]={ ["name"]="混沌巫师", - ["skill_1"]="[技能4]伤害不再降低", - ["skill_2"]="[技能2]范围+5%", - ["skill_3"]="[技能4]伤害不再降低", - ["skill_4"]="[技能2]范围+5%", - ["skill_5"]="[技能4]伤害不再降低", - ["skill_6"]="[技能2]范围+5%", - ["skill_7"]="[技能4]伤害不再降低", - ["skill_8"]="[技能2]范围+5%", - ["skill_9"]="[技能4]伤害不再降低", - ["skill_10"]="[技能2]范围+5%", - ["skill_11"]="[技能4]伤害不再降低", - ["skill_12"]="[技能2]范围+5%", - ["skill_13"]="[技能4]伤害不再降低", - ["skill_14"]="[技能2]范围+5%", - ["skill_15"]="[技能4]伤害不再降低" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [55001]={ ["name"]="死灵法师", - ["skill_1"]="[技能4]减速效果+5%", - ["skill_2"]="[技能2]子弹穿透+1", - ["skill_3"]="[技能4]减速效果+5%", - ["skill_4"]="[技能2]子弹穿透+1", - ["skill_5"]="[技能4]减速效果+5%", - ["skill_6"]="[技能2]子弹穿透+1", - ["skill_7"]="[技能4]减速效果+5%", - ["skill_8"]="[技能2]子弹穿透+1", - ["skill_9"]="[技能4]减速效果+5%", - ["skill_10"]="[技能2]子弹穿透+1", - ["skill_11"]="[技能4]减速效果+5%", - ["skill_12"]="[技能2]子弹穿透+1", - ["skill_13"]="[技能4]减速效果+5%", - ["skill_14"]="[技能2]子弹穿透+1", - ["skill_15"]="[技能4]减速效果+5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" }, [55002]={ ["name"]="血族快递伯爵", - ["skill_1"]="[技能2]范围+5%", - ["skill_2"]="[技能4]触发需要攻击次数-1", - ["skill_3"]="[技能2]范围+5%", - ["skill_4"]="[技能4]触发需要攻击次数-1", - ["skill_5"]="[技能2]范围+5%", - ["skill_6"]="[技能4]触发需要攻击次数-1", - ["skill_7"]="[技能2]范围+5%", - ["skill_8"]="[技能4]触发需要攻击次数-1", - ["skill_9"]="[技能2]范围+5%", - ["skill_10"]="[技能4]触发需要攻击次数-1", - ["skill_11"]="[技能2]范围+5%", - ["skill_12"]="[技能4]触发需要攻击次数-1", - ["skill_13"]="[技能2]范围+5%", - ["skill_14"]="[技能4]触发需要攻击次数-1", - ["skill_15"]="[技能2]范围+5%" + ["skill_1"]="[技能2]解锁", + ["skill_2"]="[技能3]解锁", + ["skill_3"]="[技能4]解锁", + ["skill_4"]="[技能1]战斗内直接生效", + ["skill_5"]="[技能1]伤害提升5%", + ["skill_6"]="[技能2]伤害提升5%", + ["skill_7"]="[技能3]伤害提升5%", + ["skill_8"]="[技能2]战斗内直接生效", + ["skill_9"]="[技能4]伤害提升5%", + ["skill_10"]="[技能1]伤害提升5%", + ["skill_11"]="[技能2]伤害提升5%", + ["skill_12"]="[技能3]战斗内直接生效", + ["skill_13"]="[技能3]伤害提升5%", + ["skill_14"]="[技能4]伤害提升5%", + ["skill_15"]="[技能4]战斗内直接生效" } } local config = { diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 4d6c4b33..58507f96 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -408,28 +408,28 @@ local skill_rogue = { ["rougedesc"]="火花姬技能附加自愈效果+2回合，自愈效果提高50%" }, [1500131]={ - ["desc"]="Combo：火花姬普攻合技能对流血敌人伤害增加10%", + ["desc"]="Combo：火花姬普攻和技能对流血敌人伤害增加10%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：火花姬普攻和技能对流血敌人伤害增加10%" }, [1500132]={ - ["desc"]="Combo：火花姬普攻合技能对流血敌人伤害增加10%", + ["desc"]="Combo：火花姬普攻和技能对流血敌人伤害增加10%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：火花姬普攻和技能对流血敌人伤害增加20%" }, [1500133]={ - ["desc"]="Combo：火花姬普攻合技能对流血敌人伤害增加10%", + ["desc"]="Combo：火花姬普攻和技能对流血敌人伤害增加10%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：火花姬普攻和技能对流血敌人伤害增加20%" }, [1500134]={ - ["desc"]="Combo：火花姬普攻合技能对流血敌人伤害增加10%", + ["desc"]="Combo：火花姬普攻和技能对流血敌人伤害增加10%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", @@ -632,28 +632,28 @@ local skill_rogue = { ["rougedesc"]="血祭修女技能释放后为团队附加亢奋效果3回合，技能伤害增加300%" }, [1600131]={ - ["desc"]="Combo：血祭修女普攻合技能对灼烧敌人伤害增加10%", + ["desc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加10%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加10%" }, [1600132]={ - ["desc"]="Combo：血祭修女普攻合技能对灼烧敌人伤害增加20%", + ["desc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加20%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加20%" }, [1600133]={ - ["desc"]="Combo：血祭修女普攻合技能对灼烧敌人伤害增加20%", + ["desc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加20%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", ["rougedesc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加20%" }, [1600134]={ - ["desc"]="Combo：血祭修女普攻合技能对灼烧敌人伤害增加30%", + ["desc"]="Combo：血祭修女普攻和技能对灼烧敌人伤害增加30%", ["entry_1"]="增伤提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至30%", @@ -1500,88 +1500,88 @@ local skill_rogue = { ["rougedesc"]="树懒镖师技能可左右消除4格，链接增伤15%" }, [3500121]={ - ["desc"]="树懒镖师技能有50%几率附加易伤1回合", - ["entry_1"]="几率提升至100%", + ["desc"]="树懒镖师技能伤害提升300%", + ["entry_1"]="技能命中附加中毒，1回合", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="易伤回合数+1", - ["rougedesc"]="树懒镖师技能有50%几率附加易伤1回合" + ["entry_3"]="中毒伤害提升100%", + ["rougedesc"]="树懒镖师技能伤害提升300%" }, [3500122]={ - ["desc"]="树懒镖师技能有50%几率附加易伤1回合", - ["entry_1"]="几率提升至100%", + ["desc"]="树懒镖师技能伤害提升300%", + ["entry_1"]="技能命中附加中毒，1回合", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="易伤回合数+1", - ["rougedesc"]="树懒镖师技能有100%几率附加易伤1回合" + ["entry_3"]="中毒伤害提升100%", + ["rougedesc"]="树懒镖师技能伤害提升300%" }, [3500123]={ - ["desc"]="树懒镖师技能有50%几率附加易伤1回合", - ["entry_1"]="战斗中直接生效！", + ["desc"]="树懒镖师技能伤害提升300%", + ["entry_1"]="技能命中附加中毒，1回合", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="易伤回合数+1", - ["rougedesc"]="树懒镖师技能有100%几率附加易伤1回合" + ["entry_3"]="中毒伤害提升100%", + ["rougedesc"]="树懒镖师技能伤害提升300%，技能附加中毒，1回合。" }, [3500124]={ - ["desc"]="树懒镖师技能有50%几率附加易伤1回合", - ["entry_1"]="几率提升至100%", + ["desc"]="树懒镖师技能伤害提升300%", + ["entry_1"]="技能命中附加中毒，1回合", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="易伤回合数+1", - ["rougedesc"]="树懒镖师技能有100%几率附加易伤2回合" + ["entry_3"]="中毒伤害提升100%", + ["rougedesc"]="树懒镖师技能伤害提升300%，技能附加中毒，1回合。" }, [3500131]={ - ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合", - ["entry_1"]="中毒伤害提升", + ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒，2回合", + ["entry_1"]="中毒几率提升50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="几率提升至100%", + ["entry_3"]="中毒回合数+1", ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合" }, [3500132]={ - ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合", - ["entry_1"]="中毒伤害提升", + ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒，2回合", + ["entry_1"]="中毒几率提升50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="几率提升至100%", - ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合，中毒伤害提升" + ["entry_3"]="中毒回合数+1", + ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有100%几率额外附加1层中毒2回合" }, [3500133]={ - ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合", - ["entry_1"]="战斗中直接生效！", + ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒，2回合", + ["entry_1"]="中毒几率提升50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="几率提升至100%", - ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合，中毒伤害提升" + ["entry_3"]="中毒回合数+1", + ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有100%几率额外附加1层中毒2回合" }, [3500134]={ - ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒2回合", - ["entry_1"]="中毒伤害提升", + ["desc"]="Combo：树懒镖师技能命中中毒敌人有50%几率额外附加1层中毒，2回合", + ["entry_1"]="中毒几率提升50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="几率提升至100%", - ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有100%几率额外附加1层中毒2回合/中毒伤害提升" + ["entry_3"]="中毒回合数+1", + ["rougedesc"]="Combo：树懒镖师技能命中中毒敌人有100%几率额外附加1层中毒3回合" }, [3500141]={ - ["desc"]="树懒镖师普攻有20%几率附加中毒1回合", - ["entry_1"]="中毒回合数+1", - ["entry_2"]="几率提升至25%", + ["desc"]="树懒镖师攻击提升5%", + ["entry_1"]="攻击提升至10%", + ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="树懒镖师普攻有20%几率附加中毒1回合" + ["rougedesc"]="树懒镖师攻击提升5%" }, [3500142]={ - ["desc"]="树懒镖师普攻有20%几率附加中毒1回合", - ["entry_1"]="中毒回合数+1", - ["entry_2"]="几率提升至25%", + ["desc"]="树懒镖师攻击提升5%", + ["entry_1"]="攻击提升至10%", + ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="树懒镖师普攻有20%几率附加中毒2回合" + ["rougedesc"]="树懒镖师攻击提升10%" }, [3500143]={ - ["desc"]="树懒镖师普攻有20%几率附加中毒1回合", - ["entry_1"]="中毒回合数+1", - ["entry_2"]="几率提升至25%", + ["desc"]="树懒镖师攻击提升5%", + ["entry_1"]="攻击提升至10%", + ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="树懒镖师普攻有25%几率附加中毒2回合" + ["rougedesc"]="树懒镖师攻击提升15%" }, [3500144]={ - ["desc"]="树懒镖师普攻有20%几率附加中毒1回合", - ["entry_1"]="战斗中直接生效！", - ["entry_2"]="几率提升至25%", + ["desc"]="树懒镖师攻击提升5%", + ["entry_1"]="攻击提升至10%", + ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="树懒镖师普攻有25%几率附加中毒2回合" + ["rougedesc"]="树懒镖师攻击提升15%" }, [3500211]={ ["desc"]="快递仙人技能可上下消除2格", @@ -1612,32 +1612,32 @@ local skill_rogue = { ["rougedesc"]="快递仙人技能可上下消除4格，链接增伤10%" }, [3500221]={ - ["desc"]="快递仙人技能命中附加易伤1回合", - ["entry_1"]="易伤效果提升", + ["desc"]="快递仙人技能命附加易伤的概率提高至100%", + ["entry_1"]="易伤效果提高", ["entry_2"]="战斗中直接生效！", ["entry_3"]="易伤回合数+1", - ["rougedesc"]="快递仙人技能命中附加易伤1回合" + ["rougedesc"]="快递仙人技能命附加易伤的概率提高至100%" }, [3500222]={ - ["desc"]="快递仙人技能命中附加易伤1回合", - ["entry_1"]="易伤效果提升", + ["desc"]="快递仙人技能命附加易伤的概率提高至100%", + ["entry_1"]="易伤效果提高", ["entry_2"]="战斗中直接生效！", ["entry_3"]="易伤回合数+1", - ["rougedesc"]="快递仙人技能命中附加易伤1回合，易伤效果提高" + ["rougedesc"]="快递仙人技能命附加易伤的概率提高至100%" }, [3500223]={ - ["desc"]="快递仙人技能命中附加易伤1回合", - ["entry_1"]="战斗中直接生效！", + ["desc"]="快递仙人技能命附加易伤的概率提高至100%", + ["entry_1"]="易伤效果提高", ["entry_2"]="战斗中直接生效！", ["entry_3"]="易伤回合数+1", - ["rougedesc"]="快递仙人技能命中附加易伤1回合，易伤效果提高" + ["rougedesc"]="快递仙人技能命附加易伤的概率提高至100%" }, [3500224]={ - ["desc"]="快递仙人技能命中附加易伤1回合", - ["entry_1"]="易伤效果提升", + ["desc"]="快递仙人技能命附加易伤的概率提高至100%", + ["entry_1"]="易伤效果提高", ["entry_2"]="战斗中直接生效！", ["entry_3"]="易伤回合数+1", - ["rougedesc"]="快递仙人技能命中附加易伤2回合，易伤效果提高" + ["rougedesc"]="快递仙人技能命附加易伤的概率提高至100%，易伤回合数提升至2回合" }, [3500231]={ ["desc"]="快递仙人攻击提升5%", @@ -1655,7 +1655,7 @@ local skill_rogue = { }, [3500233]={ ["desc"]="快递仙人攻击提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="攻击提升至10%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="攻击提升至15%", ["rougedesc"]="快递仙人攻击提升10%" @@ -1668,32 +1668,32 @@ local skill_rogue = { ["rougedesc"]="快递仙人攻击提升15%" }, [3500241]={ - ["desc"]="快递仙人普攻有20%几率附加流血2回合", + ["desc"]="快递仙人普攻有5%几率附加流血2回合", ["entry_1"]="流血回合数+1", ["entry_2"]="流血伤害提升", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="快递仙人普攻有20%几率附加流血2回合" + ["rougedesc"]="快递仙人普攻有5%几率附加流血2回合" }, [3500242]={ - ["desc"]="快递仙人普攻有20%几率附加流血2回合", + ["desc"]="快递仙人普攻有5%几率附加流血2回合", ["entry_1"]="流血回合数+1", ["entry_2"]="流血伤害提升", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="快递仙人普攻有20%几率附加流血3回合" + ["rougedesc"]="快递仙人普攻有5%几率附加流血2回合" }, [3500243]={ - ["desc"]="快递仙人普攻有20%几率附加流血2回合", + ["desc"]="快递仙人普攻有5%几率附加流血2回合", ["entry_1"]="流血回合数+1", ["entry_2"]="流血伤害提升", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="快递仙人普攻有20%几率附加流血3回合，流血伤害提升" + ["rougedesc"]="快递仙人普攻有5%几率附加流血3回合，流血伤害提升" }, [3500244]={ - ["desc"]="快递仙人普攻有20%几率附加流血2回合", - ["entry_1"]="战斗中直接生效！", + ["desc"]="快递仙人普攻有5%几率附加流血2回合", + ["entry_1"]="流血回合数+1", ["entry_2"]="流血伤害提升", ["entry_3"]="战斗中直接生效！", - ["rougedesc"]="快递仙人普攻有20%几率附加流血3回合，流血伤害提升" + ["rougedesc"]="快递仙人普攻有5%几率附加流血3回合，流血伤害提升" }, [4300111]={ ["desc"]="气泡柴犬技能可随机消除2格", @@ -1705,7 +1705,7 @@ local skill_rogue = { [4300112]={ ["desc"]="气泡柴犬技能可随机消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="消除数+2", ["entry_3"]="消除数+2", ["rougedesc"]="气泡柴犬技能可随机消除2格" }, @@ -1739,7 +1739,7 @@ local skill_rogue = { }, [4300123]={ ["desc"]="气泡柴犬技能命中50%几率附加冰霜1回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="几率提升至100%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="冰霜回合数+1", ["rougedesc"]="气泡柴犬技能命中100%几率附加冰霜1回合" @@ -1767,7 +1767,7 @@ local skill_rogue = { }, [4300133]={ ["desc"]="Combo：气泡柴犬技能命中冰霜敌人20%几率附加冻结1回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="几率提升至40%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="冻结回合数+1", ["rougedesc"]="Combo：气泡柴犬技能命中冰霜敌人40%几率附加冻结1回合" @@ -1802,7 +1802,7 @@ local skill_rogue = { }, [4300144]={ ["desc"]="气泡柴犬攻击提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="攻击提升至10%", ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="气泡柴犬攻击提升15%" @@ -1817,7 +1817,7 @@ local skill_rogue = { [4400112]={ ["desc"]="海的女儿技能可左右消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="左右消除增加2格", ["entry_3"]="技能链接时伤害增加15%", ["rougedesc"]="海的女儿技能可左右消除2格" }, @@ -1851,7 +1851,7 @@ local skill_rogue = { }, [4400123]={ ["desc"]="海的女儿技能命中附加冰霜1回合；", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="冰霜回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能伤害提高", ["rougedesc"]="海的女儿技能命中附加冰霜2回合；" @@ -1864,32 +1864,32 @@ local skill_rogue = { ["rougedesc"]="海的女儿技能命中附加冰霜2回合；技能伤害提高25%" }, [4400131]={ - ["desc"]="Combo：海的女儿技能对灼烧敌人增伤50%", - ["entry_1"]="增伤提升至100%", + ["desc"]="Combo：海的女儿技能对灼烧敌人增伤30%", + ["entry_1"]="增伤提升至50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能命中冰霜敌人50%几率附加冻结1回合", - ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤50%" + ["entry_3"]="技能命中冰霜敌人50%几率附加冻结，1回合", + ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤30%" }, [4400132]={ - ["desc"]="Combo：海的女儿技能对灼烧敌人增伤50%", - ["entry_1"]="增伤提升至100%", + ["desc"]="Combo：海的女儿技能对灼烧敌人增伤30%", + ["entry_1"]="增伤提升至50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能命中冰霜敌人50%几率附加冻结1回合", - ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤100%" + ["entry_3"]="技能命中冰霜敌人50%几率附加冻结，1回合", + ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤50%" }, [4400133]={ - ["desc"]="Combo：海的女儿技能对灼烧敌人增伤50%", - ["entry_1"]="战斗中直接生效！", + ["desc"]="Combo：海的女儿技能对灼烧敌人增伤30%", + ["entry_1"]="增伤提升至50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能命中冰霜敌人50%几率附加冻结1回合", - ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤100%" + ["entry_3"]="技能命中冰霜敌人50%几率附加冻结，1回合", + ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤50%" }, [4400134]={ - ["desc"]="Combo：海的女儿技能对灼烧敌人增伤50%", - ["entry_1"]="增伤提升至100%", + ["desc"]="Combo：海的女儿技能对灼烧敌人增伤30%", + ["entry_1"]="增伤提升至50%", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能命中冰霜敌人50%几率附加冻结1回合", - ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤100%;技能命中冰霜敌人50%几率附加冻结1回合" + ["entry_3"]="技能命中冰霜敌人50%几率附加冻结，1回合", + ["rougedesc"]="Combo：海的女儿技能对灼烧敌人增伤50%;技能命中冰霜敌人50%几率附加冻结1回合" }, [4400141]={ ["desc"]="海的女儿技能释放后50%几率为自身附加1回合反伤冰盾", @@ -1914,7 +1914,7 @@ local skill_rogue = { }, [4400144]={ ["desc"]="海的女儿技能释放后50%几率为自身附加1回合反伤冰盾", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="反伤效果提升", ["entry_2"]="护盾回合数+1", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="海的女儿技能释放后50%几率为自身附加2回合反伤冰盾，反伤倍率提高50%" @@ -1976,32 +1976,32 @@ local skill_rogue = { ["rougedesc"]="外卖天使技能有100%几率附加冻结2回合" }, [4500131]={ - ["desc"]="Combo：外卖天使技能对灼烧敌人增伤50%", + ["desc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤50%", ["entry_1"]="增伤提升至80%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至120%", - ["rougedesc"]="Combo：外卖天使技能对灼烧敌人增伤50%" + ["rougedesc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤50%" }, [4500132]={ - ["desc"]="Combo：外卖天使技能对灼烧敌人增伤50%", + ["desc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤50%", ["entry_1"]="增伤提升至80%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至120%", - ["rougedesc"]="Combo：外卖天使技能对灼烧敌人增伤80%" + ["rougedesc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤80%" }, [4500133]={ - ["desc"]="Combo：外卖天使技能对灼烧敌人增伤50%", - ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", - ["entry_3"]="增伤提升至120%", - ["rougedesc"]="Combo：外卖天使技能对灼烧敌人增伤80%" - }, - [4500134]={ - ["desc"]="Combo：外卖天使技能对灼烧敌人增伤50%", + ["desc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤50%", ["entry_1"]="增伤提升至80%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="增伤提升至120%", - ["rougedesc"]="Combo：外卖天使技能对灼烧敌人增伤120%" + ["rougedesc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤80%" + }, + [4500134]={ + ["desc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤50%", + ["entry_1"]="增伤提升至80%", + ["entry_2"]="战斗中直接生效！", + ["entry_3"]="增伤提升至120%", + ["rougedesc"]="Combo：外卖天使普攻和技能对灼烧敌人增伤120%" }, [4500141]={ ["desc"]="外卖天使普攻有20%几率附加冰霜1回合", @@ -2041,7 +2041,7 @@ local skill_rogue = { [4500212]={ ["desc"]="冰鲜队长技能可上下消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="上下消除增加2格", ["entry_3"]="技能链接时伤害增加15%", ["rougedesc"]="冰鲜队长技能可上下消除2格" }, @@ -2075,7 +2075,7 @@ local skill_rogue = { }, [4500223]={ ["desc"]="冰鲜队长技能命中附加冰霜1回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="技能腐败回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="冰霜回合数+1", ["rougedesc"]="冰鲜队长技能命中附加冰霜1回合，腐败回合+1" @@ -2103,7 +2103,7 @@ local skill_rogue = { }, [4500233]={ ["desc"]="Combo：冰鲜队长技能命中易伤敌人附加虚弱1回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="虚弱回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="虚弱回合数+2", ["rougedesc"]="Combo：冰鲜队长技能命中易伤敌人附加虚弱2回合" @@ -2138,7 +2138,7 @@ local skill_rogue = { }, [4500244]={ ["desc"]="冰鲜队长攻击提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="攻击提升至10%", ["entry_2"]="攻击提升至15%", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="冰鲜队长攻击提升15%" @@ -2153,7 +2153,7 @@ local skill_rogue = { [5300112]={ ["desc"]="圣盾卫士技能可左右消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="可上下消除2格", ["entry_3"]="技能链接超6个元素护盾回合数+1", ["rougedesc"]="圣盾卫士技能可左右消除2格" }, @@ -2187,7 +2187,7 @@ local skill_rogue = { }, [5300123]={ ["desc"]="圣盾卫士护盾承伤增加6%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="护盾承受伤害增加4%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="30%几率附加反伤效果，1回合", ["rougedesc"]="圣盾卫士护盾承伤增加10%" @@ -2215,7 +2215,7 @@ local skill_rogue = { }, [5300133]={ ["desc"]="链接圣盾卫士技能时普攻有10%概率附加中毒2回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="概率提升至20%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="概率提升至30%", ["rougedesc"]="链接圣盾卫士技能时普攻有20%概率附加中毒2回合" @@ -2250,7 +2250,7 @@ local skill_rogue = { }, [5300144]={ ["desc"]="圣盾卫士生命提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="生命提升至10%", ["entry_2"]="生命提升至15%", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="圣盾卫士生命提升15%" @@ -2265,7 +2265,7 @@ local skill_rogue = { [5400112]={ ["desc"]="混沌巫师技能可上下消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="上下消除增加2格", ["entry_3"]="技能链接时伤害增加15%", ["rougedesc"]="混沌巫师技能可上下消除2格" }, @@ -2299,7 +2299,7 @@ local skill_rogue = { }, [5400123]={ ["desc"]="混沌巫师技能命中附加中毒2回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="中毒伤害提升", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能释放后随机一种元素技能能量+2", ["rougedesc"]="混沌巫师技能命中附加中毒2回合,中毒伤害提升" @@ -2327,7 +2327,7 @@ local skill_rogue = { }, [5400133]={ ["desc"]="Combo：混沌巫师技能命中灼烧敌人伤害提升50%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="伤害提升至100%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能命中中毒敌人50%几率附加昏睡1回合", ["rougedesc"]="Combo：混沌巫师技能命中灼烧敌人伤害提升100%" @@ -2362,7 +2362,7 @@ local skill_rogue = { }, [5400144]={ ["desc"]="混沌巫师技能伤害提高10%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="技能伤害提升至20%", ["entry_2"]="技能伤害提升至30%", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="混沌巫师技能伤害提高30%" @@ -2377,7 +2377,7 @@ local skill_rogue = { [5500112]={ ["desc"]="死灵法师技能可左右消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="左右消除增加2格", ["entry_3"]="技能可上下消除2格", ["rougedesc"]="死灵法师技能可左右消除2格" }, @@ -2396,32 +2396,32 @@ local skill_rogue = { ["rougedesc"]="死灵法师技能可左右消除4格，上下消除2格" }, [5500121]={ - ["desc"]="死灵法师技能倍率提升300%", - ["entry_1"]="技能释放后随机一种颜色技能的能量+2", + ["desc"]="死灵法师技能释放后随机3个元素变为紫色", + ["entry_1"]="技能激活所需能量-2", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能释放后随机3个元素变为紫色", - ["rougedesc"]="死灵法师技能倍率提升300%" + ["entry_3"]="技能伤害提升300%", + ["rougedesc"]="死灵法师技能释放后随机3个元素变为紫色" }, [5500122]={ - ["desc"]="死灵法师技能倍率提升300%", - ["entry_1"]="技能释放后随机一种颜色技能的能量+2", + ["desc"]="死灵法师技能释放后随机3个元素变为紫色", + ["entry_1"]="技能激活所需能量-2", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能释放后随机3个元素变为紫色", - ["rougedesc"]="死灵法师技能倍率提升300%，技能释放后随机一种颜色技能的能量+2" + ["entry_3"]="技能伤害提升300%", + ["rougedesc"]="死灵法师技能所需能量-2，释放后随机3个元素变为紫色" }, [5500123]={ - ["desc"]="死灵法师技能倍率提升300%", - ["entry_1"]="战斗中直接生效！", + ["desc"]="死灵法师技能释放后随机3个元素变为紫色", + ["entry_1"]="技能激活所需能量-2", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能释放后随机3个元素变为紫色", - ["rougedesc"]="死灵法师技能倍率提升300%，技能释放后随机一种颜色技能的能量+2" + ["entry_3"]="技能伤害提升300%", + ["rougedesc"]="死灵法师技能所需能量-2，释放后随机3个元素变为紫色" }, [5500124]={ - ["desc"]="死灵法师技能倍率提升300%", - ["entry_1"]="技能释放后随机一种颜色技能的能量+2", + ["desc"]="死灵法师技能释放后随机3个元素变为紫色", + ["entry_1"]="技能激活所需能量-2", ["entry_2"]="战斗中直接生效！", - ["entry_3"]="技能释放后随机3个元素变为紫色", - ["rougedesc"]="死灵法师技能倍率提升300%，技能释放后随机一种颜色技能的能量+2且随机3个元素变为紫色" + ["entry_3"]="技能伤害提升300%", + ["rougedesc"]="死灵法师技能所需能量-2，伤害提升300%，释放后随机3个元素变为紫色" }, [5500131]={ ["desc"]="死灵法师攻击提升5%", @@ -2439,7 +2439,7 @@ local skill_rogue = { }, [5500133]={ ["desc"]="死灵法师攻击提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="攻击提升至10%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="攻击提升至15%", ["rougedesc"]="死灵法师攻击提升10%" @@ -2474,7 +2474,7 @@ local skill_rogue = { }, [5500144]={ ["desc"]="死灵法师每击杀1名敌人，全体技能伤害+10%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="击杀敌人将增加死灵法师技能能量2点", ["entry_2"]="击杀后提升能量至4点", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="死灵法师每击杀1名敌人，全体技能伤害+10%，并增加死灵法师技能能量4点" @@ -2489,7 +2489,7 @@ local skill_rogue = { [5500212]={ ["desc"]="血族快递伯爵技能可左右消除2格", ["entry_1"]="战斗中直接生效！", - ["entry_2"]="战斗中直接生效！", + ["entry_2"]="左右消除增加2格", ["entry_3"]="延X消除4格", ["rougedesc"]="血族快递伯爵技能可左右消除2格" }, @@ -2508,32 +2508,32 @@ local skill_rogue = { ["rougedesc"]="血族快递伯爵技能可左右消除4，延X消除4个元素" }, [5500221]={ - ["desc"]="血族快递伯爵技能释放后50%几率附加反击2回合", - ["entry_1"]="几率提升至100%", + ["desc"]="血族快递伯爵技能的反击概率提升至100%", + ["entry_1"]="反击回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能伤害提升300%", - ["rougedesc"]="血族快递伯爵技能释放后50%几率附加反击2回合" + ["rougedesc"]="血族快递伯爵技能的反击概率提升至100%" }, [5500222]={ - ["desc"]="血族快递伯爵技能释放后50%几率附加反击2回合", - ["entry_1"]="几率提升至100%", + ["desc"]="血族快递伯爵技能的反击概率提升至100%", + ["entry_1"]="反击回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能伤害提升300%", - ["rougedesc"]="血族快递伯爵技能释放后100%几率附加反击2回合" + ["rougedesc"]="血族快递伯爵技能的反击概率提升至100%，反击回合数+1" }, [5500223]={ - ["desc"]="血族快递伯爵技能释放后50%几率附加反击2回合", - ["entry_1"]="战斗中直接生效！", + ["desc"]="血族快递伯爵技能的反击概率提升至100%", + ["entry_1"]="反击回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能伤害提升300%", - ["rougedesc"]="血族快递伯爵技能释放后100%几率附加反击2回合" + ["rougedesc"]="血族快递伯爵技能的反击概率提升至100%，反击回合数+1" }, [5500224]={ - ["desc"]="血族快递伯爵技能释放后50%几率附加反击2回合", - ["entry_1"]="几率提升至100%", + ["desc"]="血族快递伯爵技能的反击概率提升至100%", + ["entry_1"]="反击回合数+1", ["entry_2"]="战斗中直接生效！", ["entry_3"]="技能伤害提升300%", - ["rougedesc"]="血族快递伯爵技能释放后100%几率附加反击2回合，技能伤害提升300%。" + ["rougedesc"]="血族快递伯爵技能伤害提升300%，反击概率提升至100%，反击回合数+1" }, [5500231]={ ["desc"]="血族快递伯爵攻击提升5%", @@ -2551,7 +2551,7 @@ local skill_rogue = { }, [5500233]={ ["desc"]="血族快递伯爵攻击提升5%", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="攻击提升至10%", ["entry_2"]="战斗中直接生效！", ["entry_3"]="攻击提升至15%", ["rougedesc"]="血族快递伯爵攻击提升10%" @@ -2586,7 +2586,7 @@ local skill_rogue = { }, [5500244]={ ["desc"]="Combo：血族快递伯爵普攻命中冰霜敌人有5%几率附加冻结1回合", - ["entry_1"]="战斗中直接生效！", + ["entry_1"]="几率提升至10%", ["entry_2"]="冻结回合数+1", ["entry_3"]="战斗中直接生效！", ["rougedesc"]="Combo：血族快递伯爵普攻命中冰霜敌人有10%几率附加冻结2回合" diff --git a/lua/app/ui/activity/act_seven_day/component/gift_comp.lua b/lua/app/ui/activity/act_seven_day/component/gift_comp.lua index f7217c68..7beac638 100755 --- a/lua/app/ui/activity/act_seven_day/component/gift_comp.lua +++ b/lua/app/ui/activity/act_seven_day/component/gift_comp.lua @@ -3,49 +3,51 @@ local GiftComp = class("GiftComp", LuaComponent) local GIFT_CELL = "app/ui/activity/act_seven_day/cell/gift_cell" function GiftComp:init() - local uiMap = self:getUIMap() - self.scrollRect = uiMap["gift_comp.scroll_rect"]:getLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) - self.scrollRect:addInitCallback(function() + local uiMap = self:getUIMap() + uiMap["gift_comp.title_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_3)) + uiMap["gift_comp.title_tx_2"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_4)) + self.scrollRect = uiMap["gift_comp.scroll_rect"]:getLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.scrollRect:addInitCallback(function() return GIFT_CELL end) self.scrollRect:addRefreshCallback(function(index, cell) - if self.giftList then - cell:refresh(self.giftList[index], self.period) - end + if self.giftList then + cell:refresh(self.giftList[index], self.period) + end end) self.scrollRect:clearCells() end function GiftComp:refresh(parentUI, day, period) - self.day = day - self.period = period - self.giftList = DataManager.ActSevenDayData:getGiftList(self.day, period) or GConst.EMPTY_TABLE - table.sort(self.giftList, function(a, b) - local giftRemainNumA = DataManager.ActSevenDayData:getGiftRemainNum(a.id, period) - local giftRemainNumB = DataManager.ActSevenDayData:getGiftRemainNum(b.id, period) - if (giftRemainNumA > 0 and giftRemainNumB > 0) or (giftRemainNumA <= 0 and giftRemainNumB <= 0) then - if a.isFree == b.isFree then - if a.isAd == b.isAd then - return a.id < b.id - else - if a.isAd then - return true - else - return false - end - end - else - if a.isFree then - return true - else - return false - end - end - else - return giftRemainNumA > 0 - end - end) - self.scrollRect:refillCells(#self.giftList) + self.day = day + self.period = period + self.giftList = DataManager.ActSevenDayData:getGiftList(self.day, period) or GConst.EMPTY_TABLE + table.sort(self.giftList, function(a, b) + local giftRemainNumA = DataManager.ActSevenDayData:getGiftRemainNum(a.id, period) + local giftRemainNumB = DataManager.ActSevenDayData:getGiftRemainNum(b.id, period) + if (giftRemainNumA > 0 and giftRemainNumB > 0) or (giftRemainNumA <= 0 and giftRemainNumB <= 0) then + if a.isFree == b.isFree then + if a.isAd == b.isAd then + return a.id < b.id + else + if a.isAd then + return true + else + return false + end + end + else + if a.isFree then + return true + else + return false + end + end + else + return giftRemainNumA > 0 + end + end) + self.scrollRect:refillCells(#self.giftList) end return GiftComp \ No newline at end of file diff --git a/lua/app/ui/summon/cell/summon_shop_cell.lua b/lua/app/ui/summon/cell/summon_shop_cell.lua index 764909fe..d58ea855 100644 --- a/lua/app/ui/summon/cell/summon_shop_cell.lua +++ b/lua/app/ui/summon/cell/summon_shop_cell.lua @@ -73,7 +73,7 @@ function SummonShopCell:refreshItem() local itemInfo = ConfigManager:getConfig("item")[self.id] self.itemBg:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.FRAME_QLT[itemInfo.qlt]) self.icon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, tostring(itemInfo.icon)) - self.nameTx:setText(ModuleManager.HeroManager:getHeroName(self.id)) + self.nameTx:setText(ModuleManager.ItemManager:getItemName(self.id)) self.itemNumTx:setText(self.cfg.hero.num) self.maskImg:setActive(false) end @@ -88,7 +88,8 @@ function SummonShopCell:setCost() cost = self.cfg.discount if self.cfg.discount_display ~= nil then self.disBg:setActive(self.isOwn) - self.disTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESCR_8, self.cfg.discount_display // 1000)) + -- self.disTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESCR_8, self.cfg.discount_display // 1000)) + self.disTx:setText("-" .. self.cfg.discount_display // 1000 .. "%") else self.disBg:setActive(false) end