diff --git a/Assets/ResWork/Table/Export/EffectList.json b/Assets/ResWork/Table/Export/EffectList.json index 3f9588fa8..e4f2d9dbe 100644 --- a/Assets/ResWork/Table/Export/EffectList.json +++ b/Assets/ResWork/Table/Export/EffectList.json @@ -1 +1 @@ -[{"n_EffectType": "이펙트 종류", "s_EffectPrefab": "이펙트 프리팹", "f_ProjectileLifeTime": "투사체 지속 시간", "n_PreLoadCount": "미리 로드할 개수"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_MonsterSpawn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "20"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Blood", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Burn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Cure", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Curse", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_DefenceDecrease", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Freezing", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Frost", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_KnockBack", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_ManaShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Poison", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Slow", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SpeedUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_StatUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_STR_EXTRA_SPLASH", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Stun", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Summoning", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SwordShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_VampirHeal", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Bead", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Fireball", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_IceBolt", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10501", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Dodge_Mage", "f_ProjectileLifeTime": "1", "n_PreLoadCount": "1"}, {"n_EffectType": "2", "s_EffectPrefab": "MeleeAttack", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10301", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10302", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10303", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10501", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_EnergyBall", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Flower", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "6"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_HeavyRain", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "25"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_INT_EXTRA_FREEZING", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Meteor", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "5"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PinkMagicArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PosionCloud", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Suriken", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "1"}] \ No newline at end of file +[{"n_EffectType": "이펙트 종류", "s_EffectPrefab": "이펙트 프리팹", "f_ProjectileLifeTime": "투사체 지속 시간", "n_PreLoadCount": "미리 로드할 개수"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_MonsterSpawn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "20"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Blood", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Burn", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Cure", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Curse", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_DefenceDecrease", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Freezing", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Frost", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_KnockBack", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_ManaShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Poison", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Slow", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SpeedUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_StatUp", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_STR_EXTRA_SPLASH", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Stun", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Summoning", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_SwordShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_VampirHeal", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Bead", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_Fireball", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "5"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_IceBolt", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Hit_10501", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "10"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Dodge_Mage", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "2"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Casting_ManaShield", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "2"}, {"n_EffectType": "1", "s_EffectPrefab": "Effect_Casting_Energyball", "f_ProjectileLifeTime": "0", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "MeleeAttack", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10301", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10302", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10303", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_10501", "f_ProjectileLifeTime": "0.02", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_EnergyBall", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Flower", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "6"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_HeavyRain", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "25"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_INT_EXTRA_FREEZING", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "10"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Meteor", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "5"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PinkMagicArrow", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_PosionCloud", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "2"}, {"n_EffectType": "2", "s_EffectPrefab": "Projectile_Suriken", "f_ProjectileLifeTime": "2", "n_PreLoadCount": "1"}] \ No newline at end of file diff --git a/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab b/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab new file mode 100644 index 000000000..ccc578e1b --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1057532553798376008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2694430436789627979} + m_Layer: 0 + m_Name: Effect_Casting_Energyball + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2694430436789627979 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057532553798376008} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4518239871895540517} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8920258391120528544 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2694430436789627979} + m_Modifications: + - target: {fileID: 5007752678101014402, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_Name + value: HCFX_Energy_03 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 28771f4d18687d44ebcb95043bb6bb3e, type: 3} +--- !u!4 &4518239871895540517 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5007752678101014405, guid: 28771f4d18687d44ebcb95043bb6bb3e, + type: 3} + m_PrefabInstance: {fileID: 8920258391120528544} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab.meta b/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab.meta new file mode 100644 index 000000000..85d8e7aa6 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Casting_Energyball.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1e4b6e3f529c0fe488beae68c900347d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab b/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab new file mode 100644 index 000000000..6215aa6c4 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9088789117349826386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1601207290865234233} + - component: {fileID: 6337908216528283714} + m_Layer: 0 + m_Name: Effect_Casting_ManaShield + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1601207290865234233 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9088789117349826386} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7249398947276074596} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6337908216528283714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9088789117349826386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} + m_Name: + m_EditorClassIdentifier: + NoUseParticleTime: 1 + OffTime: 1 + add_offset: {x: 0, y: 0, z: 0} + e_EffectLocation: 2 + tf_Target: {fileID: 0} +--- !u!1001 &6874623387256251271 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1601207290865234233} + m_Modifications: + - target: {fileID: 1670162521736757745, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_Name + value: StarMagicExplosion + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9812519d020ee0e43b59c3ef9b19dc40, type: 3} +--- !u!4 &7249398947276074596 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4322497292758896099, guid: 9812519d020ee0e43b59c3ef9b19dc40, + type: 3} + m_PrefabInstance: {fileID: 6874623387256251271} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab.meta b/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab.meta new file mode 100644 index 000000000..235eb6c96 --- /dev/null +++ b/Assets/Res_Addr/Effect/Effect_Casting_ManaShield.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0550f463304eea4abf84b519a6b93f6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index fe92ec81a..4340ea8e5 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -1637,9 +1637,17 @@ public class Actor : MyCoroutine Set_RunSmoke(false); if (motion.Equals("casting")) + { co_casting = StartCoroutine(Co_Casting(m_Magic.m_SkillTableData.f_CastingTime)); - if (!DSUtil.CheckNull(m_Magic) && m_Magic.m_SkillTableData.e_Skill == eEffect.Skill_JumpAttack) - StartCoroutine(Co_JumpAttack()); + m_NavMeshAgent.ResetPath(); + } + if (!DSUtil.CheckNull(m_Magic)) + { + if (m_Magic.m_SkillTableData.e_Skill == eEffect.Skill_JumpAttack) + StartCoroutine(Co_JumpAttack()); + if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_CastingEffect)) + InGameInfo.Ins.Show_Effect(m_Magic.m_SkillTableData.s_CastingEffect, Get_position()); + } return true; } diff --git a/Assets/Script/Character/Projectile/Skill/Skill_ManaShield.cs b/Assets/Script/Character/Projectile/Skill/Skill_ManaShield.cs index 37351ed19..571561f6a 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_ManaShield.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_ManaShield.cs @@ -1,7 +1,3 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - public class Skill_ManaShield : ProjectileBase { public override void Set(ProjectileData _data) diff --git a/Assets/Script/Table/Skill/table_skilllist.cs b/Assets/Script/Table/Skill/table_skilllist.cs index b6a96707c..8ebd2d403 100644 --- a/Assets/Script/Table/Skill/table_skilllist.cs +++ b/Assets/Script/Table/Skill/table_skilllist.cs @@ -21,6 +21,7 @@ public class SkillListTableData : TableDataBase public string s_Animation; // 스킬 모션 public string s_NextAnimation; // 스킬 다음 모션 public float f_CastingTime; // 캐스팅 시간 + public string s_CastingEffect; // 캐스팅 이펙트 public eSkillTarget e_SkillTarget; // 효과 대상 public float f_DefaultValue; // 기본 스킬 데미지 public float f_LevelPerValue; // 레벨당 증가 스킬 데미지