diff --git a/Assets/Res_Addr/Skill/Skill_FatalBlow.prefab b/Assets/Res_Addr/Skill/Skill_FatalBlow.prefab index 7c5fbf861..a91a465e7 100644 --- a/Assets/Res_Addr/Skill/Skill_FatalBlow.prefab +++ b/Assets/Res_Addr/Skill/Skill_FatalBlow.prefab @@ -31,7 +31,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 33000018302309492} + - {fileID: 1909011631578295402} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1240523879550051612 @@ -46,8 +46,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3293360185235824a8709aabdc7324ea, type: 3} m_Name: m_EditorClassIdentifier: + ColliderLayer: Actor m_Pierce: 1 str_HitEffect: + m_ShowTimeOverEffect: 1 m_boxcollider: {fileID: 2009372462553340028} --- !u!65 &2009372462553340028 BoxCollider: @@ -70,7 +72,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 4, y: 4, z: 4} m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &28604922988094200 +--- !u!1001 &6932339745100035130 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -78,59 +80,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 400006} m_Modifications: - - target: {fileID: 1376928433155100, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 7606252412924503732, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_Name - value: FX_Starfall + value: Blue_Slash_4 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} - propertyPath: m_LocalScale.x - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} - propertyPath: m_LocalScale.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -2 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} + - target: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -138,10 +139,10 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7d71baab11d02544875ed0fa5b4845d, type: 3} ---- !u!4 &33000018302309492 stripped + m_SourcePrefab: {fileID: 100100000, guid: 8dfe8be95a574dc46b25f1595c630265, type: 3} +--- !u!4 &1909011631578295402 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4676571415049868, guid: b7d71baab11d02544875ed0fa5b4845d, + m_CorrespondingSourceObject: {fileID: 8812055397236103248, guid: 8dfe8be95a574dc46b25f1595c630265, type: 3} - m_PrefabInstance: {fileID: 28604922988094200} + m_PrefabInstance: {fileID: 6932339745100035130} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 81eedfd26..f47bc48f1 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -806,11 +806,11 @@ public class Actor : MyCoroutine } #region 스킬 동작 - IEnumerator Co_JumpAttack(float heightPos_y, float duration) + IEnumerator Co_JumpAttack(float heightPos_y, float duration, float dist) { OptionInfo.Ins.Set_PCMove(this, false); var startPos = Get_position(); // 현재 위치 - var targetPos = Get_TeleportPostion(m_Target); + var targetPos = Get_TeleportPostion(m_Target, dist); var elapsed = 0f; @@ -1836,8 +1836,8 @@ public class Actor : MyCoroutine switch (m_Magic.m_SkillTableData.e_Skill) { - case eEffect.Skill_JumpAttack: StartCoroutine(Co_JumpAttack(1f, 0.8f)); break; - case eEffect.Skill_FatalBlow: StartCoroutine(Co_JumpAttack(0.8f, 0.6f)); break; + case eEffect.Skill_JumpAttack: StartCoroutine(Co_JumpAttack(1f, 0.8f, 1f)); break; + case eEffect.Skill_FatalBlow: StartCoroutine(Co_JumpAttack(0.8f, 0.6f, 0.5f)); break; } if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_CastingEffect)) diff --git a/Assets/Script/Character/Projectile/Skill/Skill_FatalBlow.cs b/Assets/Script/Character/Projectile/Skill/Skill_FatalBlow.cs index 398e21ee6..51f33a4eb 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_FatalBlow.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_FatalBlow.cs @@ -9,22 +9,22 @@ public class Skill_FatalBlow : ProjectileBase { m_Pierce = true; _data.eStartPos = eProjectileStartPos.Custom; - _data.v3_StartPos = _data.target.Get_position(); + _data.v3_StartPos = _data.shooter.Get_position(); base.Set(_data); + transform.LookAt(_data.target.transform); + transform.eulerAngles = new Vector3(0f, transform.eulerAngles.y); StartCoroutine(Co_Update()); } IEnumerator Co_Update() { - m_boxcollider.enabled = false; - yield return new WaitForSeconds(0.5f); m_boxcollider.enabled = true; yield return null; yield return null; m_boxcollider.enabled = false; OptionInfo.Ins.Set_PCMove(m_ProjecTileData.shooter, true); - yield return new WaitForSeconds(1f); + yield return new WaitForSeconds(2f); Off(true); } } \ No newline at end of file