From 6ee18886c8af3858de5e97599b23086823d9f320 Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 27 Jan 2021 16:30:19 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0Behaviour=20Designer=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E5=9C=A8=E6=9C=80=E4=B8=8B=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=89BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Runtime/Basic Tasks/Animator/CrossFade.cs | 2 +- .../Basic Tasks/Animator/GetApplyRootMotion.cs | 2 +- .../Basic Tasks/Animator/GetBoolParameter.cs | 2 +- .../Animator/GetCurrentAnimatorStateNameHash.cs | 50 ---------------------- .../GetCurrentAnimatorStateNameHash.cs.meta | 8 ---- .../Basic Tasks/Animator/GetDeltaPosition.cs | 2 +- .../Basic Tasks/Animator/GetDeltaRotation.cs | 2 +- .../Basic Tasks/Animator/GetFloatParameter.cs | 2 +- .../Basic Tasks/Animator/GetGravityWeight.cs | 2 +- .../Basic Tasks/Animator/GetIntegerParameter.cs | 2 +- .../Runtime/Basic Tasks/Animator/GetLayerWeight.cs | 2 +- .../Runtime/Basic Tasks/Animator/GetSpeed.cs | 2 +- .../Runtime/Basic Tasks/Animator/IsName.cs.meta | 16 +++---- 13 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs delete mode 100644 Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs.meta (limited to 'Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator') diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/CrossFade.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/CrossFade.cs index 0e2e3eb7..7080ce76 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/CrossFade.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/CrossFade.cs @@ -32,7 +32,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetApplyRootMotion.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetApplyRootMotion.cs index 610a4b4e..7ec1ecab 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetApplyRootMotion.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetApplyRootMotion.cs @@ -27,7 +27,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetBoolParameter.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetBoolParameter.cs index 5aeef328..83b5903b 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetBoolParameter.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetBoolParameter.cs @@ -29,7 +29,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs deleted file mode 100644 index df97d7ca..00000000 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs +++ /dev/null @@ -1,50 +0,0 @@ -#if UNITY_4_6 || UNITY_4_7 -using UnityEngine; - -namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator -{ - [TaskCategory("Basic/Animator")] - [TaskDescription("Gets the current state hash. Returns Success.")] - public class GetCurrentAnimatorStateNameHash : Action - { - [Tooltip("The GameObject that the task operates on. If null the task GameObject is used.")] - public SharedGameObject targetGameObject; - [Tooltip("The layer to operate on")] - public SharedInt layerIndex; - [Tooltip("The current state hash")] - [RequiredField] - public SharedInt storeValue; - - private Animator animator; - private GameObject prevGameObject; - - public override void OnStart() - { - var currentGameObject = GetDefaultGameObject(targetGameObject.Value); - if (currentGameObject != prevGameObject) { - animator = currentGameObject.GetComponent(); - prevGameObject = currentGameObject; - } - } - - public override TaskStatus OnUpdate() - { - if (animator == null) { - //Debug.LogWarning("Animator is null"); - return TaskStatus.Failure; - } - - storeValue.Value = animator.GetCurrentAnimatorStateInfo(layerIndex.Value).nameHash; - - return TaskStatus.Success; - } - - public override void OnReset() - { - targetGameObject = null; - layerIndex = 0; - storeValue = 0; - } - } -} -#endif \ No newline at end of file diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs.meta deleted file mode 100644 index 206d8fd2..00000000 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetCurrentAnimatorStateNameHash.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c0de75c64a6b6f4b8ef18423f1dc36d -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaPosition.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaPosition.cs index 7d39667f..aefb2595 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaPosition.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaPosition.cs @@ -27,7 +27,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaRotation.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaRotation.cs index 023e1c3b..565ab751 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaRotation.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetDeltaRotation.cs @@ -27,7 +27,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetFloatParameter.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetFloatParameter.cs index 63182145..6e28cb9c 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetFloatParameter.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetFloatParameter.cs @@ -29,7 +29,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetGravityWeight.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetGravityWeight.cs index a9cd172a..a1bb9508 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetGravityWeight.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetGravityWeight.cs @@ -27,7 +27,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetIntegerParameter.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetIntegerParameter.cs index 920d5bc4..ce424589 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetIntegerParameter.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetIntegerParameter.cs @@ -29,7 +29,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetLayerWeight.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetLayerWeight.cs index 0d3a8e69..679dc943 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetLayerWeight.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetLayerWeight.cs @@ -29,7 +29,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetSpeed.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetSpeed.cs index 5adc55e6..5382e259 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetSpeed.cs +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/GetSpeed.cs @@ -27,7 +27,7 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.UnityAnimator public override TaskStatus OnUpdate() { if (animator == null) { - //Debug.LogWarning("Animator is null"); + Debug.LogWarning("Animator is null"); return TaskStatus.Failure; } diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/IsName.cs.meta b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/IsName.cs.meta index 7f8263ae..37efe1f2 100644 --- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/IsName.cs.meta +++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/Animator/IsName.cs.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 96051e2f6a0e7ea42a493e6245e4ccde -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: +fileFormatVersion: 2 +guid: 96051e2f6a0e7ea42a493e6245e4ccde +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: -- cgit v1.1-26-g67d0