diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index ce6fa6b012..7a4202211a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -546,6 +546,7 @@ function this.GetSkillCombat(id) BeforeBullet = combat.BeforeBullet, SkillNumber = combat.SkillNumber, SkillDuration = combat.SkillDuration, + BeforeOrientation = combat.BeforeOrientation, Orientation = combat.Orientation, BeforeEffectType = combat.BeforeEffectType , EffectType = combat.EffectType , diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index 6b67efcf53..925fc9e930 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -1098,7 +1098,7 @@ function RoleView:CheckSkillForoleEffect(combat, skill) 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 @@ -1114,6 +1114,16 @@ function RoleView:CheckSkillForoleEffect(combat, skill) go.transform:SetParent(self.RootPanel.skillEffectRoot.transform) end + + + if self.camp == 0 and combat.BeforeOrientation == 1 then + go.transform.localRotation = Vector3.New(0, 0, 180) + offset = -offset + else + go.transform.localRotation = Vector3.zero + end + + go.transform.localScale = Vector3.one go.transform.localPosition = Vector3.zero go.transform.anchoredPosition = offset @@ -1147,7 +1157,7 @@ function RoleView:CheckSkillHitEffect(checkType, combat, skill) go.transform.localScale = Vector3.one go.transform.localPosition = tpos + offset go:SetActive(true) - self:AddDelayRecycleRes(combat.Hit, go, 1) + self:AddDelayRecycleRes(combat.Hit, go, 5) end elseif checkType == "hit" then @@ -1163,7 +1173,7 @@ function RoleView:CheckSkillHitEffect(checkType, combat, skill) go2.transform.anchoredPosition = offset--Vector2.zero go2.transform:SetParent(self.RootPanel.skillEffectRoot.transform) go2:SetActive(true) - self:AddDelayRecycleRes(combat.Hit, go2, 1) + self:AddDelayRecycleRes(combat.Hit, go2, 5) end end diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index ba722c3091..8c99e917c5 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ