diff --git a/Assets/06_ScriptableObjects.meta b/Assets/06_ScriptableObjects.meta new file mode 100644 index 0000000..f24ed1c --- /dev/null +++ b/Assets/06_ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e77ea369962199342b0e376f37cd3ab7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_ScriptableObjects/Skills.meta b/Assets/06_ScriptableObjects/Skills.meta new file mode 100644 index 0000000..d128f46 --- /dev/null +++ b/Assets/06_ScriptableObjects/Skills.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 287b4831b04b43c40bcd01ea273575e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset b/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset new file mode 100644 index 0000000..b2ea308 --- /dev/null +++ b/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70999adc26904334b845df97100da8b1, type: 3} + m_Name: 00_Skill_Elephant + m_EditorClassIdentifier: + skillPrefab: {fileID: 3924616633544540249, guid: d1bd1f24581f2cd4aa611b613ef53298, type: 3} + skillCoolTime: 1 + skillStopTime: 0.35 diff --git a/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset.meta b/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset.meta new file mode 100644 index 0000000..60d5a3f --- /dev/null +++ b/Assets/06_ScriptableObjects/Skills/00_Skill_Elephant.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 041e9e2107537264ab3fb01c4f23df99 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/0_Scenes/Game.unity b/Assets/0_Scenes/Game.unity index cfc7639..21cdb89 100644 --- a/Assets/0_Scenes/Game.unity +++ b/Assets/0_Scenes/Game.unity @@ -248,7 +248,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1027484180 +--- !u!1 &558703632 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -256,68 +256,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1027484182} - - component: {fileID: 1027484181} - - component: {fileID: 1027484183} + - component: {fileID: 558703633} m_Layer: 0 - m_Name: Player + m_Name: Skills m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1027484181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027484180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f5ce1188e2abd3c45b15851146565423, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 5 - dashDistance: 3 - dashCooldown: 1 - maxSpeed: 8 - accelerationTime: 2 - dashTime: 0.3 - moveTime: 0 - playerState: 0 - idleState: 0 ---- !u!4 &1027484182 +--- !u!4 &558703633 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027484180} + m_GameObject: {fileID: 558703632} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1451512198} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1027484183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027484180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a39f177316563f44b93781c9c27e5266, type: 3} - m_Name: - m_EditorClassIdentifier: - attackTime: 0.2 - attackCooldown: 0.5 ---- !u!1 &1451512195 +--- !u!1 &820957935 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -325,104 +287,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1451512198} - - component: {fileID: 1451512197} - - component: {fileID: 1451512196} + - component: {fileID: 820957937} + - component: {fileID: 820957936} m_Layer: 0 - m_Name: ine_idle_front_0 + m_Name: Test m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!95 &1451512196 -Animator: - serializedVersion: 7 +--- !u!114 &820957936 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1451512195} + m_GameObject: {fileID: 820957935} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2329a6f221ff90e4cb35d4f9b7099432, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &1451512197 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1451512195} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 5336683018331574198, guid: 4355109e15b558f47b557891ec0e2f79, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.5, y: 1.34} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1451512198 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4516b850d6efd2e4f99a556620b38ce7, type: 3} + m_Name: + m_EditorClassIdentifier: + skillTr: {fileID: 558703633} + skill: {fileID: 11400000, guid: 041e9e2107537264ab3fb01c4f23df99, type: 2} +--- !u!4 &820957937 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1451512195} + m_GameObject: {fileID: 820957935} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 896.5191, y: 547.0058, z: -0.9581684} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1027484182} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578057060 GameObject: @@ -507,6 +408,51 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1587264153 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587264155} + - component: {fileID: 1587264154} + m_Layer: 0 + m_Name: PlayerManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1587264154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587264153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c517b86a0d4b4f47a1685a6973f0c06, type: 3} + m_Name: + m_EditorClassIdentifier: + playerPrefab: {fileID: 5086480414002667045, guid: 92f3c6cf5af3586409d42913ed57f931, type: 3} +--- !u!4 &1587264155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587264153} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -514,4 +460,6 @@ SceneRoots: - {fileID: 360315422} - {fileID: 29877047} - {fileID: 1578057063} - - {fileID: 1027484182} + - {fileID: 1587264155} + - {fileID: 820957937} + - {fileID: 558703633} diff --git a/Assets/1_Script/Common.meta b/Assets/1_Script/Common.meta new file mode 100644 index 0000000..e0fd626 --- /dev/null +++ b/Assets/1_Script/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0db40d2fd3d03fc439f0739a1ed85c6d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Common/Utilities.meta b/Assets/1_Script/Common/Utilities.meta new file mode 100644 index 0000000..8ac4a7a --- /dev/null +++ b/Assets/1_Script/Common/Utilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4842e5bc1cca863418d9309ca2d32cd8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs b/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs new file mode 100644 index 0000000..5d0ec4e --- /dev/null +++ b/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ObjOffAfterTime : MonoBehaviour +{ + [SerializeField] float time; + private void OnEnable() + { + Invoke("ObjOff", time); + } + void ObjOff() { gameObject.SetActive(false); } +} diff --git a/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs.meta b/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs.meta new file mode 100644 index 0000000..dbb46d3 --- /dev/null +++ b/Assets/1_Script/Common/Utilities/ObjOffAfterTime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 184f2910ee922884b8ab520482eb0ed0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Play/PlayManager.cs b/Assets/1_Script/Play/PlayManager.cs index b277c09..d8e90b6 100644 --- a/Assets/1_Script/Play/PlayManager.cs +++ b/Assets/1_Script/Play/PlayManager.cs @@ -10,14 +10,6 @@ public class PlayManager : SingletonMonoBehaviour UnityEngine.SceneManagement.SceneManager.LoadScene(0); return; } - //if( GameManager.Instance.isSpeedRun) - //{ - // Debug.Log("SpeedRun 모드 활성화"); - //} - //else - //{ - // Debug.Log("일반 모드 활성화"); - //} } Event keyEvent; @@ -27,13 +19,11 @@ public class PlayManager : SingletonMonoBehaviour public Action keyAdown = null; public Action keySdown = null; public Action keyDdown = null; - public Action keyWup = null; - public Action keySup = null; - public Action keyAup = null; - public Action keyDup = null; + public Action keyQdown = null; public Action kewEsc = null; public Action keySpace = null; public Action leftMouve = null; + public Action rightMouve = null; private void OnGUI() { keyEvent = Event.current; @@ -57,30 +47,14 @@ public class PlayManager : SingletonMonoBehaviour case KeyCode.W: keyWdown?.Invoke(); break; + case KeyCode.Q: + keyQdown?.Invoke(); + break; case KeyCode.Space: - Debug.Log(keySpace); keySpace?.Invoke(); break; } } - else if (keyEvent.type == EventType.KeyUp) - { - switch (Event.current.keyCode) - { - case KeyCode.A: - keyAup?.Invoke(); - break; - case KeyCode.D: - keyDup?.Invoke(); - break; - case KeyCode.S: - keySup?.Invoke(); - break; - case KeyCode.W: - keyWup?.Invoke(); - break; - } - } } private void Update() { @@ -88,5 +62,9 @@ public class PlayManager : SingletonMonoBehaviour { leftMouve?.Invoke(); } + if(Input.GetMouseButtonDown(1)) + { + rightMouve?.Invoke(); + } } } diff --git a/Assets/1_Script/Player/PlayerAttack.cs b/Assets/1_Script/Player/PlayerAttack.cs index b17318f..f9b4555 100644 --- a/Assets/1_Script/Player/PlayerAttack.cs +++ b/Assets/1_Script/Player/PlayerAttack.cs @@ -1,4 +1,5 @@ using System.Collections; +using System.Collections.Generic; using UnityEngine; using static PlayerController; @@ -7,62 +8,71 @@ public class PlayerAttack : MonoBehaviour Animator animator; PlayerController controller; public float attackTime = 0.5f; // 공격 후 쿨다운 + public float attackCoolTime = 0.5f; + private int attackCount = 0; // 현재 공격 횟수 - private float lastAttackTime; - private bool canAttack = true; private int attackIdx = 0; // 공격 애니메이션 인덱스 (0,1 반복) - private string[] anim_Strings = { "AttackIdx", "AttackState", "idleState" }; + private bool canAttack = true; + private void Start() { controller = GetComponent(); animator = GetComponentInChildren(); PlayManager.Instance.leftMouve += Attack; + Debug.Log(123); } - private void Update() - { - if (controller.playerState == PlayerState.Dash) return; - - if (attackCount > 0 && Time.time - lastAttackTime >= attackTime) - { - AttackStop(); // 일반적인 경우는 그냥 AttackStop() - } - } void Attack() { - if(!canAttack) return; + if(!canAttack || controller.playerState == PlayerState.Skill) return; controller.playerState = PlayerState.Attack; - lastAttackTime = Time.time; attackCount++; - Debug.Log($"Attack Count: {attackCount}, Attack Index: {attackIdx}"); - animator.SetInteger(anim_Strings[0], attackIdx); + animator.SetInteger("AttackIdx", attackIdx); attackIdx = (attackIdx + 1) % 2; AttackRot(); - animator.SetFloat(anim_Strings[1], controller.idleState); + animator.SetFloat("idleState", controller.idleState); + if(coroutine != null) + { + StopCoroutine(coroutine); + coroutine = StartCoroutine(AttackStopCoroutin()); + } + else + { + coroutine = StartCoroutine(AttackStopCoroutin()); + } if (attackCount >= 3) { StartCoroutine(AttackCooldown()); // 마지막 공격이면 쿨다운 실행 } } - - public void AttackStop() + Coroutine coroutine; + IEnumerator AttackStopCoroutin() + { + yield return new WaitForSeconds(attackTime); + AttackStop(); + } + private void AttackStop() { attackCount = 0; controller.playerState = PlayerState.Idle; - animator.SetInteger(anim_Strings[0], -1); + animator.SetInteger("AttackIdx", -1); + } + public void AttackInitialized() + { + attackCount = 0; } IEnumerator AttackCooldown() { canAttack = false; - yield return new WaitForSeconds(attackTime); + yield return new WaitForSeconds(attackCoolTime); AttackStop(); // 마지막 공격 후 Stop canAttack = true; } @@ -77,19 +87,19 @@ public class PlayerAttack : MonoBehaviour if (Mathf.Abs(mouseScreenPos.x - playerScreenPos.x) > Mathf.Abs(mouseScreenPos.y - playerScreenPos.y)) { transform.GetChild(0).localEulerAngles = isLeft ? new Vector3(0, 180, 0) : new Vector3(0, 0, 0); - animator.SetFloat(anim_Strings[2], 1); + animator.SetFloat("AttackState", 1); controller.idleState = 1f; } else { if (mouseScreenPos.y > playerScreenPos.y) { - animator.SetFloat(anim_Strings[2], 0.5f); + animator.SetFloat("AttackState", 0.5f); controller.idleState = 2f / 3f; } else { - animator.SetFloat(anim_Strings[2], 0); + animator.SetFloat("AttackState", 0); controller.idleState = 1f / 3f; } } diff --git a/Assets/1_Script/Player/PlayerContoller.cs b/Assets/1_Script/Player/PlayerContoller.cs index 67011b2..852ebb2 100644 --- a/Assets/1_Script/Player/PlayerContoller.cs +++ b/Assets/1_Script/Player/PlayerContoller.cs @@ -11,10 +11,9 @@ public class PlayerController : MonoBehaviour public float accelerationTime = 2f; // 2초 동안 가속 public float dashTime = 0.5f; public float moveTime = 0f; // 이동한 시간 - public enum PlayerState { Idle, Walking, Dash, Attack } + public enum PlayerState { Idle, Walking, Dash, Attack, Skill } public PlayerState playerState; private Vector2 moveDirection = Vector2.zero; // 현재 이동 방향 - private string[] anim_Strings = { "PosX", "PosY", "idleState" }; PlayerAttack playerAttack; Animator animator; @@ -43,7 +42,7 @@ public class PlayerController : MonoBehaviour // 이동 처리 void HandleMovement() { - if (playerState == PlayerState.Dash || playerState == PlayerState.Attack) return; + if (playerState == PlayerState.Dash || playerState == PlayerState.Attack || playerState == PlayerState.Skill) return; moveDirection = Vector2.zero; // 매 프레임 초기화 if (Input.GetKey(KeyCode.A)) moveDirection += Vector2.left; @@ -65,13 +64,13 @@ public class PlayerController : MonoBehaviour // A 또는 D가 눌린 상태라면 Side 애니메이션을 우선 적용 if (moveDirection.x != 0) { - animator.SetFloat(anim_Strings[0], 1); - animator.SetFloat(anim_Strings[1], 0); + animator.SetFloat("PosX", 1); + animator.SetFloat("PosY", 0); } else { - animator.SetFloat(anim_Strings[0], 0); - animator.SetFloat(anim_Strings[1], moveDirection.y); + animator.SetFloat("PosX", 0); + animator.SetFloat("PosY", moveDirection.y); } // 회전 처리 if (Mathf.Abs(moveDirection.x) > 0) @@ -84,9 +83,9 @@ public class PlayerController : MonoBehaviour // 이동하지 않으면 Idle 상태를 설정 moveTime = 0f; animator.SetBool("isWalking", false); - animator.SetFloat(anim_Strings[0], 0); - animator.SetFloat(anim_Strings[1], 0); - animator.SetFloat(anim_Strings[2], idleState); + animator.SetFloat("PosX", 0); + animator.SetFloat("PosY", 0); + animator.SetFloat("idleState", idleState); } } private void PlayerRot(Vector2 direction) @@ -119,7 +118,7 @@ public class PlayerController : MonoBehaviour { playerState = PlayerState.Dash; animator.SetTrigger("DodgeTrigger"); - playerAttack.AttackStop(); + playerAttack.AttackInitialized(); moveTime = 0f; StartCoroutine(DashCoroutine()); // 대시 시작 } diff --git a/Assets/1_Script/Player/PlayerManager.cs b/Assets/1_Script/Player/PlayerManager.cs new file mode 100644 index 0000000..748a298 --- /dev/null +++ b/Assets/1_Script/Player/PlayerManager.cs @@ -0,0 +1,39 @@ +using UnityEngine; + +public class PlayerManager : MonoBehaviour +{ + public static PlayerManager Instance { get; private set; } + + [SerializeField] private GameObject playerPrefab; + private GameObject playerInstance; + + public GameObject Player => playerInstance; + + private void Awake() + { + Instance = this; + } + + private void Start() + { + if (playerInstance == null && playerPrefab != null) + { + playerInstance = Instantiate(playerPrefab, Vector3.zero, Quaternion.identity, transform); + } + else if (playerInstance == null) + { + Debug.LogError("Player Prefab이 할당되지 않았습니다!"); + } + } + + // Player 스크립트 참조 쉽게 하는 편의 메서드 + public T GetPlayerComponent() where T : Component + { + if (playerInstance == null) + { + Debug.LogWarning("플레이어 인스턴스가 존재하지 않습니다."); + return null; + } + return playerInstance.GetComponent(); + } +} diff --git a/Assets/1_Script/Player/PlayerManager.cs.meta b/Assets/1_Script/Player/PlayerManager.cs.meta new file mode 100644 index 0000000..444f858 --- /dev/null +++ b/Assets/1_Script/Player/PlayerManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c517b86a0d4b4f47a1685a6973f0c06 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Player/PlayerSkill.cs b/Assets/1_Script/Player/PlayerSkill.cs new file mode 100644 index 0000000..f49da17 --- /dev/null +++ b/Assets/1_Script/Player/PlayerSkill.cs @@ -0,0 +1,127 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class PlayerSkill : MonoBehaviour +{ + private Animator animator; + private PlayerController playerController; + public Dictionary skillList = new Dictionary(); + public enum SkillKeyType { M_Right, Q, E, R, T } + void Start() + { + playerController = GetComponent(); + animator = GetComponentInChildren(); + PlayManager.Instance.rightMouve += Skill_Right; + PlayManager.Instance.keySdown += Skill_Q; + } + + private void Skill_Right() + { + BaseSkill(SkillKeyType.M_Right); + } + private void Skill_Q() + { + BaseSkill(SkillKeyType.Q); + } + public void BaseSkill(SkillKeyType skillKeyType) + { + if (!skillList.ContainsKey(skillKeyType)) return; + SkillData skillData = skillList[skillKeyType]; + if (skillData != null && skillData.currentCoolTime == 0) + { + playerController.playerState = PlayerController.PlayerState.Skill; + SkillRot(); + skillData.skillBase.Active(this); + StartCoroutine(SkillCoolTime(skillData, skillData.skillBase.skillCoolTime)); + StartCoroutine(SkillStop(skillData.skillBase.skillStopTime)); + Debug.Log(123); + } + } + IEnumerator SkillStop(float time) + { + yield return new WaitForSeconds(time); + Debug.Log(123); + animator.SetInteger("SkillIdx", -1); + playerController.playerState = PlayerController.PlayerState.Idle; + } + IEnumerator SkillCoolTime(SkillData skillData,float time) + { + skillData.currentCoolTime = time; + yield return new WaitForSeconds(time); + skillData.currentCoolTime = 0; + } + public void SkillAdd(SkillBase skill, SkillKeyType skillKeyType) + { + if (!skillList.ContainsKey(skillKeyType)) + { + skillList[skillKeyType] = new SkillData(skill); + } + else + { + skillList[skillKeyType].skillBase = skill; + } + } + public void Skill_Anim(int idx) + { + animator.SetInteger("SkillIdx", idx); + } + public void SkillRot() + { + Vector3 playerScreenPos = Camera.main.WorldToScreenPoint(transform.position); + Vector3 mouseScreenPos = Input.mousePosition; + + bool isLeft = mouseScreenPos.x < playerScreenPos.x; + + if (Mathf.Abs(mouseScreenPos.x - playerScreenPos.x) > Mathf.Abs(mouseScreenPos.y - playerScreenPos.y)) + { + transform.GetChild(0).localEulerAngles = isLeft ? new Vector3(0, 180, 0) : new Vector3(0, 0, 0); + animator.SetFloat("AttackState", 1); + playerController.idleState = 1f; + } + else + { + if (mouseScreenPos.y > playerScreenPos.y) + { + animator.SetFloat("AttackState", 0.5f); + playerController.idleState = 2f / 3f; + } + else + { + animator.SetFloat("AttackState", 0); + playerController.idleState = 1f / 3f; + } + } + } + public Vector3 GetSkillDirection() + { + Vector3 playerScreenPos = Camera.main.WorldToScreenPoint(transform.position); + Vector3 mouseScreenPos = Input.mousePosition; + + Vector3 direction = (mouseScreenPos - playerScreenPos).normalized; + direction.z = 0; // 2D 기준이면 z는 0으로 + return direction; + } + + private SkillData FindSkillData(SkillBase skillBase) + { + foreach (var pair in skillList) + { + if (pair.Value.skillBase == skillBase) + return pair.Value; + } + return null; + } + public class SkillData + { + public SkillBase skillBase; + public float currentCoolTime; + + public SkillData(SkillBase baseSkill) + { + skillBase = baseSkill; + currentCoolTime = 0; + } + } +} \ No newline at end of file diff --git a/Assets/1_Script/Player/PlayerSkill.cs.meta b/Assets/1_Script/Player/PlayerSkill.cs.meta new file mode 100644 index 0000000..567a306 --- /dev/null +++ b/Assets/1_Script/Player/PlayerSkill.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: da150243b9548f44682c6e00a7d1e9ed +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/SO.meta b/Assets/1_Script/SO.meta new file mode 100644 index 0000000..c929eb3 --- /dev/null +++ b/Assets/1_Script/SO.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d8307864ef5554429dd27fdad1d1f7b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/SO/Skills.meta b/Assets/1_Script/SO/Skills.meta new file mode 100644 index 0000000..9aa9a98 --- /dev/null +++ b/Assets/1_Script/SO/Skills.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8b2840dad8d0114b9775f5803859f4c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/SO/Skills/SkillBase.cs b/Assets/1_Script/SO/Skills/SkillBase.cs new file mode 100644 index 0000000..68aa229 --- /dev/null +++ b/Assets/1_Script/SO/Skills/SkillBase.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class SkillBase : ScriptableObject +{ + public GameObject skillPrefab; + public float skillCoolTime; + public float skillStopTime; + public abstract void Active(PlayerSkill playerSkill); +} diff --git a/Assets/1_Script/SO/Skills/SkillBase.cs.meta b/Assets/1_Script/SO/Skills/SkillBase.cs.meta new file mode 100644 index 0000000..cb0b7b9 --- /dev/null +++ b/Assets/1_Script/SO/Skills/SkillBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5d12116bd9af6b848a0a1f30d1a7acb8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/SO/Skills/Skill_Elephant.cs b/Assets/1_Script/SO/Skills/Skill_Elephant.cs new file mode 100644 index 0000000..ef78224 --- /dev/null +++ b/Assets/1_Script/SO/Skills/Skill_Elephant.cs @@ -0,0 +1,20 @@ +using UnityEngine; + +[CreateAssetMenu(menuName = "Player/Skills/Skill_Elephant")] +public class Skill_Elephant : SkillBase +{ + public override void Active(PlayerSkill playerSkill) + { + playerSkill.Skill_Anim(0); + + Vector3 mouseScreenPos = Input.mousePosition; + mouseScreenPos.z = 10f; // 카메라로부터 10 유닛 앞에 스폰 + + Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(mouseScreenPos); + mouseWorldPos.z = 0f; // 2D면 z는 0 + + GameObject skill = Instantiate(skillPrefab, Test.Instance.skillTr); + skill.transform.position = mouseWorldPos; + skill.SetActive(true); + } +} diff --git a/Assets/1_Script/SO/Skills/Skill_Elephant.cs.meta b/Assets/1_Script/SO/Skills/Skill_Elephant.cs.meta new file mode 100644 index 0000000..9b295a8 --- /dev/null +++ b/Assets/1_Script/SO/Skills/Skill_Elephant.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 70999adc26904334b845df97100da8b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Test.cs b/Assets/1_Script/Test.cs index b02c43a..c84edb0 100644 --- a/Assets/1_Script/Test.cs +++ b/Assets/1_Script/Test.cs @@ -4,12 +4,22 @@ using UnityEngine; public class Test : MonoBehaviour { - + public Transform skillTr; + [SerializeField] SkillBase skill; + public static Test Instance; + private void Awake() + { + Instance = this; + } void Update() { - if(Input.GetKeyDown(KeyCode.W)) + if(Input.GetKeyDown(KeyCode.T)) { - transform.position += Vector3.up; + Tests(); } } + void Tests() + { + PlayerManager.Instance.GetPlayerComponent().SkillAdd(skill, PlayerSkill.SkillKeyType.M_Right); + } } diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills.meta new file mode 100644 index 0000000..3d18d5b --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c75a51b8269eed74b94af9ea804f9ff3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant.meta new file mode 100644 index 0000000..c0c623c --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c926d82bdbdbfb43b578dfa85c33edc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png new file mode 100644 index 0000000..1987aff Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png.meta new file mode 100644 index 0000000..bbc8d37 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant.png.meta @@ -0,0 +1,332 @@ +fileFormatVersion: 2 +guid: 06130c30194f4a24b9371e5375c2d81d +TextureImporter: + internalIDToNameTable: + - first: + 213: -749840660553697646 + second: ine_skill_elephant_0 + - first: + 213: 1068744861065384595 + second: ine_skill_elephant_1 + - first: + 213: -6779240592597117213 + second: ine_skill_elephant_2 + - first: + 213: -2430036411039725127 + second: ine_skill_elephant_3 + - first: + 213: 1240121237372802573 + second: ine_skill_elephant_4 + - first: + 213: -2888972393065648507 + second: ine_skill_elephant_5 + - first: + 213: 8011957944861444958 + second: ine_skill_elephant_6 + - first: + 213: -3363044308508671127 + second: ine_skill_elephant_7 + - first: + 213: -5602476004600743758 + second: ine_skill_elephant_8 + - first: + 213: -7066783261015251393 + second: ine_skill_elephant_9 + - first: + 213: 5745245628554414743 + second: ine_skill_elephant_10 + - first: + 213: 5991853452487344802 + second: ine_skill_elephant_11 + - first: + 213: -3814774475936278287 + second: ine_skill_elephant_12 + - first: + 213: 1773424926147044070 + second: ine_skill_elephant_13 + - first: + 213: 7883538275305047326 + second: ine_skill_elephant_14 + - first: + 213: 3923740633644795031 + second: ine_skill_elephant_15 + - first: + 213: 5157959640672788632 + second: ine_skill_elephant_16 + - first: + 213: -7938872906548835573 + second: ine_skill_elephant_17 + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_skill_elephant_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ec8168b610903f488dfd5d7a3454e9e + internalID: -1218299623 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1 + rect: + serializedVersion: 2 + x: 210 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 52d87603ed33195428daec3c9019201a + internalID: 1563511668 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2 + rect: + serializedVersion: 2 + x: 420 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ee57fbd76328c74c9ad7d38526def24 + internalID: -1162547397 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3 + rect: + serializedVersion: 2 + x: 630 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ba5e42c0c3f463040bbe3c6721333513 + internalID: 1328625289 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_4 + rect: + serializedVersion: 2 + x: 840 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6fe6ae75d4da56e4f8e2a00b10915a8e + internalID: 1614975929 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_5 + rect: + serializedVersion: 2 + x: 1050 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8bed20f086cf2904f9aefd40fc4652e7 + internalID: 390584684 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_6 + rect: + serializedVersion: 2 + x: 1260 + y: 0 + width: 210 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 491c50ec76ea06449b3522a512e0966e + internalID: -1212270713 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 550d26ce6204bbe4381bf17d7848ca17 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_skill_elephant_0: -1218299623 + ine_skill_elephant_1: 1563511668 + ine_skill_elephant_2: -1162547397 + ine_skill_elephant_3: 1328625289 + ine_skill_elephant_4: 1614975929 + ine_skill_elephant_5: 390584684 + ine_skill_elephant_6: -1212270713 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png new file mode 100644 index 0000000..961c802 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png.meta new file mode 100644 index 0000000..8e0085c --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_1_Front.png.meta @@ -0,0 +1,277 @@ +fileFormatVersion: 2 +guid: b2a9696d62bebe04f8faa63d6e9a94be +TextureImporter: + internalIDToNameTable: + - first: + 213: 9175310859075681695 + second: ine_skill_elephant_1-1_0 + - first: + 213: 4699011543847504018 + second: ine_skill_elephant_1-1_1 + - first: + 213: 1749131944384534825 + second: ine_skill_elephant_1-1_2 + - first: + 213: 3449260541160976709 + second: ine_skill_elephant_1-1_3 + - first: + 213: -7616995594210666293 + second: ine_skill_elephant_1-1_4 + - first: + 213: -5168148368631209317 + second: ine_skill_elephant_1-1_5 + - first: + 213: -9035891837375910894 + second: ine_skill_elephant_1-1_6 + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_skill_elephant_1-1_0 + rect: + serializedVersion: 2 + x: 20 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2cc34b7a41904a041bf3f7e2b7acd96c + internalID: 2128876000 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1-1_1 + rect: + serializedVersion: 2 + x: 210 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea1cab85150e966468bbd2846caffe59 + internalID: 2011239551 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1-1_2 + rect: + serializedVersion: 2 + x: 400 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9d892bf1bc8c89349a07ead6278b9bdf + internalID: -506559711 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1-1_3 + rect: + serializedVersion: 2 + x: 590 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 461de08807a6e6141a9eec38f0f2b30e + internalID: 956627902 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1-1_4 + rect: + serializedVersion: 2 + x: 780 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9fff86721778d7842a2167af85ddc11c + internalID: 463468534 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_1-1_5 + rect: + serializedVersion: 2 + x: 970 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: adb43dce0c30e5d43993f51e9a44ce8c + internalID: -488791348 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 780e3d1c3a7f25b4e8e73e6b544cb2cf + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_skill_elephant_1-1_0: 2128876000 + ine_skill_elephant_1-1_1: 2011239551 + ine_skill_elephant_1-1_2: -506559711 + ine_skill_elephant_1-1_3: 956627902 + ine_skill_elephant_1-1_4: 463468534 + ine_skill_elephant_1-1_5: -488791348 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png new file mode 100644 index 0000000..d559138 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png.meta new file mode 100644 index 0000000..c16e63b --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_2_Side.png.meta @@ -0,0 +1,283 @@ +fileFormatVersion: 2 +guid: ad7604c6b24e06046b26378132a83953 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5591182898534132589 + second: ine_skill_elephant_2-1_0 + - first: + 213: 8366695865545347887 + second: ine_skill_elephant_2-1_1 + - first: + 213: 1852557216607461764 + second: ine_skill_elephant_2-1_2 + - first: + 213: 4305299260950396006 + second: ine_skill_elephant_2-1_3 + - first: + 213: 4979850261071900208 + second: ine_skill_elephant_2-1_4 + - first: + 213: -6984478236704737568 + second: ine_skill_elephant_2-1_5 + - first: + 213: 3482425352038944175 + second: ine_skill_elephant_2-1_6 + - first: + 213: -9008079638353400661 + second: ine_skill_elephant_2-1_7 + - first: + 213: 2747168054218011304 + second: ine_skill_elephant_2-1_8 + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_skill_elephant_2-1_0 + rect: + serializedVersion: 2 + x: 25 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8a4fa73e1b94b0843a37455e59a49f4e + internalID: -459867237 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2-1_1 + rect: + serializedVersion: 2 + x: 220 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a58a7190146067947880a526562e631f + internalID: 310526613 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2-1_2 + rect: + serializedVersion: 2 + x: 415 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b332e128a0155e24aa3184921ce07bef + internalID: 1443031134 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2-1_3 + rect: + serializedVersion: 2 + x: 610 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 84ba5a7a0bca9e948ba5c428751a5937 + internalID: 1229002455 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2-1_4 + rect: + serializedVersion: 2 + x: 805 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5de0cea413f58994d940fde2741ce726 + internalID: 583469470 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_2-1_5 + rect: + serializedVersion: 2 + x: 1000 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f4b2aca6c81585c41acb0284998cf6a3 + internalID: -1175216669 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 21a860553cfed1a48b35a550b7046976 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_skill_elephant_2-1_0: -459867237 + ine_skill_elephant_2-1_1: 310526613 + ine_skill_elephant_2-1_2: 1443031134 + ine_skill_elephant_2-1_3: 1229002455 + ine_skill_elephant_2-1_4: 583469470 + ine_skill_elephant_2-1_5: -1175216669 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png new file mode 100644 index 0000000..0e6e521 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png.meta new file mode 100644 index 0000000..685ad75 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Skills/00_Elephant/ine_skill_elephant_3_Back.png.meta @@ -0,0 +1,277 @@ +fileFormatVersion: 2 +guid: 5b9afa943846d724db64d74cc716f810 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8801347118301340800 + second: ine_skill_elephant_3-1_0 + - first: + 213: 321906566672793495 + second: ine_skill_elephant_3-1_1 + - first: + 213: -8677365392873900864 + second: ine_skill_elephant_3-1_2 + - first: + 213: -2716477927028788129 + second: ine_skill_elephant_3-1_3 + - first: + 213: 2816979004403368351 + second: ine_skill_elephant_3-1_4 + - first: + 213: -8465170179684380480 + second: ine_skill_elephant_3-1_5 + - first: + 213: 3210023770481564049 + second: ine_skill_elephant_3-1_6 + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_skill_elephant_3-1_0 + rect: + serializedVersion: 2 + x: 25 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 459cb0b594a74f6439c401e8a4bd3a86 + internalID: 2037433912 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3-1_1 + rect: + serializedVersion: 2 + x: 220 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e9459ac57800b65489998e42b0b70ea7 + internalID: 183529498 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3-1_2 + rect: + serializedVersion: 2 + x: 415 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 241392fc8b702ef47a7dc62b66b9fc63 + internalID: 53193951 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3-1_3 + rect: + serializedVersion: 2 + x: 610 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b845b8c955a79c94e8fa5b8ea236a3b1 + internalID: 1199219398 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3-1_4 + rect: + serializedVersion: 2 + x: 805 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 474a8660e553f0e4da3ba03e4858dfc1 + internalID: 403282775 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_skill_elephant_3-1_5 + rect: + serializedVersion: 2 + x: 1000 + y: 7 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 28e3f0b1786f45044accd795da7eb8fc + internalID: -978268524 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 978dd5a8d871df24ca33495450b765dc + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_skill_elephant_3-1_0: 2037433912 + ine_skill_elephant_3-1_1: 183529498 + ine_skill_elephant_3-1_2: 53193951 + ine_skill_elephant_3-1_3: 1199219398 + ine_skill_elephant_3-1_4: 403282775 + ine_skill_elephant_3-1_5: -978268524 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3_Prefab/Character/Player.prefab b/Assets/3_Prefab/Character/Player.prefab new file mode 100644 index 0000000..ab2eb55 --- /dev/null +++ b/Assets/3_Prefab/Character/Player.prefab @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3769985382812857600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5224415971370631719} + - component: {fileID: 7884045260593768572} + - component: {fileID: 5823326885154472309} + m_Layer: 0 + m_Name: ine_idle_front_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5224415971370631719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769985382812857600} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3692006093894258334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7884045260593768572 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769985382812857600} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 5336683018331574198, guid: 4355109e15b558f47b557891ec0e2f79, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.5, y: 1.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5823326885154472309 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3769985382812857600} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 2329a6f221ff90e4cb35d4f9b7099432, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5086480414002667045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3692006093894258334} + - component: {fileID: 5130945402467697693} + - component: {fileID: 5365914839329356083} + - component: {fileID: 608605206804159827} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3692006093894258334 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5086480414002667045} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -896.5191, y: -547.0058, z: 0.9581684} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5224415971370631719} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5130945402467697693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5086480414002667045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5ce1188e2abd3c45b15851146565423, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 5 + dashDistance: 4 + dashCooldown: 1 + maxSpeed: 8 + accelerationTime: 2 + dashTime: 0.15 + moveTime: 0 + playerState: 1 + idleState: 0 +--- !u!114 &5365914839329356083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5086480414002667045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a39f177316563f44b93781c9c27e5266, type: 3} + m_Name: + m_EditorClassIdentifier: + attackTime: 0.4 + attackCoolTime: 0.5 +--- !u!114 &608605206804159827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5086480414002667045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da150243b9548f44682c6e00a7d1e9ed, type: 3} + m_Name: + m_EditorClassIdentifier: + skillList: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} diff --git a/Assets/3_Prefab/Character/ine_idle_front_0.prefab.meta b/Assets/3_Prefab/Character/Player.prefab.meta similarity index 74% rename from Assets/3_Prefab/Character/ine_idle_front_0.prefab.meta rename to Assets/3_Prefab/Character/Player.prefab.meta index 8bc159c..fcf9298 100644 --- a/Assets/3_Prefab/Character/ine_idle_front_0.prefab.meta +++ b/Assets/3_Prefab/Character/Player.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b83cf87f95e105c47936d95dea40fbc8 +guid: 92f3c6cf5af3586409d42913ed57f931 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/3_Prefab/Skill.meta b/Assets/3_Prefab/Skill.meta new file mode 100644 index 0000000..7aed211 --- /dev/null +++ b/Assets/3_Prefab/Skill.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84fa2be32c1701c40b9c3f61e3e146fd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3_Prefab/Skill/Ine.meta b/Assets/3_Prefab/Skill/Ine.meta new file mode 100644 index 0000000..db28d95 --- /dev/null +++ b/Assets/3_Prefab/Skill/Ine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3789a9bc0d28ff7488b325629d20d67b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3_Prefab/Character/ine_idle_front_0.prefab b/Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab similarity index 73% rename from Assets/3_Prefab/Character/ine_idle_front_0.prefab rename to Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab index 3625984..22ca698 100644 --- a/Assets/3_Prefab/Character/ine_idle_front_0.prefab +++ b/Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8458389015664898468 +--- !u!1 &3924616633544540249 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,24 +8,24 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5841220194771240502} - - component: {fileID: 5221050234668004797} - - component: {fileID: 9182241719552427484} - - component: {fileID: 5766401346828172825} + - component: {fileID: 229705195661006206} + - component: {fileID: 19960471725355112} + - component: {fileID: 8724529953039020029} + - component: {fileID: 3397926583373870192} m_Layer: 0 - m_Name: ine_idle_front_0 + m_Name: ine_skill_elephant m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5841220194771240502 +--- !u!4 &229705195661006206 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8458389015664898468} + m_GameObject: {fileID: 3924616633544540249} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -34,13 +34,13 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5221050234668004797 +--- !u!212 &19960471725355112 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8458389015664898468} + m_GameObject: {fileID: 3924616633544540249} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -51,9 +51,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -78,28 +75,28 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 5336683018331574198, guid: 4355109e15b558f47b557891ec0e2f79, type: 3} + m_Sprite: {fileID: -1218299623, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.5, y: 1.34} + m_Size: {x: 2.1, y: 3.2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &9182241719552427484 +--- !u!95 &8724529953039020029 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8458389015664898468} + m_GameObject: {fileID: 3924616633544540249} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2329a6f221ff90e4cb35d4f9b7099432, type: 2} + m_Controller: {fileID: 9100000, guid: b57ec0b48ec04bb4b8501946d2f03669, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -111,15 +108,16 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5766401346828172825 +--- !u!114 &3397926583373870192 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8458389015664898468} + m_GameObject: {fileID: 3924616633544540249} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f5ce1188e2abd3c45b15851146565423, type: 3} + m_Script: {fileID: 11500000, guid: 184f2910ee922884b8ab520482eb0ed0, type: 3} m_Name: m_EditorClassIdentifier: + time: 0.7 diff --git a/Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab.meta b/Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab.meta new file mode 100644 index 0000000..28684c2 --- /dev/null +++ b/Assets/3_Prefab/Skill/Ine/ine_skill_elephant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1bd1f24581f2cd4aa611b613ef53298 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller b/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller index d962ea8..d98936e 100644 --- a/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller +++ b/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller @@ -25,34 +25,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-8387652624220745442 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: -1 - - m_ConditionMode: 1 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8916632400208463748} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.39999998 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!206 &-8001846986610640769 BlendTree: m_ObjectHideFlags: 1 @@ -103,8 +75,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -3866436116635659990} - - {fileID: -7741661000010744119} + - {fileID: 523653244337067126} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -120,56 +91,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-7838674405646194595 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6328402681739075094} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-7741661000010744119 -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: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7216141104932533708} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.0042152405 - m_TransitionOffset: 0 - m_ExitTime: 0.9935242 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-7699645868367422385 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -221,34 +142,6 @@ AnimatorStateTransition: m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1101 &-6827491313133175732 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: -1 - - m_ConditionMode: 2 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7216141104932533708} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-6654900500824835769 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -316,9 +209,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -476288979744914789} - - {fileID: 1477102557937396473} - - {fileID: -6654900500824835769} - {fileID: -5003745128318212238} + - {fileID: 1345300826965893389} + - {fileID: -5586330050818646260} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -334,6 +227,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-5586330050818646260 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -4667464454862698068} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-5003745128318212238 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -351,39 +269,37 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.0039438605 m_TransitionOffset: 0 - m_ExitTime: 0.5 + m_ExitTime: 0.50000006 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-3866436116635659990 -AnimatorStateTransition: +--- !u!1107 &-4667464454862698068 +AnimatorStateMachine: + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8916632400208463748} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.0068058968 - m_TransitionOffset: 0 - m_ExitTime: 0.988863 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_Name: Skills + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 917379601908394024} + m_Position: {x: 340, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: + - {fileID: 8642261670342026140} + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 640, y: -10, z: 0} + m_DefaultState: {fileID: 917379601908394024} --- !u!1101 &-3129536623637096915 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -406,31 +322,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-2987906583819856654 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6328402681739075094} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!206 &-2779681242335224141 BlendTree: m_ObjectHideFlags: 1 @@ -470,6 +361,46 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!206 &-2628892282518745936 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlendTree + m_Childs: [] + m_BlendParameter: PosX + m_BlendParameterY: PosY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 +--- !u!1101 &-2236615694132322037 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -771651103483236613} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-1809099419944564976 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -498,6 +429,90 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!206 &-1581928763705544890 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: c51682249ff9ed341aef0e941ae4950d, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 439b229d2d227f647916575bd2198c2c, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 6f4d59265dcd9a84eb30f8ace0706b0d, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1101 &-1283304704051905891 +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: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7887370700708874382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1109 &-1231153834369988116 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6328402681739075094} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1107 &-771651103483236613 AnimatorStateMachine: serializedVersion: 6 @@ -515,13 +530,15 @@ AnimatorStateMachine: m_Position: {x: 690, y: -40, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: 4944301917811604634} + - {fileID: -1231153834369988116} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -70, y: 120, z: 0} - m_EntryPosition: {x: 110, y: 300, z: 0} + m_EntryPosition: {x: 570, y: -170, z: 0} m_ExitPosition: {x: 290, y: 260, z: 0} - m_ParentStateMachinePosition: {x: 500, y: 100, z: 0} + m_ParentStateMachinePosition: {x: 540, y: 170, z: 0} m_DefaultState: {fileID: -6328402681739075094} --- !u!1101 &-476288979744914789 AnimatorStateTransition: @@ -548,6 +565,51 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1109 &-388992725449245529 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7216141104932533708} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 +--- !u!1101 &-386416648127784895 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 6 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -771651103483236613} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -587,12 +649,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: IsAttack - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_Name: AttackState m_Type: 1 m_DefaultFloat: 0 @@ -605,6 +661,12 @@ AnimatorController: m_DefaultInt: -1 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: SkillIdx + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: -1 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -682,6 +744,28 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1101 &523653244337067126 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 3486942286685794114} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5909091 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &699348294161046153 AnimatorState: serializedVersion: 6 @@ -694,9 +778,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 365728724039699703} - - {fileID: 8976018309466006806} - - {fileID: -8387652624220745442} - {fileID: 4921585450168509714} + - {fileID: 7907082160977392028} + - {fileID: 4104631213722740257} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -712,7 +796,36 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &1477102557937396473 +--- !u!1102 &917379601908394024 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Skill_00_Elephant + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5959257157602563272} + - {fileID: -386416648127784895} + - {fileID: -1283304704051905891} + 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: -1581928763705544890} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &1345300826965893389 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -723,11 +836,8 @@ AnimatorStateTransition: - m_ConditionMode: 6 m_ConditionEvent: AttackIdx m_EventTreshold: -1 - - m_ConditionMode: 1 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8916632400208463748} + m_DstStateMachine: {fileID: 3486942286685794114} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -779,6 +889,56 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1101 &1908286046111462960 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -771651103483236613} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2633950312460694783 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -4667464454862698068} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &2743666210950343112 BlendTree: m_ObjectHideFlags: 1 @@ -857,6 +1017,31 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 +--- !u!1101 &2895918130934627603 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -4667464454862698068} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &3276299015312782530 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -899,13 +1084,15 @@ AnimatorStateMachine: m_Position: {x: 260, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: [] + m_EntryTransitions: + - {fileID: 8062790659859681500} + - {fileID: -388992725449245529} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 590, y: 10, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_EntryPosition: {x: 0, y: 160, z: 0} m_ExitPosition: {x: 910, y: 220, z: 0} - m_ParentStateMachinePosition: {x: 870, y: 130, z: 0} + m_ParentStateMachinePosition: {x: 630, y: 150, z: 0} m_DefaultState: {fileID: 8916632400208463748} --- !u!1101 &3766025238035238451 AnimatorStateTransition: @@ -929,6 +1116,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &4104631213722740257 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: -4667464454862698068} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &4921585450168509714 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -946,7 +1158,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.00497216 m_TransitionOffset: 0 m_ExitTime: 0.39999998 m_HasExitTime: 0 @@ -954,6 +1166,23 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1109 &4944301917811604634 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 699348294161046153} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1101 &5427976897112605097 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1007,6 +1236,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &5959257157602563272 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 6 + m_ConditionEvent: SkillIdx + m_EventTreshold: -1 + m_DstStateMachine: {fileID: 3486942286685794114} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &6083200325420957801 AnimatorStateMachine: serializedVersion: 6 @@ -1022,13 +1279,20 @@ AnimatorStateMachine: m_ChildStateMachines: - serializedVersion: 1 m_StateMachine: {fileID: 3486942286685794114} - m_Position: {x: 320, y: 130, z: 0} + m_Position: {x: 300, y: 120, z: 0} - serializedVersion: 1 m_StateMachine: {fileID: -771651103483236613} - m_Position: {x: 590, y: 130, z: 0} + m_Position: {x: 650, y: 130, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: -4667464454862698068} + m_Position: {x: 450, y: 230, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_StateMachineTransitions: + - first: {fileID: 3486942286685794114} + second: [] + - first: {fileID: -4667464454862698068} + second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 40, y: 100, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} @@ -1060,31 +1324,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &6749622186955189613 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 699348294161046153} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!206 &6929083226526445313 BlendTree: m_ObjectHideFlags: 1 @@ -1151,9 +1390,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 3276299015312782530} - - {fileID: 7591452242411202448} - - {fileID: -2987906583819856654} - {fileID: -8537870212262983865} + - {fileID: 1908286046111462960} + - {fileID: 2633950312460694783} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1247,7 +1486,7 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 ---- !u!1101 &7591452242411202448 +--- !u!1101 &7907082160977392028 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -1257,21 +1496,38 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 6 m_ConditionEvent: AttackIdx - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 699348294161046153} + m_EventTreshold: -1 + m_DstStateMachine: {fileID: 3486942286685794114} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 0.39999998 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1109 &8062790659859681500 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8916632400208463748} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!206 &8264499188535814984 BlendTree: m_ObjectHideFlags: 1 @@ -1311,6 +1567,23 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1109 &8642261670342026140 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: SkillIdx + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 917379601908394024} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 --- !u!1102 &8916632400208463748 AnimatorState: serializedVersion: 6 @@ -1323,9 +1596,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -7699645868367422385} - - {fileID: -7838674405646194595} - - {fileID: 6749622186955189613} - {fileID: 6527257459298718537} + - {fileID: -2236615694132322037} + - {fileID: 2895918130934627603} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1341,31 +1614,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &8976018309466006806 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: AttackIdx - m_EventTreshold: -1 - - m_ConditionMode: 2 - m_ConditionEvent: isWalking - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7216141104932533708} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.39999998 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 diff --git a/Assets/5_Anim/Character/Ine/Dodge/Ine_Dodge_Front.anim b/Assets/5_Anim/Character/Ine/Idle/Ine_Dodge_Front.anim similarity index 100% rename from Assets/5_Anim/Character/Ine/Dodge/Ine_Dodge_Front.anim rename to Assets/5_Anim/Character/Ine/Idle/Ine_Dodge_Front.anim diff --git a/Assets/5_Anim/Character/Ine/Dodge/Ine_Dodge_Front.anim.meta b/Assets/5_Anim/Character/Ine/Idle/Ine_Dodge_Front.anim.meta similarity index 100% rename from Assets/5_Anim/Character/Ine/Dodge/Ine_Dodge_Front.anim.meta rename to Assets/5_Anim/Character/Ine/Idle/Ine_Dodge_Front.anim.meta diff --git a/Assets/5_Anim/Character/Ine/Skills.meta b/Assets/5_Anim/Character/Ine/Skills.meta new file mode 100644 index 0000000..8adfb03 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 984c6e56303c46b459a7adcb19d14cdd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant.meta new file mode 100644 index 0000000..158e04f --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30b806d8ca4770f48a0d419a4f0bdcd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim new file mode 100644 index 0000000..9599621 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim @@ -0,0 +1,90 @@ +%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: Anim_Ine_Skill_Elephant + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1218299623, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.083333336 + value: {fileID: 1563511668, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.16666667 + value: {fileID: -1162547397, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.25 + value: {fileID: 1328625289, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.33333334 + value: {fileID: 1614975929, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.41666666 + value: {fileID: 390584684, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - time: 0.5 + value: {fileID: -1212270713, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1218299623, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: 1563511668, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: -1162547397, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: 1328625289, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: 1614975929, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: 390584684, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + - {fileID: -1212270713, guid: 06130c30194f4a24b9371e5375c2d81d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5833333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim.meta new file mode 100644 index 0000000..dacb68e --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71647a79ed1efcc40b062ef2b5cb39b3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim new file mode 100644 index 0000000..e4fbe20 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim @@ -0,0 +1,87 @@ +%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: Anim_Ine_Skill_Elephant_Back + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 2037433912, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - time: 0.083333336 + value: {fileID: 183529498, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - time: 0.16666667 + value: {fileID: 53193951, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - time: 0.25 + value: {fileID: 1199219398, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - time: 0.33333334 + value: {fileID: 403282775, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - time: 0.41666666 + value: {fileID: -978268524, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 2037433912, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - {fileID: 183529498, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - {fileID: 53193951, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - {fileID: 1199219398, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - {fileID: 403282775, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + - {fileID: -978268524, guid: 5b9afa943846d724db64d74cc716f810, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim.meta new file mode 100644 index 0000000..058b8af --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Back.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 439b229d2d227f647916575bd2198c2c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim new file mode 100644 index 0000000..b78e8a9 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim @@ -0,0 +1,87 @@ +%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: Anim_Ine_Skill_Elephant_Front + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 2128876000, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - time: 0.083333336 + value: {fileID: 2011239551, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - time: 0.16666667 + value: {fileID: -506559711, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - time: 0.25 + value: {fileID: 956627902, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - time: 0.33333334 + value: {fileID: 463468534, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - time: 0.41666666 + value: {fileID: -488791348, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 2128876000, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - {fileID: 2011239551, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - {fileID: -506559711, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - {fileID: 956627902, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - {fileID: 463468534, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + - {fileID: -488791348, guid: b2a9696d62bebe04f8faa63d6e9a94be, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim.meta new file mode 100644 index 0000000..5a2bb90 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Front.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c51682249ff9ed341aef0e941ae4950d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim new file mode 100644 index 0000000..3ba1b42 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim @@ -0,0 +1,87 @@ +%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: Anim_Ine_Skill_Elephant_Side + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -459867237, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - time: 0.083333336 + value: {fileID: 310526613, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - time: 0.16666667 + value: {fileID: 1443031134, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - time: 0.25 + value: {fileID: 1229002455, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - time: 0.33333334 + value: {fileID: 583469470, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - time: 0.41666666 + value: {fileID: -1175216669, guid: ad7604c6b24e06046b26378132a83953, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -459867237, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - {fileID: 310526613, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - {fileID: 1443031134, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - {fileID: 1229002455, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - {fileID: 583469470, guid: ad7604c6b24e06046b26378132a83953, type: 3} + - {fileID: -1175216669, guid: ad7604c6b24e06046b26378132a83953, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim.meta new file mode 100644 index 0000000..08c6178 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/Anim_Ine_Skill_Elephant_Side.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f4d59265dcd9a84eb30f8ace0706b0d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller b/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller new file mode 100644 index 0000000..364c176 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6828884703478732739 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Anim_Ine_Skill_Elephant + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 71647a79ed1efcc40b062ef2b5cb39b3, 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: ine_skill_elephant_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1645418203764230220} + 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!1107 &1645418203764230220 +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: -6828884703478732739} + m_Position: {x: 400, y: 100, 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: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6828884703478732739} diff --git a/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller.meta b/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller.meta new file mode 100644 index 0000000..7ec63dd --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Skills/Elephant/ine_skill_elephant_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b57ec0b48ec04bb4b8501946d2f03669 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: