From 09755c8d12ce9dfb1f7a9fe6ec4dd4c3c2cc9a2e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 25 Oct 2021 13:48:48 +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=E6=B5=8B=E8=AF=95=E6=88=98=E6=96=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C=E6=94=BB=E5=87=BB=E5=B0=B1=E6=98=AF=E9=98=9F=E4=BC=8D?= =?UTF-8?q?=E6=88=98=E6=96=97=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua | 2 +- .../~Lua/Modules/Battle/Test/BattleTestPanel.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 5f36831ded..0165ea396d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2497,7 +2497,7 @@ local effectList = { end) end, --对目标造成神佑状态,造成主角战斗力[a]%+[b]的血量,持续[c]回合,溢出部分转化为御甲 pvp最高只造成目标[d][e]%的治疗(d不填默认12 e:不填默认0.5 ) - --a[float],b[int],c[int] + --a[float],b[int],c[int],d[int],e[float] [131] = function(caster, target, args, interval, skill) local f1 = args[1] local v1 = args[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index 176d02554c..feb7f658e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua @@ -316,6 +316,7 @@ function this.RefreshFightData(type) for pi = 1, 25 do data.property[pi] = role.props[pi] or 0 end + data.teamDamage=data.property[4] data.skill = BattleManager.GetSkillData(role.skill,role.skinId) or {} data.superSkill = BattleManager.GetSkillData(role.superSkill) or {} -- 添加角色数据