diff --git a/Assets/02_Scripts/Editor/RedCharacterSetup.cs b/Assets/02_Scripts/Editor/RedCharacterSetup.cs index 0edda7a..747053a 100644 --- a/Assets/02_Scripts/Editor/RedCharacterSetup.cs +++ b/Assets/02_Scripts/Editor/RedCharacterSetup.cs @@ -230,14 +230,25 @@ private static AnimatorController BuildController(Dictionary clips["Idle_" + d]); - AnimatorState move = AddDirectionalState(controller, "Move", Dirs8, d => clips["Move_" + d]); - AnimatorState roll = AddDirectionalState(controller, "Roll", Dirs8, d => clips["Roll_" + d]); - AnimatorState slash = AddDirectionalState(controller, "Slash", Dirs4, d => clips["Slash_" + d]); + AnimatorState idle = AddDirectionalState(controller, "Idle", Dirs8, d => clips["Idle_" + d], "MoveX", "MoveY"); + AnimatorState move = AddDirectionalState(controller, "Move", Dirs8, d => clips["Move_" + d], "MoveX", "MoveY"); + AnimatorState roll = AddDirectionalState(controller, "Roll", Dirs8, d => clips["Roll_" + d], "MoveX", "MoveY"); + AnimatorState slash = AddDirectionalState(controller, "Slash", Dirs4, d => clips["Slash_" + d], "AttackX", "AttackY"); AnimatorStateMachine stateMachine = controller.layers[0].stateMachine; stateMachine.defaultState = idle; @@ -316,14 +327,15 @@ private static void ClearController(AnimatorController controller) /// 8방향(혹은 4방향) 클립을 2D 블렌드 트리 하나로 묶은 스테이트를 만든다. private static AnimatorState AddDirectionalState(AnimatorController controller, string name, - string[] dirs, Func pick) + string[] dirs, Func pick, + string paramX, string paramY) { AnimatorState state = controller.CreateBlendTreeInController(name, out BlendTree tree, 0); tree.name = name; tree.blendType = BlendTreeType.SimpleDirectional2D; - tree.blendParameter = "MoveX"; - tree.blendParameterY = "MoveY"; + tree.blendParameter = paramX; + tree.blendParameterY = paramY; foreach (string dir in dirs) { diff --git a/Assets/02_Scripts/GameInput.cs b/Assets/02_Scripts/GameInput.cs index 519df3c..237c442 100644 --- a/Assets/02_Scripts/GameInput.cs +++ b/Assets/02_Scripts/GameInput.cs @@ -101,6 +101,16 @@ public @GameInput() ""interactions"": """", ""initialStateCheck"": true, ""priority"": 0 + }, + { + ""name"": ""Attack"", + ""type"": ""Button"", + ""id"": ""bf2fbb7b-fd81-4ec4-824d-26ff5ce88e66"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false, + ""priority"": 0 } ], ""bindings"": [ @@ -158,6 +168,17 @@ public @GameInput() ""action"": ""Move"", ""isComposite"": false, ""isPartOfComposite"": true + }, + { + ""name"": """", + ""id"": ""7f4c479d-7d04-4598-9df4-cec2ca3408bf"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Attack"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -167,6 +188,7 @@ public @GameInput() // Character m_Character = asset.FindActionMap("Character", throwIfNotFound: true); m_Character_Move = m_Character.FindAction("Move", throwIfNotFound: true); + m_Character_Attack = m_Character.FindAction("Attack", throwIfNotFound: true); } ~@GameInput() @@ -248,6 +270,7 @@ public int FindBinding(InputBinding bindingMask, out InputAction action) private readonly InputActionMap m_Character; private List m_CharacterActionsCallbackInterfaces = new List(); private readonly InputAction m_Character_Move; + private readonly InputAction m_Character_Attack; /// /// Provides access to input actions defined in input action map "Character". /// @@ -264,6 +287,10 @@ public struct CharacterActions /// public InputAction @Move => m_Wrapper.m_Character_Move; /// + /// Provides access to the underlying input action "Character/Attack". + /// + public InputAction @Attack => m_Wrapper.m_Character_Attack; + /// /// Provides access to the underlying input action map instance. /// public InputActionMap Get() { return m_Wrapper.m_Character; } @@ -292,6 +319,9 @@ public void AddCallbacks(ICharacterActions instance) @Move.started += instance.OnMove; @Move.performed += instance.OnMove; @Move.canceled += instance.OnMove; + @Attack.started += instance.OnAttack; + @Attack.performed += instance.OnAttack; + @Attack.canceled += instance.OnAttack; } /// @@ -306,6 +336,9 @@ private void UnregisterCallbacks(ICharacterActions instance) @Move.started -= instance.OnMove; @Move.performed -= instance.OnMove; @Move.canceled -= instance.OnMove; + @Attack.started -= instance.OnAttack; + @Attack.performed -= instance.OnAttack; + @Attack.canceled -= instance.OnAttack; } /// @@ -353,5 +386,12 @@ public interface ICharacterActions /// /// void OnMove(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Attack" is either , or . + /// + /// + /// + /// + void OnAttack(InputAction.CallbackContext context); } } diff --git a/Assets/02_Scripts/GameInput.cs.meta b/Assets/02_Scripts/GameInput.cs.meta index 208bc87..0a475f9 100644 --- a/Assets/02_Scripts/GameInput.cs.meta +++ b/Assets/02_Scripts/GameInput.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: b37768cc3bc80a445892592cfe1807a9 \ No newline at end of file +guid: dacd04d022fdbea4f8089c07c8a9ba2a \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/InputManager.cs b/Assets/02_Scripts/Managers/InputManager.cs index 2afcccc..1881c94 100644 --- a/Assets/02_Scripts/Managers/InputManager.cs +++ b/Assets/02_Scripts/Managers/InputManager.cs @@ -10,6 +10,7 @@ public class InputManager : MonoBehaviour, GameInput.ICharacterActions private GameInput _input; public event Action OnMove_Event; + public event Action OnAttack_Event; private void Awake() { @@ -39,4 +40,10 @@ public void OnMove(InputAction.CallbackContext ctx) if (ctx.phase == InputActionPhase.Performed || ctx.phase == InputActionPhase.Canceled) OnMove_Event?.Invoke(ctx.ReadValue()); } + + public void OnAttack(InputAction.CallbackContext ctx) + { + if (ctx.phase == InputActionPhase.Started) + OnAttack_Event?.Invoke(); + } } \ No newline at end of file diff --git a/Assets/02_Scripts/Player/PlayerController.cs b/Assets/02_Scripts/Player/PlayerController.cs index 6f12225..f3b8cad 100644 --- a/Assets/02_Scripts/Player/PlayerController.cs +++ b/Assets/02_Scripts/Player/PlayerController.cs @@ -8,12 +8,49 @@ public class PlayerController : MonoBehaviour,ISceneInitializable private const string MoveXParam = "MoveX"; private const string MoveYParam = "MoveY"; private const string SpeedParam = "Speed"; + private const string AttackParam = "Attack"; + private const string AttackXParam = "AttackX"; + private const string AttackYParam = "AttackY"; + + // 방향은 8개로 고정이다. 각도가 아니라 이 중 하나로 분류해서 들고 다닌다 + private enum Direction + { + Right, UpRight, Up, UpLeft, Left, DownLeft, Down, DownRight + } + + // 블렌드 트리에 박아둔 자식 좌표와 같은 값이어야 가중치가 그 클립에 온전히 실린다 + private static readonly Vector2[] DirectionVectors = + { + new Vector2( 1f, 0f), // Right + new Vector2( 0.7071f, 0.7071f), // UpRight + new Vector2( 0f, 1f), // Up + new Vector2(-0.7071f, 0.7071f), // UpLeft + new Vector2(-1f, 0f), // Left + new Vector2(-0.7071f, -0.7071f), // DownLeft + new Vector2( 0f, -1f), // Down + new Vector2( 0.7071f, -0.7071f) // DownRight + }; + + // 오른손으로 휘두르므로 정면을 볼 땐 시계방향 45도 쪽을 벤다. + // 대각선을 볼 땐 그대로 (Slash 시트가 대각선 4장뿐이라 정면 그림 자체가 없다) + private static readonly Direction[] AttackDirections = + { + Direction.DownRight, // Right -> DownRight + Direction.UpRight, // UpRight -> UpRight + Direction.UpRight, // Up -> UpRight + Direction.UpLeft, // UpLeft -> UpLeft + Direction.UpLeft, // Left -> UpLeft + Direction.DownLeft, // DownLeft -> DownLeft + Direction.DownLeft, // Down -> DownLeft + Direction.DownRight // DownRight -> DownRight + }; [SerializeField] private float _moveSpeed = 4f; private Rigidbody2D _rigidbody; private Animator _animator; private Vector2 _moveInput; + private Direction _facing = Direction.Down; private void Awake() { @@ -26,6 +63,8 @@ public void OnSceneLoaded() // 씬이 다시 로드돼도 중복 구독되지 않도록 먼저 떼고 붙인다 InputManager.Instance.OnMove_Event -= this.OnMove; InputManager.Instance.OnMove_Event += this.OnMove; + InputManager.Instance.OnAttack_Event -= this.OnAttack; + InputManager.Instance.OnAttack_Event += this.OnAttack; } private void OnDestroy() @@ -33,6 +72,7 @@ private void OnDestroy() if (InputManager.Instance != null) { InputManager.Instance.OnMove_Event -= this.OnMove; + InputManager.Instance.OnAttack_Event -= this.OnAttack; } } @@ -44,29 +84,42 @@ private void OnMove(Vector2 moveInput) if (_moveInput.sqrMagnitude > 0.01f) { - // 블렌드 트리는 스프라이트를 보간하지 못한다. 8방향 중 하나로 스냅해서 넣어야 - // 한 클립에 가중치가 온전히 실려서 방향 경계에서 깜빡이지 않는다 - Vector2 facing = SnapTo8(_moveInput); - _animator.SetFloat(MoveXParam, facing.x); - _animator.SetFloat(MoveYParam, facing.y); + _facing = ToDirection(_moveInput); + + Vector2 facingVector = DirectionVectors[(int)_facing]; + _animator.SetFloat(MoveXParam, facingVector.x); + _animator.SetFloat(MoveYParam, facingVector.y); } - // 입력이 0이면 MoveX/MoveY를 건드리지 않는다 -> 멈춰도 마지막으로 보던 방향을 유지 + // 입력이 0이면 방향을 갱신하지 않는다 -> 멈춰도 마지막으로 보던 쪽을 유지 _animator.SetFloat(SpeedParam, _moveInput.magnitude); } + private void OnAttack() + { + // Slash 블렌드 트리는 MoveX/MoveY가 아니라 AttackX/AttackY를 읽는다. + // 그래서 공격이 끝나도 바라보던 방향은 그대로 남는다 + Vector2 attackVector = DirectionVectors[(int)AttackDirections[(int)_facing]]; + _animator.SetFloat(AttackXParam, attackVector.x); + _animator.SetFloat(AttackYParam, attackVector.y); + _animator.SetTrigger(AttackParam); + } + private void FixedUpdate() { // Dynamic 바디지만 힘을 주지 않고 속도를 직접 대입하므로 관성 없이 딱딱 멈춘다 _rigidbody.linearVelocity = _moveInput * _moveSpeed; } - // 입력 방향을 가장 가까운 45도 배수로 스냅한다 (대각선은 0.7071이 되어 블렌드 트리 좌표와 일치) - private static Vector2 SnapTo8(Vector2 direction) + /// + /// 입력 각도를 45도씩 8개 구간으로 나눠 분류한다. + /// 예를 들어 Up은 90도 한 점이 아니라 67.5 ~ 112.5도 구간 전체다. + /// + private static Direction ToDirection(Vector2 input) { - float angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; - float snapped = Mathf.Round(angle / 45f) * 45f * Mathf.Deg2Rad; + float angle = Mathf.Atan2(input.y, input.x) * Mathf.Rad2Deg; + int sector = Mathf.RoundToInt(angle / 45f); - return new Vector2(Mathf.Cos(snapped), Mathf.Sin(snapped)); + return (Direction)((sector + 8) % 8); // -180도는 -4 -> 4(Left)로 접힌다 } } diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_Down.anim b/Assets/03_Models/Characters/Red/Animations/Idle_Down.anim index 7b7a5ee..ba7a376 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_Down.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_Down.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de0867d81d3e99e99c6a8d9ed544d6ef6590fa5846c105687efef021dcb6cdc -size 3485 +oid sha256:3eaf75b599d9fa75a94944518b789dabe7e387325c58b0b33ee9421eb0a25307 +size 2398 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_DownLeft.anim b/Assets/03_Models/Characters/Red/Animations/Idle_DownLeft.anim index c4ee8f5..f9e86ec 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_DownLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_DownLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185fca4490b35cd3816fb766bd27977f76d037968b31bc9c5e1ba986ad1f7bd2 -size 3485 +oid sha256:8d8104771bcd16009ee29d8c506107df439fcd2466400e82744f5d15cc5d8a5a +size 2401 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_DownRight.anim b/Assets/03_Models/Characters/Red/Animations/Idle_DownRight.anim index 5d2e633..1b415cb 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_DownRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_DownRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f19d50b2751ffb5492b01bbcfd777e4744b04409b1f4912a7353a6d6d45f6c18 -size 3490 +oid sha256:b6adb64e4a8ce8c9c4b6c78bc206ad5a41830a7a150b6683d833579dd09e08fc +size 2403 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_Left.anim b/Assets/03_Models/Characters/Red/Animations/Idle_Left.anim index 13f5f30..3ce7114 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_Left.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_Left.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74d218ea642044fdc6d68d42942e275b6be50a4929f3c2d8a59cbc5dabd22e47 -size 3485 +oid sha256:0769365bc713c86f9d6db396fa9a39d3e168c19ee1fb554fccbf92ee7debcef2 +size 2398 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_Right.anim b/Assets/03_Models/Characters/Red/Animations/Idle_Right.anim index 5d309ae..75d0799 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_Right.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_Right.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b06368aa222c4fb9062c96290b4dd240f30b8a81e8cc27b1406e87e913cac0b4 -size 3486 +oid sha256:1fbf8297f88ebdcbcda2d9c7f7a2764b898eeeb748125a679e507c63e8b959ca +size 2399 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_Up.anim b/Assets/03_Models/Characters/Red/Animations/Idle_Up.anim index 5a0d3e5..65bac0e 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_Up.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_Up.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7349bd22da751c68e8f92498c8100645578d60f9ea6bef0c979565df7d348b0 -size 3483 +oid sha256:523a405a6d8727a21bbccbae9463c60fa775fd650441d9c4d54b181712f66238 +size 2396 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_UpLeft.anim b/Assets/03_Models/Characters/Red/Animations/Idle_UpLeft.anim index 37faa41..693cf1e 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_UpLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_UpLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd3e4d022775907b32529cebdcd38237027138828bb9bc0404177631fc56e83d -size 3487 +oid sha256:51d00cfc91927bf711663bfcb2a34ac7e134e4b008bb40df52d9463f95c5a11c +size 2400 diff --git a/Assets/03_Models/Characters/Red/Animations/Idle_UpRight.anim b/Assets/03_Models/Characters/Red/Animations/Idle_UpRight.anim index f2b250f..1fe8fa5 100644 --- a/Assets/03_Models/Characters/Red/Animations/Idle_UpRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Idle_UpRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af352008916d4e3f7050865efd1b02457ad2528a3024741b5ed2c03541f854a3 -size 3492 +oid sha256:6c562aa7da62598724956eaf16aeadb3252f7095fe7eddf9ea3165f15ffd6f7c +size 2402 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_Down.anim b/Assets/03_Models/Characters/Red/Animations/Move_Down.anim index b036b74..f5cc857 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_Down.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_Down.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9db9a0ae605b069334038d58950b8b764b9fd9d75ae5545479dd6bfe0600af2 -size 3986 +oid sha256:c208adeece94b8af7c3ee7b9ec1a9db8abc093d79fcd0f378ed098d8bd685b97 +size 3083 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_DownLeft.anim b/Assets/03_Models/Characters/Red/Animations/Move_DownLeft.anim index ba095d2..c3a7804 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_DownLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_DownLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2ecb392d26fe9dccc68b190fd273a0b54a2cdc0c1fefa94d7217b2911513432 -size 3988 +oid sha256:8b81637580c12a1547f0c01b0e5e68d53a69b663e12ac4ea614e1e751e460e2a +size 3085 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_DownRight.anim b/Assets/03_Models/Characters/Red/Animations/Move_DownRight.anim index e804af6..53a5231 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_DownRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_DownRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf3b3b2e2752e22c7916bab04aa71d13cbb608a584623ea3f700de953b6fdc2f -size 3997 +oid sha256:0cf6ce11c31a21270ef962840d7275e738643559ebb05dea2b741e6a31f3e4cd +size 3089 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_Left.anim b/Assets/03_Models/Characters/Red/Animations/Move_Left.anim index b559b0e..3428a1b 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_Left.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_Left.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97261529e8da274f53e0fd0e5848dc7c6f28d8f1d751086806c3ca55b708d0f6 -size 3988 +oid sha256:51ae81b116ab5f92dd69731e02134c4cabe9215be95eab7163f6e2fa4a805518 +size 3083 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_Right.anim b/Assets/03_Models/Characters/Red/Animations/Move_Right.anim index 4971fc9..a7d92a2 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_Right.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_Right.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17752be6d21c2ac98a22f9c06eca1d376ec6d2c052c59aaa85bd94e2bf969018 -size 3991 +oid sha256:fe456765ec0102494622c8c1baef12bbaea381c008a1a239f2265fa67fe143e4 +size 3084 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_Up.anim b/Assets/03_Models/Characters/Red/Animations/Move_Up.anim index 7fcf215..3a182fc 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_Up.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_Up.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a877cf5d1b863f3b664cc96044865197b16a4995c96c274540940cb71a52e9c -size 3988 +oid sha256:0e60030b3829e891092d9a6e1df9fc1d94ea1f4a5f02bc6f3a2298437e8a3dd7 +size 3081 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_UpLeft.anim b/Assets/03_Models/Characters/Red/Animations/Move_UpLeft.anim index 5f5707f..8fdbc03 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_UpLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_UpLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:729ae1840e8e5589319bcf701361f635d947c2431631d0dc1edabdc8a97178d8 -size 3996 +oid sha256:dde7b0edfc2061e0e9a52f886988766ac9bc3f956e29058982e5c5542ab6eb83 +size 3087 diff --git a/Assets/03_Models/Characters/Red/Animations/Move_UpRight.anim b/Assets/03_Models/Characters/Red/Animations/Move_UpRight.anim index c816cc0..3e2468b 100644 --- a/Assets/03_Models/Characters/Red/Animations/Move_UpRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Move_UpRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:085be144b8d0a9c9ba4cad2fd7e05c29ea2720ba97557acde388f9a1bc582ae8 -size 3995 +oid sha256:e112ee3dc93145ea8a4b09490fd388cb1937826f3b3e2b65200250f6bc451f02 +size 3087 diff --git a/Assets/03_Models/Characters/Red/Animations/RedAnimController.controller b/Assets/03_Models/Characters/Red/Animations/RedAnimController.controller index a34ed36..0627476 100644 --- a/Assets/03_Models/Characters/Red/Animations/RedAnimController.controller +++ b/Assets/03_Models/Characters/Red/Animations/RedAnimController.controller @@ -1,6 +1,102 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-6874254611879240787 +--- !u!1101 &-6797221050850975348 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 214167610525155315} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &-6271410953291772014 +BlendTree: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slash + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 152b0967f969b07488a3de28d1922062, type: 2} + m_Threshold: 0 + m_Position: {x: -0.7071, y: -0.7071} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: f20be9e9358bead4b841d51d228eda47, type: 2} + m_Threshold: 0.33333334 + m_Position: {x: 0.7071, y: -0.7071} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 6ed3d8ee60b1792428e40711049b1c58, type: 2} + m_Threshold: 0.6666667 + m_Position: {x: -0.7071, y: 0.7071} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: c5e189d0be90850438371df9e728596c, type: 2} + m_Threshold: 1 + m_Position: {x: 0.7071, y: 0.7071} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + m_BlendParameter: AttackX + m_BlendParameterY: AttackY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1102 &-6124354920346061464 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Move + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4908432700338621818} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8938632983632863130} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4319721807983958121 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -12,7 +108,7 @@ AnimatorStateTransition: m_ConditionEvent: Speed m_EventTreshold: 0.1 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3622458180250047327} + m_DstState: {fileID: -6124354920346061464} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -25,165 +121,29 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!206 &-3624203845668539833 -BlendTree: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: bee9b9660e8e8544cae2d8aaf605697a, type: 2} - m_Threshold: 0 - m_Position: {x: 0, y: -1} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: af3aea2623979a545b42d24b2626a970, type: 2} - m_Threshold: 0.14285715 - m_Position: {x: -0.7071, y: -0.7071} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 831d300c370dae044908ea7c4b24913c, type: 2} - m_Threshold: 0.2857143 - m_Position: {x: 0.7071, y: -0.7071} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 859ed0bd2e2bf344eac644c55ce1b10c, type: 2} - m_Threshold: 0.42857143 - m_Position: {x: -1, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 37b55debd4507464d97bea1d17f1f342, type: 2} - m_Threshold: 0.5714286 - m_Position: {x: 1, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: d4f3911e5f17c7a45ad2b9843b387435, type: 2} - m_Threshold: 0.71428573 - m_Position: {x: 0, y: 1} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 5e06d3b793c3a3b4e8082dc7e34d6863, type: 2} - m_Threshold: 0.85714287 - m_Position: {x: -0.7071, y: 0.7071} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 18fd1c74088225841921dc07f0910091, type: 2} - m_Threshold: 1 - m_Position: {x: 0.7071, y: 0.7071} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Blend - m_Mirror: 0 - m_BlendParameter: MoveX - m_BlendParameterY: MoveY - m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 - m_NormalizedBlendValues: 0 - m_BlendType: 1 ---- !u!1102 &-2486997814425191357 -AnimatorState: - serializedVersion: 6 +--- !u!1101 &-1422023017277632544 +AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Roll - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 9182379453996200090} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 365230908994131198} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RedAnimController - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: MoveX - m_Type: 1 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: MoveY - m_Type: 1 - m_DefaultFloat: -1 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Speed - m_Type: 1 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Attack - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Roll - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 6815402290229989870} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!206 &365230908994131198 + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 214167610525155315} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &-1416950743747945551 BlendTree: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,18 +222,82 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 ---- !u!1102 &448698662924600173 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RedAnimController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: MoveX + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: MoveY + m_Type: 1 + m_DefaultFloat: -1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: AttackX + m_Type: 1 + m_DefaultFloat: 0.7071 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: AttackY + m_Type: 1 + m_DefaultFloat: -0.7071 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Roll + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6815402290229989870} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &214167610525155315 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Slash + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 9082020438067527466} + - {fileID: -4319721807983958121} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -283,90 +307,13 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7456827777912271963} + m_Motion: {fileID: 4813498030077388005} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &1489130277080668679 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Roll - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -2486997814425191357} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1101 &1563611855647061710 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8330308266414253568} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &3622458180250047327 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Move - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1563611855647061710} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 8069003335268577343} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &4851453923614252778 +--- !u!1101 &4232803516053529876 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -378,7 +325,7 @@ AnimatorStateTransition: m_ConditionEvent: Attack m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 448698662924600173} + m_DstState: {fileID: 7656274846153462462} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -391,73 +338,97 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 ---- !u!1107 &6815402290229989870 -AnimatorStateMachine: - serializedVersion: 6 +--- !u!1101 &4329696830800521359 +AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 8330308266414253568} - m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3622458180250047327} - m_Position: {x: 230, y: 60, z: 0} - - serializedVersion: 1 - m_State: {fileID: -2486997814425191357} - m_Position: {x: 270, y: 130, z: 0} - - serializedVersion: 1 - m_State: {fileID: 448698662924600173} - m_Position: {x: 305, y: 195, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: 4851453923614252778} - - {fileID: 1489130277080668679} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8330308266414253568} ---- !u!206 &7456827777912271963 + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Roll + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7530872125262086518} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!206 &4813498030077388005 BlendTree: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Slash + m_Name: Idle m_Childs: - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 152b0967f969b07488a3de28d1922062, type: 2} + m_Motion: {fileID: 7400000, guid: bee9b9660e8e8544cae2d8aaf605697a, type: 2} m_Threshold: 0 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: af3aea2623979a545b42d24b2626a970, type: 2} + m_Threshold: 0.14285715 m_Position: {x: -0.7071, y: -0.7071} m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: f20be9e9358bead4b841d51d228eda47, type: 2} - m_Threshold: 0.33333334 + m_Motion: {fileID: 7400000, guid: 831d300c370dae044908ea7c4b24913c, type: 2} + m_Threshold: 0.2857143 m_Position: {x: 0.7071, y: -0.7071} m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: 6ed3d8ee60b1792428e40711049b1c58, type: 2} - m_Threshold: 0.6666667 + m_Motion: {fileID: 7400000, guid: 859ed0bd2e2bf344eac644c55ce1b10c, type: 2} + m_Threshold: 0.42857143 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 37b55debd4507464d97bea1d17f1f342, type: 2} + m_Threshold: 0.5714286 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: d4f3911e5f17c7a45ad2b9843b387435, type: 2} + m_Threshold: 0.71428573 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 5e06d3b793c3a3b4e8082dc7e34d6863, type: 2} + m_Threshold: 0.85714287 m_Position: {x: -0.7071, y: 0.7071} m_TimeScale: 1 m_CycleOffset: 0 m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 7400000, guid: c5e189d0be90850438371df9e728596c, type: 2} + m_Motion: {fileID: 7400000, guid: 18fd1c74088225841921dc07f0910091, type: 2} m_Threshold: 1 m_Position: {x: 0.7071, y: 0.7071} m_TimeScale: 1 @@ -471,7 +442,119 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 ---- !u!206 &8069003335268577343 +--- !u!1101 &4908432700338621818 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 214167610525155315} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &6815402290229989870 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 214167610525155315} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6124354920346061464} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7530872125262086518} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7656274846153462462} + m_Position: {x: 305, y: 195, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 4232803516053529876} + - {fileID: 4329696830800521359} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 214167610525155315} +--- !u!1102 &7530872125262086518 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Roll + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6797221050850975348} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -1416950743747945551} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7656274846153462462 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slash + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1422023017277632544} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -6271410953291772014} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!206 &8938632983632863130 BlendTree: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -550,74 +633,3 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 ---- !u!1102 &8330308266414253568 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -6874254611879240787} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: -3624203845668539833} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &9082020438067527466 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8330308266414253568} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &9182379453996200090 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8330308266414253568} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_Down.anim b/Assets/03_Models/Characters/Red/Animations/Roll_Down.anim index 2cfc7bc..08cd8c7 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_Down.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_Down.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c61e5b5e138cbc48f5a8f00ad3d3f610883779c340475c4d8c5ee5fef30410 -size 4025 +oid sha256:cb38d753586f600b10efa5233c5d49b8daadd648cc1210c82b3488535c9e3d89 +size 3100 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_DownLeft.anim b/Assets/03_Models/Characters/Red/Animations/Roll_DownLeft.anim index 1594dd7..254eede 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_DownLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_DownLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a6055a5ce383a3231b9f4334f3938232954a3547871df1a46ce5181f817eeea -size 4031 +oid sha256:847e14a92f9392667bb422ea16a11ae5de94172f705ecd992052ab35893013b7 +size 3105 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_DownRight.anim b/Assets/03_Models/Characters/Red/Animations/Roll_DownRight.anim index 6e2bdfc..4ad8fc6 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_DownRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_DownRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ffc0ce760465faab987d7eeecaecdfb8d69a3dbf81952314dc2ad0e079830dc -size 4036 +oid sha256:80696aaf362890aa30f4b30719c70dd061fc9e5ecddc363aabc8c2f85aa6be93 +size 3106 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_Left.anim b/Assets/03_Models/Characters/Red/Animations/Roll_Left.anim index 761afb2..b13947d 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_Left.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_Left.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db59c83369a1ba5f78847bbe2e2768889388901fb13cd2697baeab749d369402 -size 4031 +oid sha256:c16672dc7e3150e38ea84ef52a90c949afd3f4f0b3aa49ff19a7fed3b603600d +size 3102 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_Right.anim b/Assets/03_Models/Characters/Red/Animations/Roll_Right.anim index a2f3c6d..15e80d9 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_Right.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_Right.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb82eecb6a274938470247b3e3c7aac83f3bd647273f79656c625d8cf11e49d -size 4026 +oid sha256:5789645bf0fa4567e1d4e8096b230d4273a3bb7d4eed8a04bc1edbac579d3e39 +size 3101 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_Up.anim b/Assets/03_Models/Characters/Red/Animations/Roll_Up.anim index 5ccc4e1..9d1f79e 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_Up.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_Up.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d360337ae40b73531901c614cd282a027bd68c01be7122edcf9fb9cfffcf7658 -size 4031 +oid sha256:87cb7cd34cae8d47beea5a62ff669d6cf53a7aeeae46b9d7ca8059664c553a37 +size 3101 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_UpLeft.anim b/Assets/03_Models/Characters/Red/Animations/Roll_UpLeft.anim index e03781a..e83a796 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_UpLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_UpLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04a2fcdec2c014656cc5bfef4acb788ad41137f8528b5edc11a497f12f5fd11e -size 4031 +oid sha256:30c78329ad0a487a520ee254199788e2df721d3c7734f757a3594c9cc2f1bf3e +size 3103 diff --git a/Assets/03_Models/Characters/Red/Animations/Roll_UpRight.anim b/Assets/03_Models/Characters/Red/Animations/Roll_UpRight.anim index 75e2bbd..eb4145a 100644 --- a/Assets/03_Models/Characters/Red/Animations/Roll_UpRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Roll_UpRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f28d8fdc7ddb66a75f09856781f6b01729467bf0fca98dac3213b399134ea33 -size 4032 +oid sha256:cb223ea017675e0ff8640c0d0e2f9832c9b2e1a9e8959c70345b62877191d56a +size 3104 diff --git a/Assets/03_Models/Characters/Red/Animations/Slash_DownLeft.anim b/Assets/03_Models/Characters/Red/Animations/Slash_DownLeft.anim index 4691e80..2c8ed85 100644 --- a/Assets/03_Models/Characters/Red/Animations/Slash_DownLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Slash_DownLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b538c243a5c9095083c5fae3ae85151be8cc251e53e3eeac0bccab1642b6cfd8 -size 5651 +oid sha256:ee3901f4cadc28018bbd1bf69bfaeafcfdeb6d7bd34881f560a54e50e32b0ff6 +size 3882 diff --git a/Assets/03_Models/Characters/Red/Animations/Slash_DownRight.anim b/Assets/03_Models/Characters/Red/Animations/Slash_DownRight.anim index 5c31287..c2dcdb6 100644 --- a/Assets/03_Models/Characters/Red/Animations/Slash_DownRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Slash_DownRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d726befda33398312083ef17a46f2c5e8dce034dc00233efcb8f4aa374d6bf3 -size 5644 +oid sha256:fc14fe85b7e9926753ab251f8900d558e87e4c6f80e2a3fc69b1b6c18bbc5116 +size 3877 diff --git a/Assets/03_Models/Characters/Red/Animations/Slash_UpLeft.anim b/Assets/03_Models/Characters/Red/Animations/Slash_UpLeft.anim index d1a34b6..a73ffec 100644 --- a/Assets/03_Models/Characters/Red/Animations/Slash_UpLeft.anim +++ b/Assets/03_Models/Characters/Red/Animations/Slash_UpLeft.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d42326cc448b9b51bcdabcccf2b84c9c7fa11579fe8f19af5a59e05dee2ac139 -size 5649 +oid sha256:623e608b75d5a73c2ee2ba7cfd2ea9b8e9c2e70b41fb1173b4b66a8dd9d141e0 +size 3879 diff --git a/Assets/03_Models/Characters/Red/Animations/Slash_UpRight.anim b/Assets/03_Models/Characters/Red/Animations/Slash_UpRight.anim index a345ac5..eae3e5e 100644 --- a/Assets/03_Models/Characters/Red/Animations/Slash_UpRight.anim +++ b/Assets/03_Models/Characters/Red/Animations/Slash_UpRight.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f994ab123f591a6b0034b1beb8b932ecce878e5aabc1f4e7f33b5d5cc8607c83 -size 5652 +oid sha256:6381cfc59c4315e6a98705ae54662081a326629faf56a02923a73e1b596ab478 +size 3880 diff --git a/Assets/99_Settings/GameInput.inputactions b/Assets/99_Settings/GameInput.inputactions index 172637f..32e9619 100644 --- a/Assets/99_Settings/GameInput.inputactions +++ b/Assets/99_Settings/GameInput.inputactions @@ -15,6 +15,16 @@ "interactions": "", "initialStateCheck": true, "priority": 0 + }, + { + "name": "Attack", + "type": "Button", + "id": "bf2fbb7b-fd81-4ec4-824d-26ff5ce88e66", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false, + "priority": 0 } ], "bindings": [ @@ -72,6 +82,17 @@ "action": "Move", "isComposite": false, "isPartOfComposite": true + }, + { + "name": "", + "id": "7f4c479d-7d04-4598-9df4-cec2ca3408bf", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/99_Settings/GameInput.inputactions.meta b/Assets/99_Settings/GameInput.inputactions.meta index d12fc72..992698c 100644 --- a/Assets/99_Settings/GameInput.inputactions.meta +++ b/Assets/99_Settings/GameInput.inputactions.meta @@ -9,6 +9,6 @@ ScriptedImporter: assetBundleVariant: script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} generateWrapperCode: 1 - wrapperCodePath: + wrapperCodePath: Assets/02_Scripts/GameInput.cs wrapperClassName: wrapperCodeNamespace: