From f0c2913433296b0ff06201f35469c894e68ade07 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 23 Dec 2020 15:33:49 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=80=92=E6=B0=94=E6=97=A0=E6=B3=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index dfed50feba..4a0e4a5c7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -55,15 +55,7 @@ function RoleLogic:Init(uid, data, position) self.RageGrow = 2 -- 普通技能怒气成长 self.SuperSkillRage = 4 -- 技能需要释放的怒气值,默认为4 self.NoRageRate = 0 -- 不消耗怒气值的概率 - - -- self.isImmuneReduceRage=false --是否免疫减怒 - self.passiveList = {} - - -- 初始怒气值放在被动之后计算,使被动对初始怒气的影响生效 - self.Rage = self.Rage + self:GetRoleData(RoleDataName.InitRage)-- 当前怒气值 - - -- self.aiOrder = data.ai self.aiIndex = 1 self.aiTempCount = 0 @@ -78,7 +70,7 @@ function RoleLogic:Init(uid, data, position) self.ctrl_blind = false --致盲 self.ctrl_chaos = false --混乱 self.deadFilter = true -- 控制死亡,置为false则角色暂时无法死亡 - + self.isExile = false --是否放逐 self.reliveFilter = true -- 控制复活的标志位,置为false角色将不再享受复活效果 self.reliveHPF = 1 @@ -88,6 +80,7 @@ function RoleLogic:Init(uid, data, position) self.isImmuneAllReduceShield = false --免疫敌方无敌盾(敌方无敌盾对自己无效) self.ignoreShara = false --忽略敌方分摊 self.type = BattleUnitType.Role + self.passiveList = {} if data.passivity and #data.passivity > 0 then for i = 1, #data.passivity do local v = data.passivity[i] @@ -105,6 +98,9 @@ function RoleLogic:Init(uid, data, position) end end end + -- 初始怒气值放在被动之后计算,使被动对初始怒气的影响生效 + self.Rage = self.Rage + self:GetRoleData(RoleDataName.InitRage)-- 当前怒气值 + end -- 添加一个被动技能