From 5ca0fdabf7c9cf1bf403a9d5ed9bb34bfe44ba16 Mon Sep 17 00:00:00 2001 From: dal4segno Date: Tue, 17 Mar 2026 10:43:49 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B8=B4=EA=B8=89=ED=9A=8C=ED=94=BC=20?= =?UTF-8?q?=EC=8A=A4=ED=82=AC=20=EC=8A=AC=EB=A1=AF=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B2=80=20=EB=AA=A8=EB=8D=B8=20prefab=20=EA=B5=90?= =?UTF-8?q?=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Left Ctrl에 Evade 액션 바인딩 추가 (InputSystem_Actions) - PlayerSkillInput skillSlots 6→7개로 확장, 슬롯 6에 Evade 연결 - Prefab_Player_Default 긴급회피 스킬 슬롯 할당 - 검 무기 모델 fbx → prefab으로 교체 - 구르기 스킬 아이콘, 베기 스킬 이펙트 데이터 수정 Co-Authored-By: Claude Sonnet 4.6 --- .../Skills/Data_Skill_Player_구르기.asset | 2 +- .../Data/Skills/Data_Skill_Player_베기.asset | 2 - .../_Game/Data/Weapons/Data_Weapon_검.asset | 2 +- Assets/_Game/Models/Model_Weapon_검.fbx | Bin 27472 -> 0 bytes Assets/_Game/Models/Model_Weapon_검.fbx.meta | 83 ------------------ Assets/_Game/Models/Model_Weapon_검.prefab | 81 +++++++++++++++++ .../_Game/Models/Model_Weapon_검.prefab.meta | 9 ++ .../Player/Prefab_Player_Default.prefab | 9 +- Assets/_Game/Scripts/InputSystem_Actions.cs | 43 ++++++++- .../Scripts/InputSystem_Actions.inputactions | 20 +++++ .../_Game/Scripts/Player/PlayerSkillInput.cs | 6 +- 11 files changed, 162 insertions(+), 95 deletions(-) delete mode 100644 Assets/_Game/Models/Model_Weapon_검.fbx delete mode 100644 Assets/_Game/Models/Model_Weapon_검.fbx.meta create mode 100644 Assets/_Game/Models/Model_Weapon_검.prefab create mode 100644 Assets/_Game/Models/Model_Weapon_검.prefab.meta diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset index 315a0784..bd268336 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_구르기.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: Colosseum.Game::Colosseum.Skills.SkillData skillName: "\uAD6C\uB974\uAE30" description: - icon: {fileID: 21300000, guid: 2b3889a2bb9beb444adf6734821e1c02, type: 3} + icon: {fileID: 21300000, guid: eafcc94eae3865944b93e64c4e281aa0, type: 3} skillClip: {fileID: -14460799136228694, guid: d6d51384d6dd17a419c1d8e2a1c0c875, type: 3} endClip: {fileID: 0} useRootMotion: 1 diff --git a/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset b/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset index 5649e451..7e2d4654 100644 --- a/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset +++ b/Assets/_Game/Data/Skills/Data_Skill_Player_베기.asset @@ -23,5 +23,3 @@ MonoBehaviour: manaCost: 5 effects: - {fileID: 11400000, guid: e23fca57309ab2b4faa5c380118cd07e, type: 2} - - {fileID: 11400000, guid: 75bac55a016a0da46899806f58b76ce3, type: 2} - - {fileID: 11400000, guid: 0e496b26a1dbf40488ce54cb4fe9c27b, type: 2} diff --git a/Assets/_Game/Data/Weapons/Data_Weapon_검.asset b/Assets/_Game/Data/Weapons/Data_Weapon_검.asset index ca6b16ea..5accc40c 100644 --- a/Assets/_Game/Data/Weapons/Data_Weapon_검.asset +++ b/Assets/_Game/Data/Weapons/Data_Weapon_검.asset @@ -16,7 +16,7 @@ MonoBehaviour: description: icon: {fileID: 21300000, guid: 70e07ab1b9f326b4bae30fe839d609ea, type: 3} weaponSlot: 0 - weaponPrefab: {fileID: 1631607032641582, guid: 92cfe4029ea2b754caa0b3f00d52d41a, type: 3} + weaponPrefab: {fileID: 1631607032641582, guid: 888f3d986f4ea1a4491c1ffca7e660c9, type: 3} positionOffset: {x: 0, y: 0, z: 0} rotationOffset: {x: 0, y: 0, z: 0} scale: {x: 1, y: 1, z: 1} diff --git a/Assets/_Game/Models/Model_Weapon_검.fbx b/Assets/_Game/Models/Model_Weapon_검.fbx deleted file mode 100644 index bf3bdc13416038d01bc44c683b1e677c68dfdc3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27472 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 cp#M+m|5f<0_2{mWmiK // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator // version 1.18.0 -// from Assets/Scripts/InputSystem_Actions.inputactions +// from Assets/_Game/Scripts/InputSystem_Actions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -16,7 +16,7 @@ using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; /// -/// Provides programmatic access to , , and instances defined in asset "Assets/Scripts/InputSystem_Actions.inputactions". +/// Provides programmatic access to , , and instances defined in asset "Assets/_Game/Scripts/InputSystem_Actions.inputactions". /// /// /// This class is source generated and any manual edits will be discarded if the associated asset is reimported or modified. @@ -208,6 +208,15 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Evade"", + ""type"": ""Button"", + ""id"": ""e9ae2f2b-7ce7-4104-9394-f2f3f599e595"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -573,6 +582,17 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable ""action"": ""Skill 6"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""f0f459a5-504a-425c-ae51-c6353269c277"", + ""path"": ""/ctrl"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Evade"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -1171,6 +1191,7 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable m_Player_Skill4 = m_Player.FindAction("Skill 4", throwIfNotFound: true); m_Player_Skill5 = m_Player.FindAction("Skill 5", throwIfNotFound: true); m_Player_Skill6 = m_Player.FindAction("Skill 6", throwIfNotFound: true); + m_Player_Evade = m_Player.FindAction("Evade", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); @@ -1277,6 +1298,7 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable private readonly InputAction m_Player_Skill4; private readonly InputAction m_Player_Skill5; private readonly InputAction m_Player_Skill6; + private readonly InputAction m_Player_Evade; /// /// Provides access to input actions defined in input action map "Player". /// @@ -1341,6 +1363,10 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable /// public InputAction @Skill6 => m_Wrapper.m_Player_Skill6; /// + /// Provides access to the underlying input action "Player/Evade". + /// + public InputAction @Evade => m_Wrapper.m_Player_Evade; + /// /// Provides access to the underlying input action map instance. /// public InputActionMap Get() { return m_Wrapper.m_Player; } @@ -1405,6 +1431,9 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable @Skill6.started += instance.OnSkill6; @Skill6.performed += instance.OnSkill6; @Skill6.canceled += instance.OnSkill6; + @Evade.started += instance.OnEvade; + @Evade.performed += instance.OnEvade; + @Evade.canceled += instance.OnEvade; } /// @@ -1455,6 +1484,9 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable @Skill6.started -= instance.OnSkill6; @Skill6.performed -= instance.OnSkill6; @Skill6.canceled -= instance.OnSkill6; + @Evade.started -= instance.OnEvade; + @Evade.performed -= instance.OnEvade; + @Evade.canceled -= instance.OnEvade; } /// @@ -1846,6 +1878,13 @@ public partial class @InputSystem_Actions: IInputActionCollection2, IDisposable /// /// void OnSkill6(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Evade" is either , or . + /// + /// + /// + /// + void OnEvade(InputAction.CallbackContext context); } /// /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "UI" which allows adding and removing callbacks. diff --git a/Assets/_Game/Scripts/InputSystem_Actions.inputactions b/Assets/_Game/Scripts/InputSystem_Actions.inputactions index 0a289394..48d62b41 100644 --- a/Assets/_Game/Scripts/InputSystem_Actions.inputactions +++ b/Assets/_Game/Scripts/InputSystem_Actions.inputactions @@ -122,6 +122,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Evade", + "type": "Button", + "id": "e9ae2f2b-7ce7-4104-9394-f2f3f599e595", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -487,6 +496,17 @@ "action": "Skill 6", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "f0f459a5-504a-425c-ae51-c6353269c277", + "path": "/ctrl", + "interactions": "", + "processors": "", + "groups": "", + "action": "Evade", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/_Game/Scripts/Player/PlayerSkillInput.cs b/Assets/_Game/Scripts/Player/PlayerSkillInput.cs index d5574d30..f44bc44f 100644 --- a/Assets/_Game/Scripts/Player/PlayerSkillInput.cs +++ b/Assets/_Game/Scripts/Player/PlayerSkillInput.cs @@ -14,8 +14,8 @@ namespace Colosseum.Player public class PlayerSkillInput : NetworkBehaviour { [Header("Skill Slots")] - [Tooltip("각 슬롯에 등록할 스킬 데이터 (6개)")] - [SerializeField] private SkillData[] skillSlots = new SkillData[6]; + [Tooltip("각 슬롯에 등록할 스킬 데이터 (6개 + 긴급회피)")] + [SerializeField] private SkillData[] skillSlots = new SkillData[7]; [Header("References")] [Tooltip("SkillController (없으면 자동 검색)")] @@ -76,6 +76,7 @@ namespace Colosseum.Player inputActions.Player.Skill4.performed += _ => OnSkillInput(3); inputActions.Player.Skill5.performed += _ => OnSkillInput(4); inputActions.Player.Skill6.performed += _ => OnSkillInput(5); + inputActions.Player.Evade.performed += _ => OnSkillInput(6); } public override void OnNetworkDespawn() @@ -88,6 +89,7 @@ namespace Colosseum.Player inputActions.Player.Skill4.performed -= _ => OnSkillInput(3); inputActions.Player.Skill5.performed -= _ => OnSkillInput(4); inputActions.Player.Skill6.performed -= _ => OnSkillInput(5); + inputActions.Player.Evade.performed -= _ => OnSkillInput(6); inputActions.Disable(); } }