From 178ba22181767db0adb0229812a3e12191804257 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 23 Aug 2023 16:33:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=97=B6=E7=A9=BA?= =?UTF-8?q?=E5=A5=B3=E5=84=BF=E5=9B=BD=E7=8E=8B=20=E6=96=B0=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 2 +- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 50 +++++ .../Modules/Battle/Logic/Base/Passivity.lua | 198 ++++++++++++++++++ .../Modules/Battle/Logic/Buff/BreakArmor.lua | 2 +- .../Modules/Battle/Logic/Misc/BattleUtil.lua | 56 +++++ .../Modules/Battle/Logic/Role/RoleLogic.lua | 8 + .../~Lua/Modules/Battle/Logic/Role/Skill.lua | 2 + 7 files changed, 316 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 05cdd0cd1b..15e7b84b84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -142,7 +142,7 @@ function this.GetPassivityData(passivityList) for i = 1, #passivityList do local passiveId = tonumber(passivityList[i]) if passiveId then - LogError("passiveId======================"..passiveId) + --LogError("passiveId======================"..passiveId) local cfg = PassiveSkillLogicConfig[passiveId] -- 判断技能是否在战斗中生效 if cfg and cfg.EffectiveRange == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 4aedc7a261..1b24d9fd0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -3137,6 +3137,56 @@ local effectList = { target:AddBuff(Buff.Create(caster, BuffName.Control, round, ctrType)) end) end, + -- --己方场上人数 < 地方人数，对[a]目标选择[b]属性[c]%的法术伤害并附加逆风效果，不低于对[d]目标选择[e]属性[f]%的御甲并附加乘风效果。 + -- [160] = function(caster, target, args, interval, skill) + -- local c1 = args[1]--持续回合数 + -- local p1 = args[2]--控制类型 + -- local v1 = args[3] + -- local c2 = args[4] + -- local p1 = args[5] + -- local v2 = args[6] + -- BattleLogic.WaitForTrigger(interval, function () + -- local myArr = RoleManager.Query(function (r) return r.camp == caster.camp end) + -- local enArr = RoleManager.Query(function (r) return r.camp ~= caster.camp end) + -- if #myArr< #enArr then + -- local arr1 = BattleUtil.ChooseTarget(caster, c1) + -- for i=1, #arr1 do + -- BattleUtil.CalDamage(skill, caster,arr1[i], v1,1) + -- end + + -- else + + -- end + -- end) + -- end, + + --添加一个[a]印记,持续[b]回合 + --a[int]:7逆风风 8：顺风风 + [160] = function(caster, target, args, interval, skill) + local type = args[1] + local round= args[2] + BattleLogic.WaitForTrigger(interval, function () + if type==7 and caster.sunTime>=caster.sunMaxTime then + return + end + if type==8 and caster.niTime>=caster.niMaxTime then + return + end + target:AddBuff(Buff.Create(caster, BuffName.BreakArmor, round,type)) + end) + end, + --为目标添加[a]属性[b]%的御甲 + --a[int],b[float] + [161] = function(caster, target, args, interval, skill) + local pro = args[1] + local v1 = args[2] + BattleLogic.WaitForTrigger(interval, function () + local val = floor(BattleUtil.FP_Mul(v1, caster:GetRoleData(BattlePropList[pro]))) + --如果身上有御甲就添加御甲的值 + BattleUtil.AddBlood(target,val) + end) + + end, } return effectList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 4c96111ba1..162c436965 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12414,5 +12414,203 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.PassiveRandomControl, onPassiveRandomControl,nil,nil,role) end, + --己方场上人数 < 敌方人数，技能id为[a]，不低于地方人数，技能id为[b],技能附带的buff生效次数为[c] + --a[int],b[int],c[int] + [471] = function(role, args) + local skill1 = args[1] + local skill2 = args[2] + local time = args[3] + role.sunMaxTime=time + role.niMaxTime=time + --检测自身技能 + local checkRoleSkill=function() + local myArr = RoleManager.Query(function (r) return r.camp == role.camp end) + local enArr = RoleManager.Query(function (r) return r.camp ~= role.camp end) + if #myArr< #enArr then + role.superSkill=BattleUtil.GetSkillData(skill1,0) + else + role.superSkill=BattleUtil.GetSkillData(skill2,0) + end + end + + local onSkillCast = function(role) + checkRoleSkill() + end + role.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillCast,nil,nil,role) + + + local OnSkillCastEnd = function(skill) + if skill.id==skill1 then + role.sunTime=role.sunTime+1 + elseif skill.id==skill2 then + role.niTime=role.niTime+1 + end + end + role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role) + + end, + -- 顺风/逆风最大次数[a]改变[b]次 + --a[int 改变类型]， b[int] + [472] = function(role, args) + local ct = args[1] + local time = args[2] + role.sunMaxTime = BattleUtil.CountValue(role.sunMaxTime,time,ct) + role.niMaxTime = BattleUtil.CountValue(role.niMaxTime,time,ct) + end, + -- 处于[a]效果[b]状态的目标， 释放技能后自身改变[c][d]点怒气, + -- a[int buff大类型],b[int buff小类型],c[int 改变类型],d[int] + [473] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local ct = args[3] + local v1 = args[4] + + -- 释放技能后 + local onSkillEnd = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then + return + end + if BattleLogic.BuffMgr:HasBuff(skill.caster, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + BattleUtil.CalRage(role, skill.caster, v1, ct) + end + + end + BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd,nil,nil,role) + end, + + -- 处于[a]效果[b]状态的目标，行动前有[c]%概率，无法行动 + -- a[int buff大类型],b[int buff小类型],c[float] + [474] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local v1 = args[3] + + -- 释放技能后 + local onSkillEnd = function(skiller) + skiller.notAction=false + if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + BattleUtil.RandomAction(v1, function() + skiller.notAction=true + end) + end + + end + BattleLogic.Event:AddEvent(BattleEventName.oleTurnStart, onSkillEnd,nil,nil,role) + end, + + -- 处于[a]效果[b]状态的目标，行动前有[c]%概率额外行动一次 + -- a[int buff大类型],b[int buff小类型],c[float] + [475] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local v1 = args[3] + + -- 释放技能后 + local onSkillEnd = function(skiller) + skiller.notAction=false + if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + BattleUtil.RandomAction(v1, function() + BattleLogic.InsertSkillRole(skiller) + end) + end + + end + BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role) + end, + + -- [a]效果[b]状态的buff消失时，有[c]%概率额外行动一次 + -- a[int buff大类型],b[int buff小类型],c[float] + [476] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local v1 = args[3] + + local OnBuffEnd=function(buff) + if buff.type~= t1 and buff.signType~=t2 then + return + end + if buff.caster~=role then + return + end + BattleUtil.RandomAction(v1, function() + BattleLogic.InsertSkillRole(role) + end) + end + BattleLogic.Event:AddEvent(BattleEventName.BuffEnd, OnBuffEnd,nil,nil,role) + end, + + -- 处于[a]效果[b]状态的目标，且怒气[c]于[d]点，受到的伤害[e]改变[f]%,伤害类型[g] + --a[int],b[int],c[int 1:大于 2：小于],d[int], e[改变类型]f[float],g[int 0：所有伤害 1：直接伤害 2:间接伤害 ] + [477] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local cp = args[3] + local num= args[4] + local ct = args[5] + local f1 = args[6] + local type = args[7] + local onPassiveBeDamaging = function(func, atkRole, defRole, damage, skill, dotType) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if cp==1 and defRole.Rage<=num then + return + end + if cp==2 and defRole.Rage>=num then + return + end + + if type==1 and not skill then + return + end + + if type==2 and skill then + return + end + if BattleLogic.BuffMgr:HasBuff(defRole, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + local dmgDeduction = damage - floor(BattleUtil.ErrorCorrection(BattleUtil.CountValue(damage, f1, ct))) + if func then func(dmgDeduction) end + end + end + BattleLogic.Event:AddEvent(BattleEventName.PassiveBeDamaging, onPassiveBeDamaging,nil,nil,role) + end, + -- 处于[a]效果[b]状态的目标，且怒气[c]于[d]点，造成的伤害[e]改变[f]%,伤害类型[g] + --a[int],b[int],c[int 1:大于 2：小于],d[int], e[改变类型]f[float],g[int 0：所有伤害 1：直接伤害 2:间接伤害 ] + [478] = function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local cp = args[3] + local num= args[4] + local ct = args[5] + local f1 = args[6] + local type = args[7] + local onPassiveBeDamaging = function(func, atkRole, defRole, damage, skill, dotType) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if cp==1 and defRole.Rage<=num then + return + end + if cp==2 and defRole.Rage>=num then + return + end + + if type==1 and not skill then + return + end + + if type==2 and skill then + return + end + if BattleLogic.BuffMgr:HasBuff(atkRole, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + local dmgDeduction = damage - floor(BattleUtil.ErrorCorrection(BattleUtil.CountValue(damage, f1, ct))) + if func then func(dmgDeduction) end + end + end + BattleLogic.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveBeDamaging,nil,nil,role) + end, } return passivityList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BreakArmor.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BreakArmor.lua index b8d993c008..b1f4dc932c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BreakArmor.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BreakArmor.lua @@ -2,7 +2,7 @@ BreakArmor = Buff:New() --初始化Buff，通过传入一些自定义参数控制成长相关的数值 function BreakArmor:SetData(...) - self.signType, --1 破军 2.迷魂 3. 4.主角状态 5.仇视 6.机械猴子标记 + self.signType, --1 破军 2.迷魂 3. 4.主角状态 5.仇视 6.机械猴子标记 7.逆风 8.顺风 self.signValue1, self.signValue2=... -- 刷新排序等级 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index ce2d0a289a..5e92dbd279 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -298,6 +298,62 @@ function BattleUtil.GetMaxTargetNum(chooseId) end end + +function BattleUtil.GetSkillData(skillId,skinId) + local skillConfig=ConfigManager.TryGetConfigData(ConfigName.SkillLogicConfig,skillId) + if not skillId or not skillConfig then + return + end + local skill = {skillId} + --skill = {skillId, 命中时间, 持续时间, 伤害次数, {目标id1, 效果1, 效果2, ...},{目标id2, 效果3, 效果4, ...}, ...} + --效果 = {效果类型id, 效果参数1, 效果参数2, ...} + + local target = skillConfig.Target + local effectList = skillConfig.Effect + local effectArgsList = skillConfig.EffectValue + + local eid = BattleManager.GetCombatIdBySkin(skillId, skinId or 0) + local EffectCombat = ConfigManager.TryGetConfigData(ConfigName.CombatControl,eid) + skill[1] = skillId + skill[2] = EffectCombat.KeyFrame/1000 + skill[3] = EffectCombat.SkillDuration/1000 + skill[4] = EffectCombat.SkillNumber + + local index = 1 + for i = 1, #effectList do + local effectGroup = { target[i][1] } -- 效果目标 + for j = 1, #effectList[i] do + local effect = { effectList[i][j] } -- 效果Id + for k = 1, #effectArgsList[index] do + effect[k + 1] = effectArgsList[index][k] -- 效果参数 + end + effectGroup[j + 1] = effect + index = index + 1 + end + skill[i + 4] = effectGroup + end + return skill +end + +-- 获取技能表现id +function BattleUtil.GetCombatIdBySkin(skillId, skinId) + local skillConfig=ConfigManager.TryGetConfigData(ConfigName.SkillLogicConfig,skillId) + local effectIds = skillConfig.SkillDisplay + local eid=0 + local skin = skinId or 0 + if effectIds then + for i = 1, #effectIds do + if effectIds[i][1] == skin then + eid=effectIds[i][2] + end + end + end + if eid==0 then + eid=effectIds[1][2] + end + return eid +end + -- function BattleUtil.ChooseTarget(role, chooseId,queryType) local chooseType = floor(chooseId / 100000) % 10 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 898e3f754d..c04d1748dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -92,6 +92,7 @@ function RoleLogic:Init(uid, data, position) self.ctrl_chaos = false --混乱 self.deadFilter = true -- 控制死亡，置为false则角色暂时无法死亡 self.isSuppress = false + self.notAction = false --无法行动 self.isExile = false --是否放逐 self.reliveFilter = true -- 控制复活的标志位，置为false角色将不再享受复活效果 self.reliveHPF = 1 @@ -109,6 +110,10 @@ function RoleLogic:Init(uid, data, position) self.isNormalAttackAddRage=true --普攻是否回复怒气 self.curMainTarget=nil --当前主目标 self.isAllBurn = false --是否视敌方全体为燃烧 + self.sunTime = 0 --顺风次数 + self.sunMaxTime = 0 + self.niTime = 0 --逆风次数 + self.niMaxTime = 0 self.suppressTime = 0 --被压制的次数 self.passiveList = {} if data.passivity and #data.passivity > 0 then @@ -454,6 +459,9 @@ function RoleLogic:IsAvailable(skill) if self.ctrl_palsy and self.Rage < self.SuperSkillRage then return false end + if self.notAction then + return false + end return true end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index 782387bf74..0058f43a23 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -27,6 +27,7 @@ function Skill:Init(role, effectData, type, targets, isAdd, isRage,isTriggerJudg self.targets={} self.skillDamage=0 self.AttactScale = 0 --用于追加的技能，设定其伤害的比例 + self.effectiveTime = 0 --顺风/逆风生效次数 if isTriggerJudge~=nil then self.isTriggerJudge=isTriggerJudge else @@ -153,6 +154,7 @@ function Skill:EndSkill() self.isTriggePassivity=false self.triggerPassivityId={} self.skillDamage=0 + self.effectiveTime = 0 if self.castDoneFunc then self.castDoneFunc() end self.targets={} end) -- 2.39.1.windows.1 From 4205ce3afc862d83e947c5e43d13813f30d650e2 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 24 Aug 2023 10:27:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8474=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/Base/Passivity.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 162c436965..930243a245 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12498,7 +12498,7 @@ local passivityList = { end end - BattleLogic.Event:AddEvent(BattleEventName.oleTurnStart, onSkillEnd,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role) end, -- 处于[a]效果[b]状态的目标，行动前有[c]%概率额外行动一次 -- 2.39.1.windows.1 From 461029ab5036b6b6022fcfb236f3e572d64c7655 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 24 Aug 2023 14:48:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97battleutil=20?= =?UTF-8?q?=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/Misc/BattleUtil.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 5e92dbd279..7daa137b17 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -312,7 +312,7 @@ function BattleUtil.GetSkillData(skillId,skinId) local effectList = skillConfig.Effect local effectArgsList = skillConfig.EffectValue - local eid = BattleManager.GetCombatIdBySkin(skillId, skinId or 0) + local eid = BattleUtil.GetCombatIdBySkin(skillId, skinId or 0) local EffectCombat = ConfigManager.TryGetConfigData(ConfigName.CombatControl,eid) skill[1] = skillId skill[2] = EffectCombat.KeyFrame/1000 -- 2.39.1.windows.1 From d28ca0a5fbc51c0146ca5d4290091adfeac58db9 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 24 Aug 2023 18:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=96=B0=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 19 ++++++++++++------- .../~Lua/Modules/Battle/Logic/BattleLogic.lua | 14 ++++++++++---- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 930243a245..0912f1c1c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12473,12 +12473,15 @@ local passivityList = { if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then return end - if BattleLogic.BuffMgr:HasBuff(skill.caster, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then - BattleUtil.CalRage(role, skill.caster, v1, ct) + if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + BattleLogic.WaitForTrigger(2, function () --延迟一帧移除事件，防止触发帧和结束帧为同一帧时，被动未移除 + BattleUtil.CalRage(role, skill.owner, v1, ct) + end) + end end - BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.SkillCast, onSkillEnd,nil,nil,role) end, -- 处于[a]效果[b]状态的目标，行动前有[c]%概率，无法行动 @@ -12535,7 +12538,7 @@ local passivityList = { if buff.caster~=role then return end - BattleUtil.RandomAction(v1, function() + BattleUtil.RandomAction(1, function() BattleLogic.InsertSkillRole(role) end) end @@ -12552,8 +12555,10 @@ local passivityList = { local ct = args[5] local f1 = args[6] local type = args[7] + local onPassiveBeDamaging = function(func, atkRole, defRole, damage, skill, dotType) if skill and not skill.isTriggerJudge and judge==1 then + return end if cp==1 and defRole.Rage<=num then @@ -12575,7 +12580,7 @@ local passivityList = { if func then func(dmgDeduction) end end end - BattleLogic.Event:AddEvent(BattleEventName.PassiveBeDamaging, onPassiveBeDamaging,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveBeDamaging,nil,nil,role) end, -- 处于[a]效果[b]状态的目标，且怒气[c]于[d]点，造成的伤害[e]改变[f]%,伤害类型[g] --a[int],b[int],c[int 1:大于 2：小于],d[int], e[改变类型]f[float],g[int 0：所有伤害 1：直接伤害 2:间接伤害 ] @@ -12591,10 +12596,10 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if cp==1 and defRole.Rage<=num then + if cp==1 and atkRole.Rage<=num then return end - if cp==2 and defRole.Rage>=num then + if cp==2 and atkRole.Rage>=num then return end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 838f975f0d..7486682a37 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -28,6 +28,7 @@ local allEnemyDamage=0 local levelStarRecord local hardStageId =0 local insertSkillRole=nil +local insertSkillRoleList=nil --是否开启战斗日志 BattleLogic.IsOpenBattleRecord = false --逻辑帧频 @@ -60,6 +61,7 @@ function BattleLogic.Init(data, _userData, maxRound) userData = _userData hardStageId=data.nodeId insertSkillRole=nil + insertSkillRoleList={} BattleLogic.CurOrder = 0 BattleLogic.TotalOrder = #data.enemyData BattleLogic.Clear() @@ -321,7 +323,7 @@ function BattleLogic.TurnRound(debugTurn) --轮数变化后延时0.2秒用于初始化监听回合数被动的初始化 BattleLogic.WaitForTrigger(0.5,function() -- 切换阵营 - if not insertSkillRole then + if #insertSkillRoleList==0 and insertSkillRole==nil then CurCamp = (CurCamp + 1) % 2 end BattleLogic.CheckBattleLogic() @@ -345,8 +347,10 @@ function BattleLogic.CheckBattleLogic() local SkillRole local lastPos --如果有插入行动的英雄，就先让插入的英雄行动 - if insertSkillRole then + if insertSkillRoleList and #insertSkillRoleList>0 then + insertSkillRole=insertSkillRoleList[1] SkillRole =insertSkillRole + table.removebyvalue(insertSkillRoleList,insertSkillRole) insertSkillRole=nil --记录下正常执行行动的英雄的位置，插入英雄行动完，再按照正常顺序执行 lastPos=CurSkillPos[CurCamp] @@ -430,8 +434,10 @@ end --检测是否有插入得英雄 function BattleLogic.CheckHaveInsertRole() - if insertSkillRole then + if insertSkillRoleList and #insertSkillRoleList>0 then + insertSkillRole=insertSkillRoleList[1] local SkillRole=insertSkillRole + table.removebyvalue(insertSkillRoleList,insertSkillRole) insertSkillRole=nil -- 如果找不到下一个人，直接交换阵营 if not SkillRole then @@ -497,7 +503,7 @@ function BattleLogic.WaitForTrigger(delayTime, action) end function BattleLogic.InsertSkillRole(role) - insertSkillRole=role + table.insert(insertSkillRoleList,role) end function BattleLogic.CurFrame() -- 2.39.1.windows.1 From 4cbe612e03b4b8afd064cd8e49cfdecf810107e8 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 24 Aug 2023 18:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=8B=B1=E9=9B=84=20buff=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=8F=90=E7=A4=BA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_zhandou_chengfeng_zh.png | Bin 0 -> 7169 bytes .../ArtFont/r_zhandou_chengfeng_zh.png.meta | 110 ++++++++++++++++++ .../ArtFont/r_zhandou_nifeng_zh.png | Bin 0 -> 6919 bytes .../ArtFont/r_zhandou_nifeng_zh.png.meta | 110 ++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png.meta create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..99359e26dce705f055677df863f22ab54c5d5054 GIT binary patch literal 7169 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 AEdT%j literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png.meta b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png.meta new file mode 100644 index 0000000000..183fbfa5a9 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_chengfeng_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6f4d6757ba37340478cda3bb356f0625 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a063dc7da6ea4ee4ca5e2fc7690b3254 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FloatingViewAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..c539563b2199edc65de8c7462dd4539bbebc2073 GIT binary patch literal 6919 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 I<;;Ws4|D|TnE(I) literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png.meta b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png.meta new file mode 100644 index 0000000000..36df4f6e0f --- /dev/null +++ b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/r_zhandou_nifeng_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a0ef88d7ea9c13a41913c20aad5ad223 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 46235fdc680d302418aad1adc323a17d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FloatingViewAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: -- 2.39.1.windows.1 From 91c292a809a0b3098da3e1e9e4be81128fae886a Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 25 Aug 2023 11:49:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8475=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/Base/Passivity.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 0912f1c1c8..1d9cb348ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12513,7 +12513,6 @@ local passivityList = { -- 释放技能后 local onSkillEnd = function(skiller) - skiller.notAction=false if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then BattleUtil.RandomAction(v1, function() BattleLogic.InsertSkillRole(skiller) -- 2.39.1.windows.1 From d9778dbae429db4f447fcd7571651e2589f87ff7 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 25 Aug 2023 16:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Buff.lua | 1 + .../Modules/Battle/Logic/Base/Passivity.lua | 29 ++++++++++++++----- .../Battle/Logic/Misc/BattleDefine.lua | 1 + 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index 47112c3197..ae66a6d895 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -370,6 +370,7 @@ function BuffManager:Update() buff:OnEnd() buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff) BattleLogic.Event:DispatchEvent(BattleEventName.BuffEnd, buff) + BattleLogic.Event:DispatchEvent(BattleEventName.BuffBeClear, buff) putBuff(buff) buffList:Remove(index) else diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1d9cb348ee..ecb6652b42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12473,11 +12473,11 @@ local passivityList = { if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then return end - if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then + if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) + return buff.caster == role and buff.signType == t2 end) then BattleLogic.WaitForTrigger(2, function () --延迟一帧移除事件，防止触发帧和结束帧为同一帧时，被动未移除 BattleUtil.CalRage(role, skill.owner, v1, ct) end) - end end @@ -12493,13 +12493,17 @@ local passivityList = { -- 释放技能后 local onSkillEnd = function(skiller) - skiller.notAction=false + --skiller.notAction=false if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then BattleUtil.RandomAction(v1, function() skiller.notAction=true end) end + local onTurnEnd = function(turner) + turner.notAction= false + end + skiller.Event:AddEvent(BattleEventName.RoleTurnEnd, onTurnEnd,nil,nil,role) end BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role) end, @@ -12511,16 +12515,25 @@ local passivityList = { local t2 = args[2] local v1 = args[3] + local triggerRole={} -- 释放技能后 local onSkillEnd = function(skiller) + if BattleUtil.ChecklistIsContainValue(triggerRole,skiller) then + return + end if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then BattleUtil.RandomAction(v1, function() BattleLogic.InsertSkillRole(skiller) + table.insert(triggerRole,skiller) end) end end BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role) + + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd,function(curRound) + triggerRole={} + end) end, -- [a]效果[b]状态的buff消失时，有[c]%概率额外行动一次 @@ -12531,17 +12544,19 @@ local passivityList = { local v1 = args[3] local OnBuffEnd=function(buff) - if buff.type~= t1 and buff.signType~=t2 then + + if buff.caster~=role then return end - if buff.caster~=role then + if buff.type~= t1 or buff.signType~=t2 then return end - BattleUtil.RandomAction(1, function() + + BattleUtil.RandomAction(v1, function() BattleLogic.InsertSkillRole(role) end) end - BattleLogic.Event:AddEvent(BattleEventName.BuffEnd, OnBuffEnd,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.BuffBeClear, OnBuffEnd,nil,nil,role) end, -- 处于[a]效果[b]状态的目标，且怒气[c]于[d]点，受到的伤害[e]改变[f]%,伤害类型[g] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index dad5d3fa06..b947cec061 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -144,6 +144,7 @@ BattleEventName = { BuffTrigger = indexAdd(), BuffBeAdd=indexAdd(), BuffEnd = indexAdd(), + BuffBeClear = indexAdd(), BuffCountChange = indexAdd(), BuffCover = indexAdd(), BuffRoundChange = indexAdd(), -- 2.39.1.windows.1 From 0d6566c725148b5b03c4f535c240a40ba24742a3 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 25 Aug 2023 17:14:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8472=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index ecb6652b42..b4157a45ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12454,8 +12454,13 @@ local passivityList = { [472] = function(role, args) local ct = args[1] local time = args[2] - role.sunMaxTime = BattleUtil.CountValue(role.sunMaxTime,time,ct) - role.niMaxTime = BattleUtil.CountValue(role.niMaxTime,time,ct) + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, function(curRound) + -- 第i1回合开始 + if curRound == 1 then + role.sunMaxTime = BattleUtil.CountValue(role.sunMaxTime,time,ct) + role.niMaxTime = BattleUtil.CountValue(role.niMaxTime,time,ct) + end + end) end, -- 处于[a]效果[b]状态的目标， 释放技能后自身改变[c][d]点怒气, -- a[int buff大类型],b[int buff小类型],c[int 改变类型],d[int] @@ -12473,8 +12478,8 @@ local passivityList = { if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then return end - if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) - return buff.caster == role and buff.signType == t2 end) then + --local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==caster and buff.type==t1 and buff.damageType==t2 end) + if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) return buff.caster == role and buff.signType == t2 end) then BattleLogic.WaitForTrigger(2, function () --延迟一帧移除事件，防止触发帧和结束帧为同一帧时，被动未移除 BattleUtil.CalRage(role, skill.owner, v1, ct) end) -- 2.39.1.windows.1 From 47edf3b630b2ad42840b9bd85a963fc16a5d6136 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 25 Aug 2023 18:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8?= =?UTF-8?q?477=20478=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/Base/Passivity.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index b4157a45ad..104c58a54e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12580,6 +12580,9 @@ local passivityList = { return end + if defRole==nil or defRole.Rage==nil then + return + end if cp==1 and defRole.Rage<=num then return end @@ -12615,6 +12618,9 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end + if atkRole==nil or atkRole.Rage==nil then + return + end if cp==1 and atkRole.Rage<=num then return end -- 2.39.1.windows.1 From 595487091ba9f35fc4d7b2ed01b7c808154c6f00 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 25 Aug 2023 18:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3Dbattlelogic=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/BattleLogic.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 7486682a37..f556910c3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -350,7 +350,8 @@ function BattleLogic.CheckBattleLogic() if insertSkillRoleList and #insertSkillRoleList>0 then insertSkillRole=insertSkillRoleList[1] SkillRole =insertSkillRole - table.removebyvalue(insertSkillRoleList,insertSkillRole) + table_removebyvalue(insertSkillRoleList,insertSkillRole) + --table.removebyvalue(insertSkillRoleList,insertSkillRole) insertSkillRole=nil --记录下正常执行行动的英雄的位置，插入英雄行动完，再按照正常顺序执行 lastPos=CurSkillPos[CurCamp] @@ -437,7 +438,8 @@ function BattleLogic.CheckHaveInsertRole() if insertSkillRoleList and #insertSkillRoleList>0 then insertSkillRole=insertSkillRoleList[1] local SkillRole=insertSkillRole - table.removebyvalue(insertSkillRoleList,insertSkillRole) + --table.removebyvalue(insertSkillRoleList,insertSkillRole) + table_removebyvalue(insertSkillRoleList,insertSkillRole) insertSkillRole=nil -- 如果找不到下一个人，直接交换阵营 if not SkillRole then -- 2.39.1.windows.1