From a5c191cf74238084d9bd9f805b4b6755f70d956d Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 1 Sep 2021 08:30:42 +0800 Subject: =?UTF-8?q?*=E6=94=B9=E5=8F=98=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Unit/Component/MonsterAnimation.cs | 110 ----- .../Unit/Component/MonsterAnimation.cs.meta | 11 - Assets/Scripts/Unit/Component/MonsterState.cs | 179 -------- Assets/Scripts/Unit/Component/MonsterState.cs.meta | 11 - Assets/Scripts/Unit/Component/PCAnimation.cs | 217 ---------- Assets/Scripts/Unit/Component/PCAnimation.cs.meta | 11 - Assets/Scripts/Unit/Component/PCState.cs | 460 --------------------- Assets/Scripts/Unit/Component/PCState.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitAnimation.cs | 249 ----------- .../Scripts/Unit/Component/UnitAnimation.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitCollider.cs | 123 ------ Assets/Scripts/Unit/Component/UnitCollider.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitComponent.cs | 42 -- .../Scripts/Unit/Component/UnitComponent.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitRender.cs | 12 - Assets/Scripts/Unit/Component/UnitRender.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitSkill.cs | 12 - Assets/Scripts/Unit/Component/UnitSkill.cs.meta | 11 - Assets/Scripts/Unit/Component/UnitState.cs | 12 - Assets/Scripts/Unit/Component/UnitState.cs.meta | 11 - 20 files changed, 1526 deletions(-) delete mode 100644 Assets/Scripts/Unit/Component/MonsterAnimation.cs delete mode 100644 Assets/Scripts/Unit/Component/MonsterAnimation.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/MonsterState.cs delete mode 100644 Assets/Scripts/Unit/Component/MonsterState.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/PCAnimation.cs delete mode 100644 Assets/Scripts/Unit/Component/PCAnimation.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/PCState.cs delete mode 100644 Assets/Scripts/Unit/Component/PCState.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitAnimation.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitAnimation.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitCollider.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitCollider.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitComponent.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitComponent.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitRender.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitRender.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitSkill.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitSkill.cs.meta delete mode 100644 Assets/Scripts/Unit/Component/UnitState.cs delete mode 100644 Assets/Scripts/Unit/Component/UnitState.cs.meta (limited to 'Assets/Scripts/Unit/Component') diff --git a/Assets/Scripts/Unit/Component/MonsterAnimation.cs b/Assets/Scripts/Unit/Component/MonsterAnimation.cs deleted file mode 100644 index 4db4b07f..00000000 --- a/Assets/Scripts/Unit/Component/MonsterAnimation.cs +++ /dev/null @@ -1,110 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MonsterAnimation : UnitAnimation -{ - public enum ELayer - { - Basic = 0, - - Count, - } - - // 动作名，和animator里的state对应 - public enum EAnimState - { - // layer 0 - Idle = 0, - Move, - Jump, - Hit, - Attack, - Rise, - Stinger, - Turn, - Landing, - - AirAttack0, - AirAttack1, - AirAttack2, - AirAttack3, - - Attack0, - Attack1, - Attack2, - Attack3, - } - - public override void Initialize() - { - base.Initialize(); - - m_Animator = this.m_Owner.unitObj.GetComponent(); - - m_Animator.speed = 0; - - m_LayerInfo = new AnimatorLayerInfo[2]; - m_LayerInfo[0] = new AnimatorLayerInfo(this, m_Animator, (int)ELayer.Basic); - //m_LayerInfo[1] = new AnimatorLayerInfo(this, m_Animator, ELayer.Attack); - - if (m_Animator == null) - { - LogHelper.LogError("没有挂Animator组件"); - } - - } - - public override void OnUpdate() - { - base.OnUpdate(); - - UpdateLayer(); - UpdateAnimation(); - UpdateRootMotion(); - } - - void UpdateLayer() - { - m_LayerInfo[0].OnUpdate(); - return; - for (int i = 0; i < m_LayerInfo.Length; ++i) - { - m_LayerInfo[i].OnUpdate(); - } - } - - void UpdateAnimation() - { - m_Animator.speed = 1; - m_Animator.Update(Time.deltaTime); - m_Animator.speed = 0; - } - - void UpdateRootMotion() - { - m_Owner.unitRootMotion.UpdateRootMotion(); - } - - public void AnimIdle() - { - m_Animator.CrossFade("Idle", 0.2f, 0); - } - - public void AnimHitLight() - { - m_Animator.Play("HitLight", 0, 0); - //m_Animator.CrossFade("HitLight", 0.05f, 0, 0, 0); - } - public void AnimHitAir() - { - m_Animator.Play("HitAir", 0, 0); - //m_Animator.CrossFade("HitLight", 0.05f, 0, 0, 0); - } - - public void AnimRise() - { - m_Animator.CrossFade("Rise", 0); - } - -} diff --git a/Assets/Scripts/Unit/Component/MonsterAnimation.cs.meta b/Assets/Scripts/Unit/Component/MonsterAnimation.cs.meta deleted file mode 100644 index 448e6a1a..00000000 --- a/Assets/Scripts/Unit/Component/MonsterAnimation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cfaa5c94122a41d4f8fa844112514102 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/MonsterState.cs b/Assets/Scripts/Unit/Component/MonsterState.cs deleted file mode 100644 index cd2ed8e5..00000000 --- a/Assets/Scripts/Unit/Component/MonsterState.cs +++ /dev/null @@ -1,179 +0,0 @@ -using System; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MonsterState : UnitState -{ - public enum EUnitState - { - Nien, - - Idle, - - Move, - - HitLight, - HitAir, - HitGround, - HitFall, - KnockDown, - Rise, - - Pull, - Landing, - } - - [SerializeField] private EUnitState m_State; - public EUnitState CurrentState { get { return m_State; } } - - UnitAnimation unitAnimation { get { return m_Owner.unitAnimation; } } - - public override void Initialize() - { - base.Initialize(); - } - - public void ChangeState(EUnitState nextState, T param = default, bool bForce = false) - { - if (!IsChange(nextState, bForce)) - return; - - LogHelper.Log("Monster UnitState: " + m_State.ToString() + " -> " + nextState.ToString()); - - StopAllCoroutines(); - - EUnitState prevState = m_State; - string methodFunc = "On" + m_State.ToString() + "Exit"; - MethodInfo exitMethod = GetType().GetMethod(methodFunc, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(EUnitState) }, null); - if (exitMethod != null) - { - exitMethod.Invoke(this, new object[] { nextState }); - } - else - { - LogHelper.LogError("缺少 " + methodFunc); - } - m_State = nextState; - - StartCoroutine(m_State.ToString(), param); - } - - bool IsChange(EUnitState newState, bool bForce) - { - if (newState != m_State || bForce) - return true; - return false; - } - - IEnumerator Nein() { yield break; } - void OnNienExit(EUnitState nextState) { } - - public struct IdleParam { } - - public struct LandingParam { } - - public struct HitLightParam { } - - public struct HitAirParam { } - - public struct RiseParam { } - - #region Idle - - IEnumerator Idle(IdleParam param) - { - //if (m_Owner.isInAir) // 浮空切换到landing - //{ - // ChangeState(EUnitState.Landing, new LandingParam()); - //} - //else // idle - //{ - m_Owner.SetYPosition(0); - m_Owner.monsterAnimation.AnimIdle(); - while (true) - { - yield return null; - } - //} - } - - void OnIdleExit(EUnitState nextState) - { - } - #endregion - - #region HitLight - - IEnumerator HitLight(HitLightParam param) - { - m_Owner.monsterAnimation.AnimHitLight(); - yield return null; - while (true) - { - bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNomralizedTime == 1; - if(reachEnd) - { - ChangeState(EUnitState.Idle, new IdleParam()); - } - yield return null; - } - } - - void OnHitLightExit(EUnitState nextState) - { - } - - #endregion - - #region HitAir - - IEnumerator HitAir(HitAirParam param) - { - m_Owner.monsterAnimation.AnimHitAir(); - yield return null; - while (true) - { - bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNomralizedTime == 1; - if (reachEnd) - { - //yield return new WaitForSeconds(1f); - ChangeState(EUnitState.Rise, new RiseParam()); - } - yield return null; - } - } - - void OnHitAirExit(EUnitState nextState) - { - } - - #endregion - - #region Rise - - IEnumerator Rise(RiseParam param) - { - m_Owner.monsterAnimation.AnimRise(); - yield return null; - while (true) - { - bool reachEnd = m_Owner.monsterAnimation.layers[0].playbackNomralizedTime == 1; - if (reachEnd) - { - ChangeState(EUnitState.Idle, new IdleParam()); - } - yield return null; - } - } - - void OnRiseExit(EUnitState nextState) - { - } - - - #endregion - - -} \ No newline at end of file diff --git a/Assets/Scripts/Unit/Component/MonsterState.cs.meta b/Assets/Scripts/Unit/Component/MonsterState.cs.meta deleted file mode 100644 index 7d60499f..00000000 --- a/Assets/Scripts/Unit/Component/MonsterState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b7b1805198282374fbc67108671f8a72 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/PCAnimation.cs b/Assets/Scripts/Unit/Component/PCAnimation.cs deleted file mode 100644 index 9c2a77ec..00000000 --- a/Assets/Scripts/Unit/Component/PCAnimation.cs +++ /dev/null @@ -1,217 +0,0 @@ -#define ANIM_CROSS_FADE -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PCAnimation : UnitAnimation -{ - public enum ELayer - { - Basic = 0, - Attack, - SwordAttack, - GunAttack, - UpperBody, - LowerBody, - Count, - } - - - // 动作名，和animator里的state对应 - public enum EAnimState - { - // layer 0 - Idle = 0, - Move, - Jump, - Hit, - Attack, - Rise, - Stinger, - Turn, - Landing, - - AirAttack0, - AirAttack1, - AirAttack2, - AirAttack3, - - Attack0, - Attack1, - Attack2, - Attack3, - } - -#if !ANIM_CROSS_FADE - // 切换动画 - public enum ETrigger - { - ToIdle, - ToMove, - ToJump, - ToAttack, - ToAirAttack, - ToLanding, - } -#endif - - private UnitActionData m_ActionData; - - public bool applyRootMotion { get; set; }// 动态设置root motion - public bool applyRootCurve { get; set; } // 程序生成的root motion - - public override void Initialize() - { - base.Initialize(); - - m_Animator = this.m_Owner.unitObj.GetComponent(); - - m_Animator.speed = 0; - - m_LayerInfo = new AnimatorLayerInfo[2]; - m_LayerInfo[0] = new AnimatorLayerInfo(this, m_Animator, (int)ELayer.Basic); - //m_LayerInfo[1] = new AnimatorLayerInfo(this, m_Animator, ELayer.Attack); - - if (m_Animator == null) - { - LogHelper.LogError("没有挂Animator组件"); - } - - applyRootMotion = true; - } - - public override void OnUpdate() - { - base.OnUpdate(); - - UpdateLayer(); - UpdateAnimation(); - - if (applyRootMotion) - UpdateRootMotion(); - if (applyRootCurve) - UpdateRootCurve(); - } - - void UpdateLayer() - { - m_LayerInfo[0].OnUpdate(); - return; - for (int i = 0; i < m_LayerInfo.Length; ++i) - { - m_LayerInfo[i].OnUpdate(); - } - } - - void UpdateAnimation() - { - m_Animator.speed = 1; - m_Animator.Update(Time.deltaTime); - m_Animator.speed = 0; - } - - void UpdateRootMotion() - { - m_Owner.unitRootMotion.UpdateRootMotion(); - } - - void UpdateRootCurve() - { - } - - public void AnimIdle() - { -#if ANIM_CROSS_FADE - m_Animator.CrossFade("Idle", 0.2f, 0); -#else - ResetAllTriggers(); - m_Animator.SetTrigger(ETrigger.ToIdle.ToString()); -#endif - } - - public void AnimMove() - { -#if ANIM_CROSS_FADE - m_Animator.CrossFade("Move", 0.01f, 0); -#else - ResetAllTriggers(); - m_Animator.SetTrigger(ETrigger.ToMove.ToString()); -#endif - } - - public void AnimJump() - { -#if ANIM_CROSS_FADE - m_Animator.CrossFade("Jump", 0.01f); -#else - ResetAllTriggers(); - SetTrigger(ETrigger.ToJump); -#endif - } - - public void AnimAirAttack(int id) - { - m_Owner.unitCollider.OnAnimationChange(); -#if ANIM_CROSS_FADE - m_Animator.CrossFade("AirAttack" + id, 0.05f); -#else - ResetAllTriggers(); - SetTrigger(ETrigger.ToAirAttack); -#endif - } - - public void AnimAttack(int id) - { - m_Owner.unitCollider.OnAnimationChange(); - m_Animator.CrossFade("Attack" + id, 0.05f); - } - - public void AnimAirDash() - { - if (layers[0].stateInfo.IsName("AirDash")) - { - m_Animator.Play("AirDash", 0, 0); - } - else - { - m_Animator.CrossFade("AirDash", 0.05f); - } - } - - public void AnimLanding() - { -#if ANIM_CROSS_FADE - m_Animator.CrossFade("Landing", 0.05f); -#else - ResetAllTriggers(); - SetTrigger(ETrigger.ToLanding); -#endif - } - - public void AnimLandingGround() - { -#if ANIM_CROSS_FADE - m_Animator.CrossFade("LandingGround", 0.00f); -#else - ResetAllTriggers(); - SetTrigger(ETrigger.ToLanding); -#endif - } - -#if !ANIM_CROSS_FADE - void ResetAllTriggers() - { - var values = Enum.GetValues(typeof(ETrigger)); - foreach (var e in values) - { - m_Animator.ResetTrigger(e.ToString()); - } - } -#endif - - private void Play(string animState, float fade = 0.1f, float offset = 0f, int layer = 0) - { - m_Animator.CrossFade(animState, fade, layer, offset); - } -} diff --git a/Assets/Scripts/Unit/Component/PCAnimation.cs.meta b/Assets/Scripts/Unit/Component/PCAnimation.cs.meta deleted file mode 100644 index 6999e268..00000000 --- a/Assets/Scripts/Unit/Component/PCAnimation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f844378e1edf4b249b3b2f9a8e4a6842 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/PCState.cs b/Assets/Scripts/Unit/Component/PCState.cs deleted file mode 100644 index a9252e26..00000000 --- a/Assets/Scripts/Unit/Component/PCState.cs +++ /dev/null @@ -1,460 +0,0 @@ -using System; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 角色状态机 -[DisallowMultipleComponent] -public class PCState : UnitState -{ - public enum EUnitState - { - Nien, - - Idle, - Move, - Spawn, - Die, - Dead, - // - Attack, - AirAttack, - AirDash, - // - HitAir, - HitAirHit, - Knockdown, - // - HitGuard, - // - Walk, - // - Rise, - // - Jump, - // 转身 - Turn, - Landing, // 从空中降落 - } - - [SerializeField] private EUnitState m_State; - public EUnitState CurrentState { get { return m_State; } } - - public override void Initialize() - { - base.Initialize(); - } - - PCAnimation pcAnimation { get { return m_Owner.pcAnimation; } } - - #region state param - public struct IdleParam { } - - public struct MoveParam - { - public bool isRight; - public string key; - } - - public struct SkillParam - { - - } - - public struct AirDashParam - { - - } - - public struct JumpParam - { } - - public struct TurnParam - { - EUnitState nextState; - } - - public struct LandingParam { } - - #endregion - public void ChangeState(EUnitState nextState, T param = default, bool bForce = false) - { - if (!IsChange(nextState, bForce)) - return; - - LogHelper.Log("UnitState: " + m_State.ToString() + " -> " + nextState.ToString()); - - StopAllCoroutines(); - - EUnitState prevState = m_State; - string methodFunc = "On" + m_State.ToString() + "Exit"; - MethodInfo exitMethod = GetType().GetMethod(methodFunc, BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(EUnitState) }, null); - if (exitMethod != null) - { - exitMethod.Invoke(this, new object[] { nextState }); - } - else - { - LogHelper.LogError("缺少 " + methodFunc); - } - m_State = nextState; - - StartCoroutine(m_State.ToString(), param); - } - - bool IsChange(EUnitState newState, bool bForce) - { - if (newState != m_State || bForce) - return true; - return false; - } - - IEnumerator Nein() { yield break; } - void OnNienExit(EUnitState nextState) { } - - public void TurnAround(bool bRight) - { - m_Owner.transform.rotation = Quaternion.Euler(0, bRight ? 0 : 180, 0); - } - - public void TurnLeft() - { - TurnAround(false); - } - - public void TurnRight() - { - TurnAround(true); - } - - #region Idle - - IEnumerator Idle(IdleParam param) - { - //if (m_Owner.isInAir) // 浮空切换到landing - //{ - // ChangeState(EUnitState.Landing, new LandingParam()); - //} - //else // idle - //{ - m_Owner.SetYPosition(0); - m_Owner.pcAnimation.AnimIdle(); - while (true) - { - if (Input.GetKeyDown("j")) - { - ChangeState(EUnitState.Attack, new SkillParam()); - } - if (Input.GetKeyDown("space")) - { - ChangeState(EUnitState.Jump, new JumpParam()); - } - if (Input.GetKey("d")) - { - MoveParam move = new MoveParam(); - move.isRight = true; - move.key = "d"; - ChangeState(EUnitState.Move, move); - } - if (Input.GetKey("a")) - { - MoveParam move = new MoveParam(); - move.isRight = false; - move.key = "a"; - ChangeState(EUnitState.Move, move); - } - yield return null; - } - //} - } - - void OnIdleExit(EUnitState nextState) - { - } - #endregion - - #region Move - IEnumerator Move(MoveParam param) - { - if (m_Owner.isTowardRight && !param.isRight - || !m_Owner.isTowardRight && param.isRight) - { - //m_Owner.pcAnimation.Play(UnitAnimation.EAnimState.Turn); - //yield return new WaitForActionReachEnd(m_Owner.pcAnimation); - //if (param.isRight) - // m_Owner.transform.rotation = Quaternion.Euler(0, 0, 0); - //else - // m_Owner.transform.rotation = Quaternion.Euler(0, 180, 0); - m_Owner.transform.rotation = Quaternion.Euler(0, param.isRight ? 0 : 180, 0); - } - //if (Input.GetKey(param.key)) - m_Owner.pcAnimation.AnimMove(); - while (Input.GetKey(param.key)) - { - yield return null; - } - ChangeState(EUnitState.Idle, new IdleParam()); - } - - void OnMoveExit(EUnitState nextState) - { - m_Owner.pcAnimation.animator.ResetTrigger("ToMove"); - } - - #endregion - - #region Attack - - IEnumerator Attack(SkillParam param) - { - const int total = 3; - int id = 0; - m_Owner.pcAnimation.AnimAttack(id); - yield return null; - while (true) - { - bool canCombo = m_Owner.pcAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo); - if (canCombo) - { - if (Input.GetKeyDown("j")) - { - if (Input.GetKey("a")) - { - TurnAround(false); - } - if (Input.GetKey("d")) - { - TurnAround(true); - } - ++id; - m_Owner.pcAnimation.AnimAttack(id); - yield return null; // 等待animator更新 - yield return new WaitForTransitionDone(m_Owner.pcAnimation); - } - } - - bool reachEnd = m_Owner.pcAnimation.layers[0].playbackNomralizedTime == 1; - if (reachEnd) - { - ChangeState(EUnitState.Idle, new IdleParam()); - } - - yield return null; - } - } - - void OnAttackExit(EUnitState next) - { - } - - #endregion - - #region AirAttack - - IEnumerator AirAttack(SkillParam param) - { - int id = 0; - m_Owner.pcAnimation.AnimAirAttack(id); - yield return null; // 等待animator更新 - while (true) - { - bool canCombo = m_Owner.pcAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo); - if (canCombo) - { - if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) - { - TurnLeft(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) - { - TurnRight(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - - if (Input.GetKeyDown("j")) - { - if (Input.GetKey("a")) - { - TurnAround(false); - } - if (Input.GetKey("d")) - { - TurnAround(true); - } - ++id; - m_Owner.pcAnimation.AnimAirAttack(id); - yield return null; // 等待animator更新 - yield return new WaitForTransitionDone(m_Owner.pcAnimation); - } - } - - bool reachEnd = m_Owner.pcAnimation.layers[0].playbackNomralizedTime == 1; - if (reachEnd) - { - ChangeState(EUnitState.Landing, new LandingParam()); - } - - yield return null; - } - } - - void OnAirAttackExit(EUnitState next) - { - - } - - #endregion - - #region AirDash - - IEnumerator AirDash(AirDashParam param) - { - m_Owner.pcAnimation.AnimAirDash(); - yield return null; - while (true) - { - bool reachEnd = m_Owner.pcAnimation.layers[0].playbackNomralizedTime == 1; - if (reachEnd) - { - ChangeState(EUnitState.Landing, new LandingParam()); - } - - bool canCombo = m_Owner.pcAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo); - if (canCombo) - { - if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) - { - TurnLeft(); - m_Owner.pcAnimation.AnimAirDash(); - } - if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) - { - TurnRight(); - m_Owner.pcAnimation.AnimAirDash(); - } - - if (Input.GetKeyDown("j")) - { - if (Input.GetKey("a")) - { - TurnAround(false); - } - if (Input.GetKey("d")) - { - TurnAround(true); - } - ChangeState(EUnitState.AirAttack, new SkillParam()); - } - } - - yield return null; - } - } - - void OnAirDashExit(EUnitState next) - { - } - - #endregion - - #region Jump - - IEnumerator Jump(JumpParam param) - { - pcAnimation.AnimJump(); - yield return null; - yield return new WaitForTransitionDone(pcAnimation); - while (true) - { - if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) - { - TurnLeft(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) - { - TurnRight(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - if (pcAnimation.layers[0].playbackNomralizedTime >= 1) - ChangeState(EUnitState.Idle, new IdleParam()); - bool canAttack = m_Owner.pcAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo); - if (Input.GetKeyDown("j") && canAttack) - { - ChangeState(EUnitState.AirAttack, new SkillParam()); - } - yield return null; - } - } - - void OnJumpExit(EUnitState next) - { - } - - #endregion - - #region Landing - - IEnumerator Landing(LandingParam param) - { - m_Owner.pcAnimation.AnimLanding(); - yield return null; - yield return new WaitForTransitionDone(m_Owner.pcAnimation); - float vy = 2; - float g = 9.8f; - bool landingGround = false; - float vz = 5; - while (true) - { - Vector3 pos = m_Owner.transform.position; - vy += g * Time.deltaTime; - pos.y -= vy * Time.deltaTime; - pos.y = Mathf.Max(0, pos.y); - if (Input.GetKey("a")) - { - TurnAround(false); - pos.x -= vz * Time.deltaTime; - } - if (Input.GetKey("d")) - { - TurnAround(true); - pos.x += vz * Time.deltaTime; - } - m_Owner.transform.position = pos; - if (pos.y > 0 && pos.y <= 1 && !landingGround) - { - landingGround = true; - m_Owner.pcAnimation.AnimLandingGround(); - } - if (pos.y <= 0) - { - pos.y = 0; - m_Owner.transform.position = pos; - ChangeState(EUnitState.Idle, new IdleParam()); - } - - if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A)) - { - TurnLeft(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D)) - { - TurnRight(); - ChangeState(EUnitState.AirDash, new AirDashParam()); - } - - yield return null; - } - } - - void OnLandingExit(EUnitState next) - { - } - - #endregion - -} - \ No newline at end of file diff --git a/Assets/Scripts/Unit/Component/PCState.cs.meta b/Assets/Scripts/Unit/Component/PCState.cs.meta deleted file mode 100644 index 548a0a91..00000000 --- a/Assets/Scripts/Unit/Component/PCState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a888cbca17562d4dbea1f28fd4dcbab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitAnimation.cs b/Assets/Scripts/Unit/Component/UnitAnimation.cs deleted file mode 100644 index 3df9ef89..00000000 --- a/Assets/Scripts/Unit/Component/UnitAnimation.cs +++ /dev/null @@ -1,249 +0,0 @@ -#define ANIM_CROSS_FADE -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -#if UNITY_EDITOR -using UnityEditor; -#endif - -// 单独一层动画 -public class AnimatorLayerInfo -{ - public int layer; - - public int layerIndex { get { return (int)layer; } } - - public string name { get { return m_Animator.GetLayerName(layerIndex); } } - - private Animator m_Animator; - - // 当前动作的animation data，如果是blendtree选第一个动作 - private AnimationData m_AnimationData; - public AnimationData animationData - { - get - { - if (clipInfo == null || clipInfo.Length == 0) - return null; - var clip = clipInfo[0]; //选第一个 - string folder = m_UnitAnimation.owner.folder; - string name = clip.clip.name; - if (m_AnimationData != null && m_AnimationData.animationName == name) - return m_AnimationData; - string path = folder + "AnimationData/" + name + ".asset" ; // 要注意这里使用名字区别的，因为最终每个角色的动画都会在一个目录下面 -#if UNITY_EDITOR - m_AnimationData = AssetDatabase.LoadAssetAtPath(path); -#endif - return m_AnimationData; - } - } - - // 当前动作所有animation data，包括blendtree使用的所有动画 - //private List m_AnimationDatas; - //public List animationDatas - //{ - // get - // { - // return null; - // } - //} - - // 当前在播放的动作 - // 如果处于transition中，动作不变，切换完成后才会到下一个动作 - public AnimatorStateInfo stateInfo - { - get - { - AnimatorStateInfo stateInfo = m_Animator.GetCurrentAnimatorStateInfo(layerIndex); - AnimatorClipInfo[] clips = m_Animator.GetCurrentAnimatorClipInfo(layerIndex); - if(clips == null || clips.Length == 0) - { - stateInfo = m_Animator.GetNextAnimatorStateInfo(layerIndex); - } - return stateInfo; - } - } - - private int preStateHash = -1; - - // 当前正在播放和融合的片段信息 - public AnimatorClipInfo[] clipInfo - { - get - { - AnimatorClipInfo[] clips = m_Animator.GetCurrentAnimatorClipInfo(layerIndex); - if(clips.Length == 0) - { - // 如果transition设置了打断，会出现GetCurrentAnimatorClipinfo返回空数组的情况 - clips = m_Animator.GetNextAnimatorClipInfo(layerIndex); - } - return clips; - } - } - - public int stateHash - { - get - { - return stateInfo.shortNameHash; - } - } - - //public float playbackTimeInSeconds - //{ - // get - // { - // return stateInfo.normalizedTime * stateInfo.length;// stateInfo.length会等于infinity，因为设置了animator.speed = 0 - // } - //} - - // 并非准确的播放时间，只是逻辑时间，因为动画会加速减速 - public float playbackTimeInSeconds - { - get - { - return playbackNomralizedTime * clipInfo[0].clip.length; - } - } - - // 这个是真实世界的时间 - private float m_PlaybackRealTime; - public float playbackRealTimeInSeconds - { - get - { - return m_PlaybackRealTime; - } - } - - // 播放进度百分比，[0-1]，是逻辑上的，如果动画不是loop，那么播放完后normalizedTime是1 - public float playbackNomralizedTime - { - get - { - //return stateInfo.normalizedTime % 1f; - if (!stateInfo.loop && stateInfo.normalizedTime > 1) - return 1; - return stateInfo.normalizedTime % 1f; - } - } - - public float playbackSpeed - { - get - { - return m_Animator.GetFloat("PlaybackSpeed" + layerIndex); - } - set - { - float v = Mathf.Clamp(value, 0, 10); - m_Animator.SetFloat("PlaybackSpeed" + layerIndex, v); - } - } - - public float weight - { - get - { - return m_Animator.GetLayerWeight(layerIndex); - } - } - - public int nextStateHash - { - get - { - //if (!isInTransition) - // return 0; - AnimatorStateInfo nextState = m_Animator.GetNextAnimatorStateInfo(layerIndex); - int hash = nextState.shortNameHash; // 如果不在过渡中，hash是0 - return hash; - } - } - - public bool isInTransition - { - get - { - return m_Animator.IsInTransition(layerIndex); - } - } - - public bool applySpeedCurve { get; set; } - - UnitAnimation m_UnitAnimation; - - Coroutine m_CalcPlaybackTimeCoroutine; - - TimelineEventProxy m_TimelineEventProxy; - - public AnimatorLayerInfo(UnitAnimation unitAnimation, Animator animator, int layer) - { - this.m_UnitAnimation = unitAnimation; - this.m_Animator = animator; - this.layer = layer; - m_CalcPlaybackTimeCoroutine = unitAnimation.StartCoroutine(CalcPlaybackRealTimeCoroutine()); - m_TimelineEventProxy = new TimelineEventProxy(unitAnimation.owner.transform, unitAnimation.owner); - applySpeedCurve = true; - } - - IEnumerator CalcPlaybackRealTimeCoroutine() - { - while (true) - { - if(preStateHash != stateHash) - { - m_PlaybackRealTime = 0; - } - m_PlaybackRealTime += Time.deltaTime; - preStateHash = stateHash; - yield return null; - } - } - - public bool IsToggleOpen(EAnimationToogle toggle) - { - if (m_AnimationData == null) - return false; - return m_AnimationData.IsToggleOpen(toggle, playbackNomralizedTime); - } - - public void OnUpdate() - { - // 执行事件 - m_TimelineEventProxy.ExecuteAnimationEvents(animationData, playbackTimeInSeconds * TimelineEventProxy.FPS); - - // 播放速度控制 - if (applySpeedCurve && animationData != null && animationData.speedCurve != null) - { - playbackSpeed = animationData.speedCurve.Evaluate(playbackNomralizedTime); - } - - } - -} - -// 控制动画播放、执行动作timeline(包括执行事件和碰撞盒) -// 每个layer同时只会有一个动画在播放，在执行transition时，current animation依然是 -// 这个动作，只有完全过渡完成后才会切到下一个动作 -// 当前是什么动作以ainmator的GetCurrentAnimatorStateInfo为准 -[DisallowMultipleComponent] -public class UnitAnimation : UnitComponent -{ - public AnimatorLayerInfo[] layers { get { return m_LayerInfo; } } - protected AnimatorLayerInfo[] m_LayerInfo; - - public Animator animator { get { return m_Animator; } } - protected Animator m_Animator; - - - public bool isInTransition - { - get - { - return m_Animator.IsInTransition(0); - } - } - -} diff --git a/Assets/Scripts/Unit/Component/UnitAnimation.cs.meta b/Assets/Scripts/Unit/Component/UnitAnimation.cs.meta deleted file mode 100644 index 75ce33fe..00000000 --- a/Assets/Scripts/Unit/Component/UnitAnimation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4af875f33239ebf409f3e4954c0ee0cb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs b/Assets/Scripts/Unit/Component/UnitCollider.cs deleted file mode 100644 index ac9698a8..00000000 --- a/Assets/Scripts/Unit/Component/UnitCollider.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 角色当前的碰撞盒 -[DisallowMultipleComponent] -public class UnitCollider : UnitComponent -{ - public bool showGizmos; - - private Dictionary> m_HitMask = new Dictionary>(); - - public override void Awake() - { - base.Awake(); - - ColliderRegistry.Instance.AddCollider(this); - } - - public override void OnDestroy() - { - ColliderRegistry.Instance.RemoveCollider(this); - - base.OnDestroy(); - } - - public override void Initialize() - { - base.Initialize(); - showGizmos = true; - } - - // 返回当前激活的对应类型的碰撞盒数据 - public ColliderInfo[] GetCurrentBoxesInfoByType(ColliderBox.EColliderType type, int layer = 0) - { - var layerInfo = m_Owner.unitAnimation.layers[0]; - AnimationData animData = layerInfo.animationData; - AnimatorClipInfo[] clipInfos = layerInfo.clipInfo; - //if(clipInfos == null || clipInfos.Length == 0) - //{ - // return null; - //} - float playbackTime = layerInfo.playbackNomralizedTime * clipInfos[0].clip.length; - //float playbackTime = layerInfo.playbackRealTimeInSeconds; - ColliderInfo[] infos = animData.GetActiveCollidersInfo(type, playbackTime); - return infos; - } - - // 动作切换，重置collider mask - public void OnAnimationChange() - { - m_HitMask.Clear(); - } - - public void RecordCollision(int colliderHash, int targetHash) - { - List record; - if (!m_HitMask.TryGetValue(colliderHash, out record)) - { - record = new List(); - m_HitMask.Add(colliderHash, record); - } - record.Add(targetHash); - } - - public bool CanCollide(int colliderHash, int targetHash) - { - List record; - if(!m_HitMask.TryGetValue(colliderHash, out record)) - { - return true; - } - return !record.Contains(targetHash); - } - -#if UNITY_EDITOR - - // 绘制collider调试 - public void OnDrawGizmos() - { - if (!showGizmos) - return; - - Vector3 unitPos = m_Owner.transform.position; - - OnDrawColliders(ColliderBox.EColliderType.HurtBox, Color.green); - OnDrawColliders(ColliderBox.EColliderType.HitBox, Color.red); - } - - void OnDrawColliders(ColliderBox.EColliderType type, Color color) - { - ColliderInfo[] boxes = GetCurrentBoxesInfoByType(type); - if (boxes == null || boxes.Length == 0) - return; - Vector3 unitPos = m_Owner.transform.position; - Quaternion right = Quaternion.Euler(0, 0, 0); - Vector3 fac = new Vector3(1,1, m_Owner.transform.forward.normalized == Vector3.forward ? 1 : -1); - Color oldC = Gizmos.color; - Gizmos.color = color * 0.5f; - for (int i = 0; i < boxes.Length; ++i) - { - var box = boxes[i]; - if (!box.isValid) - continue; - Vector3 localPos = box.position; - Vector3 localSize = box.size; - var pivot = box.pivot; - Vector3 pos = Vector3.zero; // gizmo位置 - switch (pivot) - { - case ColliderBox.Pivot.MiddleBottom: - localPos.y += localSize.y / 2; - break; - } - pos = unitPos + Vector3.Scale(localPos, fac); - Gizmos.DrawCube(pos, localSize); - } - Gizmos.color = oldC; - } - -#endif - -} diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs.meta b/Assets/Scripts/Unit/Component/UnitCollider.cs.meta deleted file mode 100644 index fa98ddc9..00000000 --- a/Assets/Scripts/Unit/Component/UnitCollider.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a4f3dea33ad590458ab820a086a8be3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitComponent.cs b/Assets/Scripts/Unit/Component/UnitComponent.cs deleted file mode 100644 index 1e4df1fc..00000000 --- a/Assets/Scripts/Unit/Component/UnitComponent.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UnitComponent : MonoBehaviour -{ - public UnitController owner { get { return m_Owner; } } - - protected UnitController m_Owner; - - public bool IsAlive - { - get - { - return m_Owner != null; - } - } - - public virtual void Awake() - { - } - - public virtual void OnDestroy() - { - } - - public virtual void Initialize() - { - m_Owner = GetComponent(); - } - - public virtual void Release() - { - m_Owner = null; - StopAllCoroutines(); - } - - public virtual void OnUpdate() { } - - private void Update() { } - -} diff --git a/Assets/Scripts/Unit/Component/UnitComponent.cs.meta b/Assets/Scripts/Unit/Component/UnitComponent.cs.meta deleted file mode 100644 index 2641a06f..00000000 --- a/Assets/Scripts/Unit/Component/UnitComponent.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4c2f1fe7707e5364aab4ddc6a962bb6e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitRender.cs b/Assets/Scripts/Unit/Component/UnitRender.cs deleted file mode 100644 index 2ba53a7d..00000000 --- a/Assets/Scripts/Unit/Component/UnitRender.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 控制角色渲染 -[DisallowMultipleComponent] -public class UnitRender : UnitComponent -{ - - - -} diff --git a/Assets/Scripts/Unit/Component/UnitRender.cs.meta b/Assets/Scripts/Unit/Component/UnitRender.cs.meta deleted file mode 100644 index 98aaba31..00000000 --- a/Assets/Scripts/Unit/Component/UnitRender.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8a5b6a015d074924b8a247980bb04693 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitSkill.cs b/Assets/Scripts/Unit/Component/UnitSkill.cs deleted file mode 100644 index 6a6a3a0e..00000000 --- a/Assets/Scripts/Unit/Component/UnitSkill.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 技能逻辑 -[DisallowMultipleComponent] - -public class UnitSkill : UnitComponent -{ - - -} diff --git a/Assets/Scripts/Unit/Component/UnitSkill.cs.meta b/Assets/Scripts/Unit/Component/UnitSkill.cs.meta deleted file mode 100644 index 882bb398..00000000 --- a/Assets/Scripts/Unit/Component/UnitSkill.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d55937c5d88bcc84986d79cd2ec0468b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/Component/UnitState.cs b/Assets/Scripts/Unit/Component/UnitState.cs deleted file mode 100644 index 2825f606..00000000 --- a/Assets/Scripts/Unit/Component/UnitState.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 角色状态机 -[DisallowMultipleComponent] -public class UnitState : UnitComponent -{ - -} \ No newline at end of file diff --git a/Assets/Scripts/Unit/Component/UnitState.cs.meta b/Assets/Scripts/Unit/Component/UnitState.cs.meta deleted file mode 100644 index 781994dc..00000000 --- a/Assets/Scripts/Unit/Component/UnitState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e5c9c1db07e3c734ebf185f14cc7356a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.1-26-g67d0