diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 418cc2ef..dd3ca817 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -14,6 +14,13 @@ local chapter = { 1, 5 }, + ["involved_skill"]={ + { + 12, + 7, + 13 + } + }, ["not_involved_skill"]={ 4, 5, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 667d04a4..2cd441f9 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -48,22 +48,19 @@ local monster_chapter = { ["monster_exp"]=12000 }, [1010501]={ - ["monster_base"]=433001, + ["monster_base"]=413001, ["is_boss"]=2, ["atk"]=2100000, ["hp"]=36000000, ["atk_times"]=2, ["hurt_skill"]={ - 40001, - 40002, - 40003, - 40004 + 40012, + 40013, + 40014, + 40015 }, ["skill"]={ - 40005 - }, - ["passive_skill"]={ - 40006 + 40016 }, ["monster_exp"]=18000 }, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index f8449121..29c6c678 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -3482,7 +3482,7 @@ local skill = { }, ["fx_self"]=300068, ["bullet_time"]={ - 1000, + 1100, 3000, 600 }, @@ -8612,8 +8612,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack01", ["name_hit"]={ @@ -8634,8 +8634,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack02", ["name_hit"]={ @@ -8656,8 +8656,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["name_act"]="attack03", ["name_hit"]={ @@ -8679,8 +8679,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["cd"]=2, ["cd_start"]=0, @@ -11026,7 +11026,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=400055 + ["fx_self"]=400057 }, [40002]={ ["effect_type"]=1, @@ -11053,7 +11053,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=400055 + ["fx_self"]=400057 }, [40003]={ ["effect_type"]=1, @@ -11080,7 +11080,7 @@ local skill = { ["name_hit"]={ "suffer01" }, - ["fx_self"]=400055 + ["fx_self"]=400057 }, [40004]={ ["effect_type"]=1, @@ -11107,7 +11107,7 @@ local skill = { ["name_hit"]={ "suffer02" }, - ["fx_self"]=400055 + ["fx_self"]=400057 }, [40005]={ ["battle_icon"]="45002", @@ -11143,7 +11143,7 @@ local skill = { ["effect_block"]={ 1, 2, - 3 + 4 }, ["skill_position"]={ 2, @@ -11161,11 +11161,11 @@ local skill = { "suffer02", "suffer01" }, - ["fx_self"]=400056, + ["fx_self"]=400058, ["bullet_time"]={ - 1167, + 1100, 3000, - 300 + 600 } }, [40006]={ @@ -11309,8 +11309,8 @@ local skill = { }, ["obj"]=1, ["skill_position"]={ - 1, - 140 + 2, + 0 }, ["cd"]=3, ["cd_start"]=0, @@ -11322,9 +11322,160 @@ local skill = { "suffer03" }, ["fx_self"]=400028 + }, + [40012]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000001 + }, + ["name_act"]="attack01", + ["name_hit"]={ + "suffer01" + }, + ["fx_self"]=400009 + }, + [40013]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000002 + }, + ["name_act"]="attack02", + ["name_hit"]={ + "suffer02" + }, + ["fx_self"]=400009 + }, + [40014]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000003 + }, + ["name_act"]="attack03", + ["name_hit"]={ + "suffer01" + }, + ["fx_self"]=400009 + }, + [40015]={ + ["position"]=1, + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000004 + }, + ["name_act"]="attack04", + ["name_hit"]={ + "suffer02" + }, + ["fx_self"]=400009 + }, + [40016]={ + ["position"]=1, + ["battle_icon"]="13001", + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt_red", + ["num"]=20000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=3000, + ["round"]=2 + } + }, + ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=5, + ["sound"]=12001200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["name_hit"]={ + "suffer01" + }, + ["fx_self"]=400010, + ["bullet_time"]={ + 561, + 3000, + 400 + } } } local config = { -data=skill,count=425 +data=skill,count=430 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index ebbaebc8..f8271936 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -5754,6 +5754,9 @@ local skill_rogue = { ["obj"]=7 }, [5300131]={ + ["buff_id"]={ + "poison" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -5770,6 +5773,9 @@ local skill_rogue = { ["obj"]=7 }, [5300132]={ + ["buff_id"]={ + "poison" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, @@ -5786,6 +5792,9 @@ local skill_rogue = { ["obj"]=7 }, [5300133]={ + ["buff_id"]={ + "poison" + }, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 998fa1a7..812b86c6 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ ["desc"]="获得护盾1回合,且30%几率附加反伤20%" + }, + [40016]={ + ["desc"]="造成一次大量伤害，30%概率附加灼烧，2回合。" } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill.lua b/lua/app/config/strings/de/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/de/skill.lua +++ b/lua/app/config/strings/de/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill.lua b/lua/app/config/strings/en/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/en/skill.lua +++ b/lua/app/config/strings/en/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skill.lua b/lua/app/config/strings/es/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/es/skill.lua +++ b/lua/app/config/strings/es/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill.lua b/lua/app/config/strings/fr/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/fr/skill.lua +++ b/lua/app/config/strings/fr/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill.lua b/lua/app/config/strings/id/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/id/skill.lua +++ b/lua/app/config/strings/id/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/ja/skill.lua +++ b/lua/app/config/strings/ja/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill.lua b/lua/app/config/strings/ko/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/ko/skill.lua +++ b/lua/app/config/strings/ko/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill.lua b/lua/app/config/strings/pt/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/pt/skill.lua +++ b/lua/app/config/strings/pt/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill.lua b/lua/app/config/strings/ru/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/ru/skill.lua +++ b/lua/app/config/strings/ru/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill.lua b/lua/app/config/strings/th/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/th/skill.lua +++ b/lua/app/config/strings/th/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill.lua b/lua/app/config/strings/vi/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/vi/skill.lua +++ b/lua/app/config/strings/vi/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index fdde38be..fd10571b 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -151,9 +151,12 @@ local skill = { }, [40011]={ + }, + [40016]={ + } } local config = { -data=skill,count=51 +data=skill,count=52 } return config \ No newline at end of file