diff --git a/Assets/01_Scenes/GameScene.unity b/Assets/01_Scenes/GameScene.unity index 4ffcc14..5078194 100644 --- a/Assets/01_Scenes/GameScene.unity +++ b/Assets/01_Scenes/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91f1b22b1256ef74a3fee47abe5d97a31fa5971627774bf9d965c8e76009c476 -size 136940 +oid sha256:fce44bd56a8f550399ffd71602702d3a60e46dfe9a9ceffd2c34e6695c738e6c +size 137432 diff --git a/Assets/02_Scripts/Managers/Global/DataManager.cs b/Assets/02_Scripts/Managers/Global/DataManager.cs index 1e0d7ce..004779c 100644 --- a/Assets/02_Scripts/Managers/Global/DataManager.cs +++ b/Assets/02_Scripts/Managers/Global/DataManager.cs @@ -31,8 +31,9 @@ private void Awake() private async Awaitable Start() { - await LoadUserCharacters(1); - await LoadPlayableCharacters(); + + //await LoadUserCharacters(1); + //await LoadPlayableCharacters(); } public async Awaitable LoadUserCharacters(int userNo) diff --git a/Assets/02_Scripts/Managers/Global/InputManager.cs b/Assets/02_Scripts/Managers/Global/InputManager.cs index ac1d05c..98987ba 100644 --- a/Assets/02_Scripts/Managers/Global/InputManager.cs +++ b/Assets/02_Scripts/Managers/Global/InputManager.cs @@ -22,6 +22,7 @@ public class InputManager : MonoBehaviour public event Action OnJumpEvent; public event Action OnAimToggleEvent; public event Action OnLookEvent; + public event Action OnDodgeEvent; public event Action OnNormalAttackEvent; public event Action OnHeavyAttackEvent; @@ -100,6 +101,7 @@ public void SetCharacterInputMap(string mapName) BindActionCharacter("Jump", OnJump); BindActionCharacter("AimToggle", OnAimToggle); BindActionCharacter("Look", OnLook); + BindActionCharacter("Dodge", OnDodge); BindActionCharacter("NormalAttack", OnNormalAttack); BindActionCharacter("HeavyAttack", OnHeavyAttack); @@ -189,6 +191,15 @@ private void OnLook(InputAction.CallbackContext ctx) Vector2 look = ctx.ReadValue(); OnLookEvent?.Invoke(look); } + + private void OnDodge(InputAction.CallbackContext ctx) + { + if(ctx.started) + { + OnDodgeEvent?.Invoke(InputState.Started); + } + } + private void OnNormalAttack(InputAction.CallbackContext ctx) { OnNormalAttackEvent?.Invoke(); diff --git a/Assets/02_Scripts/Managers/Local/LevelManager.cs b/Assets/02_Scripts/Managers/Local/LevelManager.cs index 9a8ae07..2713660 100644 --- a/Assets/02_Scripts/Managers/Local/LevelManager.cs +++ b/Assets/02_Scripts/Managers/Local/LevelManager.cs @@ -104,6 +104,7 @@ public void OnSceneLoaded(Scene scene, LoadSceneMode mode) InputManager.Instance.OnJumpEvent += CurrentCharacterController.JumpInput; InputManager.Instance.OnAimToggleEvent += CurrentCharacterController.AimToggleInput; InputManager.Instance.OnLookEvent += CurrentCharacterController.LookInput; + InputManager.Instance.OnDodgeEvent += CurrentCharacterController.DodgeInput; //InputManager.Instance.OnNormalAttackEvent; //InputManager.Instance.OnHeavyAttackEvent; diff --git a/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs b/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs index 0efb65d..e0bbe3b 100644 --- a/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs +++ b/Assets/02_Scripts/Player/Controllers/PlayerCharacterController.cs @@ -210,16 +210,14 @@ private void Movement() //구르기중일때 전용 로직 if (_stateMachine.CurrentState == PlayerState.Dodge) { - _dodgeTimer = _dodgeDuration; - + Debug.Log("구르기중"); float normalizedTime = (_dodgeDuration - _dodgeTimer) / _dodgeDuration; // 0 ~ 1 사이의 진행률 - if (normalizedTime >= 1.0f) + if (normalizedTime >= 1f) { + Debug.Log("구르기 끝남"); // 구르기 종료 -> 원래상태로 복귀 로직 - //StateMachine.ChangeState(PlayerState.Idle); - //_currentSpd = 0f; - + _stateMachine.ChangeState(PlayerState.Idle); return; } @@ -250,8 +248,6 @@ private void Movement() _currentSpd = Mathf.MoveTowards(_currentSpd, targetSpd, currentStepSpeed * accelWeight * Time.deltaTime); _anim.SetFloat("speedRatio", _currentSpd / _spdCoefficient); - - Vector3 camForward = Camera.main.transform.forward; //메인카메라의 로컬기준 앞쪽방향 camForward.y = 0; //높이를 무시하기 위해 0으로 @@ -350,9 +346,11 @@ private void OnAnimatorMove() } private void ApplyMove() { - //지상이동이 가능한 상황이 아니고, 공중이동도 가능한 상황이 아니라면 - if (!_stateMachine.CanMove() && !_stateMachine.CanControlInAir()) + //지상이동이 가능한 상황이 아니고, 공중이동도 가능한 상황이 아니라면, 또한 대쉬중도 아니라면 + if (!_stateMachine.CanMove() && !_stateMachine.CanControlInAir() && !_stateMachine.CanDodge()) { + Debug.Log("aaaaaaaaaaaaaaaa"); + _moveTargetDir.x = 0f; _moveTargetDir.z = 0f; } @@ -377,6 +375,7 @@ private void TickTimer() { if (_jumpReadyCoolTimer > 0) _jumpReadyCoolTimer -= Time.deltaTime; if (_jumpReadyCoolTimer < 0) _jumpReadyCoolTimer = 0f; if (_moveCutTimer > 0) _moveCutTimer -= Time.deltaTime; if (_moveCutTimer < 0) _moveCutTimer = 0f; + if(_dodgeTimer > 0) _dodgeTimer -= Time.deltaTime; ; if (_dodgeTimer < 0) _dodgeTimer = 0f; } #endregion @@ -425,9 +424,51 @@ public void DodgeInput(InputState inputState) // 입력이 없으면 카메라가 보는 앞방향, 있으면 입력 방향 _dodgeDir = _moveInput.sqrMagnitude > Mathf.Epsilon ? _moveTargetDir.normalized : camForward; + + float angle = Vector3.SignedAngle(camForward, _dodgeDir, Vector3.up); + int dodgeAnimType = 0; + if (angle < 0) angle += 360f; // -180 +180 ==> 0~360 + + if ((angle >= 0f && angle < 22.5f) || (angle >= 337.5f && angle <= 360f)) + { + dodgeAnimType = 0; //상 : Fwd 애니메이션 + } + else if(angle >= 22.5f && angle < 67.5f) + { + dodgeAnimType = 0; //우상 : Fwd 애니메이션 + } + else if(angle >= 67.5f && angle < 112.5f) + { + dodgeAnimType = 1; //우 : Right 애니메이션 + } + else if (angle >= 112.5f && angle < 157.5f) + { + dodgeAnimType = 1; //우하 : Right 애니메이션 + } + else if(angle >= 157.5f && angle < 202.5f) + { + dodgeAnimType = 2; //하 : Back 애니메이션 + } + else if (angle >= 202.5f && angle < 247.5f) + { + dodgeAnimType = 3; //좌하 : Left 애니메이션 + } + else if(angle >= 247.5f && angle < 292.5f) + { + dodgeAnimType = 3; //좌 : Left 애니메이션 + } + else if(angle >= 292.5f && angle < 337.5f) + { + dodgeAnimType = 0; //좌상 : Fwd 애니메이션 + } + + //각도 따라 다른 애니메이션 재생 + _anim.SetInteger("DodgeAnimType", dodgeAnimType); + _anim.SetTrigger("DodgeTrigger"); + // 상태 전환 및 타이머 초기화 _stateMachine.ChangeState(PlayerState.Dodge); - _dodgeTimer = 0f; + _dodgeTimer = _dodgeDuration; } } public void AimToggleInput(InputState inputState) diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Bwd.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Bwd.FBX.meta index cda7937..96b4674 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Bwd.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Bwd.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 1232465e0c1d1ab469b63971f3130c36 +AssetOrigin: + serializedVersion: 1 + productId: 323032 + packageName: KAWAII ANIMATIONS Cool Action + packageVersion: 1.4.1.2 + assetPath: Assets/Models/Gold/Animations/@CA_SuddenStop_Bwd.FBX + uploadId: 862270 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Dodge_End_Bwd_RM + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 60 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +92,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +823,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +835,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 323032 - packageName: KAWAII ANIMATIONS Cool Action - packageVersion: 1.4.1.2 - assetPath: Assets/Models/Gold/Animations/@CA_SuddenStop_Bwd.FBX - uploadId: 862270 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Fwd.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Fwd.FBX.meta index dba26ad..a27928f 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Fwd.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_End_Fwd.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 2d0578e38b164fc4096f797f8e29dbdc +AssetOrigin: + serializedVersion: 1 + productId: 277585 + packageName: KAWAII ANIMATIONS 100 + packageVersion: 1.10.2.2 + assetPath: Assets/Models/Gold/Animations/@KA_SuddenStop_Fwd.FBX + uploadId: 828262 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Dodge_End_Fwd_RM + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 60 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +92,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +823,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +835,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 277585 - packageName: KAWAII ANIMATIONS 100 - packageVersion: 1.10.2.2 - assetPath: Assets/Models/Gold/Animations/@KA_SuddenStop_Fwd.FBX - uploadId: 828262 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Left.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Left.FBX.meta index 96b7c93..2f7f64b 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Left.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Left.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 4452a714400c20d48a5ddc3a95998d7f +AssetOrigin: + serializedVersion: 1 + productId: 323032 + packageName: KAWAII ANIMATIONS Cool Action + packageVersion: 1.4.1.2 + assetPath: Assets/Models/Gold/Animations/@CA_Evade3_Left.FBX + uploadId: 862270 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Dodge_Left + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 60 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +92,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +823,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +835,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 323032 - packageName: KAWAII ANIMATIONS Cool Action - packageVersion: 1.4.1.2 - assetPath: Assets/Models/Gold/Animations/@CA_Evade3_Left.FBX - uploadId: 862270 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Right.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Right.FBX.meta index cba64f2..76a2c93 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Right.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Right.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: bbb9f13c9f5e49745a186f449ee7e476 +AssetOrigin: + serializedVersion: 1 + productId: 323032 + packageName: KAWAII ANIMATIONS Cool Action + packageVersion: 1.4.1.2 + assetPath: Assets/Models/Gold/Animations/@CA_Evade2_Right.FBX + uploadId: 862270 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Dodge_Right + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 50 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +92,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +823,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +835,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 323032 - packageName: KAWAII ANIMATIONS Cool Action - packageVersion: 1.4.1.2 - assetPath: Assets/Models/Gold/Animations/@CA_Evade2_Right.FBX - uploadId: 862270 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Bwd.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Bwd.FBX.meta index dcd4865..5082f63 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Bwd.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Bwd.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 7ca2d23a4519bc346abc35cf93aa444d +AssetOrigin: + serializedVersion: 1 + productId: 323032 + packageName: KAWAII ANIMATIONS Cool Action + packageVersion: 1.4.1.2 + assetPath: Assets/KAWAII_ANIMATIOMS_CoolAction/Assets/Animations/Action/@CA_Dash_Bwd.FBX + uploadId: 862270 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,65 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Dodge_Start_Bwd + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 20 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Loop + takeName: Unreal Take + internalID: 7902992383661667977 + firstFrame: 14 + lastFrame: 15 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +121,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +852,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +864,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 323032 - packageName: KAWAII ANIMATIONS Cool Action - packageVersion: 1.4.1.2 - assetPath: Assets/KAWAII_ANIMATIOMS_CoolAction/Assets/Animations/Action/@CA_Dash_Bwd.FBX - uploadId: 862270 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Fwd.FBX.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Fwd.FBX.meta index c6c5c55..a4e273f 100644 --- a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Fwd.FBX.meta +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale@Dodge_Start_Fwd.FBX.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 8353ee390798c84488f8662c76c42260 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +16,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -48,10 +46,10 @@ ModelImporter: loopBlend: 0 loopBlendOrientation: 1 loopBlendPositionY: 1 - loopBlendPositionXZ: 1 + loopBlendPositionXZ: 0 keepOriginalOrientation: 1 keepOriginalPositionY: 1 - keepOriginalPositionXZ: 1 + keepOriginalPositionXZ: 0 heightFromFeet: 0 mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 @@ -87,6 +85,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -815,8 +816,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim new file mode 100644 index 0000000..db4bd6e --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ab7327c15b7fa945774578d61826e594b10b1a11e8124d06ffb5ec38d4cdf5 +size 2334147 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim.meta new file mode 100644 index 0000000..09dc1ed --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Bwd_RM.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77321e851ac705a49bc5874297f9a006 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim new file mode 100644 index 0000000..8141b5e --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ca8391650b595f2ad127af6d2808bbffa9ca5bfeb4363a7c75c30fd64a3ac16 +size 2273250 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim.meta new file mode 100644 index 0000000..37d33ee --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_End_Fwd_RM.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e845594797ae1e409cccb627f531ed3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim new file mode 100644 index 0000000..de1f8c1 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17b2dd8026bfe0fa73f56c6048f37cd36cddee23673da3ff559b3d9bc78a0d16 +size 4663788 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim.meta new file mode 100644 index 0000000..0f335af --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8eb0b6f781201d488b34c40b70591c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim new file mode 100644 index 0000000..36a926b --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:246080664922ca1469b33efa2545c0c670970e473dbff970680db85555aafa47 +size 245944 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim.meta new file mode 100644 index 0000000..95a808b --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Bwd.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b97958c66487784e9ef81a8742061a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim new file mode 100644 index 0000000..16caf67 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2f8329bf53a9ce6bcf53e5695a687b061fcefccda8151f1277b8b0e4a8f4dfc +size 247909 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim.meta new file mode 100644 index 0000000..6d58fb5 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Loop_Fwd.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbb60bc5eb6e1f343bd9e8b12126b900 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim new file mode 100644 index 0000000..8aedef9 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cdca73f4b9ebb4f753d73ab720bddd8e0d22e4b804224568559cf6a11fbe5d5 +size 3801788 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim.meta new file mode 100644 index 0000000..f6c444e --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1beae37fce1b7f9498e91b0a4c6e424c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim new file mode 100644 index 0000000..aef5a9a --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8107436558429362c282581de8f4f042026eaf3c5c90cbc14ef715842867e312 +size 1573163 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim.meta new file mode 100644 index 0000000..52f92a0 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Bwd_RM.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06a2ffe2693a44642a27891e170d8b59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim new file mode 100644 index 0000000..9c285d2 --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dfbd03a827f71da5a2bc6e5755835c5a0cbe20ea39a068373c96ce8f6db6341 +size 1595269 diff --git a/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim.meta b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim.meta new file mode 100644 index 0000000..63f085b --- /dev/null +++ b/Assets/04_Characters/FeMale/Animations/Dodge/FeMale_Dodge_Start_Fwd_RM.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1d6b2301b6afa94ea5e19cc54572441 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Characters/_Game/Players/Player_Gold/Player_Gold_AnimController.controller b/Assets/04_Characters/_Game/Players/Player_Gold/Player_Gold_AnimController.controller index 2198940..72aa9a8 100644 --- a/Assets/04_Characters/_Game/Players/Player_Gold/Player_Gold_AnimController.controller +++ b/Assets/04_Characters/_Game/Players/Player_Gold/Player_Gold_AnimController.controller @@ -1,5 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9046083185347147507 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Loop_Fwd + m_Speed: 0.2 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3357864253676057110} + 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: 7400000, guid: cbb60bc5eb6e1f343bd9e8b12126b900, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-8722098701096857895 AnimatorState: serializedVersion: 6 @@ -78,6 +105,78 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8024466712095330630 +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: -8570500849040507336} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7963924178289167818 +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: DodgeTrigger + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: DodgeAnimType + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4318311975501677214} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7907393263805376904 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-7579174083933423690 AnimatorStateMachine: serializedVersion: 6 @@ -141,6 +240,100 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1101 &-6291363380844226556 +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: -9046083185347147507} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.02 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6148920265124558464 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6117129080687154468 +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: DodgeTrigger + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: DodgeAnimType + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6291579955758181559} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-5888339968087681051 +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: -1127860512156195972} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.02 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-5656908960061501505 AnimatorState: serializedVersion: 6 @@ -219,6 +412,50 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1976129971184940029 +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: -8570500849040507336} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1603015540798273785 +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: -8570500849040507336} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1500156996094094829 AnimatorState: serializedVersion: 6 @@ -247,6 +484,55 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-1127860512156195972 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Loop_Bwd + m_Speed: 0.2 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4570026667187063362} + 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: 7400000, guid: 2b97958c66487784e9ef81a8742061a3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-836702214325906071 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-698811317881900774 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -323,6 +609,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: DodgeTrigger + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: DodgeAnimType + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -384,6 +682,62 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &353558729242649957 +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: DodgeTrigger + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: DodgeAnimType + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4949057993600689868} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &388199595845217076 +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: DodgeTrigger + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: DodgeAnimType + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1324399673947456525} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &1245360627142967677 BlendTree: m_ObjectHideFlags: 1 @@ -519,6 +873,34 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1102 &1324399673947456525 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Right + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7907393263805376904} + - {fileID: -1976129971184940029} + 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: 7400000, guid: 1beae37fce1b7f9498e91b0a4c6e424c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!206 &2089482822529989841 BlendTree: m_ObjectHideFlags: 1 @@ -606,6 +988,56 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 2 +--- !u!1101 &3357864253676057110 +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: 4074845238009965472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4074845238009965472 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_End_Fwd_RM + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -836702214325906071} + - {fileID: -8024466712095330630} + 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: 7400000, guid: 3e845594797ae1e409cccb627f531ed3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &4138553629876828812 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -631,6 +1063,55 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &4318311975501677214 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Start_Fwd_RM + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6291363380844226556} + 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: 7400000, guid: e1d6b2301b6afa94ea5e19cc54572441, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4570026667187063362 +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: 6013777257816203469} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &4699439757535628436 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -656,6 +1137,56 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &4949057993600689868 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Left + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6148920265124558464} + - {fileID: 5328461273130313044} + 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: 7400000, guid: e8eb0b6f781201d488b34c40b70591c6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5003769350869484587 +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: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5274542655692502972 AnimatorState: serializedVersion: 6 @@ -682,6 +1213,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5328461273130313044 +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: -8570500849040507336} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.3 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5635060497623533376 AnimatorState: serializedVersion: 6 @@ -728,6 +1281,61 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 0} +--- !u!1102 &6013777257816203469 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_End_Bwd_RM + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5003769350869484587} + - {fileID: -1603015540798273785} + 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: 7400000, guid: 77321e851ac705a49bc5874297f9a006, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6291579955758181559 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Dodge_Start_Bwd_RM + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5888339968087681051} + 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: 7400000, guid: 06a2ffe2693a44642a27891e170d8b59, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &8227715279690986525 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -797,10 +1405,10 @@ AnimatorStateMachine: m_Position: {x: 30, y: -270, z: 0} - serializedVersion: 1 m_State: {fileID: -8722098701096857895} - m_Position: {x: -140, y: 280, z: 0} + m_Position: {x: 100, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 5274542655692502972} - m_Position: {x: -140, y: 350, z: 0} + m_Position: {x: 100, y: 310, z: 0} - serializedVersion: 1 m_State: {fileID: 5635060497623533376} m_Position: {x: -180, y: 150, z: 0} @@ -810,9 +1418,37 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -1500156996094094829} m_Position: {x: 330, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4318311975501677214} + m_Position: {x: -1130, y: 310, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4074845238009965472} + m_Position: {x: -1130, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6291579955758181559} + m_Position: {x: -900, y: 310, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6013777257816203469} + m_Position: {x: -900, y: 480, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4949057993600689868} + m_Position: {x: -660, y: 340, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1324399673947456525} + m_Position: {x: -440, y: 340, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9046083185347147507} + m_Position: {x: -1130, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1127860512156195972} + m_Position: {x: -900, y: 400, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -2852576785219703626} + - {fileID: -7963924178289167818} + - {fileID: -6117129080687154468} + - {fileID: 353558729242649957} + - {fileID: 388199595845217076} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] diff --git a/Assets/98_Input/InputSystem_Actions.inputactions b/Assets/98_Input/InputSystem_Actions.inputactions index 3e9d431..5bc9b15 100644 --- a/Assets/98_Input/InputSystem_Actions.inputactions +++ b/Assets/98_Input/InputSystem_Actions.inputactions @@ -105,6 +105,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Dodge", + "type": "Button", + "id": "3f2622d8-6022-4a1a-b513-7e415ded4e7b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -283,6 +292,17 @@ "action": "Look", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "58155357-d0cb-4cd1-9eac-31156dd473e2", + "path": "/leftCtrl", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Dodge", + "isComposite": false, + "isPartOfComposite": false } ] },