From 8327a4326cfeada8df8ebd18101ba130caa18309 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 18 Jan 2021 17:13:51 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8=20137=20=20=E4=BF=AE=E6=94=B9=20=20=20=E5=A4=8D?= =?UTF-8?q?=E6=B4=BB=E5=90=8E=E8=A1=80=E9=87=8F=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 4 ++-- .../Modules/Battle/Logic/Role/RoleLogic.lua | 20 +++++++++---------- .../Modules/Battle/View/Unit/EnemyView.lua | 1 + .../Modules/Battle/View/Unit/PlayerView.lua | 2 +- .../Modules/Battle/View/Unit/RoleView.lua | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index b118d55849..9ebfcd76d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2526,7 +2526,7 @@ local passivityList = { -- 技能后后 local onSkillEnd = function(skill) if skill.type == BattleSkillType.Special then - local list = skill:GetDirectTargetsNoMiss() + local list = skill:GetDirectTargets() if list then local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1)) for _, r in ipairs(list) do @@ -6247,7 +6247,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.RoleDead, OnDead) end, - --修改持续效果的治疗值为[a] [b]属性的[c]% + --修改持续效果的治疗值为[a]属性的[b]% --a[int] b[float] [300]=function(role,args,id,judge) local pro=args[1] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 071d3aeed0..f099ebb663 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -539,7 +539,7 @@ function RoleLogic:Relive() self.data:SetValue(RoleDataName.Hp, reHp) -- 发送复活事件 self.Event:DispatchEvent(BattleEventName.RoleRelive, self) - BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) -- 复活的血量算做加血 BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) return true @@ -557,15 +557,15 @@ function RoleLogic:SetRelive(hpf, caster) self.reliveHPF = hpf or 1 self.reliveCaster = caster RoleManager.AddReliveRole(self) - local maxHp = self.data:GetData(RoleDataName.MaxHp) - local reHp = floor(self.reliveHPF * maxHp) - self.data:SetValue(RoleDataName.Hp, reHp) - -- 发送复活事件 - --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) - --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) - -- 复活的血量算做加血 - BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) - return true + -- local maxHp = self.data:GetData(RoleDataName.MaxHp) + -- local reHp = floor(self.reliveHPF * maxHp) + -- self.data:SetValue(RoleDataName.Hp, reHp) + -- -- 发送复活事件 + -- --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- -- 复活的血量算做加血 + -- BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) + -- return true end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index f158cd2cfa..2004cc7bd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -546,6 +546,7 @@ function EnemyView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index b2259a5a1d..777e490a73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -583,7 +583,7 @@ function PlayerView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false - + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index 865d8c872b..82506d6009 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -680,7 +680,7 @@ function RoleView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false - + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end