diff options
Diffstat (limited to 'Assets/Scripts/Avatar')
167 files changed, 0 insertions, 3687 deletions
diff --git a/Assets/Scripts/Avatar/Actions.meta b/Assets/Scripts/Avatar/Actions.meta deleted file mode 100644 index d3b985d9..00000000 --- a/Assets/Scripts/Avatar/Actions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 11a73902b983ea045bd5fb50d69dc802 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs deleted file mode 100644 index 6f2252d7..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionAnimCrossFade : ActionBase -{ - Animator m_Animator; - int m_TargetAnimation; - float m_Duration; - - public ActionAnimCrossFade(Animator animator, int toAnim, float duration = 0) - { - m_Animator = animator; - m_TargetAnimation = toAnim; - m_Duration = duration; - } - - public override void Execute() - { - m_Animator.CrossFade(m_TargetAnimation, m_Duration); - } - -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs.meta b/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs.meta deleted file mode 100644 index 6eed1575..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionAnimCrossFade.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 86ec4b9e82965164ba7d950129542f85 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionBase.cs b/Assets/Scripts/Avatar/Actions/ActionBase.cs deleted file mode 100644 index 1458e340..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionBase.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public abstract class ActionBase -{ - private int m_ID; - public int ID - { - get - { - return m_ID; - } - } - - protected ActionBase() - { - m_ID = UIDManager.Acquire(); - } - - public abstract void Execute(); - -} diff --git a/Assets/Scripts/Avatar/Actions/ActionBase.cs.meta b/Assets/Scripts/Avatar/Actions/ActionBase.cs.meta deleted file mode 100644 index 8ef84b69..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bbdb3ec1494e7c8418f9068fb2815cfc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs deleted file mode 100644 index 82b176fd..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionDontUseGravity : ActionBase -{ - PhysicsBody m_Body; - - public ActionDontUseGravity(PhysicsBody body) - { - m_Body = body; - } - - public override void Execute() - { - m_Body.UseGravity = false; - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs.meta deleted file mode 100644 index 9957eef0..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionDontUseGravity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 500bcab3888d71747971dfa5f364fcd6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects.meta b/Assets/Scripts/Avatar/Actions/ActionEffects.meta deleted file mode 100644 index 17a426dd..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0b5ccfefc2e6b104a8566f4da9a16c5f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs deleted file mode 100644 index 0b2ac361..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionActivateAfterImage : ActionBase
-{
- private bool m_IsActive;
-
- public ActionActivateAfterImage(bool isActive)
- {
- m_IsActive = isActive;
- }
-
- public override void Execute()
- {
- AfterImagePool.Instance.Activate(m_IsActive);
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs.meta b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs.meta deleted file mode 100644 index 189e2f24..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionActivateAfterImage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8df8331b2b9416b499e856b691c2326e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs deleted file mode 100644 index 1d5c2f8b..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionAfterImageInterval : ActionBase
-{
- private int m_Interval;
-
- public ActionAfterImageInterval(int interval)
- {
- m_Interval = interval;
- }
-
- public override void Execute()
- {
- AfterImagePool.Instance.SetInterval(m_Interval);
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs.meta b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs.meta deleted file mode 100644 index fa144bad..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionAfterImageInterval.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e87b2df9fee7956449df7dc2d430b862 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs deleted file mode 100644 index 6a00aaa8..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// 播放特效
-public class ActionPlayEffect : ActionBase
-{
- enum Type
- {
- GivenPosition, // 固定位置
- FollowObject, // 动态位置
- Avatar, // 角色
- }
-
- Type m_Type;
-
- string m_Effect;
- Vector3 m_Position;
- Vector3 m_Rotation;
- Vector3 m_Scale;
- Transform m_Follow;
- Avatar m_Avatar;
-
- public ActionPlayEffect(string effect, Vector3 position, Vector3 rotation, Vector3 scale)
- {
-
- }
-
- public ActionPlayEffect(string effect, Transform followPosition, Vector3 rotation, Vector3 scale)
- {
-
- }
-
- public ActionPlayEffect(string effect, Avatar avatar, Vector3 rotation, Vector3 scale)
- {
- m_Type = Type.Avatar;
- m_Effect = effect;
- m_Avatar = avatar;
- m_Rotation = rotation;
- m_Scale = scale;
- }
-
- public override void Execute()
- {
- if (m_Type == Type.Avatar)
- m_Position = m_Avatar.GetEffectPosition();
- EffectsManager.Instance.PlayEffect(m_Effect, m_Position, m_Rotation, m_Scale);
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs.meta b/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs.meta deleted file mode 100644 index 0e085fc4..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionEffects/ActionPlayEffect.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ca4c24da837b8854f8510118217e063d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs deleted file mode 100644 index c411c3fa..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 创建角色残影 -/// </summary> -public class ActionFlashEffect : ActionBase -{ - public override void Execute() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs.meta b/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs.meta deleted file mode 100644 index ea99c96b..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionFlashEffect.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a193a2045f759e4abaff6bfef12658f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionFreeze.cs b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs deleted file mode 100644 index 7f26f35a..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionFreeze.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionFreze : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionFreeze.cs.meta b/Assets/Scripts/Avatar/Actions/ActionFreeze.cs.meta deleted file mode 100644 index eb9fe77a..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionFreeze.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 32c173c981e85414c83ec9b0fc7d9722 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionJump.cs b/Assets/Scripts/Avatar/Actions/ActionJump.cs deleted file mode 100644 index 364dd7de..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJump.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// 垂直跳跃，切换到jump state
-public class ActionJump : ActionSwitchState
-{
- private JumpState m_JumpState;
-
- public ActionJump(StateController system, JumpState jumpState)
- : base(system, jumpState)
- {
- m_JumpState = jumpState;
- }
-
- public override void Execute()
- {
- m_JumpState.SetDir(JumpState.Direction.Neutral);
- base.Execute();
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionJump.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJump.cs.meta deleted file mode 100644 index 8c48a0a7..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJump.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 987cd3139a86b4c4fa0acdbb621e9e14 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs deleted file mode 100644 index c21fce77..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionJumpBack : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs.meta deleted file mode 100644 index c8db01c7..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpBack.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1b4b55d531ec4084294169cddfbeb57a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs deleted file mode 100644 index 0751d659..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionJumpBackward : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs.meta deleted file mode 100644 index 99c729b3..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpBackward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 635bcce72805fc14ebc1cb057db4e1b2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs deleted file mode 100644 index 2fb28dc4..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// 垂直跳跃，切换到jump state
-public class ActionJumpForward : ActionSwitchState
-{
- private JumpState m_JumpState;
-
- public ActionJumpForward(StateController system, JumpState jumpState)
- : base(system, jumpState)
- {
- m_JumpState = jumpState;
- }
-
- public override void Execute()
- {
- m_JumpState.SetDir(JumpState.Direction.Forward);
- base.Execute(); // switch to jump state
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs.meta b/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs.meta deleted file mode 100644 index 27f6ba43..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionJumpForward.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c97763c6fe099c43bab267ccc3888a9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionLog.cs b/Assets/Scripts/Avatar/Actions/ActionLog.cs deleted file mode 100644 index b276d2ef..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionLog.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionLog : ActionBase -{ - string m_Content = ""; - - public ActionLog(string content) - { - m_Content = content; - } - - public override void Execute() - { - Debug.Log(m_Content); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionLog.cs.meta b/Assets/Scripts/Avatar/Actions/ActionLog.cs.meta deleted file mode 100644 index 92995276..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionLog.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 012a5a398b677f94abeb0aa12659d5ec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs deleted file mode 100644 index 442ce999..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionPlaySfx : ActionBase -{ - GameObject m_Sfx; - Vector3 m_TargetPos; - - public ActionPlaySfx(GameObject sfx, Vector3 position) - { - m_Sfx = sfx; - m_TargetPos = position; - } - - public override void Execute() - { - } -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs.meta deleted file mode 100644 index 2b206e8f..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPlaySfx.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 302075a0d3527d44f9188351f0f6d070 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs deleted file mode 100644 index 237b7455..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionPlaySound : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs.meta deleted file mode 100644 index a9bbf014..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPlaySound.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c43194c5e437d5d4fb02a7b0618a7b0e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs deleted file mode 100644 index 9db10173..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionPosAdd : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs.meta b/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs.meta deleted file mode 100644 index 209f3795..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionPositionAdd.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc9cfba8e327546488ec1c83add3e127 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionRush.cs b/Assets/Scripts/Avatar/Actions/ActionRush.cs deleted file mode 100644 index 19f1b625..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionRush.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionRush : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionRush.cs.meta b/Assets/Scripts/Avatar/Actions/ActionRush.cs.meta deleted file mode 100644 index 760ef5f0..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionRush.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 43fb6de9baefcab4087468f33ae40a51 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs deleted file mode 100644 index 8869801d..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionSetFeetPosition : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs.meta deleted file mode 100644 index 87656dc0..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetFeetPosition.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: da4e331f7a5282e4ca369384e69e98a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs b/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs deleted file mode 100644 index 5e2f62ed..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionSetLocalVelocity : ActionBase -{
- PhysicsBody m_Body;
-
- Vector3 m_Velocity;
-
- public ActionSetLocalVelocity(PhysicsBody body, Vector3 localVelocity)
- {
- m_Body = body;
- m_Velocity = localVelocity;
- }
-
- public override void Execute()
- {
- m_Body.LocalVelocity = m_Velocity;
- } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs.meta deleted file mode 100644 index 0a91e7cd..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetLocalVelocity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d0c4285c1d134b045b7a5f323c258579 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs deleted file mode 100644 index a4e62294..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionSetPosition : ActionBase -{ - public ActionSetPosition() - { - } - - public override void Execute() - { - throw new System.NotImplementedException(); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs.meta deleted file mode 100644 index 466f5692..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetPosition.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6125833c9bb56f546bbd74cb0c7c32b3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs deleted file mode 100644 index 3289ac81..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionSetVelocity : ActionBase -{ - PhysicsBody m_Body; - - Vector3 m_Velocity; - - public ActionSetVelocity(PhysicsBody body, Vector3 velocity) - { - m_Body = body; - m_Velocity = velocity; - } - - public override void Execute() - { - m_Body.Velocity = m_Velocity; - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs.meta deleted file mode 100644 index 3f677ed0..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetVelocity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0334529cb8b95d5449a4d50a41099c0e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs deleted file mode 100644 index effc3ca7..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionSetVelocityX : ActionBase -{ - PhysicsBody m_Body; - - float m_VelX; - - public ActionSetVelocityX(PhysicsBody body, float x) - { - m_Body = body; - m_VelX = x; - } - - public override void Execute() - { - Vector3 v = m_Body.Velocity; - v.x = m_VelX; - m_Body.Velocity = v; - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta deleted file mode 100644 index 5b39b3ec..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6130f371839788049b56f4d71468bc51 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs deleted file mode 100644 index d55270ab..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ActionShakeCamera : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
diff --git a/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs.meta b/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs.meta deleted file mode 100644 index 93a39df8..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionShakeCamera.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a5f356ae9f970af40b86475bc21a0d5c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs deleted file mode 100644 index 890d1e66..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 基础的切换 state -public class ActionSwitchState : ActionBase -{ - StateController m_StateController; - StateBase m_TargetState; - - public ActionSwitchState(StateController stateSystem, StateBase targetState) - { - m_StateController = stateSystem; - m_TargetState = targetState; - } - - public override void Execute() - { -#if UNITY_EDITOR - string thsName = m_StateController.Current.GetType().FullName; - string clsName = m_TargetState.GetType().FullName; - Debug.Log(thsName + " -> " + clsName); -#endif - - m_StateController.SwitchToState(m_TargetState); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs.meta deleted file mode 100644 index 3059d95d..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionSwitchAbility.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ce17bc5eca89ffc468e536284af75c4f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs deleted file mode 100644 index 8d888d30..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionTowardLeft : ActionBase -{ - Transform m_Obj; - Vector3 m_Angel = new Vector3(0, -90, 0); - - public ActionTowardLeft(Transform obj) - { - m_Obj = obj; - } - - public override void Execute() - { - m_Obj.rotation = Quaternion.Euler(m_Angel); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs.meta deleted file mode 100644 index 313b4775..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTowardLeft.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 44aaf2eda01524845942fae69a26b5e1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs deleted file mode 100644 index b7dadf3a..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionTowardRight : ActionBase -{ - Transform m_Obj; - Vector3 m_Angel = new Vector3(0, 90, 0); - - public ActionTowardRight(Transform obj) - { - m_Obj = obj; - } - - public override void Execute() - { - m_Obj.rotation = Quaternion.Euler(m_Angel); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs.meta deleted file mode 100644 index 1477951b..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTowardRight.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a2b93c99bf228014392dcff8416c8fe0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionTurn180.cs b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs deleted file mode 100644 index 325a3e88..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTurn180.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionTurn180 : ActionBase -{ - Transform m_Obj; - Vector3 m_Angel = new Vector3(0, 180, 0); - - public ActionTurn180(Transform obj) - { - m_Obj = obj; - } - - public override void Execute() - { - m_Obj.Rotate(m_Angel); - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionTurn180.cs.meta b/Assets/Scripts/Avatar/Actions/ActionTurn180.cs.meta deleted file mode 100644 index ee218a48..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionTurn180.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fcc6f64fbe0e7cb48a2db882fe5611c7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs deleted file mode 100644 index 92cf3261..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionUseGravity : ActionBase -{ - PhysicsBody m_Body; - - public ActionUseGravity(PhysicsBody body) - { - m_Body = body; - } - - public override void Execute() - { - m_Body.UseGravity = true; - } -} diff --git a/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs.meta b/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs.meta deleted file mode 100644 index 42eeb7aa..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionUseGravity.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5b25d9149f0503645907db055a0e94f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs deleted file mode 100644 index 5b4cfda3..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionWipeCmdRecord : ActionBase -{ - public override void Execute() - { - _InputManager.Instance.CommandRecord.Clear(); - } -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs.meta b/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs.meta deleted file mode 100644 index 86c5ec59..00000000 --- a/Assets/Scripts/Avatar/Actions/ActionWipeCmdRecord.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6124291d136fa604bafde35cb10af76b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/CameraActions.meta b/Assets/Scripts/Avatar/Actions/CameraActions.meta deleted file mode 100644 index a4650ff8..00000000 --- a/Assets/Scripts/Avatar/Actions/CameraActions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d30a503b2bf1b04284baaadbf080a1f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs deleted file mode 100644 index 607473c2..00000000 --- a/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionMoveCamera : ActionBase -{
- public ActionMoveCamera()
- {
-
- }
-
- public override void Execute()
- {
- throw new System.NotImplementedException();
- }
-} diff --git a/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs.meta b/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs.meta deleted file mode 100644 index 3812e732..00000000 --- a/Assets/Scripts/Avatar/Actions/CameraActions/ActionMoveCamera.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 67f15f0e55848fe4187e667a2e3e7d76 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs deleted file mode 100644 index 11c965cf..00000000 --- a/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionPauseTime : ActionBase -{
- public override void Execute()
- {
-
-
- } -} diff --git a/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs.meta b/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs.meta deleted file mode 100644 index 5cca5838..00000000 --- a/Assets/Scripts/Avatar/Actions/CameraActions/ActionPauseTime.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4f2e2377ca8624a4097987aa981db53d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/EffectActions.meta b/Assets/Scripts/Avatar/Actions/EffectActions.meta deleted file mode 100644 index 8b300c5b..00000000 --- a/Assets/Scripts/Avatar/Actions/EffectActions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c8aea8ed2489dde4fba46dde6f2a8d09 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs deleted file mode 100644 index 2da01daf..00000000 --- a/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 残影特效 -public class ActionDisableGhost : ActionBase -{ - CharacterGhostEffect m_GhostEffect; - - public ActionDisableGhost(CharacterGhostEffect effect) - { - m_GhostEffect = effect; - } - - public override void Execute() - { - m_GhostEffect.IsEnable = false; - } -} diff --git a/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs.meta b/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs.meta deleted file mode 100644 index 185da50b..00000000 --- a/Assets/Scripts/Avatar/Actions/EffectActions/ActionDisableGhost.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8548d7836b8033643954ca68cc3a5948 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs deleted file mode 100644 index fa2d8e74..00000000 --- a/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 残影特效 -public class ActionEffectGhost : ActionBase -{ - CharacterGhostEffect m_GhostEffect; - - public ActionEffectGhost(CharacterGhostEffect effect) - { - m_GhostEffect = effect; - } - - public override void Execute() - { - m_GhostEffect.IsEnable = true; - } -} diff --git a/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs.meta b/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs.meta deleted file mode 100644 index 6a55db7d..00000000 --- a/Assets/Scripts/Avatar/Actions/EffectActions/ActionEffectGhost.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 68cbffdb70cd84041b2aa7b2134a10e8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/UberActions.meta b/Assets/Scripts/Avatar/Actions/UberActions.meta deleted file mode 100644 index c2620d0e..00000000 --- a/Assets/Scripts/Avatar/Actions/UberActions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 74422fa2d75a19040b26845660f7b51b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs deleted file mode 100644 index b62d3b37..00000000 --- a/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ActionUber : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs.meta b/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs.meta deleted file mode 100644 index 69d003aa..00000000 --- a/Assets/Scripts/Avatar/Actions/UberActions/ActionUber.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5986fb71b8f521d4c9bffe103916f1c5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Avatar.cs b/Assets/Scripts/Avatar/Avatar.cs deleted file mode 100644 index 8787b942..00000000 --- a/Assets/Scripts/Avatar/Avatar.cs +++ /dev/null @@ -1,151 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-/// <summary>
-/// 角色，包括player和opponents
-/// </summary>
-public partial class Avatar : MonoBehaviour, IInteractable
-{
- public string Name;
-
- // 一个角色包括一个身体的collider和若干hitbox和hurtbox
- public PhysicsBody m_Body; - public PhysicsBox m_BodyCollider;
- public Hitbox[] m_Hitbox;
- public Hurtbox[] m_Hurtbox;
-
- public Transform m_Hips; -
- protected StateController m_StateController = new StateController();
-
- // 预定义的state，角色必须定义的
- protected StateBase m_StateLightHurt;
- protected StateBase m_StateMidiumHurt;
- protected StateBase m_StateHeavyHurt;
- protected StateBase m_StateGroundHurt;
- protected StateBase m_StateAirHurt;
-
- public PhysicsBody Body
- {
- get
- {
- return m_Body;
- }
- }
-
- public PhysicsPrimitive[] GetAllPrimitive()
- {
- throw new System.NotImplementedException();
- }
-
- protected void Init()
- {
- AvatarManager.Instance.AddAvatar(this);
- }
-
- public PhysicsBox GetHitbox()
- {
- throw new System.NotImplementedException();
- }
-
- public PhysicsBox GetHurtbox()
- {
- throw new System.NotImplementedException();
- }
-
- public PhysicsPrimitive[] GetAllHit()
- {
- throw new System.NotImplementedException();
- }
-
- public bool IsHit()
- {
- for (int i = 0; i < m_Hitbox.Length; ++i)
- {
- if (PhysicsWorld.Instance.HasCollision(m_Hitbox[i].Collider))
- {
- return true;
- }
- }
- return false;
- }
-
- public bool IsHurt()
- {
- for (int i = 0; i < m_Hitbox.Length; ++i)
- {
- if (PhysicsWorld.Instance.HasCollision(m_Hurtbox[i].Collider))
- {
- return true;
- }
- }
- return false;
- }
-
- public void OnUpdate()
- {
- m_StateController.OnUpdate();
- }
-
- // 在物理模拟之后调用
- public void OnPhysicsUpdate()
- {
- m_StateController.OnPhysicsUpdate();
- }
-
- public virtual Vector3 GetEffectPosition()
- {
- return Vector3.zero;
- }
-
- // 获得当前击打如果有的话
- public Hit GetHit()
- {
- return m_StateController.GetHit();
- }
-
- public virtual void OnHit(HitInfo hitInfo)
- {
- //Debug.Log("Hit");
- m_StateController.OnHit(hitInfo);
- }
-
- public virtual void OnHurt(HurtInfo hurtInfo)
- {
- //Debug.Log("Hurt");
- HitDefination hitDef = hurtInfo.hitDef;
- if (hitDef != null)
- ApplyHit(hitDef);
- m_StateController.OnHurt(hurtInfo);
- }
-
-
- protected ConditionBase Not(ConditionBase cond)
- {
- return new ConditionNot(cond);
- }
-
- protected ConditionBase And(ConditionBase c1, ConditionBase c2)
- {
- return new ConditionAnd(c1, c2);
- }
-
- protected ConditionBase Ands(params ConditionBase[] cond)
- {
- List<ConditionBase> conditions = new List<ConditionBase>();
- for (int i = 0; i < cond.Length; ++i)
- {
- conditions.Add(cond[i]);
- }
- ConditionMultiAnd and = new ConditionMultiAnd(conditions);
- return and;
- }
-
- protected ConditionBase Or(ConditionBase c1, ConditionBase c2)
- {
- return new ConditionOr(c1, c2);
- }
-
-}
diff --git a/Assets/Scripts/Avatar/Avatar.cs.meta b/Assets/Scripts/Avatar/Avatar.cs.meta deleted file mode 100644 index 88269a31..00000000 --- a/Assets/Scripts/Avatar/Avatar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4a9cb2414b4a10143919919cfe80537e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Avatar_Hurt.cs b/Assets/Scripts/Avatar/Avatar_Hurt.cs deleted file mode 100644 index c6b840b9..00000000 --- a/Assets/Scripts/Avatar/Avatar_Hurt.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public partial class Avatar : MonoBehaviour, IInteractable
-{
- void ApplyHit(HitDefination hit)
- {
- if(hit.hurtAddForce.magnitude != 0)
- {
- m_Body.AddForce(hit.hurtAddForce);
- }
-
- // 切换到受击状态
- switch(hit.type)
- {
- case HitType.Light: m_StateController.SwitchToState(m_StateLightHurt); break;
- case HitType.Midium: m_StateController.SwitchToState(m_StateMidiumHurt); break;
- case HitType.Heavy: m_StateController.SwitchToState(m_StateHeavyHurt); break;
- case HitType.Ground: m_StateController.SwitchToState(m_StateGroundHurt); break;
- case HitType.Air: m_StateController.SwitchToState(m_StateAirHurt); break;
- default:
- m_StateController.SwitchToState(m_StateLightHurt);
- break;
- }
-
- // spark
- if(hit.sparkName != string.Empty)
- {
- if(hit.sparkHostType == HitSparkHost.Center)
- {
- SparksManager.Instance.PlaySpark(hit.sparkName, m_Hips);
- }
- }
-
- }
-
-}
diff --git a/Assets/Scripts/Avatar/Avatar_Hurt.cs.meta b/Assets/Scripts/Avatar/Avatar_Hurt.cs.meta deleted file mode 100644 index 9b72c6ac..00000000 --- a/Assets/Scripts/Avatar/Avatar_Hurt.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b8225de6932892342bf356e15bda0858 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Bahaviours.meta b/Assets/Scripts/Avatar/Bahaviours.meta deleted file mode 100644 index 982222bf..00000000 --- a/Assets/Scripts/Avatar/Bahaviours.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d10a8e3e46f321146b54b9f74ca76db6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs deleted file mode 100644 index cbc9c632..00000000 --- a/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GhostEffectSpwan : MonoBehaviour -{ - public CharacterGhostEffect GhostEffect; - - public void SpawnGhost() - { - GhostEffect.CreateGhost(); - } - -} diff --git a/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs.meta b/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs.meta deleted file mode 100644 index 4acfc78c..00000000 --- a/Assets/Scripts/Avatar/Bahaviours/GhostEffectSpwan.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 12bdc2613cfcd9043ad58b1bcc15c8ce -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions.meta b/Assets/Scripts/Avatar/Conditions.meta deleted file mode 100644 index 9ee89e8b..00000000 --- a/Assets/Scripts/Avatar/Conditions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4564e909667997f48822cb2d05ed360f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs deleted file mode 100644 index 4b71b837..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 记录之前的state序列满足某个序列
-/// combo的时候根据当前序列决定combo
-/// </summary>
-public class ConditionStateSeq : ConditionBase
-{
- List<int> m_TargetStateSeq = new List<int>();
-
- public ConditionStateSeq(List<int> commandSeq)
- : base()
- {
- m_TargetStateSeq = commandSeq;
- }
-
- public override bool Evaluate()
- {
- // 验证记录的stateSeq是否满足
-
-
- throw new System.NotImplementedException();
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs.meta deleted file mode 100644 index 5070f1cc..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionAbilitySeq.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7bbf0480c45c29843b8ba41229bb29b1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs deleted file mode 100644 index 0f9b4529..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionAttkExpireTime : ConditionBase -{ - AttackState m_State; - float m_ExpireTime; - - public ConditionAttkExpireTime(AttackState attack, float expireTime) - { - m_State = attack; - m_ExpireTime = expireTime; - } - - public override bool Evaluate() - { - return m_State.ExpireTime > m_ExpireTime; - } -} - diff --git a/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs.meta deleted file mode 100644 index 80b4d7a7..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionAttkExpireTime.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 385e621dcc66179459c6f2a2b3b81319 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionBase.cs b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs deleted file mode 100644 index 8dff29da..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionBase.cs +++ /dev/null @@ -1,196 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 触发条件基类
-/// </summary>
-public abstract class ConditionBase
-{
-
- public ConditionBase()
- {
- }
-
- public abstract bool Evaluate();
-
-}
-
-/// <summary>
-/// 两个condition都达成才会返回真
-/// </summary>
-public sealed class ConditionNot : ConditionBase
-{
- ConditionBase m_Condition;
-
-
- public ConditionNot(ConditionBase cond)
- : base()
- {
- m_Condition = cond;
- }
-
- public override bool Evaluate()
- {
- return !m_Condition.Evaluate();
- }
-}
-
-/// <summary>
-/// 总是满足
-/// </summary>
-public sealed class ConditionAlways : ConditionBase
-{
- public override bool Evaluate()
- {
- return true;
- }
-}
-
-/// <summary>
-/// 总是不满足
-/// </summary>
-public sealed class ConditionAlwaysNot : ConditionBase
-{
- public override bool Evaluate()
- {
- return false;
- }
-}
-
-/// <summary>
-/// 两个condition都达成才会返回真
-/// </summary>
-public sealed class ConditionAnd : ConditionBase
-{
- ConditionBase m_FirstCondition, m_LastCondition;
-
-
- public ConditionAnd(ConditionBase first, ConditionBase last)
- : base()
- {
- m_FirstCondition = first;
- m_LastCondition = last;
- }
-
- public override bool Evaluate()
- {
- return m_FirstCondition.Evaluate() && m_LastCondition.Evaluate();
- }
-}
-
-/// <summary>
-/// 两个condition至少一个达成才会返回真
-/// </summary>
-public sealed class ConditionOr : ConditionBase
-{
- ConditionBase m_FirstCondition, m_LastCondition;
-
-
- public ConditionOr(ConditionBase first, ConditionBase last)
- : base()
- {
- m_FirstCondition = first;
- m_LastCondition = last;
- }
-
- public override bool Evaluate()
- {
- return m_FirstCondition.Evaluate() || m_LastCondition.Evaluate();
- }
-}
-
-
-/// <summary>
-/// 两个condition都不达成才会返回真
-/// </summary>
-public sealed class ConditionNone : ConditionBase
-{
- ConditionBase m_FirstCondition, m_LastCondition;
-
- public ConditionNone(ConditionBase first, ConditionBase last)
- : base()
- {
- m_FirstCondition = first;
- m_LastCondition = last;
- }
-
- public override bool Evaluate()
- {
- return !m_FirstCondition.Evaluate() && !m_LastCondition.Evaluate();
- }
-}
-
-
-/// <summary>
-/// 多个condition都达成才会返回真
-/// </summary>
-public sealed class ConditionMultiAnd : ConditionBase
-{
- List<ConditionBase> m_Conditions = new List<ConditionBase>();
-
- public ConditionMultiAnd(List<ConditionBase> conditions)
- : base()
- {
- m_Conditions.AddRange(conditions);
- }
-
- public override bool Evaluate()
- {
- foreach(var condition in m_Conditions)
- {
- if(!condition.Evaluate())
- return false;
- }
- return true;
- }
-}
-
-/// <summary>
-/// 多个condition至少一个达成才会返回真
-/// </summary>
-public sealed class ConditionMultiOr : ConditionBase
-{
- List<ConditionBase> m_Conditions;
-
- public ConditionMultiOr(List<ConditionBase> conditions)
- : base()
- {
- m_Conditions.AddRange(conditions);
- }
-
- public override bool Evaluate()
- {
- foreach (var condition in m_Conditions)
- {
- if (condition.Evaluate())
- return true;
- }
- return false;
- }
-}
-
-/// <summary>
-/// 多个condition都不达成才会返回真
-/// </summary>
-public sealed class ConditionMultiNone : ConditionBase
-{
- List<ConditionBase> m_Conditions;
-
- public ConditionMultiNone(List<ConditionBase> conditions)
- : base()
- {
- m_Conditions.AddRange(conditions);
- }
-
- public override bool Evaluate()
- {
- foreach (var condition in m_Conditions)
- {
- if (condition.Evaluate())
- return false;
- }
- return true;
- }
-}
-
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionBase.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionBase.cs.meta deleted file mode 100644 index 4c321ffd..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 21029775aaf8cdd4a868a45725313c3a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs deleted file mode 100644 index e958776a..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionButtonHold : ConditionBase -{ - GamepadButton m_Button; - - public ConditionButtonHold(GamepadButton button) - { - m_Button = button; - } - - public override bool Evaluate() - { - return _InputManager.Instance.IsButtonHold(m_Button); - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs.meta deleted file mode 100644 index 82d350e2..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionButtonHold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2b0cd6f63cbe32649a15ab38d5bb6ee3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs deleted file mode 100644 index ec4e489c..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionCheckHp : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs.meta deleted file mode 100644 index e5b205b2..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckHp.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e4b80b2be76ae9149af7b8a57f1e68ef -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs deleted file mode 100644 index 98859483..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionCheckJumpState : ConditionBase -{ - JumpState m_State; - JumpState.Stage m_Stage; - JumpState.Direction m_Direction; - - public ConditionCheckJumpState(JumpState state, JumpState.Stage stage = JumpState.Stage.None, JumpState.Direction direction = JumpState.Direction.None) - { - m_State = state; - m_State = state; - m_Direction = direction; - } - - public override bool Evaluate() - { - if (m_State == null) - return false; - if (m_Stage != JumpState.Stage.None && m_Direction != JumpState.Direction.None) - { - return m_State.CurStage == m_Stage - && m_State.CurDirection == m_Direction; - } - else if (m_Stage != JumpState.Stage.None && m_Direction == JumpState.Direction.None) - { - return m_State.CurStage == m_Stage; - } - else if (m_Stage == JumpState.Stage.None && m_Direction != JumpState.Direction.None) - { - return m_State.CurDirection == m_Direction; - } - else - return false; - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta deleted file mode 100644 index aefa0807..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d7c948fe9eefbd14d9137b19e92e1fc4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs deleted file mode 100644 index c14bff3c..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionCheckMp : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs.meta deleted file mode 100644 index d920a18f..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCheckMp.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a603843f7ac083c45ba5b2ec23d4cc0b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs deleted file mode 100644 index 1b6159cb..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 连击操作，综合ConditionMotionRange和ConditionCommand
-/// </summary>
-public class ConditionCombo : ConditionBase
-{
- public override bool Evaluate()
- {
- throw new System.NotImplementedException();
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs.meta deleted file mode 100644 index 45582943..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCombo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 015528a2fbc923f45b1e25c11a6ade2b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs deleted file mode 100644 index 46ce602f..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 按下某个command
-/// </summary>
-public class ConditionCommand : ConditionBase
-{
- GamepadButton m_TargetCommand;
-
- public ConditionCommand(GamepadButton command)
- {
- m_TargetCommand = command;
- }
-
- public override bool Evaluate()
- {
- return _InputManager.Instance.CurrentCommand.code == m_TargetCommand;
- }
-
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs.meta deleted file mode 100644 index 100638e6..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCommand.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6334908b568b7c046bbeb3f526f95841 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs deleted file mode 100644 index e54435b4..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 一个command序列，用来触发连击
-/// </summary>
-public class ConditionCommandSeq : ConditionBase
-{
- List<GamepadButton> m_CommandSeq = new List<GamepadButton>();
- float m_DeltaTime = 0;
- List<int> m_LastCmdID = new List<int>();
-
- List<int> id = new List<int>();
-
- public ConditionCommandSeq(List<GamepadButton> commandSeq, float maxDeltaTime)
- {
- m_CommandSeq.AddRange(commandSeq);
- m_DeltaTime = maxDeltaTime;
- }
-
- public override bool Evaluate()
- {
- List<Command> commandRecord = _InputManager.Instance.CommandRecord;
- if (commandRecord == null || commandRecord.Count < m_CommandSeq.Count)
- return false;
- id.Clear();
- for (int i = 1; i < m_CommandSeq.Count; ++i)
- {
- GamepadButton button = m_CommandSeq[i];
- GamepadButton preButton = m_CommandSeq[i-1];
- int j = commandRecord.Count - m_CommandSeq.Count + i;
- Command cmd = commandRecord[j];
- Command preCmd = commandRecord[j-1];
- if (preCmd.code != preButton || cmd.code != button)
- return false;
- if (cmd.time - preCmd.time > m_DeltaTime)
- return false;
- id.Add(preCmd.id);
- if (j == commandRecord.Count - 1)
- id.Add(cmd.id);
- }
-
- //for (int i = 0; i < id.Count; ++i)
- //{
- // if (m_LastCmdID.Contains(id[i]))
- // return false;
- //}
- //m_LastCmdID.Clear();
- //m_LastCmdID.AddRange(id);
-
- return true;
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs.meta deleted file mode 100644 index fc77bd3c..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionCommandSeq.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7316354e3f99412419c866e0fc3906c6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionInair.cs b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs deleted file mode 100644 index 212e5172..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionInair.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 某个角色是否浮空
-/// </summary>
-public class ConditionInAir : ConditionBase
-{
- PhysicsPrimitive m_Prim;
-
- public ConditionInAir(PhysicsPrimitive prim)
- {
- m_Prim = prim;
- }
-
- public override bool Evaluate()
- {
- return m_Prim.IsInAir;
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionInair.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionInair.cs.meta deleted file mode 100644 index 8bbf610f..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionInair.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8855eebdb67a2cc4baeb2a21e5b40ed4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs deleted file mode 100644 index a6e57e37..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ConditionJumpDone : ConditionBase
-{
- JumpState m_Jump;
- float m_T;
-
- public ConditionJumpDone(JumpState jump, float t = 1f)
- {
- m_Jump = jump;
- m_T = t;
- }
-
- public override bool Evaluate()
- {
- return m_Jump.IsJumpDone(m_T);
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs.meta deleted file mode 100644 index 34a9de96..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 734f6d264357f2c43b13f8203f7ecd41 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs deleted file mode 100644 index e0f75a69..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionJumpOnGround : ConditionBase -{ - JumpState m_Jump; - - public ConditionJumpOnGround(JumpState jump) - { - m_Jump = jump; - } - - public override bool Evaluate() - { - return m_Jump.IsJumpGround(); - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs.meta deleted file mode 100644 index 33f0341b..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpOnGround.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a04452218ec0b849bbed3d0ba35cd12 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs deleted file mode 100644 index a6bd96c0..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ConditionJumpReady : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs.meta deleted file mode 100644 index d947e116..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionJumpReady.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 300b4929ffe151c43bfce427115a05a9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs deleted file mode 100644 index 18d71e86..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 动画已经播放完毕 -/// </summary> -public class ConditionMotionAtEnd : ConditionBase -{ - Animator m_Animator; - int m_AnimationHash; - - public ConditionMotionAtEnd(Animator animator, int animationHash) - : base() - { - m_Animator = animator; - m_AnimationHash = animationHash; - } - - public override bool Evaluate() - { - AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0); - if(info.shortNameHash == m_AnimationHash) - { - float t = info.normalizedTime; - if (t >= 0.99f) - return true; - } - return false; - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs.meta deleted file mode 100644 index 1688dd68..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionAtEnd.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f5cbdf2ebe12b5d46afa21a62609d15c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs deleted file mode 100644 index 282ef929..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionAnimFrameRange : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs.meta deleted file mode 100644 index 3fc88fb1..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionFrameRange.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 28e7aa2c7b5a9d74b936ec5731eeec36 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs deleted file mode 100644 index c902ae26..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 某个动画是否播放到了某个时间（归一化了的）范围内 -/// </summary> -public sealed class ConditionMotionRange : ConditionBase -{ - Vector2 m_TimeRange = new Vector2(); - Animator m_Animator; - - public ConditionMotionRange(Animator animator, float start, float end) - { - m_Animator = animator; - - m_TimeRange.Set(start, end); - } - - public override bool Evaluate() - { - AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0); - float time = info.normalizedTime; - bool result = time >= m_TimeRange.x && time <= m_TimeRange.y; - return result; - } - -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs.meta deleted file mode 100644 index 926a8560..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMotionRange.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 56b6b5bfaf0d4e147a2f0f1809e7739b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs deleted file mode 100644 index 1084f191..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionMoveButtonHold : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs.meta deleted file mode 100644 index 45cf47bb..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionMoveButtonHold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 77299e998cbe9d1429c2d0b731bff6e3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs deleted file mode 100644 index f1317d80..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionNoMoveButtonHold : ConditionBase -{ - public ConditionNoMoveButtonHold() - { - } - - public override bool Evaluate() - { - bool isMoveButtonDown = _InputManager.Instance.IsButtonHold(GamepadButton.Left) || _InputManager.Instance.IsButtonHold(GamepadButton.Right); - return !isMoveButtonDown; - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs.meta deleted file mode 100644 index db883c19..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNoMoveButtonHold.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ce1302d58bf3a7043b6e2e25d13525d9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs deleted file mode 100644 index 8db94951..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionNotHit : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs.meta deleted file mode 100644 index 7058713f..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNotHit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b0d86b3d8867b144f90fcedf4a6351c3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs deleted file mode 100644 index 9604677a..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionNotHurt : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs.meta deleted file mode 100644 index bbe77240..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionNotHurt.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ab089a23fff18a647856f2e33a145784 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs deleted file mode 100644 index 36cbfd05..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionTowardLeft : ConditionBase -{ - Transform m_Obj; - - public ConditionTowardLeft(Transform obj) - { - m_Obj = obj; - } - - public override bool Evaluate() - { - return Mathf.Approximately(m_Obj.rotation.eulerAngles.y, 270f) - || Mathf.Approximately(m_Obj.rotation.eulerAngles.y, -90f); - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs.meta deleted file mode 100644 index e3a399a6..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionTowardLeft.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e2f90baa8b157234f93cdb949b43cd24 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs deleted file mode 100644 index d26a1fd0..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ConditionTowardRight : ConditionBase -{ - Transform m_Obj; - - public ConditionTowardRight(Transform obj) - { - m_Obj = obj; - } - - public override bool Evaluate() - { - return Mathf.Approximately(m_Obj.rotation.eulerAngles.y, 90f); - } -} diff --git a/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs.meta deleted file mode 100644 index 901efb57..00000000 --- a/Assets/Scripts/Avatar/Conditions/ConditionTowardRight.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ab6f3e1b40a1eff4196b069e4fd25469 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/Interactive.meta b/Assets/Scripts/Avatar/Conditions/Interactive.meta deleted file mode 100644 index cf125393..00000000 --- a/Assets/Scripts/Avatar/Conditions/Interactive.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 38b2530cdab57854e90007371516c2bf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs deleted file mode 100644 index d36cc538..00000000 --- a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// hitbox击中
-public class ConditionHit : ConditionBase
-{
- IInteractable m_Obj;
-
- public ConditionHit(IInteractable obj)
- {
- m_Obj = obj;
-
- }
-
- public override bool Evaluate()
- {
- bool isHit = m_Obj.IsHit();
- return isHit;
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs.meta b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs.meta deleted file mode 100644 index 9c607983..00000000 --- a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c354907230901bf45849e4bb93601b60 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs deleted file mode 100644 index 8a76528d..00000000 --- a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// hurtbox被击中
-public class ConditionHurt : ConditionBase
-{
- IInteractable m_Obj;
-
- public ConditionHurt(IInteractable obj)
- {
- m_Obj = obj;
- }
-
- public override bool Evaluate()
- {
- bool isHit = m_Obj.IsHit();
- return isHit;
- }
-}
diff --git a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs.meta b/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs.meta deleted file mode 100644 index e54feb2d..00000000 --- a/Assets/Scripts/Avatar/Conditions/Interactive/ConditionHurt.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 62448f0af4616f64c987ac12131db584 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/EnforceZCoord.cs b/Assets/Scripts/Avatar/EnforceZCoord.cs deleted file mode 100644 index 2adcd4d6..00000000 --- a/Assets/Scripts/Avatar/EnforceZCoord.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class EnforceZCoord : MonoBehaviour -{ - private void Start()
- {
-
- }
-
- void OnAnimatorMove() - { - Animator animator = GetComponent<Animator>(); - if (animator == null) - return; - - AnimatorStateInfo stateInfo = animator.GetCurrentAnimatorStateInfo(0); - - if (stateInfo.IsTag("IgnoreRootMotion")) - { - // ignore root motion - //Debug.Log("ignore root motion "); - } - else if (stateInfo.IsTag("IgnoreRootMotionY")) - { - Vector3 position = transform.position; - position.x += animator.deltaPosition.x; - transform.position = position; - - transform.rotation *= animator.deltaRotation; - } - else - { - // animator.deltaPosition和animator.deltaRotation是animator做的root motion后的结果 - // 在后面做一个硬性约束z=0，将角色限制在z=0平面上 - Vector3 position = transform.position; - position.x += animator.deltaPosition.x; - position.y += animator.deltaPosition.y; - transform.position = position; - - // animation clip导入设置旋转一般上设置为baked inpose，不需要手动限制 - transform.rotation *= animator.deltaRotation; - } - } -} diff --git a/Assets/Scripts/Avatar/EnforceZCoord.cs.meta b/Assets/Scripts/Avatar/EnforceZCoord.cs.meta deleted file mode 100644 index 76f8b6ce..00000000 --- a/Assets/Scripts/Avatar/EnforceZCoord.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 159e1f8ce7b6ba840b409f1e6e8f3e3e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/HitDefination.cs b/Assets/Scripts/Avatar/HitDefination.cs deleted file mode 100644 index d5d68b23..00000000 --- a/Assets/Scripts/Avatar/HitDefination.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary>
-/// 攻击类型，对应不同的受击者反馈（动作）
-/// </summary> -public enum HitType
-{
- Light, // 轻击
- Midium, // 中击
- Heavy, // 重击
- Ground, // 击倒
- Air, // 击飞
-} - -public enum HitSparkHost
-{
- Center, // 受击者质心 - Hitpoint, // 重叠盒子中心 - Fixed, // 固定挂点sparkHost - WorldPosition, // 世界空间位置sparkRotation -} - -/// <summary>
-/// 一个hit的定义，如果一个attack有多个hit，需要定义多个HitDef
-/// </summary> -public class HitDefination -{
- // 触发的开始和结束时间范围，用来处理一个attack多个hit的情况
- public float start = 0f; - public float end = 1f;
-
- public HitType type = HitType.Light; // 类型
-
- // 特效
- public string sparkName = string.Empty; // 特效 - public HitSparkHost sparkHostType = HitSparkHost.Center;
- public Transform sparkHost = null; // 特效挂点 - public Vector3 sparkPosition; // 特效位置 - public Quaternion sparkRotation; // 特效旋转 - public Vector3 sparkScale = Vector3.one; // 特效缩放 - - // 相机反馈 - - // 攻击方反馈 - - // 受击方反馈 - public Vector3 hurtAddForce = Vector3.zero; - -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/HitDefination.cs.meta b/Assets/Scripts/Avatar/HitDefination.cs.meta deleted file mode 100644 index d542f9ff..00000000 --- a/Assets/Scripts/Avatar/HitDefination.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 25b7556b2c9481e49938afa25157f3fc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/HitInfo.cs b/Assets/Scripts/Avatar/HitInfo.cs deleted file mode 100644 index aef9a03f..00000000 --- a/Assets/Scripts/Avatar/HitInfo.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary>
-/// 每个招式配置的单个hit数据
-/// </summary> -public class Hit -{ - public HitDefination defination; - - /// <summary> - /// 记录这个hit命中的avatar，避免连续击中 - /// </summary> - private List<IInteractable> m_HitAvatars = new List<IInteractable>(); - - public void AddRecord(IInteractable interactable) - { - if (!m_HitAvatars.Contains(interactable)) - m_HitAvatars.Add(interactable); - } - - // 招式结束后，清除记录的avatar - public void WipeRecords() - { - m_HitAvatars.Clear(); - } - - public bool HasRecord(IInteractable interactable)
- {
- return m_HitAvatars.Contains(interactable);
- } - -} diff --git a/Assets/Scripts/Avatar/HitInfo.cs.meta b/Assets/Scripts/Avatar/HitInfo.cs.meta deleted file mode 100644 index ab541e49..00000000 --- a/Assets/Scripts/Avatar/HitInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3f1668cf50ed81641a8f344328012e30 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Hitbox.cs b/Assets/Scripts/Avatar/Hitbox.cs deleted file mode 100644 index 5fd0cecf..00000000 --- a/Assets/Scripts/Avatar/Hitbox.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Hitbox : MonoBehaviour
-{
- [SerializeField]
- private PhysicsBox m_BoxCollider;
- public PhysicsBox Collider
- {
- get
- {
- return m_BoxCollider;
- }
- }
-
- [SerializeField]
- private MonoBehaviour m_Host ;
-
- public IInteractable Host
- {
- get
- {
- return m_Host as IInteractable;
- }
- }
-
- private void Awake()
- {
- HitManager.Instance.AddHitBox(this);
- }
-
-}
diff --git a/Assets/Scripts/Avatar/Hitbox.cs.meta b/Assets/Scripts/Avatar/Hitbox.cs.meta deleted file mode 100644 index 19075d69..00000000 --- a/Assets/Scripts/Avatar/Hitbox.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f763a2db7c267714f824ca6a69bec569 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Hurtbox.cs b/Assets/Scripts/Avatar/Hurtbox.cs deleted file mode 100644 index b5bd738f..00000000 --- a/Assets/Scripts/Avatar/Hurtbox.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Hurtbox : MonoBehaviour
-{
- [SerializeField]
- private PhysicsBox m_BoxCollider;
- public PhysicsBox Collider
- {
- get {
- return m_BoxCollider;
- }
- }
-
- [SerializeField]
- private MonoBehaviour m_Host;
-
- public IInteractable Host
- {
- get
- {
- return m_Host as IInteractable;
- }
- }
-
- private void Awake()
- {
- HitManager.Instance.AddHurtBox(this);
- }
-
-
-}
diff --git a/Assets/Scripts/Avatar/Hurtbox.cs.meta b/Assets/Scripts/Avatar/Hurtbox.cs.meta deleted file mode 100644 index f0c2e2ff..00000000 --- a/Assets/Scripts/Avatar/Hurtbox.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 154a74587976e25469eae9a4a8c7762b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/IInteractable.cs b/Assets/Scripts/Avatar/IInteractable.cs deleted file mode 100644 index 7a648c6c..00000000 --- a/Assets/Scripts/Avatar/IInteractable.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public interface IInteractable -{ - PhysicsPrimitive[] GetAllPrimitive(); - - PhysicsBox GetHitbox(); - - PhysicsBox GetHurtbox(); - - PhysicsPrimitive[] GetAllHit(); - - bool IsHit(); - - bool IsHurt();
-
- void OnHit(HitInfo hitInfo); - - void OnHurt(HurtInfo hurtInfo); - -} diff --git a/Assets/Scripts/Avatar/IInteractable.cs.meta b/Assets/Scripts/Avatar/IInteractable.cs.meta deleted file mode 100644 index ae065c04..00000000 --- a/Assets/Scripts/Avatar/IInteractable.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f6f243903bde9804488701c6d0f7920a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/StateController.cs b/Assets/Scripts/Avatar/StateController.cs deleted file mode 100644 index 12ba6fe4..00000000 --- a/Assets/Scripts/Avatar/StateController.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 每个角色拥有一个state system -/// </summary> -public class StateController -{ - /// <summary> - /// 当前执行的state - /// </summary> - private StateBase m_Currrent; - - public StateBase Current - { - get - { - return m_Currrent; - } - } - - private List<StateBase> m_States = new List<StateBase>(); - - private UberState m_UberState; - - public StateController() - { - } - - public void ForceStart(StateBase state) - { - if (state == null) - return; - - if (m_Currrent != null) - m_Currrent.OnExit(); - - m_Currrent = state; - m_Currrent.OnEnter(); - } - - public void SetUberState(UberState state) - { - m_UberState = state; - } - - public void AddState(StateBase state) - { - m_States.Add(state); - } - - public void OnUpdate() - { - if(m_Currrent != null) - { - m_Currrent.OnUpdate(); - } - if(m_UberState != null) - { - m_UberState.OnUpdate(); - } - } - - public void OnPhysicsUpdate() - { - if(m_Currrent != null) - { - m_Currrent.OnPhysicsUpdate(); - } - if(m_UberState != null) - { - m_UberState.OnPhysicsUpdate(); - } - } - - public void OnHit(HitInfo info) - { - if (m_Currrent != null) - m_Currrent.OnHit(info); - } - - public void OnHurt(HurtInfo info) - { - if (m_Currrent != null) - m_Currrent.OnHurt(info); - } - - public void SwitchToState(StateBase targetState) - { - if (m_Currrent != null) - m_Currrent.OnExit(); - m_Currrent = targetState; - m_Currrent.OnEnter(); - } - - // 获得当前击打如果有的话 - public Hit GetHit() - { - if (Current == null || !(Current is AttackState)) - return null; - AttackState state = Current as AttackState; - return state.GetHit(); - } - -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/StateController.cs.meta b/Assets/Scripts/Avatar/StateController.cs.meta deleted file mode 100644 index 8974eb37..00000000 --- a/Assets/Scripts/Avatar/StateController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4dec6f0208c6e564980e1380ad151233 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States.meta b/Assets/Scripts/Avatar/States.meta deleted file mode 100644 index 4b958769..00000000 --- a/Assets/Scripts/Avatar/States.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 962b8b798c2077c4db88f3828ba14d55 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/AbilityBase.cs b/Assets/Scripts/Avatar/States/AbilityBase.cs deleted file mode 100644 index 4932a3de..00000000 --- a/Assets/Scripts/Avatar/States/AbilityBase.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 同一个角色同一个时间只能有一个state -/// </summary> -public abstract class StateBase -{ - protected int m_StateID; - public int ID - { - get - { - return m_StateID; - } - } - - public StateBase() - { - m_StateID = UIDManager.Acquire(); - } - - public virtual void OnInit() { } - - /// <summary> - /// 进入当前state的回调 - /// </summary> - public virtual void OnEnter() { } - - /// <summary> - /// 退出当前state的回调 - /// </summary> - public virtual void OnExit() { } - - /// <summary> - /// 当前state的update函数 - /// </summary> - public virtual void OnUpdate() { } - - /// <summary> - /// 在物理模拟之后更新 - /// </summary> - public virtual void OnPhysicsUpdate() { } - - /// <summary> - /// 过渡到下一个state的回调 - /// </summary> - /// <param name="to"></param> - public virtual void OnTranslate(StateBase to) { } - - /// <summary> - /// 检测到hitbox碰撞时的回调 - /// </summary> - public virtual void OnHit(HitInfo info) { } - - /// <summary> - /// 检测到hurtbox碰撞时的回调 - /// </summary> - public virtual void OnHurt(HurtInfo info) { } - - /// <summary> - /// 检测到defendbox碰撞时的回调 - /// </summary> - public virtual void OnDefend() { } -} diff --git a/Assets/Scripts/Avatar/States/AbilityBase.cs.meta b/Assets/Scripts/Avatar/States/AbilityBase.cs.meta deleted file mode 100644 index 79a6b7eb..00000000 --- a/Assets/Scripts/Avatar/States/AbilityBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a3b3cfab4bd1dd74bb539687535b58f1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/AttackState.cs b/Assets/Scripts/Avatar/States/AttackState.cs deleted file mode 100644 index 18a20115..00000000 --- a/Assets/Scripts/Avatar/States/AttackState.cs +++ /dev/null @@ -1,177 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public struct AttackStateConfig -{ - public Vector3 velocity; // velocity setup - public int motion; - public Animator animator; - public PhysicsBody body; - public float crossFade; -} - -// 单独的一个招式 -public class AttackState : StateBase -{ - AttackStateConfig m_Config = new AttackStateConfig(); - - private List<Trigger> m_Triggers = new List<Trigger>(); - - private List<Trigger> m_PhysicsTriggers = new List<Trigger>(); - - /// <summary> - /// 这个招式配置的hit - /// </summary> - private List<Hit> m_Hits = new List<Hit>(); - - /// <summary> - /// 从动画结束开始计时 - /// </summary> - float m_TimeCount; - public float ExpireTime - { - get - { - return m_TimeCount; - } - } - - /// <summary> - /// 这个招式的hit个数 - /// </summary> - public int HitCount - { - get - { - return m_Hits != null ? m_Hits.Count : 0; - } - } - - - public AttackState(Animator animator, int animation, PhysicsBody body = null, float crossFade = 0f) - { - m_Config.animator = animator; - m_Config.motion = animation; - m_Config.velocity = Vector3.zero; - m_Config.body = body; - m_Config.crossFade = crossFade; - } - - public AttackState(AttackStateConfig config) - { - m_Config = config; - } - - public override void OnInit() - { - } - - public override void OnDefend() - { - throw new System.NotImplementedException(); - } - - public override void OnEnter() - { - m_TimeCount = 0; - - m_Config.animator.CrossFade(m_Config.motion, m_Config.crossFade); - - if(m_Config.body != null) - { - m_Config.body.LocalVelocity = m_Config.velocity; - } - - foreach(var hit in m_Hits) - { - hit.WipeRecords(); - } - - foreach(var trigger in m_Triggers) - { - trigger.Reset(); - } - } - - public override void OnExit() - { - m_TimeCount = 0; - } - - public override void OnHit(HitInfo info) - { - } - - public override void OnHurt(HurtInfo info) - { - } - - public override void OnTranslate(StateBase to) - { - } - - public override void OnUpdate() - { - AnimatorStateInfo info = m_Config.animator.GetCurrentAnimatorStateInfo(0); - if(info.shortNameHash == m_Config.motion && info.normalizedTime >= 0.99f) - { - m_TimeCount += Time.deltaTime; - } - foreach (var stateTrigger in m_Triggers) - { - if (stateTrigger.Update() && stateTrigger.Swallow) - break; - } - } - - // 在物理模拟之后 - public override void OnPhysicsUpdate() - { - foreach (var trigger in m_PhysicsTriggers) - { - if (trigger.Update() && trigger.Swallow) - break; - } - } - - public void AddTrigger(Trigger trigger) - { - if (trigger == null || m_Triggers.Contains(trigger)) - return; - m_Triggers.Add(trigger); - } - - public void AddPhysicsTrigger(Trigger trigger) - { - if (trigger == null || m_PhysicsTriggers.Contains(trigger)) - return; - m_PhysicsTriggers.Add(trigger); - } - - public void AddHitDefination(HitDefination defination) - { - Hit info = new Hit(); - info.defination = defination; - m_Hits.Add(info); - } - - // 获得当前时间点产生的hit - public Hit GetHit() - { - AnimatorStateInfo info = m_Config.animator.GetCurrentAnimatorStateInfo(0); - float normalizeTime = info.normalizedTime; - for (int i = 0; i< m_Hits.Count; ++i) - { - Hit hit = m_Hits[i]; - float start = hit.defination.start; - float end = hit.defination.end; - if(normalizeTime >= start && normalizeTime <= end) - { - return hit; - } - } - return null; - } - -} diff --git a/Assets/Scripts/Avatar/States/AttackState.cs.meta b/Assets/Scripts/Avatar/States/AttackState.cs.meta deleted file mode 100644 index 4159d2bc..00000000 --- a/Assets/Scripts/Avatar/States/AttackState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eefcc728a2660c0459b0d79230cc4dec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/DashState.cs b/Assets/Scripts/Avatar/States/DashState.cs deleted file mode 100644 index c9237d4c..00000000 --- a/Assets/Scripts/Avatar/States/DashState.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class DashState : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Avatar/States/DashState.cs.meta b/Assets/Scripts/Avatar/States/DashState.cs.meta deleted file mode 100644 index c246c665..00000000 --- a/Assets/Scripts/Avatar/States/DashState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6d5a31f4a65fbba429d0a2ff3b3a49a4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/DodgeState.cs b/Assets/Scripts/Avatar/States/DodgeState.cs deleted file mode 100644 index 58bc9301..00000000 --- a/Assets/Scripts/Avatar/States/DodgeState.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -/// <summary> -/// Dodge state -/// </summary> -public class DodgeState : StateBase -{ - public DodgeState() - { - - } - -} diff --git a/Assets/Scripts/Avatar/States/DodgeState.cs.meta b/Assets/Scripts/Avatar/States/DodgeState.cs.meta deleted file mode 100644 index e7297a88..00000000 --- a/Assets/Scripts/Avatar/States/DodgeState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 838e30895704e13479bfb0f5c06229e5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/HurtState.cs b/Assets/Scripts/Avatar/States/HurtState.cs deleted file mode 100644 index db48d1a4..00000000 --- a/Assets/Scripts/Avatar/States/HurtState.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// <summary> -/// 将伤害类型进行分类，决定不同的motion类型 -/// </summary> -public enum HurtType -{ - Light = 0, // 轻击 - Medium, // 中击 - Hard, // 重击 - Back, - Up, - Diagup -} - - -public class HurtState : StateBase -{ - Animator m_Animator; - - int m_AnimHash; - - /// <summary> - /// 在Idle状态时可以切换的state - /// </summary> - private List<Trigger> m_Triggers = new List<Trigger>(); - - public HurtState(Animator animator, int animation) - : base() - { - m_Animator = animator; - m_AnimHash = animation; - } - - public override void OnEnter() - { - m_Animator.CrossFadeInFixedTime(m_AnimHash, 0.25f); - - foreach (var trigger in m_Triggers) - { - trigger.Reset(); - } - } - - public override void OnInit() - { - base.OnInit(); - } - - public override void OnUpdate() - { - foreach (var trigger in m_Triggers) - { - if (trigger.Update() && trigger.Swallow) - break; - } - - base.OnUpdate(); - } - - public void AddTrigger(Trigger trigger) - { - if (trigger == null || m_Triggers.Contains(trigger)) - return; - m_Triggers.Add(trigger); - } - -} diff --git a/Assets/Scripts/Avatar/States/HurtState.cs.meta b/Assets/Scripts/Avatar/States/HurtState.cs.meta deleted file mode 100644 index ba24ef88..00000000 --- a/Assets/Scripts/Avatar/States/HurtState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a7f21d9eef4527249a00204754fbff5b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/IdleState.cs b/Assets/Scripts/Avatar/States/IdleState.cs deleted file mode 100644 index 8b46b904..00000000 --- a/Assets/Scripts/Avatar/States/IdleState.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public class IdleState : StateBase -{ - Animator m_Animator; - - int m_AnimHash; - - /// <summary> - /// 在Idle状态时可以切换的state - /// </summary> - private List<Trigger> m_Triggers = new List<Trigger>(); - - public IdleState(Animator animator, int animation) - : base() - { - m_Animator = animator; - m_AnimHash = animation; - } - - public override void OnEnter() - { - m_Animator.CrossFadeInFixedTime(m_AnimHash, 0.25f); - - foreach (var trigger in m_Triggers) - { - trigger.Reset(); - } - } - - public override void OnInit() - { - base.OnInit(); - } - - public override void OnUpdate() - { - foreach(var trigger in m_Triggers) - { - if (trigger.Update() && trigger.Swallow) - break; - } - - base.OnUpdate(); - } - - public void AddTrigger(Trigger trigger) - { - if (trigger == null || m_Triggers.Contains(trigger)) - return; - m_Triggers.Add(trigger); - } - -} diff --git a/Assets/Scripts/Avatar/States/IdleState.cs.meta b/Assets/Scripts/Avatar/States/IdleState.cs.meta deleted file mode 100644 index f872a5a6..00000000 --- a/Assets/Scripts/Avatar/States/IdleState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5761f8b5c41ec014381b1bd33ad42f1d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/JumpState.cs b/Assets/Scripts/Avatar/States/JumpState.cs deleted file mode 100644 index 1e172358..00000000 --- a/Assets/Scripts/Avatar/States/JumpState.cs +++ /dev/null @@ -1,263 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public struct JumpStateConfig -{ - public PhysicsBody body; - public PhysicsPrimitive collider; - public Animator animator; - - public float neutralJumpSpeedY; // 垂直跳跃的基础速度 - public float fowardJumpSpeedX; // 向前跳跃的水平速度 - public float backwardJumpSpeedX; // 向后跳跃的水平速度（一般来说是负值） - - public int animJump; - public int animNU; - public int animFU; - public int animBU; - public int animND; - public int animFD; - public int animBD; - public int animJumpEnd; - - public bool skipStart; //没有准备动作 -} - -public class JumpState : StateBase -{ - public enum Direction - { - None, - Neutral, - Forward, - Backward - } - - public enum Stage - { - None, - Ready, - Up, - Down, - End, - } - - Direction m_Dir; - - PhysicsBody m_Body; - PhysicsPrimitive m_Collider; - - Animator m_Animator; - - public float m_NeutralJumpSpeedY; // 垂直跳跃的基础速度 - public float m_FowardJumpSpeedX; // 向前跳跃的水平速度 - public float m_BackwardJumpSpeedX; // 向后跳跃的水平速度（一般来说是负值） - - // jump motions - int m_AnimJumpStart; // on ground - int m_AnimJumpNeutralUpwards; - int m_AnimJumpNeutralDownwards; - int m_AnimJumpFwdUpwards; - int m_AnimJumpFwdDownwards; - int m_AnimJumpBackUpwards; - int m_AnimJumpBackDownwards; - int m_AnimJumpEnd; // on ground again - - int m_CurAnim; - Stage m_CurStage; - int m_CurUpMotion; - int m_CurDownMotion; - Vector3 m_CurInitVelocity; - - public Stage CurStage - { - get - { - return m_CurStage; - } - } - - public Direction CurDirection - { - get - { - return m_Dir; - } - } - - private List<Trigger> m_Triggers = new List<Trigger>(); - - bool m_SkipStart; - - public JumpState(JumpStateConfig config) - { - m_Body = config.body; - m_Collider = config.collider; - m_Animator = config.animator; - m_NeutralJumpSpeedY = config.neutralJumpSpeedY; - m_FowardJumpSpeedX = config.fowardJumpSpeedX; - m_BackwardJumpSpeedX = config.backwardJumpSpeedX; - m_AnimJumpStart = config.animJump; - m_AnimJumpNeutralUpwards = config.animNU; - m_AnimJumpNeutralDownwards = config.animND; - m_AnimJumpFwdUpwards = config.animFU; - m_AnimJumpFwdDownwards = config.animFD; - m_AnimJumpBackUpwards = config.animBU; - m_AnimJumpBackDownwards = config.animBD; - m_AnimJumpEnd = config.animJumpEnd; // on ground again - m_SkipStart = config.skipStart; - } - - public void SetDir(Direction dir) - { - m_Dir = dir; - } - - public override void OnEnter() - { - base.OnEnter(); - - m_CurAnim = 0; - - switch(m_Dir) - { - case Direction.Neutral: - m_CurUpMotion = m_AnimJumpNeutralUpwards; - m_CurDownMotion = m_AnimJumpNeutralDownwards; - m_CurInitVelocity = new Vector3(0, m_NeutralJumpSpeedY, 0); - break; - case Direction.Forward: - m_CurUpMotion = m_AnimJumpFwdUpwards; - m_CurDownMotion = m_AnimJumpFwdDownwards; - m_CurInitVelocity = new Vector3(m_FowardJumpSpeedX, m_NeutralJumpSpeedY, 0); - break; - case Direction.Backward: - m_CurUpMotion = m_AnimJumpBackUpwards; - m_CurDownMotion = m_AnimJumpBackDownwards; - m_CurInitVelocity = new Vector3(m_BackwardJumpSpeedX, m_NeutralJumpSpeedY, 0); - break; - } - - bool isOnGround = m_Collider.IsOnGround; - bool isUp = m_Body.Velocity.y > 0; - bool isDown = m_Body.Velocity.y < 0; - bool isFreeFall = Mathf.Approximately(m_Body.Velocity.y, 0); - - if (isOnGround && !m_SkipStart) - m_CurStage = Stage.Ready; - else if (isUp || isOnGround && m_SkipStart) - m_CurStage = Stage.Up; - else if (isDown || isFreeFall) - m_CurStage = Stage.Down; - } - - public override void OnUpdate() - { - foreach (var stateTrigger in m_Triggers) - { - if (stateTrigger.Update() && stateTrigger.Swallow) - return; - } - - AnimatorStateInfo motionInfo = m_Animator.GetCurrentAnimatorStateInfo(0); - - switch (m_CurStage) - { - case Stage.Ready: - if(m_CurAnim != m_AnimJumpStart) - { - m_Animator.CrossFade(m_AnimJumpStart, 0.2f); - m_CurAnim = m_AnimJumpStart; - } - if(motionInfo.shortNameHash == m_AnimJumpStart && motionInfo.normalizedTime >= 1f) - { - m_CurStage = Stage.Up; - } - break; - case Stage.Up: - if(m_CurAnim != m_CurUpMotion) - { - m_Body.LocalVelocity = m_CurInitVelocity; - m_Animator.CrossFade(m_CurUpMotion, 0.05f); - m_CurAnim = m_CurUpMotion; - } - if(m_Body.Velocity.y < 0) - { - m_CurStage = Stage.Down; - } - break; - case Stage.Down: - if(m_CurAnim != m_CurDownMotion) - { - m_Animator.CrossFade(m_CurDownMotion, 0.5f); - m_CurAnim = m_CurDownMotion; - } - if(m_Collider.IsOnGround) - { - m_CurStage = Stage.End; - } - break; - case Stage.End: - if(m_CurAnim != m_AnimJumpEnd) - { - m_Animator.CrossFade(m_AnimJumpEnd, 0.2f); - m_CurAnim = m_AnimJumpEnd; - } - break; - } - } - - public override void OnPhysicsUpdate() - { - base.OnPhysicsUpdate(); - } - - /// <summary> - /// 跳跃准备动作已经完毕 - /// </summary> - /// <returns></returns> - public bool IsJumpReady() - { - if (m_CurAnim != m_AnimJumpStart) - return false; - - AnimatorStateInfo state = m_Animator.GetCurrentAnimatorStateInfo(0); - if (state.shortNameHash == m_CurAnim && state.normalizedTime >= 1f) - return true; - - return false; - } - - /// <summary> - /// 结束 - /// </summary> - /// <returns></returns> - public bool IsJumpDone(float t = 1f) - { - if (m_CurStage == Stage.End) - { - AnimatorStateInfo state = m_Animator.GetCurrentAnimatorStateInfo(0); - return state.shortNameHash == m_AnimJumpEnd && state.normalizedTime >= t; - } - - return false; - } - - /// <summary> - /// 着地 - /// </summary> - /// <returns></returns> - public bool IsJumpGround() - { - return m_CurStage == Stage.End && m_Collider.IsOnGround; - } - - public void AddTrigger(Trigger trigger) - { - if (trigger == null || m_Triggers.Contains(trigger)) - return; - m_Triggers.Add(trigger); - } - -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/States/JumpState.cs.meta b/Assets/Scripts/Avatar/States/JumpState.cs.meta deleted file mode 100644 index 3d18db1c..00000000 --- a/Assets/Scripts/Avatar/States/JumpState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b3175c1ee1042e144b77c298e7b61eeb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/MoveState.cs b/Assets/Scripts/Avatar/States/MoveState.cs deleted file mode 100644 index 0fbfcddb..00000000 --- a/Assets/Scripts/Avatar/States/MoveState.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MoveState : StateBase -{ - Animator m_Animator; - int m_AnimHash; - - /// <summary> - /// 在跑动状态时可以切换的state - /// </summary> - private List<Trigger> m_Triggers = new List<Trigger>(); - - public MoveState(Animator animator, int animation) - { - m_Animator = animator; - m_AnimHash = animation; - } - - public override void OnInit() - { - - } - - public override void OnDefend() - { - throw new System.NotImplementedException(); - } - - public override void OnEnter() - { - m_Animator.CrossFadeInFixedTime(m_AnimHash, 0.1f); - - foreach (var trigger in m_Triggers) - { - trigger.Reset(); - } - } - - public override void OnExit() - { - } - - public override void OnTranslate(StateBase to) - { - } - - public override void OnUpdate() - { - foreach (var stateTrigger in m_Triggers) - { - if (stateTrigger.Update() && stateTrigger.Swallow) - break; - } - } - - public void AddTrigger(Trigger trigger) - { - if (trigger == null || m_Triggers.Contains(trigger)) - return; - m_Triggers.Add(trigger); - } - -} diff --git a/Assets/Scripts/Avatar/States/MoveState.cs.meta b/Assets/Scripts/Avatar/States/MoveState.cs.meta deleted file mode 100644 index eb1dbbd7..00000000 --- a/Assets/Scripts/Avatar/States/MoveState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ae20739ccc918064dbe538d303d4be99 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/States/UberState.cs b/Assets/Scripts/Avatar/States/UberState.cs deleted file mode 100644 index a0b6d940..00000000 --- a/Assets/Scripts/Avatar/States/UberState.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// 一个角色只能有一个uber state，用来处理状态的自动切换 -public abstract class UberState : StateBase -{ - public abstract void OnUpdate(); - - public abstract void OnPhysicsUpdate(); - -} diff --git a/Assets/Scripts/Avatar/States/UberState.cs.meta b/Assets/Scripts/Avatar/States/UberState.cs.meta deleted file mode 100644 index b36ffc94..00000000 --- a/Assets/Scripts/Avatar/States/UberState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eafda132ea825cc46b32edfe09ebdecc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Avatar/Trigger.cs b/Assets/Scripts/Avatar/Trigger.cs deleted file mode 100644 index a885327c..00000000 --- a/Assets/Scripts/Avatar/Trigger.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public enum TriggerOnlyOnce -{ - Off = 0, - On = 1, -} - -public enum TriggerSwallow -{ - Off = 0, - On = 1 -} - - -/// <summary> -/// 不同效果的trigger继承这个基类 -/// </summary> - -public sealed class Trigger -{ - private TriggerSwallow m_Swallow; - public bool Swallow - { - get - { - return m_Swallow == TriggerSwallow.On; - } - } - - private ConditionBase m_Condition; - private List<ActionBase> m_ActionChain = new List<ActionBase>();
-
- private TriggerOnlyOnce m_OnlyOnce; - - private bool m_IsTriggered; - - public Trigger(ConditionBase condition, List<ActionBase> actions, TriggerOnlyOnce onlyOnce = TriggerOnlyOnce.Off, TriggerSwallow swallow = TriggerSwallow.On) - { - m_OnlyOnce = onlyOnce;
- m_Swallow = swallow; - m_Condition = condition; - m_ActionChain.AddRange(actions); - } - public Trigger(ConditionBase condition, ActionBase action, TriggerOnlyOnce onlyOnce = TriggerOnlyOnce.Off, TriggerSwallow swallow = TriggerSwallow.On) - { - m_OnlyOnce = onlyOnce;
- m_Swallow = swallow; - m_Condition = condition; - m_ActionChain.Add(action); - } - - //重置触发器的参数 - public void Reset() - { - m_IsTriggered = false; - } - - /// <summary> - /// 如果触发执行了，返回true,否则返回false - /// </summary> - /// <returns></returns> - public bool Update() - { - if (m_IsTriggered && m_OnlyOnce == TriggerOnlyOnce.On) - return false; - if (m_Condition.Evaluate()) - { - foreach(var action in m_ActionChain) - { - action.Execute(); - } - m_IsTriggered = true; - return true; - } - return false; - } - -}
\ No newline at end of file diff --git a/Assets/Scripts/Avatar/Trigger.cs.meta b/Assets/Scripts/Avatar/Trigger.cs.meta deleted file mode 100644 index 91d7d1b8..00000000 --- a/Assets/Scripts/Avatar/Trigger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8c2bda4ac997ddc4e8e9e38c7c718882 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: |