diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 06ffb3e6..13df2718 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -316,8 +316,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index d595b9a7..2b67baa7 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -265,7 +265,7 @@ local skill_rogue = { ["round"]=9999 } }, - ["obj"]=1, + ["obj"]=8, ["icon"]="7" }, [20]={ @@ -338,7 +338,7 @@ local skill_rogue = { ["round"]=9999 } }, - ["obj"]=1, + ["obj"]=8, ["icon"]="10" }, [25]={ diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 0691a237..1ea23265 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -201,13 +201,13 @@ local skill_rogue = { ["desc"]="跟快速治愈连接线上的元素伤害增加10%" }, [200603]={ - ["desc"]="连接快速治愈的每一击都将恢复2%生命值" + ["desc"]="连接快速治愈的每一击都将恢复生命值" }, [200700]={ ["desc"]="巨剑连斩:每一次攻击的伤害将增加50%" }, [200701]={ - ["desc"]="巨剑连被连接消除其上下左右4个元素" + ["desc"]="巨剑连斩被连接消除其上下左右4个元素" }, [200702]={ ["desc"]="跟巨剑连斩连接线上的元素伤害增加10%" diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 2eeaf2cd..5fde9583 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -201,7 +201,7 @@ local skill_rogue = { ["desc"]="Increases the damage of elements connected by the same link of Quick Regen by 10%" }, [200603]={ - ["desc"]="Each attack of elements connected by the same link of Quick Regen restores 2% HP" + ["desc"]="Each attack of elements connected by the same link of Quick Regen restores HP" }, [200700]={ ["desc"]="Great Sword Combos: Increases the damage of each attack by 50%" diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 87cb3ee5..41dcf7c1 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -12,6 +12,7 @@ BattleConst.ELEMENT_WIGHT = 100 BattleConst.MAX_ELEMENT_WIGHT = 500 BattleConst.SIDE_ATK = 1 BattleConst.SIDE_DEF = 2 +BattleConst.SIDE_ATK_ALL = 8 BattleConst.SKILL_TYPE_ACTIVE = 1 BattleConst.SKILL_TYPE_NORMAL = 2 BattleConst.SKILL_TYPE_ASSISTING = 3 diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index bbd100c3..c40d7b23 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -199,6 +199,21 @@ local _addSkillEffect = function(skillInfo, battleData, battleController) local target = atkComp if skillInfo.obj == BattleConst.SIDE_DEF then target = defComp + elseif skillInfo.obj == BattleConst.SIDE_ATK then + target = atkComp + elseif skillInfo.obj == BattleConst.SIDE_ATK_ALL then + for matchtype, comp in pairs(battleController.atkTeam:getUnitComp()) do + local buffEntity = BattleBuffEntity:create() + buffEntity:init(effect, comp.unitEntity) + buffEntity:setTargetSide(skillInfo.obj) + comp:takeEffect(buffEntity, comp) + end + return + else + local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTartgetSide()] + if matchType then + target = battleController.atkTeam:getUnitComp()[matchType] + end end local buffEntity = BattleBuffEntity:create() buffEntity:init(effect, atkComp.unitEntity)