diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index d0458cd8..406834cc 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -8,7 +8,6 @@ local hero = { 1200113, 1200114 }, - ["hurt_num"]=3, ["base_skill"]=1200120, ["support_skill"]=1200110, ["rouge_skill"]=200500, @@ -64,7 +63,6 @@ local hero = { 2200113, 2200114 }, - ["hurt_num"]=3, ["base_skill"]=2200120, ["support_skill"]=2200110, ["rouge_skill"]=200200, @@ -120,7 +118,6 @@ local hero = { 2300113, 2300114 }, - ["hurt_num"]=3, ["base_skill"]=2300120, ["support_skill"]=2300110, ["rouge_skill"]=200700, @@ -176,7 +173,6 @@ local hero = { 3200113, 3200114 }, - ["hurt_num"]=3, ["base_skill"]=3200120, ["support_skill"]=3200110, ["rouge_skill"]=200100, @@ -232,7 +228,6 @@ local hero = { 3300113, 3300114 }, - ["hurt_num"]=3, ["base_skill"]=3300120, ["support_skill"]=3300110, ["rouge_skill"]=200600, @@ -288,7 +283,6 @@ local hero = { 4200113, 4200114 }, - ["hurt_num"]=3, ["base_skill"]=4200120, ["support_skill"]=4200110, ["rouge_skill"]=200300, @@ -344,7 +338,6 @@ local hero = { 4300113, 4300114 }, - ["hurt_num"]=3, ["base_skill"]=4300120, ["support_skill"]=4300110, ["rouge_skill"]=200800, @@ -400,7 +393,6 @@ local hero = { 5200113, 5200114 }, - ["hurt_num"]=3, ["base_skill"]=5200120, ["support_skill"]=5200110, ["rouge_skill"]=200400, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index da958817..395a35e7 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -974,10 +974,10 @@ local monster_chapter = { 10058 }, ["skill"]={ - 10059, 10060 }, ["passive_skill"]={ + 10059, 10061 }, ["monster_exp"]=18000 @@ -1175,11 +1175,11 @@ local monster_chapter = { 10058 }, ["skill"]={ - 10059, 10060, 10062 }, ["passive_skill"]={ + 10059, 10061 }, ["monster_exp"]=22000 @@ -1511,11 +1511,11 @@ local monster_chapter = { 10058 }, ["skill"]={ - 10059, 10060, 10062 }, ["passive_skill"]={ + 10059, 10061 }, ["monster_exp"]=18000 @@ -2165,11 +2165,11 @@ local monster_chapter = { 10058 }, ["skill"]={ - 10059, 10060, 10062 }, ["passive_skill"]={ + 10059, 10061 }, ["monster_exp"]=24000 diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index f64ed48e..a0bf0448 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1103,8 +1103,7 @@ local skill = { ["shake_type"]=3, ["sound_hit"]=4300120, ["name_act"]="skill01", - ["fx_self"]=300031, - ["fx_target"]=300032 + ["fx_self"]=300031 }, [4300121]={ ["energy"]=10, @@ -1153,8 +1152,7 @@ local skill = { ["shake_type"]=3, ["sound_hit"]=4300120, ["name_act"]="skill01", - ["fx_self"]=300031, - ["fx_target"]=300032 + ["fx_self"]=300031 }, [5200110]={ ["position"]=5, @@ -2332,7 +2330,7 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]=10029, @@ -2351,7 +2349,7 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]=10030, @@ -2370,7 +2368,7 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1, + ["skill_position"]=2, ["shake_time"]=100, ["shake_type"]=1, ["sound_hit"]=10031, diff --git a/lua/app/module/battle/helper/battle_buff_handle.lua b/lua/app/module/battle/helper/battle_buff_handle.lua index a51fb72f..90967341 100644 --- a/lua/app/module/battle/helper/battle_buff_handle.lua +++ b/lua/app/module/battle/helper/battle_buff_handle.lua @@ -32,9 +32,9 @@ end function BattleBuffHandle.doBuffWork(unitComp, buffEffect) local buff = buffEffect.buff local buffType = buff:getBuffType() - if buffType == 2 then + if buffType == 4 then _doDotWork(unitComp, buffEffect, buff) - elseif buffType == 4 then + elseif buffType == 6 then _doHotWork(unitComp, buffEffect, buff) end local fxList = buff:getFxTake()