diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_구르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_구르기.asset index 1d0aa021..556f32a3 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_구르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_구르기.asset @@ -31,4 +31,3 @@ MonoBehaviour: manaCost: 0 maxGemSlotCount: 2 castStartEffects: [] - effects: [] diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_도발.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_도발.asset index 51cdd02d..f031e1aa 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_도발.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_도발.asset @@ -34,5 +34,7 @@ MonoBehaviour: manaCost: 10 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: f0aaa98426be3d44082a386c00ea9aea, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 4e6ed26d4cd68a9d3f45ad5f38da5190, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_돌진.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_돌진.asset index 2d630e9e..9470d01c 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_공용_돌진.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_공용_돌진.asset @@ -31,4 +31,3 @@ MonoBehaviour: manaCost: 0 maxGemSlotCount: 2 castStartEffects: [] - effects: [] diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_광역치유.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_광역치유.asset index 07ff5c88..d55d9620 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_광역치유.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_광역치유.asset @@ -30,6 +30,5 @@ MonoBehaviour: cooldown: 8 manaCost: 15 maxGemSlotCount: 2 - castStartEffects: [] - effects: - - {fileID: 11400000, guid: 91e08eac488e96b4797dd113dddb78ec, type: 2} + castStartEffects: + - {fileID: 11400000, guid: 27c0fd82314471ff7b0ceb85fefc9dcf, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_마법광선.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_마법광선.asset index 61b07cc7..1d078409 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_마법광선.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_마법광선.asset @@ -38,7 +38,7 @@ MonoBehaviour: channelDuration: 3 channelTickInterval: 0.5 channelTickEffects: - - {fileID: 11400000, guid: 958fe7b9b5d33bb4d83303d3478756ba, type: 2} + - {fileID: 11400000, guid: 5439a9a24502924f6302c2493e61e527, type: 2} channelEndEffects: [] channelVfxPrefab: {fileID: 1062685050423962, guid: 75ec5047abb8242419c33baf6ca45ca8, type: 3} channelVfxMountPath: CastPoint diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_보호막.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_보호막.asset index 6ec9efdb..b948cdd9 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_보호막.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_보호막.asset @@ -30,6 +30,5 @@ MonoBehaviour: cooldown: 10 manaCost: 15 maxGemSlotCount: 2 - castStartEffects: [] - effects: - - {fileID: 11400000, guid: 65ed1eabc2fb73d43b86230317222608, type: 2} + castStartEffects: + - {fileID: 11400000, guid: 7fc2b1c9c7ff0fe08f01821e6b3e11a9, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_부활.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_부활.asset index 88f5b7f8..158f26f2 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_부활.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_부활.asset @@ -30,6 +30,5 @@ MonoBehaviour: cooldown: 30 manaCost: 30 maxGemSlotCount: 2 - castStartEffects: [] - effects: - - {fileID: 11400000, guid: a0777ce154a0edd4ab3936e53205ba28, type: 2} + castStartEffects: + - {fileID: 11400000, guid: 64ec4bc26f0346b5fa114255eacbfcdf, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_유도탄.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_유도탄.asset index fe59c768..c791fd4c 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_유도탄.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_유도탄.asset @@ -31,5 +31,7 @@ MonoBehaviour: manaCost: 6 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: 07a1db9cf2057fa4889d27ff699c490b, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 3c24de1bceb5ccfc9385385e5c699557, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_치유광선.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_치유광선.asset index f8f428f9..c9921322 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_마법_치유광선.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_마법_치유광선.asset @@ -36,7 +36,7 @@ MonoBehaviour: channelDuration: 2.5 channelTickInterval: 0.5 channelTickEffects: - - {fileID: 11400000, guid: 3c87c068bc01da443bbb6e89eaaceb18, type: 2} + - {fileID: 11400000, guid: c4a8062454924a3fd863efd0b8479e0a, type: 2} channelEndEffects: [] channelVfxPrefab: {fileID: 100100000, guid: b9aac1c232ed68c44be97372b7fc6914, type: 3} channelVfxMountPath: CastPoint diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방어태세.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방어태세.asset index c13d8af7..33b46bf8 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방어태세.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방어태세.asset @@ -31,5 +31,7 @@ MonoBehaviour: manaCost: 10 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: 300d73daaa4a93044ac7e19585b06316, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: d40b44390a329caf7f769f953be34b3e, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방패치기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방패치기.asset index 1d7a515f..84536245 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방패치기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_방패_방패치기.asset @@ -31,6 +31,7 @@ MonoBehaviour: manaCost: 10 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: a6563db8afce56744b6d9011f7da33d1, type: 2} - - {fileID: 11400000, guid: 29608765f5e1e084aadd30c4d1dfab16, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 088548d47982b87a545ce5f5b1ab60b7, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_내려찍기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_내려찍기.asset index 5e3b6833..8bc02c93 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_내려찍기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_내려찍기.asset @@ -32,5 +32,3 @@ MonoBehaviour: manaCost: 10 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_모아베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_모아베기.asset index 31e6cbcf..8a4ec20d 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_모아베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_모아베기.asset @@ -32,5 +32,3 @@ MonoBehaviour: manaCost: 12 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: f3a7b1c2d4e5f6a8b9c0d1e2f3a4b5c6, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_연속베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_연속베기.asset index 89f316dd..f55839f6 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_연속베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_연속베기.asset @@ -18,7 +18,8 @@ MonoBehaviour: skillRole: 1 activationType: 1 baseTypes: 1 - animationClips: [] + animationClips: + - {fileID: 7400000, guid: 60a7aefb54ade4a41904977685930f3d, type: 2} animationSpeed: 1 useRootMotion: 0 ignoreRootMotionY: 1 @@ -31,6 +32,13 @@ MonoBehaviour: manaCost: 15 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: a99c0e3badadb474e91d173e78478af4, type: 2} - - {fileID: 11400000, guid: eabae38b59d43b940af4a05940e71ef4, type: 2} + triggeredEffects: [] + isChanneling: 0 + channelDuration: 3 + channelTickInterval: 0.5 + channelTickEffects: [] + channelEndEffects: [] + channelVfxPrefab: {fileID: 0} + channelVfxMountPath: + channelVfxLengthScale: 1 + channelVfxWidthScale: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_찌르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_찌르기.asset index a8d3aaf0..4fcaa0d6 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_찌르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_찌르기.asset @@ -31,5 +31,3 @@ MonoBehaviour: manaCost: 8 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: 94d1e7f22bfd24d4d827d52f83c18685, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_회전베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_회전베기.asset index ba15d2a5..02ae6d30 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_양손_회전베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_양손_회전베기.asset @@ -18,7 +18,9 @@ MonoBehaviour: skillRole: 1 activationType: 1 baseTypes: 1 - animationClips: [] + animationClips: + - {fileID: 7400000, guid: 3fe6587798a1a3a47a568b0dea6ffbf4, type: 2} + - {fileID: 7400000, guid: 448433a9cacf21e428d4e29f81741ad2, type: 2} animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 @@ -31,6 +33,13 @@ MonoBehaviour: manaCost: 15 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: cdb2092bc74fa35408cb093cd24fba82, type: 2} - - {fileID: 11400000, guid: ab86efb2934c18b4598e2fa5b6ccf648, type: 2} + triggeredEffects: [] + isChanneling: 0 + channelDuration: 3 + channelTickInterval: 0.5 + channelTickEffects: [] + channelEndEffects: [] + channelVfxPrefab: {fileID: 0} + channelVfxMountPath: + channelVfxLengthScale: 1 + channelVfxWidthScale: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_베기.asset index 8cf41c1b..8cca4312 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_베기.asset @@ -33,5 +33,7 @@ MonoBehaviour: manaCost: 5 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: e23fca57309ab2b4faa5c380118cd07e, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 0a79e4690166da35e8582d20ec0e9308, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_연속베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_연속베기.asset index 0a75f315..5d5b5df8 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_연속베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_연속베기.asset @@ -18,7 +18,8 @@ MonoBehaviour: skillRole: 1 activationType: 1 baseTypes: 1 - animationClips: [] + animationClips: + - {fileID: 7400000, guid: fe55ab7fad6cd644db9bd2b6183fe180, type: 2} animationSpeed: 1 useRootMotion: 0 ignoreRootMotionY: 1 @@ -31,6 +32,22 @@ MonoBehaviour: manaCost: 10 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: 5c8977946ac095044961f0b2645210c3, type: 2} - - {fileID: 11400000, guid: 06e16e53f7d1a5e4783e2ffa4d4ec950, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 63a64e7bf66816c0e8d2a02ae912b03c, type: 2} + - triggerIndex: 1 + effects: + - {fileID: 11400000, guid: 749d331dcc55c6408f07dc70165193ac, type: 2} + - triggerIndex: 2 + effects: + - {fileID: 11400000, guid: b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7, type: 2} + isChanneling: 0 + channelDuration: 3 + channelTickInterval: 0.5 + channelTickEffects: [] + channelEndEffects: [] + channelVfxPrefab: {fileID: 0} + channelVfxMountPath: + channelVfxLengthScale: 1 + channelVfxWidthScale: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_올려베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_올려베기.asset index c5672420..f2fb4fb6 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_올려베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_올려베기.asset @@ -34,5 +34,7 @@ MonoBehaviour: manaCost: 5 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_전진베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_전진베기.asset index 1e4bbf08..8866318d 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_전진베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_전진베기.asset @@ -18,7 +18,8 @@ MonoBehaviour: skillRole: 1 activationType: 1 baseTypes: 17 - animationClips: [] + animationClips: + - {fileID: 7400000, guid: e7ef39b0eacfc6940a8c7e1f20ba97e7, type: 2} animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 @@ -31,6 +32,16 @@ MonoBehaviour: manaCost: 8 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: a62b755095eb8904a9c5f72e89b18458, type: 2} - - {fileID: 11400000, guid: ed7044f0b4d4e7f479aecc4f29ce59fe, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 59b8b33b725bbaec1f0fdedb4293afba, type: 2} + isChanneling: 0 + channelDuration: 3 + channelTickInterval: 0.5 + channelTickEffects: [] + channelEndEffects: [] + channelVfxPrefab: {fileID: 0} + channelVfxMountPath: + channelVfxLengthScale: 1 + channelVfxWidthScale: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_찌르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_찌르기.asset index b8a0f78c..468132a0 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_한손_찌르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_한손_찌르기.asset @@ -34,5 +34,7 @@ MonoBehaviour: manaCost: 5 maxGemSlotCount: 2 castStartEffects: [] - effects: - - {fileID: 11400000, guid: a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4, type: 2} + triggeredEffects: + - triggerIndex: 0 + effects: + - {fileID: 11400000, guid: 7b19e612521f80e5cc0f0c87ad3aeceb, type: 2}