diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index 09017a36..ea2f02e1 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -266,6 +266,7 @@ local buff = { ["buff_type"]=8, ["decr"]=2, ["icon"]="stun", + ["show_name"]=true, ["control_priority"]=2, ["fx_continued"]={ 13 @@ -297,6 +298,7 @@ local buff = { ["buff_type"]=1, ["decr"]=2, ["icon"]="normal_attack_dec", + ["show_name"]=true, ["fx_get"]={ 32 } @@ -308,6 +310,7 @@ local buff = { ["stack"]=2, ["decr"]=1, ["icon"]="high", + ["show_name"]=true, ["fx_get"]={ 30 } @@ -396,6 +399,7 @@ local buff = { ["decr"]=2, ["formula"]=4, ["icon"]="burn", + ["show_name"]=true, ["fx_take"]={ 36 } @@ -416,6 +420,7 @@ local buff = { ["buff_type"]=7, ["decr"]=2, ["icon"]="frozen", + ["show_name"]=true, ["control_priority"]=1, ["fx_continued"]={ 16 @@ -432,6 +437,7 @@ local buff = { ["decr"]=2, ["formula"]=4, ["icon"]="poison", + ["show_name"]=true, ["fx_take"]={ 35 } @@ -442,6 +448,7 @@ local buff = { ["buff_type"]=7, ["decr"]=2, ["icon"]="imprison", + ["show_name"]=true, ["control_priority"]=4, ["fx_get"]={ 29 @@ -453,6 +460,7 @@ local buff = { ["buff_type"]=1, ["decr"]=2, ["icon"]="corrupt", + ["show_name"]=true, ["fx_get"]={ 19 } @@ -464,6 +472,7 @@ local buff = { ["decr"]=2, ["formula"]=4, ["icon"]="bleed", + ["show_name"]=true, ["fx_take"]={ 31 } @@ -474,6 +483,7 @@ local buff = { ["buff_type"]=1, ["decr"]=2, ["icon"]="weaken", + ["show_name"]=true, ["fx_continued"]={ 33 } @@ -485,6 +495,7 @@ local buff = { ["stack"]=1, ["decr"]=2, ["icon"]="lethargy", + ["show_name"]=true, ["control_priority"]=3, ["fx_continued"]={ 28 @@ -496,6 +507,7 @@ local buff = { ["buff_type"]=1, ["decr"]=2, ["icon"]="curse", + ["show_name"]=true, ["fx_get"]={ 37 } @@ -505,7 +517,8 @@ local buff = { ["name"]="lock", ["buff_type"]=7, ["decr"]=2, - ["icon"]="lock" + ["icon"]="lock", + ["show_name"]=true }, [59]={ ["id"]=59, @@ -527,6 +540,7 @@ local buff = { ["buff_type"]=7, ["decr"]=1, ["icon"]="undead", + ["show_name"]=true, ["fx_continued"]={ 15 } @@ -537,7 +551,8 @@ local buff = { ["buff_type"]=1, ["stack"]=1, ["decr"]=1, - ["icon"]="counterattack" + ["icon"]="counterattack", + ["show_name"]=true }, [63]={ ["id"]=63, @@ -545,6 +560,7 @@ local buff = { ["buff_type"]=1, ["decr"]=1, ["icon"]="thorns", + ["show_name"]=true, ["fx_continued"]={ 18 } diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 92bf55d1..08de7182 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1387,7 +1387,7 @@ local skill = { ["trigger"]=7, ["effect"]={ { - ["type"]="dmg_addition_yellow_add", + ["type"]="dmg_addition_red_add", ["num"]=5000, ["ratio"]=10000, ["round"]=1 diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 9be155d4..34ed7b2e 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1306,7 +1306,7 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=15, + ["type"]=14, ["parameter"]={ 6 }, @@ -1917,14 +1917,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=9, ["skill_position"]=2, ["effect"]={ { ["type"]="add_skill", ["num"]=2400222, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=4, @@ -1953,14 +1953,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=12, + ["type"]=9, ["skill_position"]=2, ["effect"]={ { ["type"]="add_skill", ["num"]=2400224, ["ratio"]=10000, - ["round"]=1 + ["round"]=999 } }, ["obj"]=4, diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index 1f3eafe9..f9af8c02 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -6,7 +6,7 @@ local buff = { }, [8]={ ["id"]=8, - ["desc"]="黄色抗性:受到黄色元素英雄的伤害降低{0}。", + ["desc"]="金色抗性:受到金色元素英雄的伤害降低{0}。", ["name"]="dec_dmg_yellow_add" }, [9]={ @@ -36,6 +36,7 @@ local buff = { }, [33]={ ["id"]=33, + ["show_name"]="眩晕", ["desc"]="眩晕:本回合无法行动。", ["name"]="stun" }, @@ -46,11 +47,13 @@ local buff = { }, [36]={ ["id"]=36, + ["show_name"]="冰霜", ["desc"]="冰霜:普攻次数-{0}。", ["name"]="normal_attack_dec" }, [37]={ ["id"]=37, + ["show_name"]="亢奋", ["desc"]="亢奋:普攻次数+{0}。", ["name"]="normal_attack_add" }, @@ -61,76 +64,91 @@ local buff = { }, [48]={ ["id"]=48, + ["show_name"]="灼烧", ["desc"]="灼烧:回合结束时造成释放者攻击力{0}的伤害。", ["name"]="burn" }, [49]={ ["id"]=49, + ["show_name"]="易伤", ["desc"]="易伤:受到所有伤害提升{0}。", ["name"]="vulnerable" }, [50]={ ["id"]=50, + ["show_name"]="冻结", ["desc"]="冻结:本回合无法行动,且增益效果不生效。", ["name"]="frozen" }, [51]={ ["id"]=51, + ["show_name"]="中毒", ["desc"]="中毒:回合结束时造成释放者攻击力{0}的伤害。", ["name"]="poison" }, [52]={ ["id"]=52, + ["show_name"]="禁锢", ["desc"]="禁锢:本回合只可使用普攻,且技能进度不会增长。", ["name"]="imprison" }, [53]={ ["id"]=53, + ["show_name"]="腐败", ["desc"]="腐败:生命恢复效果降低{0}。", ["name"]="corrupt" }, [54]={ ["id"]=54, + ["show_name"]="流血", ["desc"]="流血:受击时恢复攻击者生命,回合结束时造成释放者攻击力{0}的伤害。", ["name"]="bleed" }, [55]={ ["id"]=55, + ["show_name"]="虚弱", ["desc"]="虚弱:造成的伤害降低{0}。", ["name"]="weaken" }, [56]={ ["id"]=56, + ["show_name"]="昏睡", ["desc"]="昏睡:本回合无法行动,受击会移除效果。", ["name"]="lethargy" }, [57]={ ["id"]=57, + ["show_name"]="诅咒", ["desc"]="诅咒:攻击不会造成伤害,而是治疗对方。", ["name"]="curse" }, [58]={ ["id"]=58, + ["show_name"]="锁定", ["desc"]="锁定:随机锁定棋盘上的一种颜色,无法选中。", ["name"]="lock" }, [59]={ ["id"]=59, + ["show_name"]="先手", ["desc"]="先手:每回合都率先出手。", ["name"]="first_hand" }, [61]={ ["id"]=61, + ["show_name"]="不死", ["desc"]="不死:受到致命伤害不会死亡。", ["name"]="undead" }, [62]={ ["id"]=62, + ["show_name"]="反击", ["desc"]="反击:受到直接伤害时有{0}的概率进行反击。", ["name"]="counterattack" }, [63]={ ["id"]=63, + ["show_name"]="反伤", ["desc"]="反伤:反弹{0}对方伤害。", ["name"]="thorns" }, diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index 1657df6a..fd89f16c 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -6,7 +6,7 @@ local buff = { }, [8]={ ["id"]=8, - ["desc"]="黃色抗性:受到黃色元素英雄的傷害降低{0}。", + ["desc"]="金色抗性:受到金色元素英雄的傷害降低{0}。", ["name"]="dec_dmg_yellow_add" }, [9]={ diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index ff3c50ed..83e8b2d8 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1302,6 +1302,18 @@ function BattleUnitComp:addMaxHp(percent) end function BattleUnitComp:addBuff(buffEffect) + if buffEffect.buff:needShowName() and buffEffect.buff:getShowName(true) then + local direction = BattleConst.EFFECT_TYPE_MOVE_R + local x, y = self.team:getMainUnitLocalPosition(self) + x = x + 80 + if self.side == BattleConst.SIDE_ATK then + direction = BattleConst.EFFECT_TYPE_MOVE_L + x = x - 80 + end + y = y - 120 + self:showEffectNumber(BattleConst.EFFECT_COLOR_SPECIAL, direction, buffEffect.buff:getShowName(true), x - 20, y - 20, 0) + end + return self.team:addBuff(buffEffect) end diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index 10f8ed09..d64456e3 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -18,6 +18,8 @@ function BattleBuffEntity:init(effectParams, owner, hostSkill) self.buffType = self.buffInfo.buff_type self.cantRemove = false self.notShowIcon = false + self.showNameStr = nil + self.showNameRedColor = nil end function BattleBuffEntity:setOwner(owner) @@ -108,6 +110,23 @@ function BattleBuffEntity:getFxDisappear() return self.buffInfo.fx_disappear end +function BattleBuffEntity:getShowName(needRedColor) + if not self.showNameStr then + self.showNameStr = I18N:getTextWithOtherKey("buff", "name", self:getName(), "show_name") + end + if not self.showNameRedColor and self.showNameStr then + self.showNameRedColor = "" .. self.showNameStr .. "" + end + if needRedColor then + return self.showNameRedColor + end + return self.showNameStr +end + +function BattleBuffEntity:needShowName() + return self.buffInfo.show_name +end + function BattleBuffEntity:isCantRemove() return self.cantRemove end