diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 590d5a1e2..4185729f7 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Skill/Skill_DashSlash.prefab b/Assets/Res_Addr/Skill/Skill_DashSlash.prefab index 00b295d7d..a0ee3fd77 100644 --- a/Assets/Res_Addr/Skill/Skill_DashSlash.prefab +++ b/Assets/Res_Addr/Skill/Skill_DashSlash.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 1546606949675769332} - component: {fileID: 5111058809629920574} + - component: {fileID: 4297691991093958427} m_Layer: 0 m_Name: Skill_DashSlash m_TagString: Untagged @@ -30,7 +31,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1836927718114409633} + - {fileID: 945079205388860479} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5111058809629920574 @@ -45,140 +46,27 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a23a198f02eb0d43aec2c73f22314af, type: 3} m_Name: m_EditorClassIdentifier: + ColliderLayer: Actor m_Pierce: 1 str_HitEffect: - go_effect: {fileID: 1831299349266973681} ---- !u!1001 &1832658455297489783 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1546606949675769332} - m_Modifications: - - target: {fileID: 1403155227687046, guid: 4e2074741319b474387d3407224cba5f, type: 3} - propertyPath: m_Name - value: FX_SLASH - 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 + m_ShowTimeOverEffect: 1 + go_effect: {fileID: 295994491076003401} + list_DamgeDelayTime: + - 0.01 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.5 + m_Collider: {fileID: 4297691991093958427} +--- !u!65 &4297691991093958427 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1831299349266973681} + m_GameObject: {fileID: 2248026914158479146} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -191,11 +79,100 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 8.322192, y: 8, z: 8} - m_Center: {x: 0.16109625, y: 0, z: -0.37000018} ---- !u!4 &1836927718114409633 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4781919058806742, guid: 4e2074741319b474387d3407224cba5f, + m_Size: {x: 2.8939738, y: 3, z: 6.898247} + m_Center: {x: -0.24211812, y: 0, z: 0.5121741} +--- !u!1001 &7992047011628252273 +PrefabInstance: + 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} - 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} diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index f47bc48f1..1ff0876fa 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -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)); 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].target = m_Target; 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); if (IsMainPC() && !testskill) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL); return Play_Skill(skilldata.s_Animation); diff --git a/Assets/Script/Character/Projectile/Skill/Skill_DashSlash.cs b/Assets/Script/Character/Projectile/Skill/Skill_DashSlash.cs index 71e007815..537704eb9 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_DashSlash.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_DashSlash.cs @@ -1,19 +1,45 @@ +using System.Collections; +using System.Collections.Generic; using UnityEngine; public class Skill_DashSlash : ProjectileBase { public GameObject go_effect; + public List list_DamgeDelayTime = new List(); + public Collider m_Collider; public override void Set(ProjectileData _data) { base.Set(_data); + transform.eulerAngles = new Vector3(0f, transform.eulerAngles.y, 0f); 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); - _data.shooter.Set_Warp(_data.target.Get_PositionFoward()); - transform.position = _data.shooter.Get_Center_position(); - StartCoroutine(Co_Off(0.1f)); + Off(true); }); + + 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; + } } } \ No newline at end of file