diff --git a/Assets/02.Scripts/Character/AnimationController.cs b/Assets/02.Scripts/Character/AnimationController.cs index 2351fa116..ea62063a3 100644 --- a/Assets/02.Scripts/Character/AnimationController.cs +++ b/Assets/02.Scripts/Character/AnimationController.cs @@ -79,6 +79,11 @@ namespace BlueWater return _animator.GetCurrentAnimatorStateInfo(animatorLayer).normalizedTime; } + public float GetCurrentAnimationLength(int animatorLayer = 0) + { + return _animator.GetCurrentAnimatorStateInfo(animatorLayer).length; + } + public void ResetAnimationSpeed() { _animator.speed = 1f; diff --git a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset index 82a781d98..7c04db62d 100644 --- a/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset +++ b/Assets/02.Scripts/ScriptableObject/Enemy/Boss/SlimeData.asset @@ -24,7 +24,7 @@ MonoBehaviour: - k__BackingField: 1 k__BackingField: 7 k__BackingField: 100 - k__BackingField: 1 + k__BackingField: 1.2 k__BackingField: 10 k__BackingField: {x: 1.5, y: 2.5} k__BackingField: 1 @@ -33,7 +33,7 @@ MonoBehaviour: - k__BackingField: 2 k__BackingField: 6 k__BackingField: 70 - k__BackingField: 0.8 + k__BackingField: 1.1 k__BackingField: 8 k__BackingField: {x: 1.25, y: 2.25} k__BackingField: 0 @@ -42,7 +42,7 @@ MonoBehaviour: - k__BackingField: 3 k__BackingField: 4 k__BackingField: 50 - k__BackingField: 0.6 + k__BackingField: 1 k__BackingField: 6 k__BackingField: {x: 1, y: 2} k__BackingField: 0 @@ -51,7 +51,7 @@ MonoBehaviour: - k__BackingField: 4 k__BackingField: 2 k__BackingField: 30 - k__BackingField: 0.5 + k__BackingField: 0.9 k__BackingField: 7 k__BackingField: {x: 0.75, y: 1.75} k__BackingField: 0 @@ -60,7 +60,7 @@ MonoBehaviour: - k__BackingField: 5 k__BackingField: 1 k__BackingField: 10 - k__BackingField: 0.45 + k__BackingField: 0.8 k__BackingField: 8 k__BackingField: {x: 0.5, y: 1.5} k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/TitanSlime/JumpSlamData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/TitanSlime/JumpSlamData.asset index 0bec13740..286fd3988 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/TitanSlime/JumpSlamData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/TitanSlime/JumpSlamData.asset @@ -17,11 +17,12 @@ MonoBehaviour: k__BackingField: k__BackingField: 1 k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0.5 k__BackingField: 0 k__BackingField: 1 k__BackingField: 3 k__BackingField: 2 k__BackingField: 3 k__BackingField: 0.5 + k__BackingField: 3 diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs index 5a9357b21..36ee51aef 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/TitanSlime/JumpSlam.cs @@ -43,13 +43,13 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills { Utils.StartUniqueCoroutine(this, ref SkillCoroutineInstance, SkillCoroutine(actions)); } - + private IEnumerator SkillCoroutine(params Action[] actions) { EnableSkill = false; - _titanSlime.StopMove(); _animationController.SetAnimationParameter("isJumpSlam", true); + _animationController.SetAnimationParameter("idleIndex", 0); var animationStarted = false; yield return StartCoroutine(_animationController.WaitForAnimationToRun("JumpSlam", @@ -73,26 +73,33 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills transform.position = endPosition + Vector3.up * _colliderRadius; transform.localScale = Vector3.one * (_colliderRadius * 2f); - ShowIndicator(); if (_titanSlimeState.HasRabbit) { AudioManager.Instance.PlaySfx("JumpSlam"); } - var fill = 1 / _titanSlimeState.AnimationLength; + var startIndicatorTime = 1 - SkillData.CastingTime; + var fill = 1 / startIndicatorTime; + var isShowingIndicator = false; while (_animationController.IsComparingCurrentAnimation("JumpSlam") && _animationController.GetCurrentAnimationNormalizedTime() <= 1f) { + var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); if (IsUsingIndicator && Indicator) { - var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; - Indicator.material.SetFloat(_fillHash, fillValue); + if (startIndicatorTime <= normalizedTime) + { + if (!isShowingIndicator) + { + ShowIndicator(); + isShowingIndicator = true; + } + var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; + Indicator.material.SetFloat(_fillHash, fillValue); + } } - var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); - var horizontalPosition = Vector3.Lerp(startPosition, endPosition, normalizedTime); - var heightFactor = Mathf.Sin(Mathf.PI * normalizedTime); - SkillUser.transform.position = new Vector3(horizontalPosition.x, startPosition.y + heightFactor * _jumpSlamData.JumpHeight, horizontalPosition.z); + SkillUser.transform.position = Vector3.Lerp(startPosition, endPosition, normalizedTime); yield return null; } @@ -108,14 +115,89 @@ namespace BlueWater.Enemies.Bosses.TitanSlime.Skills private void EndSkill(float cooldown, Action action) { Utils.EndUniqueCoroutine(this, ref SkillCoroutineInstance); - + + var randomIdleIndex = Random.Range(1, 3); _animationController.ResetAnimationSpeed(); + _animationController.SetAnimationParameter("idleIndex", randomIdleIndex); _animationController.SetAnimationParameter("isJumpSlam", false); _userRigidbody.useGravity = true; action?.Invoke(); Utils.StartUniqueCoroutine(this, ref CooldownCoroutineInstance,Utils.CoolDownCoroutine(cooldown, EndCooldown)); } + + // private IEnumerator SkillCoroutine(params Action[] actions) + // { + // EnableSkill = false; + // + // _titanSlime.StopMove(); + // _animationController.SetAnimationParameter("isJumpSlam", true); + // + // var animationStarted = false; + // yield return StartCoroutine(_animationController.WaitForAnimationToRun("JumpSlam", + // success => animationStarted = success)); + // + // if (!animationStarted) + // { + // EndSkill(0, actions[0]); + // yield break; + // } + // + // _userRigidbody.useGravity = false; + // _animationController.SetCurrentAnimationSpeed(_titanSlimeState.AnimationLength); + // + // var startPosition = SkillUser.transform.position; + // var targetPosition = _targetCollider.transform.position; + // var targetDistance = Vector3.Distance(targetPosition, startPosition); + // var endPosition = targetDistance <= _titanSlimeState.ViewRange + // ? CalculateRandomPosition(targetPosition, 1f) + // : CalculateRandomPosition(startPosition, 3f); + // + // transform.position = endPosition + Vector3.up * _colliderRadius; + // transform.localScale = Vector3.one * (_colliderRadius * 2f); + // ShowIndicator(); + // + // if (_titanSlimeState.HasRabbit) + // { + // AudioManager.Instance.PlaySfx("JumpSlam"); + // } + // + // var fill = 1 / _titanSlimeState.AnimationLength; + // while (_animationController.IsComparingCurrentAnimation("JumpSlam") && + // _animationController.GetCurrentAnimationNormalizedTime() <= 1f) + // { + // if (IsUsingIndicator && Indicator) + // { + // var fillValue = Indicator.material.GetFloat(_fillHash) + Time.deltaTime * fill; + // Indicator.material.SetFloat(_fillHash, fillValue); + // } + // var normalizedTime = _animationController.GetCurrentAnimationNormalizedTime(); + // var horizontalPosition = Vector3.Lerp(startPosition, endPosition, normalizedTime); + // var heightFactor = Mathf.Sin(Mathf.PI * normalizedTime); + // SkillUser.transform.position = new Vector3(horizontalPosition.x, startPosition.y + heightFactor * _jumpSlamData.JumpHeight, horizontalPosition.z); + // + // yield return null; + // } + // + // HideIndicator(); + // SkillUser.transform.position = endPosition; + // var randomCooldown = Random.Range(_titanSlimeState.RandomCooldown.x, _titanSlimeState.RandomCooldown.y); + // + // DoAttack(endPosition); + // EndSkill(randomCooldown, actions[0]); + // } + // + // private void EndSkill(float cooldown, Action action) + // { + // Utils.EndUniqueCoroutine(this, ref SkillCoroutineInstance); + // + // _animationController.ResetAnimationSpeed(); + // _animationController.SetAnimationParameter("isJumpSlam", false); + // _userRigidbody.useGravity = true; + // action?.Invoke(); + // + // Utils.StartUniqueCoroutine(this, ref CooldownCoroutineInstance,Utils.CoolDownCoroutine(cooldown, EndCooldown)); + // } private Vector3 CalculateRandomPosition(Vector3 startPosition, float range, int iterationCount = 100) { diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab index 3a242b209..0c11277a3 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab @@ -98,18 +98,22 @@ PrefabInstance: - target: {fileID: 310644174614533744, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_Controller value: - objectReference: {fileID: 9100000, guid: 6b9e8e1525b02c145b8817927168bfa3, type: 2} + objectReference: {fileID: 9100000, guid: 8fe41f34df91b3f4e8e002f6fd4d7b90, type: 2} + - target: {fileID: 3476210053167940160, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_LocalScale.x - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_LocalScale.y - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_LocalScale.z - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6255916646741457976, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_LocalPosition.x @@ -154,7 +158,7 @@ PrefabInstance: - target: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d6b1de63f7c4f9d49abc4e5ca656f027, type: 3} + objectReference: {fileID: 21300000, guid: 1fafe0657fb83b2459087e593642117f, type: 3} - target: {fileID: 6274137400612009998, guid: db7798cbd0a93f44aac56d479a2994c7, type: 3} propertyPath: m_WasSpriteAssigned value: 1 diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle.anim b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle01.anim similarity index 99% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle.anim rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle01.anim index a0ff4cf7b..eb389b066 100644 --- a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle.anim +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle01.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle + m_Name: Idle01 serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle.anim.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle01.anim.meta similarity index 100% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle.anim.meta rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle01.anim.meta diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim new file mode 100644 index 000000000..a40340bd9 --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim @@ -0,0 +1,276 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 1.5, y: 0.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 1.15, y: 0.85, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.85 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim.meta new file mode 100644 index 000000000..902d7011e --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7417ed5eb1f7fac4db74423289ffaa42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim new file mode 100644 index 000000000..f71b6a047 --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim @@ -0,0 +1,285 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle03 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.35, y: 0.65, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 1.4, y: 0.6, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 1.2, y: 0.8, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 1.4, y: 0.6, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 1.35, y: 0.65, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.35 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.35 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.65 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.65 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim.meta new file mode 100644 index 000000000..0d18dd05c --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/Idle03.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4276c5af03fbab45a2d413bc3eb93f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam.anim b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam01.anim similarity index 99% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam.anim rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam01.anim index bbc60b3f7..988814819 100644 --- a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam.anim +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam01.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JumpSlam + m_Name: JumpSlam01 serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam.anim.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam01.anim.meta similarity index 100% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam.anim.meta rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam01.anim.meta diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim new file mode 100644 index 000000000..060649ffc --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim @@ -0,0 +1,589 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpSlam02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0.5, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0.37037033, z: 0} + inSlope: {x: 0, y: -1.0694444, z: 0} + outSlope: {x: 0, y: -1.0694444, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0, y: 0.14351857, z: 0} + inSlope: {x: 0, y: -1.111111, z: 0} + outSlope: {x: 0, y: -1.111111, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.5, y: 0.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 1.4, y: 0.6, z: 1} + inSlope: {x: -0.8000002, y: 0.8000002, z: 0} + outSlope: {x: -0.8000002, y: 0.8000002, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0.5, y: 1.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1.1, y: 0.9, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0.8, y: 1.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 1.5, y: 0.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1.4 + inSlope: -0.8000002 + outSlope: -0.8000002 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.6 + inSlope: 0.8000002 + outSlope: 0.8000002 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.37037033 + inSlope: -1.0694444 + outSlope: -1.0694444 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.14351857 + inSlope: -1.111111 + outSlope: -1.111111 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim.meta new file mode 100644 index 000000000..f486066d3 --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/JumpSlam02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4553181c1fde7264691809460d5f3ee0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime.controller b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime01.controller similarity index 99% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime.controller rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime01.controller index d813f206a..4fb0547f5 100644 --- a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime.controller +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime01.controller @@ -83,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: TitanSlime + m_Name: TitanSlime01 serializedVersion: 5 m_AnimatorParameters: - m_Name: isJumpSlam diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime.controller.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime01.controller.meta similarity index 100% rename from Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime.controller.meta rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime01.controller.meta diff --git a/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller new file mode 100644 index 000000000..8d429011f --- /dev/null +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller @@ -0,0 +1,252 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8414504172347423945 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle03 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2976679204716556710} + 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: a4276c5af03fbab45a2d413bc3eb93f4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7016525864609928283 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpSlam + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3151112554341954750} + - {fileID: 9086732281484457503} + 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: 4553181c1fde7264691809460d5f3ee0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-3151112554341954750 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isJumpSlam + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: idleIndex + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1942324923186578916} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.8974782 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2976679204716556710 +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: isJumpSlam + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7016525864609928283} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.04692751 + m_TransitionOffset: 0 + m_ExitTime: 0.9527826 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2565555922634151165 +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: -1942324923186578916} + m_Position: {x: 340, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7016525864609928283} + m_Position: {x: 460, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8414504172347423945} + m_Position: {x: 580, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + 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: 880, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1942324923186578916} +--- !u!1101 &-2519802886456780164 +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: isJumpSlam + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7016525864609928283} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.8974202 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1942324923186578916 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle02 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2519802886456780164} + 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: 7417ed5eb1f7fac4db74423289ffaa42, type: 2} + 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: TitanSlime02 + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isJumpSlam + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: idleIndex + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2565555922634151165} + 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!1101 &9086732281484457503 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isJumpSlam + m_EventTreshold: 0 + - m_ConditionMode: 6 + m_ConditionEvent: idleIndex + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8414504172347423945} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.050000012 + m_TransitionOffset: 0.0028312835 + m_ExitTime: 0.9457088 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/07.Animations/CombatPlayer.controller.meta b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller.meta similarity index 79% rename from Assets/07.Animations/CombatPlayer.controller.meta rename to Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller.meta index 515211f22..361d18dea 100644 --- a/Assets/07.Animations/CombatPlayer.controller.meta +++ b/Assets/07.Animations/Characters/Enemies/Bosses/TitanSlime/TitanSlime02.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ba7128fb2a648b45afdadc20a611653 +guid: 8fe41f34df91b3f4e8e002f6fd4d7b90 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/07.Animations/CombatPlayer.controller b/Assets/07.Animations/CombatPlayer.controller deleted file mode 100644 index 65309d97e..000000000 --- a/Assets/07.Animations/CombatPlayer.controller +++ /dev/null @@ -1,12 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CombatPlayer - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: []