From 34ae0ed497475a309f3242ec7c8e0c676909efdb Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 23 Nov 2020 21:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E6=97=A0?= =?UTF-8?q?=E7=94=A8log=E5=88=A0=E9=99=A4=EF=BC=8C=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 +--- .../~Lua/Modules/Battle/Logic/SkillManager.lua | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 4c358ec398..4e61181687 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1479,7 +1479,6 @@ local passivityList = { [78] = function(role, args) local pro = args[1] local f1 = args[2] - LogBattle("开始治疗") --这里加一个延时,防止执行时显示层还没有初始化,从而没有表现 BattleLogic.WaitForTrigger(0.05, function() local val = floor(BattleUtil.FP_Mul(f1, role:GetRoleData(BattlePropList[pro]))) @@ -5042,7 +5041,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.RoleHit, onHit) end, - -- 击杀目标后对敌方血量百分比最低两���角色造成[a]%[b]伤害 重写170 一次技能只触发一次被动 + -- 击杀目标后对敌方血量百分比最低两名角色造成[a]%[b]伤害 重写170 一次技能只触发一次被动 -- a[float]b[伤害类型] [253] = function(role, args) local f1 = args[1] @@ -5427,7 +5426,6 @@ local passivityList = { local sta3=args[3] local skiller=nil local immune = function(buff) - LogError(buff.damageType) return buff.type == BuffName.DOT and (buff.damageType==sta2 or buff.damageType==sta3) end local curBuff=nil diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 5500b1fb3c..d820659a29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -13,12 +13,11 @@ this.IsSkilling = false this.MaxSkillCount = 20 -- 单个回合内最多释放20次技能 -- 初始化 function this.Init() + this.CurSkillCount = 0 this.Clear() end function this.CheckMaxCount() - -- 清除数量限制 - this.CurSkillCount = 0 if not this.CurSkillCount then this.CurSkillCount = 0 end