From 5445cc36999a157ca499ae09affa28bd6dc27a63 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 11 Jul 2019 15:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/Base/Effect.lua | 2 +- luafight/Modules/Battle/Logic/Base/Skill.lua | 3 ++- luafight/Modules/Battle/Logic/BattleLogic.lua | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/luafight/Modules/Battle/Logic/Base/Effect.lua b/luafight/Modules/Battle/Logic/Base/Effect.lua index e39ceb091..0ba1d0fc5 100644 --- a/luafight/Modules/Battle/Logic/Base/Effect.lua +++ b/luafight/Modules/Battle/Logic/Base/Effect.lua @@ -19,7 +19,7 @@ local propertyList = { RoleDataName.CritDamageFactor, RoleDataName.TreatFacter, RoleDataName.MaxHp, - RoleDataName.MaxHp, + RoleDataName.Hp, RoleDataName.CureFacter, RoleDataName.Tenacity, } diff --git a/luafight/Modules/Battle/Logic/Base/Skill.lua b/luafight/Modules/Battle/Logic/Base/Skill.lua index fc892f83d..8cdf7c9be 100644 --- a/luafight/Modules/Battle/Logic/Base/Skill.lua +++ b/luafight/Modules/Battle/Logic/Base/Skill.lua @@ -156,7 +156,8 @@ function Skill:Cast() end self.owner.Event:DispatchEvent(BattleEventName.SkillCast, self) else - BattleLogic.Event:DispatchEvent(BattleEventName.SkillCast, self.cd, self.owner.camp) --队伍技能结构和其他相同,只是cd项为对应异妖类型 + self.owner.curSkill = self + BattleLogic.Event:DispatchEvent(BattleEventName.SkillCast, self.cd, self.owner) --队伍技能结构和其他相同,只是cd项为对应异妖类型 end --技能的施法时间计算,根据当前目标id关联的持续时间,取其中时间最长的一个 diff --git a/luafight/Modules/Battle/Logic/BattleLogic.lua b/luafight/Modules/Battle/Logic/BattleLogic.lua index f47bb4635..70d178f86 100644 --- a/luafight/Modules/Battle/Logic/BattleLogic.lua +++ b/luafight/Modules/Battle/Logic/BattleLogic.lua @@ -25,8 +25,8 @@ BattleLogic.Result = -1 BattleLogic.Event = BattleEvent.New() BattleLogic.BuffMgr = BuffManager.New() -local playerTeamDummyRole = {camp = 0, Event = BattleLogic.Event, isTeam = true} -local enemyTeamDummyRole = {camp = 1, Event = BattleLogic.Event, isTeam = true} +local playerTeamDummyRole = {camp = 0, Event = BattleLogic.Event, isTeam = true, curSkill = nil} +local enemyTeamDummyRole = {camp = 1, Event = BattleLogic.Event, isTeam = true, curSkill = nil} local playerTeamSkillList = {} local enemyTeamSkillList = {} local playerTeamSkillIndex