diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_강인함.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_강인함.asset index 21efd1e3..dd8907e9 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_강인함.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_강인함.asset @@ -18,6 +18,9 @@ MonoBehaviour: \uC82C" icon: {fileID: 0} category: 3 + allowedSkillTypes: 63 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1.05 cooldownMultiplier: 1.05 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_관통.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_관통.asset index 04f8b883..cd98d9c5 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_관통.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_관통.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uD14C\uC2A4\uD2B8\uC6A9 \uACF5\uACA9 \uC82C" icon: {fileID: 0} category: 1 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1 cooldownMultiplier: 1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_도전자.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_도전자.asset index 875afed3..29e8643e 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_도전자.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_도전자.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uC5B9\uB294 \uD14C\uC2A4\uD2B8\uC6A9 \uC82C" icon: {fileID: 0} category: 2 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1 cooldownMultiplier: 1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_수호.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_수호.asset index 7b72abba..3251a56e 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_수호.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_수호.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uC5B9\uB294 \uD14C\uC2A4\uD2B8\uC6A9 \uC82C" icon: {fileID: 0} category: 4 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1.05 cooldownMultiplier: 1.1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_약화.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_약화.asset index 5d32662e..8422b532 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_약화.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_약화.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uB514\uBC84\uD504\uB97C \uBD80\uC5EC\uD558\uB294 \uC81C\uC5B4 \uC82C" icon: {fileID: 0} category: 5 + allowedSkillTypes: 63 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1.05 cooldownMultiplier: 1.05 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_연속.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_연속.asset index 2d02723e..2d471f15 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_연속.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_연속.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uC2DC\uC804\uD558\uB294 \uD14C\uC2A4\uD2B8\uC6A9 \uC82C" icon: {fileID: 0} category: 6 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1.2 cooldownMultiplier: 1.15 castSpeedMultiplier: 1.1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_예리함.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_예리함.asset index 2c7965e9..1bb19bbb 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_예리함.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_예리함.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uD14C\uC2A4\uD2B8\uC6A9 \uACF5\uACA9 \uC82C" icon: {fileID: 0} category: 1 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1 cooldownMultiplier: 1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_충격.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_충격.asset index f371fd14..cd1e2ce8 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_충격.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_충격.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uD14C\uC2A4\uD2B8\uC6A9 \uACF5\uACA9 \uC82C" icon: {fileID: 0} category: 1 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1 cooldownMultiplier: 1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_파쇄.asset b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_파쇄.asset index a7eb0579..4368a92a 100644 --- a/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_파쇄.asset +++ b/Assets/_Game/Data/SkillGems/Data_SkillGem_Player_파쇄.asset @@ -17,6 +17,9 @@ MonoBehaviour: \uAC15\uD654\uD558\uB294 \uD14C\uC2A4\uD2B8\uC6A9 \uC82C" icon: {fileID: 0} category: 1 + allowedSkillTypes: 1 + incompatibleCategories: + incompatibleGems: [] manaCostMultiplier: 1.15 cooldownMultiplier: 1.1 castSpeedMultiplier: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_광역치유.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_광역치유.asset index 00180c6f..86a159fb 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_광역치유.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_광역치유.asset @@ -10,11 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_광역치유 + m_Name: "Data_Skill_Player_\uAD11\uC5ED\uCE58\uC720" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 광역 치유 - description: 주변 아군과 자신의 체력을 함께 회복한다. + skillName: "\uAD11\uC5ED \uCE58\uC720" + description: "\uC8FC\uBCC0 \uC544\uAD70\uACFC \uC790\uC2E0\uC758 \uCCB4\uB825\uC744 + \uD568\uAED8 \uD68C\uBCF5\uD55C\uB2E4." icon: {fileID: 0} + baseTypes: 4 skillClip: {fileID: -8689311932429934276, guid: 836c26605050496b9fd07dd456e6ea82, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,6 +28,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 16 manaCost: 30 + maxGemSlotCount: 2 castStartEffects: - {fileID: 11400000, guid: e7d0d605c1c2449ebc41f1a713670d6b, type: 2} effects: diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset index 3b05143a..bb2d2aa8 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset @@ -15,14 +15,19 @@ MonoBehaviour: skillName: "\uAD6C\uB974\uAE30" description: icon: {fileID: 21300000, guid: eafcc94eae3865944b93e64c4e281aa0, type: 3} + baseTypes: 16 skillClip: {fileID: -14460799136228694, guid: d6d51384d6dd17a419c1d8e2a1c0c875, type: 3} endClip: {fileID: 0} + animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 + jumpToTarget: 0 blockMovementWhileCasting: 1 blockJumpWhileCasting: 1 blockOtherSkillsWhileCasting: 1 cooldown: 10 manaCost: 0 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: 8b2c3d4e5f60718293a4b5c6d7e8f901, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_도발.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_도발.asset index d1c1905a..f2ba0edb 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_도발.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_도발.asset @@ -10,11 +10,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_도발 + m_Name: "Data_Skill_Player_\uB3C4\uBC1C" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 도발 - description: 주변 적의 위협 수치를 크게 높이고 짧은 시간 동안 위협 생성량을 증가시킨다. + skillName: "\uB3C4\uBC1C" + description: "\uC8FC\uBCC0 \uC801\uC758 \uC704\uD611 \uC218\uCE58\uB97C \uD06C\uAC8C + \uB192\uC774\uACE0 \uC9E7\uC740 \uC2DC\uAC04 \uB3D9\uC548 \uC704\uD611 \uC0DD\uC131\uB7C9\uC744 + \uC99D\uAC00\uC2DC\uD0A8\uB2E4." icon: {fileID: 0} + baseTypes: 40 skillClip: {fileID: -4662563244894722208, guid: de4d0153716747cd9fc90c60f5efb1ae, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,5 +29,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 8 manaCost: 10 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: f0aaa98426be3d44082a386c00ea9aea, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_돌진.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_돌진.asset index dc1fe95c..a918f3a1 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_돌진.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_돌진.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: "Data_Skill_Player_\uB3CC\uC9C4" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData skillName: "\uB3CC\uC9C4" - description: + description: icon: {fileID: 0} + baseTypes: 16 skillClip: {fileID: 0} endClip: {fileID: 0} + animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 + jumpToTarget: 0 + blockMovementWhileCasting: 1 + blockJumpWhileCasting: 1 + blockOtherSkillsWhileCasting: 1 cooldown: 3 manaCost: 15 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_방어태세.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_방어태세.asset index 738841c6..6a2e8381 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_방어태세.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_방어태세.asset @@ -10,11 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_방어태세 + m_Name: "Data_Skill_Player_\uBC29\uC5B4\uD0DC\uC138" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 방어 태세 - description: 짧은 시간 동안 받는 피해를 줄이고 위협 생성량을 높인다. + skillName: "\uBC29\uC5B4 \uD0DC\uC138" + description: "\uC9E7\uC740 \uC2DC\uAC04 \uB3D9\uC548 \uBC1B\uB294 \uD53C\uD574\uB97C + \uC904\uC774\uACE0 \uC704\uD611 \uC0DD\uC131\uB7C9\uC744 \uB192\uC778\uB2E4." icon: {fileID: 0} + baseTypes: 2 skillClip: {fileID: -592826573199220879, guid: 52e14756abda46499f4739d811043b3d, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,6 +28,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 10 manaCost: 12 + maxGemSlotCount: 2 castStartEffects: - {fileID: 11400000, guid: e7d0d605c1c2449ebc41f1a713670d6b, type: 2} effects: diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset index 7e2d4654..e3e339c7 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset @@ -15,11 +15,19 @@ MonoBehaviour: skillName: "\uBCA0\uAE30" description: icon: {fileID: 0} + baseTypes: 1 skillClip: {fileID: -7717634560727564301, guid: 0f6fd9302e489b94d96774e2713b1317, type: 3} endClip: {fileID: -8265974341663887746, guid: fbcbf9c09792c924296ac6036e76f6dc, type: 3} + animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 + jumpToTarget: 0 + blockMovementWhileCasting: 1 + blockJumpWhileCasting: 1 + blockOtherSkillsWhileCasting: 1 cooldown: 1 manaCost: 5 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: e23fca57309ab2b4faa5c380118cd07e, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_보호막.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_보호막.asset index ad834fbd..adf4559e 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_보호막.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_보호막.asset @@ -10,11 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_보호막 + m_Name: "Data_Skill_Player_\uBCF4\uD638\uB9C9" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 보호막 - description: 주변 아군과 자신에게 피해를 흡수하는 보호막을 부여한다. + skillName: "\uBCF4\uD638\uB9C9" + description: "\uC8FC\uBCC0 \uC544\uAD70\uACFC \uC790\uC2E0\uC5D0\uAC8C \uD53C\uD574\uB97C + \uD761\uC218\uD558\uB294 \uBCF4\uD638\uB9C9\uC744 \uBD80\uC5EC\uD55C\uB2E4." icon: {fileID: 0} + baseTypes: 6 skillClip: {fileID: -1185230921767219677, guid: f2d90cfa60b04630af1dde00f4d29320, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,6 +28,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 18 manaCost: 24 + maxGemSlotCount: 2 castStartEffects: - {fileID: 11400000, guid: e7d0d605c1c2449ebc41f1a713670d6b, type: 2} effects: diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_젬테스트공격.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_젬테스트공격.asset index 7f6a196e..6971df50 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_젬테스트공격.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_젬테스트공격.asset @@ -16,6 +16,7 @@ MonoBehaviour: description: "\uB2E4\uC911 \uC82C \uD6A8\uACFC \uAC80\uC99D\uC6A9 \uBE60\uB978 \uB2E8\uC77C \uACF5\uACA9" icon: {fileID: 0} + baseTypes: 1 skillClip: {fileID: -8689311932429934276, guid: ac0adc4c7f982fe4d82eac9c2267f0c6, type: 3} endClip: {fileID: 0} animationSpeed: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_찌르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_찌르기.asset index b20c9f0e..f0934498 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_찌르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_찌르기.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: "Data_Skill_Player_\uCC0C\uB974\uAE30" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData skillName: "\uCC0C\uB974\uAE30" - description: + description: icon: {fileID: 0} + baseTypes: 1 skillClip: {fileID: -8689311932429934276, guid: ac0adc4c7f982fe4d82eac9c2267f0c6, type: 3} endClip: {fileID: 0} + animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 + jumpToTarget: 0 + blockMovementWhileCasting: 1 + blockJumpWhileCasting: 1 + blockOtherSkillsWhileCasting: 1 cooldown: 1 manaCost: 5 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_철벽.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_철벽.asset index 9f930bf6..efb88303 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_철벽.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_철벽.asset @@ -10,11 +10,13 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_철벽 + m_Name: "Data_Skill_Player_\uCCA0\uBCBD" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 철벽 - description: 짧은 시간 동안 무적이 되며 위협 생성량이 약간 증가한다. + skillName: "\uCCA0\uBCBD" + description: "\uC9E7\uC740 \uC2DC\uAC04 \uB3D9\uC548 \uBB34\uC801\uC774 \uB418\uBA70 + \uC704\uD611 \uC0DD\uC131\uB7C9\uC774 \uC57D\uAC04 \uC99D\uAC00\uD55C\uB2E4." icon: {fileID: 0} + baseTypes: 6 skillClip: {fileID: -7313196749698736815, guid: 95764ba490b24918b73fc1553e34dc1e, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,6 +28,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 18 manaCost: 20 + maxGemSlotCount: 2 castStartEffects: - {fileID: 11400000, guid: e7d0d605c1c2449ebc41f1a713670d6b, type: 2} effects: diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_치유.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_치유.asset index 522b4a3f..ba467c0f 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_치유.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_치유.asset @@ -10,11 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 94f0a76cebcac2f4fb5daf1b675fd79f, type: 3} - m_Name: Data_Skill_Player_치유 + m_Name: "Data_Skill_Player_\uCE58\uC720" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData - skillName: 치유 - description: 자신의 체력을 빠르게 회복한다. + skillName: "\uCE58\uC720" + description: "\uC790\uC2E0\uC758 \uCCB4\uB825\uC744 \uBE60\uB974\uAC8C \uD68C\uBCF5\uD55C\uB2E4." icon: {fileID: 0} + baseTypes: 4 skillClip: {fileID: -8689311932429934276, guid: 4450ee0d92144ade9f63dd601432d3bf, type: 3} endClip: {fileID: 0} animationSpeed: 1 @@ -26,6 +27,7 @@ MonoBehaviour: blockOtherSkillsWhileCasting: 1 cooldown: 8 manaCost: 18 + maxGemSlotCount: 2 castStartEffects: - {fileID: 11400000, guid: e7d0d605c1c2449ebc41f1a713670d6b, type: 2} effects: diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_투사체.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_투사체.asset index 67cf431b..c7b63ff9 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_투사체.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_투사체.asset @@ -16,11 +16,19 @@ MonoBehaviour: description: "\uD22C\uC0AC\uCCB4\uB97C \uBC1C\uC0AC\uD569\uB2C8\uB2E4. \uBA85\uC911 \uC2DC \uC6D0\uAC70\uB9AC \uB300\uBBF8\uC9C0\uB97C \uC785\uD799\uB2C8\uB2E4." icon: {fileID: 0} + baseTypes: 1 skillClip: {fileID: -8689311932429934276, guid: ac0adc4c7f982fe4d82eac9c2267f0c6, type: 3} endClip: {fileID: 0} + animationSpeed: 1 useRootMotion: 1 ignoreRootMotionY: 1 + jumpToTarget: 0 + blockMovementWhileCasting: 1 + blockJumpWhileCasting: 1 + blockOtherSkillsWhileCasting: 1 cooldown: 1.5 manaCost: 10 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: fa684d4a7ce68d54aa4ce101f9400c35, type: 2} diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_회전베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_회전베기.asset index 4137dbd3..e0e0f34a 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_회전베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_회전베기.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: "Data_Skill_Player_\uD68C\uC804\uBCA0\uAE30" m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData skillName: "\uD68C\uC804\uBCA0\uAE30" - description: + description: icon: {fileID: 0} + baseTypes: 1 skillClip: {fileID: 0} endClip: {fileID: 0} + animationSpeed: 1 useRootMotion: 0 ignoreRootMotionY: 1 + jumpToTarget: 0 + blockMovementWhileCasting: 1 + blockJumpWhileCasting: 1 + blockOtherSkillsWhileCasting: 1 cooldown: 2 manaCost: 10 + maxGemSlotCount: 2 + castStartEffects: [] effects: - {fileID: 11400000, guid: c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6, type: 2} diff --git a/Assets/_Game/Scripts/Editor/PlayerSkillDebugMenu.cs b/Assets/_Game/Scripts/Editor/PlayerSkillDebugMenu.cs index 31474c0d..e5cd0458 100644 --- a/Assets/_Game/Scripts/Editor/PlayerSkillDebugMenu.cs +++ b/Assets/_Game/Scripts/Editor/PlayerSkillDebugMenu.cs @@ -624,7 +624,8 @@ namespace Colosseum.Editor 1f, 1f, 0, - damageEffect); + damageEffect, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( ChallengerGemPath, @@ -639,7 +640,8 @@ namespace Colosseum.Editor 1f, 1.5f, 0, - tauntEffect); + tauntEffect, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( GuardianGemPath, @@ -654,7 +656,8 @@ namespace Colosseum.Editor 1.5f, 1f, 0, - shieldEffect); + shieldEffect, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( RepeatGemPath, @@ -669,7 +672,8 @@ namespace Colosseum.Editor 1f, 1f, 1, - null); + null, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( FortitudeGemPath, @@ -718,7 +722,8 @@ namespace Colosseum.Editor 1f, 1f, 0, - edgeDamageEffect); + edgeDamageEffect, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( ImpactGemPath, @@ -733,7 +738,8 @@ namespace Colosseum.Editor 1f, 1f, 0, - impactDamageEffect); + impactDamageEffect, + allowedSkillTypes: SkillBaseType.Attack); CreateOrUpdateGemAsset( BreachGemPath, @@ -748,7 +754,8 @@ namespace Colosseum.Editor 1f, 1f, 0, - breachDamageEffect); + breachDamageEffect, + allowedSkillTypes: SkillBaseType.Attack); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); @@ -786,6 +793,20 @@ namespace Colosseum.Editor SkillGemData impactGem = AssetDatabase.LoadAssetAtPath(ImpactGemPath); SkillGemData breachGem = AssetDatabase.LoadAssetAtPath(BreachGemPath); + SetSkillBaseTypes(slashSkill, SkillBaseType.Attack); + SetSkillBaseTypes(tauntSkill, SkillBaseType.Control | SkillBaseType.Utility); + SetSkillBaseTypes(guardSkill, SkillBaseType.Defense); + SetSkillBaseTypes(dashSkill, SkillBaseType.Mobility); + SetSkillBaseTypes(ironWallSkill, SkillBaseType.Defense | SkillBaseType.Support); + SetSkillBaseTypes(pierceSkill, SkillBaseType.Attack); + SetSkillBaseTypes(gemTestSkill, SkillBaseType.Attack); + SetSkillBaseTypes(healSkill, SkillBaseType.Support); + SetSkillBaseTypes(areaHealSkill, SkillBaseType.Support); + SetSkillBaseTypes(shieldSkill, SkillBaseType.Defense | SkillBaseType.Support); + SetSkillBaseTypes(projectileSkill, SkillBaseType.Attack); + SetSkillBaseTypes(spinSkill, SkillBaseType.Attack); + SetSkillBaseTypes(evadeSkill, SkillBaseType.Mobility); + EnsureGemTestSkillSlotCount(gemTestSkill, 3); CreateOrUpdatePresetAsset( @@ -1314,7 +1335,10 @@ namespace Colosseum.Editor SkillEffect triggeredEffect, AbnormalityData[] selfAbnormalities = null, int triggeredAbnormalityIndex = -1, - AbnormalityData[] onHitAbnormalities = null) + AbnormalityData[] onHitAbnormalities = null, + SkillBaseType allowedSkillTypes = SkillBaseType.All, + SkillGemCategory[] incompatibleCategories = null, + SkillGemData[] incompatibleGems = null) { SkillGemData gem = AssetDatabase.LoadAssetAtPath(assetPath); if (gem == null) @@ -1340,6 +1364,21 @@ namespace Colosseum.Editor serializedGem.FindProperty("shieldMultiplier").floatValue = shieldMultiplier; serializedGem.FindProperty("threatMultiplier").floatValue = threatMultiplier; serializedGem.FindProperty("additionalRepeatCount").intValue = additionalRepeatCount; + serializedGem.FindProperty("allowedSkillTypes").intValue = (int)allowedSkillTypes; + + SerializedProperty incompatibleCategoriesProperty = serializedGem.FindProperty("incompatibleCategories"); + incompatibleCategoriesProperty.arraySize = incompatibleCategories != null ? incompatibleCategories.Length : 0; + for (int i = 0; i < incompatibleCategoriesProperty.arraySize; i++) + { + incompatibleCategoriesProperty.GetArrayElementAtIndex(i).enumValueIndex = (int)incompatibleCategories[i]; + } + + SerializedProperty incompatibleGemsProperty = serializedGem.FindProperty("incompatibleGems"); + incompatibleGemsProperty.arraySize = incompatibleGems != null ? incompatibleGems.Length : 0; + for (int i = 0; i < incompatibleGemsProperty.arraySize; i++) + { + incompatibleGemsProperty.GetArrayElementAtIndex(i).objectReferenceValue = incompatibleGems[i]; + } SerializedProperty castStartEffectsProperty = serializedGem.FindProperty("castStartEffects"); castStartEffectsProperty.arraySize = 0; @@ -1385,6 +1424,21 @@ namespace Colosseum.Editor EditorUtility.SetDirty(gem); } + private static void SetSkillBaseTypes(SkillData skill, SkillBaseType baseTypes) + { + if (skill == null) + return; + + SerializedObject serializedSkill = new SerializedObject(skill); + SerializedProperty baseTypesProperty = serializedSkill.FindProperty("baseTypes"); + if (baseTypesProperty == null || baseTypesProperty.intValue == (int)baseTypes) + return; + + baseTypesProperty.intValue = (int)baseTypes; + serializedSkill.ApplyModifiedPropertiesWithoutUndo(); + EditorUtility.SetDirty(skill); + } + private static DamageEffect CreateOrUpdateDamageEffectAsset(string assetPath, float baseDamage) { DamageEffect effect = AssetDatabase.LoadAssetAtPath(assetPath); diff --git a/Assets/_Game/Scripts/Player/PlayerSkillInput.cs b/Assets/_Game/Scripts/Player/PlayerSkillInput.cs index f9073608..50752d82 100644 --- a/Assets/_Game/Scripts/Player/PlayerSkillInput.cs +++ b/Assets/_Game/Scripts/Player/PlayerSkillInput.cs @@ -432,6 +432,7 @@ namespace Colosseum.Player skillLoadoutEntries[slotIndex] = loadoutEntry != null ? loadoutEntry.CreateCopy() : new SkillLoadoutEntry(); skillLoadoutEntries[slotIndex].EnsureGemSlotCapacity(); + skillLoadoutEntries[slotIndex].SanitizeInvalidGems(true); skillSlots[slotIndex] = skillLoadoutEntries[slotIndex].BaseSkill; OnSkillSlotsChanged?.Invoke(); } @@ -468,6 +469,7 @@ namespace Colosseum.Player { skillLoadoutEntries[i] = loadouts[i] != null ? loadouts[i].CreateCopy() : new SkillLoadoutEntry(); skillLoadoutEntries[i].EnsureGemSlotCapacity(); + skillLoadoutEntries[i].SanitizeInvalidGems(true); skillSlots[i] = skillLoadoutEntries[i].BaseSkill; } diff --git a/Assets/_Game/Scripts/Skills/SkillData.cs b/Assets/_Game/Scripts/Skills/SkillData.cs index 0d23a58a..b3873196 100644 --- a/Assets/_Game/Scripts/Skills/SkillData.cs +++ b/Assets/_Game/Scripts/Skills/SkillData.cs @@ -5,6 +5,23 @@ using UnityEngine; namespace Colosseum.Skills { + /// + /// 젬 장착 조건에서 사용하는 기반 스킬 분류입니다. + /// 하나의 스킬이 여러 분류를 동시에 가질 수 있습니다. + /// + [Flags] + public enum SkillBaseType + { + None = 0, + Attack = 1 << 0, + Defense = 1 << 1, + Support = 1 << 2, + Control = 1 << 3, + Mobility = 1 << 4, + Utility = 1 << 5, + All = Attack | Defense | Support | Control | Mobility | Utility, + } + /// /// 스킬 데이터. 스킬의 기본 정보와 효과 목록을 관리합니다. /// @@ -17,6 +34,10 @@ namespace Colosseum.Skills [SerializeField] private string description; [SerializeField] private Sprite icon; + [Header("기반 스킬 분류")] + [Tooltip("젬 장착 가능 조건에 사용하는 기반 스킬 분류")] + [SerializeField] private SkillBaseType baseTypes = SkillBaseType.None; + [Header("애니메이션")] [Tooltip("기본 Animator Controller의 'Skill' 상태에 덮어씌워질 클립")] [SerializeField] private AnimationClip skillClip; @@ -61,6 +82,7 @@ namespace Colosseum.Skills public string SkillName => skillName; public string Description => description; public Sprite Icon => icon; + public SkillBaseType BaseTypes => baseTypes; public AnimationClip SkillClip => skillClip; public AnimationClip EndClip => endClip; public float AnimationSpeed => animationSpeed; diff --git a/Assets/_Game/Scripts/Skills/SkillGemData.cs b/Assets/_Game/Scripts/Skills/SkillGemData.cs index 6b879404..c41f52e2 100644 --- a/Assets/_Game/Scripts/Skills/SkillGemData.cs +++ b/Assets/_Game/Scripts/Skills/SkillGemData.cs @@ -65,6 +65,14 @@ namespace Colosseum.Skills [Tooltip("젬의 주 역할 분류")] [SerializeField] private SkillGemCategory category = SkillGemCategory.Common; + [Header("장착 제약")] + [Tooltip("장착 가능한 기반 스킬 분류입니다. None 또는 All이면 제한하지 않습니다.")] + [SerializeField] private SkillBaseType allowedSkillTypes = SkillBaseType.All; + [Tooltip("함께 장착할 수 없는 젬 분류")] + [SerializeField] private SkillGemCategory[] incompatibleCategories = Array.Empty(); + [Tooltip("함께 장착할 수 없는 특정 젬")] + [SerializeField] private List incompatibleGems = new(); + [Header("기본 수치 보정")] [Tooltip("장착 시 마나 비용 배율")] [Min(0f)] [SerializeField] private float manaCostMultiplier = 1f; @@ -99,6 +107,7 @@ namespace Colosseum.Skills public string Description => description; public Sprite Icon => icon; public SkillGemCategory Category => category; + public SkillBaseType AllowedSkillTypes => allowedSkillTypes; public float ManaCostMultiplier => manaCostMultiplier; public float CooldownMultiplier => cooldownMultiplier; public float CastSpeedMultiplier => castSpeedMultiplier; @@ -107,9 +116,59 @@ namespace Colosseum.Skills public float ShieldMultiplier => shieldMultiplier; public float ThreatMultiplier => threatMultiplier; public int AdditionalRepeatCount => additionalRepeatCount; + public IReadOnlyList IncompatibleCategories => incompatibleCategories; + public IReadOnlyList IncompatibleGems => incompatibleGems; public IReadOnlyList CastStartEffects => castStartEffects; public IReadOnlyList TriggeredEffects => triggeredEffects; public IReadOnlyList SelfAbnormalities => selfAbnormalities; public IReadOnlyList OnHitAbnormalities => onHitAbnormalities; + + /// + /// 지정한 기반 스킬에 이 젬을 장착할 수 있는지 확인합니다. + /// + public bool CanAttachToSkill(SkillData skill) + { + if (skill == null) + return false; + + if (allowedSkillTypes == SkillBaseType.None || allowedSkillTypes == SkillBaseType.All) + return true; + + return (allowedSkillTypes & skill.BaseTypes) != 0; + } + + /// + /// 지정한 젬 분류와 상호 배타적인지 확인합니다. + /// + public bool IsCategoryIncompatible(SkillGemCategory otherCategory) + { + if (incompatibleCategories == null || incompatibleCategories.Length == 0) + return false; + + for (int i = 0; i < incompatibleCategories.Length; i++) + { + if (incompatibleCategories[i] == otherCategory) + return true; + } + + return false; + } + + /// + /// 지정한 젬과 상호 배타적인지 확인합니다. + /// + public bool IsGemIncompatible(SkillGemData other) + { + if (other == null || incompatibleGems == null || incompatibleGems.Count == 0) + return false; + + for (int i = 0; i < incompatibleGems.Count; i++) + { + if (incompatibleGems[i] == other) + return true; + } + + return false; + } } } diff --git a/Assets/_Game/Scripts/Skills/SkillLoadoutEntry.cs b/Assets/_Game/Scripts/Skills/SkillLoadoutEntry.cs index 00f232b9..4cfff9e3 100644 --- a/Assets/_Game/Scripts/Skills/SkillLoadoutEntry.cs +++ b/Assets/_Game/Scripts/Skills/SkillLoadoutEntry.cs @@ -44,6 +44,7 @@ namespace Colosseum.Skills } } + copy.SanitizeInvalidGems(); return copy; } @@ -56,7 +57,10 @@ namespace Colosseum.Skills slotCount = Mathf.Max(0, slotCount); if (socketedGems != null && socketedGems.Length == slotCount) + { + SanitizeInvalidGems(); return; + } SkillGemData[] resized = new SkillGemData[slotCount]; if (socketedGems != null) @@ -69,21 +73,23 @@ namespace Colosseum.Skills } socketedGems = resized; + SanitizeInvalidGems(); } public void SetBaseSkill(SkillData skill) { baseSkill = skill; EnsureGemSlotCapacity(); + SanitizeInvalidGems(); } public void SetGem(int slotIndex, SkillGemData gem) { - EnsureGemSlotCapacity(); - if (slotIndex < 0 || slotIndex >= socketedGems.Length) - return; - - socketedGems[slotIndex] = gem; + if (!TrySetGem(slotIndex, gem, out string reason) && gem != null) + { + string skillName = baseSkill != null ? baseSkill.SkillName : "(없음)"; + Debug.LogWarning($"[SkillLoadout] 젬 장착 실패 | Skill={skillName} | Slot={slotIndex} | Gem={gem.GemName} | Reason={reason}"); + } } public SkillGemData GetGem(int slotIndex) @@ -95,6 +101,64 @@ namespace Colosseum.Skills return socketedGems[slotIndex]; } + /// + /// 지정한 슬롯에 젬을 장착 시도하고, 실패 이유를 반환합니다. + /// + public bool TrySetGem(int slotIndex, SkillGemData gem, out string reason) + { + reason = string.Empty; + EnsureGemSlotCapacity(); + + if (slotIndex < 0 || slotIndex >= socketedGems.Length) + { + reason = "유효하지 않은 젬 슬롯입니다."; + return false; + } + + if (gem == null) + { + socketedGems[slotIndex] = null; + return true; + } + + if (!TryValidateGemForSlot(slotIndex, gem, null, out reason)) + return false; + + socketedGems[slotIndex] = gem; + return true; + } + + /// + /// 현재 로드아웃의 잘못된 젬 조합을 제거합니다. + /// + public void SanitizeInvalidGems(bool logWarnings = false) + { + if (socketedGems == null || socketedGems.Length == 0) + return; + + List acceptedGems = new List(socketedGems.Length); + for (int i = 0; i < socketedGems.Length; i++) + { + SkillGemData gem = socketedGems[i]; + if (gem == null) + continue; + + if (TryValidateGemForSlot(i, gem, acceptedGems, out string reason)) + { + acceptedGems.Add(gem); + continue; + } + + if (logWarnings) + { + string skillName = baseSkill != null ? baseSkill.SkillName : "(없음)"; + Debug.LogWarning($"[SkillLoadout] 젬 장착 제약으로 제거됨 | Skill={skillName} | Slot={i} | Gem={gem.GemName} | Reason={reason}"); + } + + socketedGems[i] = null; + } + } + public float GetResolvedManaCost() { if (baseSkill == null) @@ -347,6 +411,78 @@ namespace Colosseum.Skills abnormalityList.Add(abnormality); } + private bool TryValidateGemForSlot(int slotIndex, SkillGemData gem, IReadOnlyList acceptedGems, out string reason) + { + reason = string.Empty; + if (gem == null) + return true; + + if (baseSkill == null) + { + reason = "기반 스킬이 없는 슬롯에는 젬을 장착할 수 없습니다."; + return false; + } + + if (!gem.CanAttachToSkill(baseSkill)) + { + reason = $"기반 스킬 분류 제약을 만족하지 않습니다. Skill={baseSkill.BaseTypes}, Allowed={gem.AllowedSkillTypes}"; + return false; + } + + if (acceptedGems != null) + { + for (int i = 0; i < acceptedGems.Count; i++) + { + if (!TryValidateGemPair(gem, acceptedGems[i], out reason)) + return false; + } + + return true; + } + + for (int i = 0; i < socketedGems.Length; i++) + { + if (i == slotIndex) + continue; + + SkillGemData otherGem = socketedGems[i]; + if (otherGem == null) + continue; + + if (!TryValidateGemPair(gem, otherGem, out reason)) + return false; + } + + return true; + } + + private static bool TryValidateGemPair(SkillGemData gem, SkillGemData otherGem, out string reason) + { + reason = string.Empty; + if (gem == null || otherGem == null) + return true; + + if (gem == otherGem) + { + reason = "동일한 젬은 하나의 스킬에 여러 개 장착할 수 없습니다."; + return false; + } + + if (gem.IsGemIncompatible(otherGem) || otherGem.IsGemIncompatible(gem)) + { + reason = $"{gem.GemName}과 {otherGem.GemName}은 함께 장착할 수 없습니다."; + return false; + } + + if (gem.IsCategoryIncompatible(otherGem.Category) || otherGem.IsCategoryIncompatible(gem.Category)) + { + reason = $"{gem.Category} / {otherGem.Category} 분류 조합은 허용되지 않습니다."; + return false; + } + + return true; + } + private float GetResolvedScalarMultiplier(System.Func selector) { if (baseSkill == null)