돌진 베기 데미지 추가

This commit is contained in:
Ino 2025-05-03 05:49:31 +09:00
parent 3c278017b3
commit 3c36331a8b
4 changed files with 144 additions and 141 deletions

Binary file not shown.

View File

@ -10,6 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1546606949675769332} - component: {fileID: 1546606949675769332}
- component: {fileID: 5111058809629920574} - component: {fileID: 5111058809629920574}
- component: {fileID: 4297691991093958427}
m_Layer: 0 m_Layer: 0
m_Name: Skill_DashSlash m_Name: Skill_DashSlash
m_TagString: Untagged m_TagString: Untagged
@ -30,7 +31,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1836927718114409633} - {fileID: 945079205388860479}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5111058809629920574 --- !u!114 &5111058809629920574
@ -45,140 +46,27 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0a23a198f02eb0d43aec2c73f22314af, type: 3} m_Script: {fileID: 11500000, guid: 0a23a198f02eb0d43aec2c73f22314af, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ColliderLayer: Actor
m_Pierce: 1 m_Pierce: 1
str_HitEffect: str_HitEffect:
go_effect: {fileID: 1831299349266973681} m_ShowTimeOverEffect: 1
--- !u!1001 &1832658455297489783 go_effect: {fileID: 295994491076003401}
PrefabInstance: list_DamgeDelayTime:
m_ObjectHideFlags: 0 - 0.01
serializedVersion: 2 - 0.1
m_Modification: - 0.1
serializedVersion: 3 - 0.1
m_TransformParent: {fileID: 1546606949675769332} - 0.1
m_Modifications: - 0.1
- target: {fileID: 1403155227687046, guid: 4e2074741319b474387d3407224cba5f, type: 3} - 0.5
propertyPath: m_Name m_Collider: {fileID: 4297691991093958427}
value: FX_SLASH --- !u!65 &4297691991093958427
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.000017352402
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.y
value: 2.157468
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.z
value: 0.04618919
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.w
value: 0.8653189
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5012218
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000007450581
objectReference: {fileID: 0}
- target: {fileID: 4128704551632066, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -60.162
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalScale.x
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalScale.y
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalScale.z
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1403155227687046, guid: 4e2074741319b474387d3407224cba5f,
type: 3}
insertIndex: -1
addedObject: {fileID: 8594722768523727425}
- targetCorrespondingSourceObject: {fileID: 1403155227687046, guid: 4e2074741319b474387d3407224cba5f,
type: 3}
insertIndex: -1
addedObject: {fileID: 4695122307932267738}
m_SourcePrefab: {fileID: 100100000, guid: 4e2074741319b474387d3407224cba5f, type: 3}
--- !u!1 &1831299349266973681 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1403155227687046, guid: 4e2074741319b474387d3407224cba5f,
type: 3}
m_PrefabInstance: {fileID: 1832658455297489783}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8594722768523727425
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1831299349266973681}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a38a032bc645dd748bf40d9200bf783a, type: 3}
m_Name:
m_EditorClassIdentifier:
Off_OnlyThisObj_byHit: 0
--- !u!65 &4695122307932267738
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1831299349266973681} m_GameObject: {fileID: 2248026914158479146}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
@ -191,11 +79,100 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 8.322192, y: 8, z: 8} m_Size: {x: 2.8939738, y: 3, z: 6.898247}
m_Center: {x: 0.16109625, y: 0, z: -0.37000018} m_Center: {x: -0.24211812, y: 0, z: 0.5121741}
--- !u!4 &1836927718114409633 stripped --- !u!1001 &7992047011628252273
Transform: PrefabInstance:
m_CorrespondingSourceObject: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1546606949675769332}
m_Modifications:
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.2
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7706469311968983608, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
propertyPath: m_Name
value: FX_7Blue Stab
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4288fa4a0d6d8f441a99a3067fdee9c4, type: 3}
--- !u!1 &295994491076003401 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7706469311968983608, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3} type: 3}
m_PrefabInstance: {fileID: 1832658455297489783} m_PrefabInstance: {fileID: 7992047011628252273}
m_PrefabAsset: {fileID: 0}
--- !u!4 &945079205388860479 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7202642212723441742, guid: 4288fa4a0d6d8f441a99a3067fdee9c4,
type: 3}
m_PrefabInstance: {fileID: 7992047011628252273}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}

View File

@ -688,7 +688,7 @@ public class Actor : MyCoroutine
} }
} }
if (IsRole(eRole.PC) && !testskill) if (IsRole(eRole.PC))
{ {
var needMP = skilldata.n_MP - (skilldata.n_MP * m_Stat.Get_Stat(eStat.SKILL_COST)); var needMP = skilldata.n_MP - (skilldata.n_MP * m_Stat.Get_Stat(eStat.SKILL_COST));
if (needMP > m_Stat.Get_Stat(eStat.MP)) if (needMP > m_Stat.Get_Stat(eStat.MP))
@ -708,7 +708,7 @@ public class Actor : MyCoroutine
list_SkillData[index].m_SkillListTableData = m_Magic.m_SkillTableData; list_SkillData[index].m_SkillListTableData = m_Magic.m_SkillTableData;
list_SkillData[index].target = m_Target; list_SkillData[index].target = m_Target;
m_SkillData = list_SkillData[index]; m_SkillData = list_SkillData[index];
m_Stat.Set_Stat(false, eStat.MP, skilldata.n_MP); if (!testskill) m_Stat.Set_Stat(false, eStat.MP, skilldata.n_MP);
Set_MagicCoolTime(skilldata.Get_CoolTime(m_Stat.Get_Stat(eStat.COOLTIME_Multiplier)), index); Set_MagicCoolTime(skilldata.Get_CoolTime(m_Stat.Get_Stat(eStat.COOLTIME_Multiplier)), index);
if (IsMainPC() && !testskill) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL); if (IsMainPC() && !testskill) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL);
return Play_Skill(skilldata.s_Animation); return Play_Skill(skilldata.s_Animation);

View File

@ -1,19 +1,45 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class Skill_DashSlash : ProjectileBase public class Skill_DashSlash : ProjectileBase
{ {
public GameObject go_effect; public GameObject go_effect;
public List<float> list_DamgeDelayTime = new List<float>();
public Collider m_Collider;
public override void Set(ProjectileData _data) public override void Set(ProjectileData _data)
{ {
base.Set(_data); base.Set(_data);
transform.eulerAngles = new Vector3(0f, transform.eulerAngles.y, 0f);
go_effect.SetActive(false); go_effect.SetActive(false);
_data.shooter.Set_Invisible(0.5f, () => m_Collider.enabled = false;
_data.shooter.Set_Invisible(0.5f, () => { StartCoroutine(Co_Update()); });
}
private void Update()
{
if (m_ProjecTileData.target)
transform.position = m_ProjecTileData.target.Get_position();
}
IEnumerator Co_Update()
{
go_effect.SetActive(true);
m_ProjecTileData.shooter.Set_Warp(m_ProjecTileData.target.Get_PositionFoward());
transform.position = m_ProjecTileData.shooter.Get_Center_position();
yield return new WaitForSeconds(0.25f);
m_ProjecTileData.shooter.Set_Invisible(2.5f, () =>
{ {
go_effect.SetActive(true); Off(true);
_data.shooter.Set_Warp(_data.target.Get_PositionFoward());
transform.position = _data.shooter.Get_Center_position();
StartCoroutine(Co_Off(0.1f));
}); });
for (int i = 0; i < list_DamgeDelayTime.Count; i++)
{
m_Collider.enabled = false;
yield return new WaitForSeconds(list_DamgeDelayTime[i]);
m_Collider.enabled = true;
yield return null;
}
} }
} }