diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 1283f1c4ea..ce6fa6b012 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -547,6 +547,7 @@ function this.GetSkillCombat(id) SkillNumber = combat.SkillNumber, SkillDuration = combat.SkillDuration, Orientation = combat.Orientation, + BeforeEffectType = combat.BeforeEffectType , EffectType = combat.EffectType , HitEffectType = combat.HitEffectType, BeforeOffset = combat.BeforeOffset, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index 6f212cc0a0..6b67efcf53 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -1092,21 +1092,33 @@ function RoleView:CheckSkillForoleEffect(combat, skill) if not skill then return end - if combat.BeforeBullet and combat.BeforeBullet ~= "" then - local path = combat.BeforeBullet - local offset = combat.BeforeOffset and Vector3.New(combat.BeforeOffset[1], combat.BeforeOffset[2], 0) or Vector3.zero + if not combat.BeforeBullet or combat.BeforeBullet == "" then + return + end + local go + local path = combat.BeforeBullet + local offset = combat.BeforeOffset and Vector3.New(combat.BeforeOffset[1], combat.BeforeOffset[2], 0) or Vector3.zero + + -- 挂在人身上,以人物中心为原点 + if combat.BeforeEffectType == 1 then local sortingOrder if self.camp == 0 then sortingOrder = self.GameObject:GetComponent("Canvas").sortingOrder end - local go = loadAsset(path, sortingOrder) + go = loadAsset(path, sortingOrder) go.transform:SetParent(self.GameObject.transform) - go.transform.localScale = Vector3.one - go.transform.localPosition = Vector3.zero - go.transform.anchoredPosition = offset - go:SetActive(true) - self:AddDelayRecycleRes(path, go, 3) + -- 屏幕中心 + elseif combat.BeforeEffectType == 2 then + local sortingOrder = self.RootPanel.skillEffectRoot:GetComponent("Canvas").sortingOrder + go = loadAsset(path, sortingOrder) + go.transform:SetParent(self.RootPanel.skillEffectRoot.transform) end + + go.transform.localScale = Vector3.one + go.transform.localPosition = Vector3.zero + go.transform.anchoredPosition = offset + go:SetActive(true) + self:AddDelayRecycleRes(path, go, 4) end -- 检测技能命中特效显示 diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index 72ed6125c6..af69108c8d 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ