diff --git a/lua/app/config/activity_boss_rush_rank.lua b/lua/app/config/activity_boss_rush_rank.lua index 77482b3c..86e83724 100644 --- a/lua/app/config/activity_boss_rush_rank.lua +++ b/lua/app/config/activity_boss_rush_rank.lua @@ -899,7 +899,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [502]={ ["activity"]=2006, ["ranking"]={ 2, @@ -924,7 +924,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [503]={ ["activity"]=2006, ["ranking"]={ 3, @@ -949,7 +949,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [504]={ ["activity"]=2006, ["ranking"]={ 4, @@ -974,7 +974,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [505]={ ["activity"]=2006, ["ranking"]={ 11, @@ -999,7 +999,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [506]={ ["activity"]=2006, ["ranking"]={ 51, @@ -1024,7 +1024,7 @@ local activity_boss_rush_rank = { } } }, - [501]={ + [507]={ ["activity"]=2006, ["ranking"]={ 501, diff --git a/lua/app/config/activity_rank.lua b/lua/app/config/activity_rank.lua index 413e20bb..097e23e0 100644 --- a/lua/app/config/activity_rank.lua +++ b/lua/app/config/activity_rank.lua @@ -1450,7 +1450,7 @@ local activity_rank = { } }, [1101]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 1, 1 @@ -1475,7 +1475,7 @@ local activity_rank = { } }, [1102]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 2, 2 @@ -1500,7 +1500,7 @@ local activity_rank = { } }, [1103]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 3, 3 @@ -1525,7 +1525,7 @@ local activity_rank = { } }, [1104]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 4, 10 @@ -1550,7 +1550,7 @@ local activity_rank = { } }, [1105]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 11, 50 @@ -1575,7 +1575,7 @@ local activity_rank = { } }, [1106]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 51, 500 @@ -1600,7 +1600,7 @@ local activity_rank = { } }, [1107]={ - ["act_id"]=1406, + ["act_id"]=1806, ["ranking"]={ 501, 99999999 @@ -1625,7 +1625,7 @@ local activity_rank = { } }, [1201]={ - ["act_id"]=1506, + ["act_id"]=1906, ["ranking"]={ 1, 1 @@ -1650,7 +1650,7 @@ local activity_rank = { } }, [1202]={ - ["act_id"]=1506, + ["act_id"]=1906, ["ranking"]={ 2, 2 @@ -1675,7 +1675,7 @@ local activity_rank = { } }, [1203]={ - ["act_id"]=1506, + ["act_id"]=1906, ["ranking"]={ 3, 3 @@ -1700,7 +1700,7 @@ local activity_rank = { } }, [1204]={ - ["act_id"]=1506, + ["act_id"]=1906, ["ranking"]={ 4, 10 @@ -1725,7 +1725,7 @@ local activity_rank = { } }, [1205]={ - ["act_id"]=1506, + ["act_id"]=1906, ["ranking"]={ 11, 99999999 @@ -1750,7 +1750,7 @@ local activity_rank = { } }, [1301]={ - ["act_id"]=1706, + ["act_id"]=2106, ["ranking"]={ 1, 1 @@ -1775,7 +1775,7 @@ local activity_rank = { } }, [1302]={ - ["act_id"]=1706, + ["act_id"]=2106, ["ranking"]={ 2, 2 @@ -1800,7 +1800,7 @@ local activity_rank = { } }, [1303]={ - ["act_id"]=1706, + ["act_id"]=2106, ["ranking"]={ 3, 3 @@ -1825,7 +1825,7 @@ local activity_rank = { } }, [1304]={ - ["act_id"]=1706, + ["act_id"]=2106, ["ranking"]={ 4, 10 @@ -1850,7 +1850,7 @@ local activity_rank = { } }, [1305]={ - ["act_id"]=1706, + ["act_id"]=2106, ["ranking"]={ 11, 99999999 diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 1a0b03c2..7df80abb 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -12981,8 +12981,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=60, - ["id_for_nothing"]="UAg=", + ["id"]=64, + ["id_for_nothing"]="UAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -13155,8 +13155,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=60, - ["id_for_nothing"]="UAg=", + ["id"]=64, + ["id_for_nothing"]="UAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -13329,8 +13329,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=60, - ["id_for_nothing"]="UAg=", + ["id"]=64, + ["id_for_nothing"]="UAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -13503,8 +13503,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=60, - ["id_for_nothing"]="UAg=", + ["id"]=64, + ["id_for_nothing"]="UAw=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -13677,8 +13677,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=61, - ["id_for_nothing"]="UAk=", + ["id"]=65, + ["id_for_nothing"]="UA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -13851,8 +13851,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=61, - ["id_for_nothing"]="UAk=", + ["id"]=65, + ["id_for_nothing"]="UA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -14025,8 +14025,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=61, - ["id_for_nothing"]="UAk=", + ["id"]=65, + ["id_for_nothing"]="UA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -14199,8 +14199,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=61, - ["id_for_nothing"]="UAk=", + ["id"]=65, + ["id_for_nothing"]="UA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -14373,8 +14373,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=61, - ["id_for_nothing"]="UAk=", + ["id"]=65, + ["id_for_nothing"]="UA0=", ["num"]=1, ["num_for_nothing"]="Vw==" }, diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua index 67bcedf0..e9edf4d4 100644 --- a/lua/app/config/fx.lua +++ b/lua/app/config/fx.lua @@ -2315,6 +2315,26 @@ local fx = { ["res"]="sfx_p0047_b02", ["bind"]="root" }, + [300183]={ + ["res"]="sfx_p0048_b01", + ["bind"]="root" + }, + [300184]={ + ["res"]="sfx_p0048_b02", + ["bind"]="root" + }, + [300185]={ + ["res"]="sfx_p0048_b03", + ["bind"]="root" + }, + [300186]={ + ["res"]="sfx_p0048_b04", + ["bind"]="root" + }, + [300187]={ + ["res"]="sfx_p0048_b05", + ["bind"]="root" + }, [400000]={ ["res"]="sfx_p0012_b01", ["bind"]="root", @@ -3233,9 +3253,34 @@ local fx = { ["res"]="sfx_p0047_b02", ["bind"]="root", ["flip"]=1 + }, + [400183]={ + ["res"]="sfx_p0048_b01", + ["bind"]="root", + ["flip"]=1 + }, + [400184]={ + ["res"]="sfx_p0048_b02", + ["bind"]="root", + ["flip"]=1 + }, + [400185]={ + ["res"]="sfx_p0048_b03", + ["bind"]="root", + ["flip"]=1 + }, + [400186]={ + ["res"]="sfx_p0048_b04", + ["bind"]="root", + ["flip"]=1 + }, + [400187]={ + ["res"]="sfx_p0048_b05", + ["bind"]="root", + ["flip"]=1 } } local config = { -data=fx,count=757 +data=fx,count=767 } return config \ No newline at end of file diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 671a434a..f5a0882a 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -25,7 +25,7 @@ local monster_chapter = { }, [301]={ ["monster_base"]=10003, - ["hp"]=36000000, + ["hp"]=33000000, ["atk"]=600000, ["atk_times"]=2, ["hurt_skill"]={ diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 557b8fdd..45955689 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -826,11 +826,11 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5400311 + 1000011 }, ["name_act"]="attack01", - ["fx_self"]=300127, - ["fx_self_mirror"]=400127 + ["fx_self"]=300183, + ["fx_self_mirror"]=400183 }, [54003012]={ ["skill_position"]={ @@ -840,11 +840,11 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5400312 + 1000012 }, ["name_act"]="attack02", - ["fx_self"]=300128, - ["fx_self_mirror"]=400128 + ["fx_self"]=300184, + ["fx_self_mirror"]=400184 }, [54003013]={ ["skill_position"]={ @@ -854,11 +854,11 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]={ - 5400313 + 1000013 }, ["name_act"]="attack03", - ["fx_self"]=300129, - ["fx_self_mirror"]=400129 + ["fx_self"]=300185, + ["fx_self_mirror"]=400185 }, [54003014]={ ["skill_position"]={ @@ -868,11 +868,11 @@ local skin_skill = { ["shake_time"]=100, ["shake_type"]=2, ["sound_hit"]={ - 5400314 + 1000014 }, ["name_act"]="attack04", - ["fx_self"]=300130, - ["fx_self_mirror"]=400130 + ["fx_self"]=300186, + ["fx_self_mirror"]=400186 }, [54003015]={ ["skill_position"]={ @@ -884,13 +884,13 @@ local skin_skill = { ["sound"]=5400315, ["sound_delay"]=0.0, ["name_act"]="skill01", - ["fx_self"]=300131, + ["fx_self"]=300187, ["bullet_time"]={ 1166, 3000, 400 }, - ["fx_self_mirror"]=400131 + ["fx_self_mirror"]=400187 } } local config = {