diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 17478985..0c602023 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -6242,6 +6242,8 @@ local arena_rank = { [401]={ ["season"]=4, ["score"]=900, + ["reset_rank"]=501, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=40, ["k2"]=350, @@ -6400,6 +6402,8 @@ local arena_rank = { [402]={ ["season"]=4, ["score"]=1000, + ["reset_rank"]=501, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=35, ["k2"]=290, @@ -6566,6 +6570,8 @@ local arena_rank = { [403]={ ["season"]=4, ["score"]=1100, + ["reset_rank"]=501, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=30, ["k2"]=200, @@ -6732,6 +6738,8 @@ local arena_rank = { [404]={ ["season"]=4, ["score"]=1200, + ["reset_rank"]=504, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=30, ["k2"]=300, @@ -6906,6 +6914,8 @@ local arena_rank = { [405]={ ["season"]=4, ["score"]=1400, + ["reset_rank"]=504, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=28, ["k2"]=250, @@ -7080,6 +7090,8 @@ local arena_rank = { [406]={ ["season"]=4, ["score"]=1600, + ["reset_rank"]=504, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=25, ["k2"]=200, @@ -7254,6 +7266,8 @@ local arena_rank = { [407]={ ["season"]=4, ["score"]=1800, + ["reset_rank"]=504, + ["inactive_reset_rank"]=501, ["min_point"]=4, ["k1"]=23, ["k2"]=150, @@ -7428,6 +7442,8 @@ local arena_rank = { [408]={ ["season"]=4, ["score"]=2000, + ["reset_rank"]=508, + ["inactive_reset_rank"]=504, ["min_point"]=4, ["k1"]=21, ["k2"]=250, @@ -7602,6 +7618,8 @@ local arena_rank = { [409]={ ["season"]=4, ["score"]=2200, + ["reset_rank"]=508, + ["inactive_reset_rank"]=504, ["min_point"]=4, ["k1"]=20, ["k2"]=180, @@ -7776,6 +7794,8 @@ local arena_rank = { [410]={ ["season"]=4, ["score"]=2500, + ["reset_rank"]=508, + ["inactive_reset_rank"]=504, ["min_point"]=4, ["k1"]=18, ["k2"]=150, @@ -7950,6 +7970,8 @@ local arena_rank = { [411]={ ["season"]=4, ["score"]=2800, + ["reset_rank"]=508, + ["inactive_reset_rank"]=504, ["min_point"]=4, ["k1"]=16, ["k2"]=130, @@ -8124,6 +8146,8 @@ local arena_rank = { [412]={ ["season"]=4, ["score"]=3100, + ["reset_rank"]=508, + ["inactive_reset_rank"]=504, ["min_point"]=4, ["k1"]=15, ["k2"]=120, @@ -8298,6 +8322,8 @@ local arena_rank = { [501]={ ["season"]=5, ["score"]=900, + ["reset_rank"]=601, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=40, ["k2"]=350, @@ -8456,6 +8482,8 @@ local arena_rank = { [502]={ ["season"]=5, ["score"]=1000, + ["reset_rank"]=601, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=35, ["k2"]=290, @@ -8622,6 +8650,8 @@ local arena_rank = { [503]={ ["season"]=5, ["score"]=1100, + ["reset_rank"]=601, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=30, ["k2"]=200, @@ -8788,6 +8818,8 @@ local arena_rank = { [504]={ ["season"]=5, ["score"]=1200, + ["reset_rank"]=604, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=30, ["k2"]=300, @@ -8962,6 +8994,8 @@ local arena_rank = { [505]={ ["season"]=5, ["score"]=1400, + ["reset_rank"]=604, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=28, ["k2"]=250, @@ -9136,6 +9170,8 @@ local arena_rank = { [506]={ ["season"]=5, ["score"]=1600, + ["reset_rank"]=604, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=25, ["k2"]=200, @@ -9310,6 +9346,8 @@ local arena_rank = { [507]={ ["season"]=5, ["score"]=1800, + ["reset_rank"]=604, + ["inactive_reset_rank"]=601, ["min_point"]=4, ["k1"]=23, ["k2"]=150, @@ -9484,6 +9522,8 @@ local arena_rank = { [508]={ ["season"]=5, ["score"]=2000, + ["reset_rank"]=608, + ["inactive_reset_rank"]=604, ["min_point"]=4, ["k1"]=21, ["k2"]=250, @@ -9658,6 +9698,8 @@ local arena_rank = { [509]={ ["season"]=5, ["score"]=2200, + ["reset_rank"]=608, + ["inactive_reset_rank"]=604, ["min_point"]=4, ["k1"]=20, ["k2"]=180, @@ -9832,6 +9874,8 @@ local arena_rank = { [510]={ ["season"]=5, ["score"]=2500, + ["reset_rank"]=608, + ["inactive_reset_rank"]=604, ["min_point"]=4, ["k1"]=18, ["k2"]=150, @@ -10006,6 +10050,8 @@ local arena_rank = { [511]={ ["season"]=5, ["score"]=2800, + ["reset_rank"]=608, + ["inactive_reset_rank"]=604, ["min_point"]=4, ["k1"]=16, ["k2"]=130, @@ -10180,6 +10226,8 @@ local arena_rank = { [512]={ ["season"]=5, ["score"]=3100, + ["reset_rank"]=608, + ["inactive_reset_rank"]=604, ["min_point"]=4, ["k1"]=15, ["k2"]=120, diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 34784160..67bcedf0 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -2307,6 +2307,14 @@ local fx = { ["res"]="sfx_p0046_b05", ["bind"]="root" }, + [300181]={ + ["res"]="sfx_p0047_b01", + ["bind"]="root" + }, + [300182]={ + ["res"]="sfx_p0047_b02", + ["bind"]="root" + }, [400000]={ ["res"]="sfx_p0012_b01", ["bind"]="root", @@ -3215,9 +3223,19 @@ local fx = { ["res"]="sfx_p0046_b05", ["bind"]="root", ["flip"]=1 + }, + [400181]={ + ["res"]="sfx_p0047_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400182]={ + ["res"]="sfx_p0047_b02", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=753 +data=fx,count=757 } return config \ No newline at end of file diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 0aefe0ce..8681ee1b 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -328,7 +328,7 @@ local skin = { 44001012, 44001013, 44001014, - 4001015 + 44001015 } }, [44002]={ diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 0758c73d..ee727318 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -744,7 +744,7 @@ local skin_skill = { }, ["fx_self_mirror"]=400180 }, - [24001011]={ + [44001011]={ ["skill_position"]={ 2, 0 @@ -752,13 +752,13 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000001 + 5200110 }, ["name_act"]="attack01", - ["fx_self"]=300033, - ["fx_self_mirror"]=400045 + ["fx_target"]=300181, + ["fx_target_mirror"]=400181 }, - [24001012]={ + [44001012]={ ["skill_position"]={ 2, 0 @@ -766,13 +766,13 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000002 + 5200110 }, ["name_act"]="attack02", - ["fx_self"]=300033, - ["fx_self_mirror"]=400045 + ["fx_target"]=300181, + ["fx_target_mirror"]=400181 }, - [24001013]={ + [44001013]={ ["skill_position"]={ 2, 0 @@ -780,13 +780,13 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000003 + 5200110 }, ["name_act"]="attack03", - ["fx_self"]=300093, - ["fx_self_mirror"]=400046 + ["fx_target"]=300181, + ["fx_target_mirror"]=400181 }, - [24001014]={ + [44001014]={ ["skill_position"]={ 2, 0 @@ -794,29 +794,29 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 1000004 + 5200110 }, ["name_act"]="attack04", - ["fx_self"]=300094, - ["fx_self_mirror"]=400047 + ["fx_target"]=300181, + ["fx_target_mirror"]=400181 }, - [24001015]={ + [44001015]={ ["skill_position"]={ 2, 0 }, ["shake_time"]=200, ["shake_type"]=5, - ["sound"]=44001200, + ["sound"]=44001015, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_target"]=300034, + ["fx_target"]=300182, ["bullet_time"]={ - 633, + 1533, 3000, 400 }, - ["fx_target_mirror"]=400048 + ["fx_target_mirror"]=400182 } } local config = {