From 93413b3b07a8b5e1c79f8c8d203b257f70bc40a3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 31 Aug 2021 14:25:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=88=98=E6=96=97=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 9 ++++++ .../Modules/Battle/Logic/Role/RoleLogic.lua | 28 ------------------- .../Modules/Battle/Logic/SkillManager.lua | 22 +++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index ac15a40221..2bfe5abcb5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2247,6 +2247,15 @@ local passivityList = { local i1 = args[4] -- 释放技能后 local onSkillEnd = function(skill) + BattleLogManager.Log( + "Passive 119", + "camp", role.camp, + "pos", role.position, + "isSkill", tostring(skill ~= nil), + "isTriggerJudge", tostring(skill.isTriggerJudge), + "type", tostring(skill.type), + "judge", tostring(judge) + ) if skill and not skill.isTriggerJudge and judge==1 then return end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 0cfdc3ed6d..377c118f87 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -424,15 +424,6 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets) end SkillManager.AddSkill(self, effectData, type, targets, isAdd, isRage,isTriggerJudge) -- - BattleLogManager.Log( - "Add Skill", - "camp", self.camp, - "pos", self.position, - "type", type, - "isRage", tostring(isRage), - "isAdd", tostring(isAdd), - "targets", targets and #targets or "0" - ) end --加入额外技能,用于额外释放技能 by:王振兴 @@ -450,15 +441,6 @@ function RoleLogic:InsertExtraSkill(id,type) end --和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴 SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,isTrigger) - BattleLogManager.Log( - "Insert Extra Skill", - "camp", self.camp, - "pos", self.position, - "type", skillType, - "isRage", tostring(false), - "isAdd", tostring(true), - "targets", targets and #targets or "0" - ) end end @@ -468,16 +450,6 @@ function RoleLogic:InsertSkill(type, isRage, isAdd, targets) if not self.IsCanAddSkill and isAdd then return end local effectData = type == BattleSkillType.Normal and self.skill or self.superSkill SkillManager.InsertSkill(self, effectData, type, targets, isAdd, isRage) - -- - BattleLogManager.Log( - "Insert Skill", - "camp", self.camp, - "pos", self.position, - "type", type, - "isRage", tostring(isRage), - "isAdd", tostring(isAdd), - "targets", targets and #targets or "0" - ) end -- 设置是否可以追加技能 function RoleLogic:SetIsCanAddSkill(isCan) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 243949d49e..c6f1f688cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -49,6 +49,16 @@ function this.AddSkill(caster, effectData, type, targets, isAdd, isRage,isTrigge if not this.CheckMaxCount() then return end + BattleLogManager.Log( + "Add Skill", + "camp", caster.camp, + "pos", caster.position, + "type", type, + "isRage", tostring(isRage), + "isAdd", tostring(isAdd), + "isTriggerJudge", tostring(isTriggerJudge), + "targets", targets and #targets or "0" + ) local skill = skillPool:Get() skill:Init(caster, effectData, type, targets, isAdd, isRage,isTriggerJudge) if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列 @@ -64,6 +74,18 @@ function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage,isTri if not this.CheckMaxCount() then return end + BattleLogManager.Log( + "Insert Skill", + "camp", caster.camp, + "pos", caster.position, + "type", type, + "isRage", tostring(isRage), + "isAdd", tostring(isAdd), + "isTriggerJudge", tostring(isTriggerJudge), + "isLoop", tostring(isLoop), + "targets", targets and #targets or "0" + ) + local skill = skillPool:Get() --角色被混乱后