做了如下修改：

Bian-Sh · Bian-Sh · commit d6add48b3428 · 2023-01-12T22:30:25.000+08:00
1. 加入了 loglevel，可以选择输出哪些级别的log
2. await 模式下的时间是 oneshot，常规的不是
3. await 支持返回 AnimationEvent，这样就能获取动画信息啦！
4. 加入了事件的移除功能，并在 demo 中进行了演示
diff --git a/Assets/MecanimEventSystem/Example/AnimClips/EventListener.cs b/Assets/MecanimEventSystem/Example/AnimClips/EventListener.cs
@@ -15,28 +15,69 @@ private void Start()
         }
         private void OnGUI()
         {
-            if (GUILayout.Button("Rotate动态添加回调 （oneshot）"))
+            EventHandler.LogLevels = LogLevel.All & ~LogLevel.Warning; // warning 再本示例中输出太多，先干掉！
+            void OnCompletedForRotate(AnimationEvent v)
             {
-                animator.SetTarget("Rotate").OnCompleted((v) =>
+                string clipname = v.animatorClipInfo.clip.name;
+                if (v.animatorStateInfo.IsName("Base Layer.Rotate"))//演示Base Layer的事件接受 ---因为AnimationClip在这个动画机中被多次复用，层别Layer信息是非常必要的（区别于上面的示例）
                 {
-                    string clipname = v.animatorClipInfo.clip.name;
-                    if (v.animatorStateInfo.IsName("Base Layer.Rotate"))//演示Base Layer的事件接受 ---因为AnimationClip在这个动画机中被多次复用，层别Layer信息是非常必要的（区别于上面的示例）
-                    {
-                        Debug.Log("结束时Base Layer：" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate);
-                    }
+                    Debug.Log("结束时<color=red>Base Layer：</color>" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate);
+                }
+                if (v.animatorStateInfo.IsName("New Layer.Rotate1212"))//演示其它层的事件接受
+                {
+                    Debug.Log("结束时<color=green>New Layer：</color>" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate);
+                }
+            }
+
+
+            if (GUILayout.Button("1. Rotate动态添加回调"))
+            {
+                animator.SetTarget("Rotate").OnCompleted(OnCompletedForRotate);
+            }
+            if (GUILayout.Button("移除上面添加的回调"))
+            {
+                animator.RemoveListener(OnCompletedForRotate, "Rotate");
+            }
 
-                    if (v.animatorStateInfo.IsName("New Layer.Rotate1212"))//演示其它层的事件接受
-                    {
-                        Debug.Log("结束时New Layer：" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate);
-                    }
-                });
+            void OnCompletedForRotateOneceMore(AnimationEvent v)
+            {
+                string clipname = v.animatorClipInfo.clip.name;
+                if (v.animatorStateInfo.IsName("Base Layer.Rotate"))//演示Base Layer的事件接受
+                {
+                    Debug.Log("结束时<color=red>Base Layer：</color>" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate + "又搞一次！");
+                }
+                if (v.animatorStateInfo.IsName("New Layer.Rotate1212"))//演示其它层的事件接受
+                {
+                    Debug.Log("结束时<color=green>New Layer：</color>" + clipname + ":" + v.time * v.animatorClipInfo.clip.frameRate + "又搞一次！");
+                }
             }
 
-            if (GUILayout.Button("触发baseLayer.Left （oneshot）"))
+
+            if (GUILayout.Button("2. 为 Rotate 再叠加一个回调"))
+            {
+                animator.SetTarget("Rotate").OnCompleted(OnCompletedForRotateOneceMore);
+            }
+            if (GUILayout.Button("移除上面叠加的回调"))
+            {
+                animator.RemoveListener(OnCompletedForRotateOneceMore, "Rotate");
+            }
+
+
+            if (GUILayout.Button("3. 触发baseLayer.Left"))
             {
                 animator.SetTrigger("Left");
             }
 
+            if (animator.HasAnyListener("Rotate"))
+            {
+                if (GUILayout.Button("4. 触发 BaseLayer.Rotate "))
+                {
+                    animator.SetTrigger("Rotate");
+                }
+            }
+
+            EventHandler.LogLevels = LogLevel.All;
+
         }
     }
 }
diff --git a/Assets/MecanimEventSystem/Example/TestForAwait/Test.cs b/Assets/MecanimEventSystem/Example/TestForAwait/Test.cs
@@ -45,8 +45,8 @@ private async void OnButtonClicked()
         {
             button.interactable = false;
             Debug.Log($"{nameof(Test)}:  Default is  expand , Now start collapse！");
-            await callbackClps.SetBoolAsync("Expand", false);
-            Debug.Log($"{nameof(Test)}:  collapse Completed ！");
+            var r = await callbackClps.SetBoolAsync("Expand", false);
+            Debug.Log($"{nameof(Test)}:  collapse Completed , clip name = {r.animatorClipInfo.clip.name}！");
             text.text = "collapsed";
         }
 
diff --git a/Assets/MecanimEventSystem/Runtime/Async/MESCustomAwaiter.cs b/Assets/MecanimEventSystem/Runtime/Async/MESCustomAwaiter.cs
@@ -8,7 +8,7 @@ public static class MESCustomAwaiter
     public static AnimationAwaiter SetBoolAsync(this EventState state, string paramName, bool value)
     {
         var awaiter = new AnimationAwaiter();
-        state.OnCompleted(v => awaiter.Complete());
+        state.OnCompleted(awaiter.SetResult);
         state.SetBool(paramName, value);
         return awaiter;
     }
@@ -34,10 +34,12 @@ public void OnCompleted(Action continuation)
     }
 
     public AnimationAwaiter GetAwaiter() => this;
-    public object GetResult() => null;
-    public void Complete()
+    public AnimationEvent GetResult() => animationEvent;
+    AnimationEvent animationEvent;
+    public void SetResult(AnimationEvent ae)
     {
         _isDone = true;
+        animationEvent = ae;
         if (Thread.CurrentThread.ManagedThreadId == id)
         {
             _continuation?.Invoke();
diff --git a/Assets/MecanimEventSystem/Runtime/CallbackListener.cs b/Assets/MecanimEventSystem/Runtime/CallbackListener.cs
@@ -1,4 +1,7 @@
-﻿using System.Numerics;
+﻿using Codice.CM.SEIDInfo;
+using System;
+using System.Collections.Generic;
+using System.Numerics;
 using UnityEditor;
 using UnityEngine;
 using static zFrame.Event.EventHandler;
@@ -19,9 +22,18 @@ private void AnimatorEventCallBack(AnimationEvent ae)
             AnimationClip clip = ae.animatorClipInfo.clip;//动画片段名称
             int currentFrame = Mathf.FloorToInt(ae.animatorClipInfo.clip.frameRate * ae.time);  //动画片段当前帧 向下取整
             var actions = GetAction(animator, clip, currentFrame);
-            foreach (var item in actions)
+            var temp = new List<Action<AnimationEvent>>(actions);
+            for (int i = 0; i < temp.Count; i++)
             {
-                item?.Invoke(ae);
+                var action = temp[i];
+                if (action != null)
+                {
+                    action.Invoke(ae);
+                    if (action.Method.DeclaringType.Name == nameof(AnimationAwaiter)) // the callback  which comes from AnimationAwaiter should be oneshot event.
+                    {
+                        actions.Remove(action);
+                    }
+                }
             }
         }
     }
diff --git a/Assets/MecanimEventSystem/Runtime/EventExtension.cs b/Assets/MecanimEventSystem/Runtime/EventExtension.cs
@@ -1,4 +1,5 @@
-﻿using UnityEngine;
+﻿using System;
+using UnityEngine;
 using static zFrame.Event.EventHandler;
 
 namespace zFrame.Event
@@ -13,7 +14,7 @@ public static class EventExtension
         /// <returns>事件配置器</returns>
         public static EventState SetTarget(this Animator animator, string clipName)
         {
-            EventInfo a_EventInfo = GenerAnimationInfo(animator, clipName);
+            EventInfo a_EventInfo = GetAnimationInfo(animator, clipName);
             animator.EnsureComponent<CallbackListener>();
             //获得需要处理的动画片段
             return new EventState(a_EventInfo);
@@ -27,7 +28,7 @@ public static EventState SetTarget(this Animator animator, string clipName)
         /// <returns>事件配置器</returns>
         public static EventState GetEventConfig(this Animator animator, string clipName)
         {
-            EventInfo a_EventInfo = GenerAnimationInfo(animator, clipName);
+            EventInfo a_EventInfo = GetAnimationInfo(animator, clipName);
             animator.EnsureComponent<CallbackListener>();
             //获得需要处理的动画片段
             return new EventState(a_EventInfo);
@@ -41,13 +42,29 @@ public static EventState GetEventConfig(this Animator animator, string clipName)
         /// <returns>事件配置器</returns>
         public static EventState SetTarget(this Animator animator, string clipName, int frame)
         {
-            EventInfo a_EventInfo = GenerAnimationInfo(animator, clipName);
+            EventInfo a_EventInfo = GetAnimationInfo(animator, clipName);
             animator.EnsureComponent<CallbackListener>();
             //获得需要处理的动画片段
             return new EventState(a_EventInfo, frame);
         }
 
-
+        public static void RemoveListener(this Animator animator, Action<AnimationEvent> action, string clipName, int frame = -1)
+        {
+            EventInfo a_EventInfo = GetAnimationInfo(animator, clipName, false);
+            if (null != a_EventInfo)
+            {
+                a_EventInfo.RemoveListener(frame, action);
+            }
+        }
+        public static bool HasAnyListener(this Animator animator, string clipName, int frame = -1)
+        {
+            EventInfo a_EventInfo = GetAnimationInfo(animator, clipName, false);
+            if (null != a_EventInfo)
+            {
+                return a_EventInfo.HasAnyListener(frame);
+            }
+            return false;
+        }
         private static T EnsureComponent<T>(this Component target) where T : Component
         {
             T component = target.GetComponent<T>();
diff --git a/Assets/MecanimEventSystem/Runtime/EventHandler.cs b/Assets/MecanimEventSystem/Runtime/EventHandler.cs
@@ -2,12 +2,23 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+[Flags]
+public enum LogLevel
+{
+    None = 1,
+    Error = 2,
+    Warning = 4,
+    Info = 8,
+    All = Error | Warning | Info
+}
+
 namespace zFrame.Event
 {
     public static class EventHandler
     {
         /// <summary>动画机及其事件信息Pairs</summary>
         private static List<EventInfo> eventContainer = new List<EventInfo>();
+        public static LogLevel LogLevels = LogLevel.All;
 
         private const string func = "AnimatorEventCallBack";
 
@@ -17,12 +28,12 @@ public static class EventHandler
         /// <param name="animator">动画机</param>
         /// <param name="clipName">动画片段名称</param>
         /// <param name="frame">指定帧</param>
-        public static EventInfo GenerAnimationInfo(Animator animator, string clipName)
+        public static EventInfo GetAnimationInfo(Animator animator, string clipName, bool createIfNotFound = true)
         {
             AnimationClip clip = GetAnimationClip(animator, clipName);
             if (clip)
             {
-                return GetEventInfo(animator, clip);  //获取指定事件信息类
+                return GetEventInfo(animator, clip, createIfNotFound);  //获取指定事件信息类
             }
             else
             {
@@ -39,16 +50,22 @@ public static void GenerateAnimationEvent(EventInfo eventInfo, int frame)
         {
             if (frame < 0 || frame > eventInfo.totalFrames)
             {
-                Debug.LogError($"AnimatorEventSystem[紧急]：【{eventInfo.animator.name}】所在的动画机【{eventInfo.animationClip.name}】片段帧数设置错误【{frame}】！");
+                if (LogLevels.HasFlag(LogLevel.Error))
+                {
+                    Debug.LogError($"AnimatorEventSystem[紧急]：【{eventInfo.animator.name}】所在的动画机【{eventInfo.animationClip.name}】片段帧数设置错误【{frame}】！");
+                }
                 return;
             }
             float _time = frame / eventInfo.animationClip.frameRate;
             AnimationEvent[] events = eventInfo.animationClip.events;
-            AnimationEvent varEvent = Array.Find(events, v =>Mathf.Approximately(v.time, _time));
+            AnimationEvent varEvent = Array.Find(events, v => Mathf.Approximately(v.time, _time));
             if (null != varEvent)
             {
                 if (varEvent.functionName == func) return;
-                Debug.Log($"AnimatorEventSystem[一般]：【{eventInfo.animator.name}】所在的动画机【{eventInfo.animationClip.name}】片段【{frame}】帧已存在回调方法【{varEvent.functionName}】，将自动覆盖！");
+                if (LogLevels.HasFlag(LogLevel.Info))
+                {
+                    Debug.Log($"AnimatorEventSystem[一般]：【{eventInfo.animator.name}】所在的动画机【{eventInfo.animationClip.name}】片段【{frame}】帧已存在回调方法【{varEvent.functionName}】，将自动覆盖！");
+                }
             }
             varEvent = new()
             {
@@ -58,7 +75,10 @@ public static void GenerateAnimationEvent(EventInfo eventInfo, int frame)
             };
             eventInfo.animationClip.AddEvent(varEvent); //绑定事件
             eventInfo.animator.Rebind(); //重新绑定动画器的所有动画的属性和网格数据。
-            Debug.Log($"{nameof(EventHandler)}:完成 AnimationEvent 添加, 建议优先在编辑器下就把事件安插OK以避免动画机的重新绑定，see more ↓ \nClip Name = {eventInfo.animationClip.name} , frame = {frame} , time = {_time} ,Function  Name = {func}");
+            if (LogLevels.HasFlag(LogLevel.Info))
+            {
+                Debug.Log($"{nameof(EventHandler)}:完成 AnimationEvent 添加, 建议优先在编辑器下就把事件安插OK以避免动画机的重新绑定，see more ↓ \nClip Name = {eventInfo.animationClip.name} , frame = {frame} , time = {_time} ,Function  Name = {func}");
+            }
         }
 
         /// <summary>数据重置，用于总管理类清理数据用</summary>
@@ -78,10 +98,10 @@ public static void Clear()
         /// <param name="animator">动画机</param>
         /// <param name="clip">动画片段</param>
         /// <returns>事件信息类</returns>
-        private static EventInfo GetEventInfo(Animator animator, AnimationClip clip)
+        private static EventInfo GetEventInfo(Animator animator, AnimationClip clip, bool createIfNotFound = true)
         {
             EventInfo a_EventInfo = eventContainer.Find(v => v.animator == animator && v.animationClip == clip);
-            if (null == a_EventInfo)
+            if (null == a_EventInfo && createIfNotFound)
             {
                 a_EventInfo = new EventInfo(animator, clip);
                 eventContainer.Add(a_EventInfo);
@@ -100,25 +120,33 @@ public static AnimationClip GetAnimationClip(Animator animator, string name)
             #region 异常提示
             if (null == animator)
             {
-                Debug.LogError("AnimatorEventSystem[紧急]：指定Animator不得为空！");
+                if (LogLevels.HasFlag(LogLevel.Error))
+                {
+                    Debug.LogError("AnimatorEventSystem[紧急]：指定Animator不得为空！");
+                }
                 return null;
             }
             RuntimeAnimatorController runtimeAnimatorController = animator.runtimeAnimatorController;
             if (null == runtimeAnimatorController)
             {
-                Debug.LogError("AnimatorEventSystem[紧急]：指定【" + animator.name + "】Animator未挂载Controller！");
+                if (LogLevels.HasFlag(LogLevel.Error))
+                {
+                    Debug.LogError("AnimatorEventSystem[紧急]：指定【" + animator.name + "】Animator未挂载Controller！");
+                }
                 return null;
             }
             AnimationClip[] clips = runtimeAnimatorController.animationClips;
             AnimationClip[] varclip = Array.FindAll(clips, v => v.name == name);
             if (null == varclip || varclip.Length == 0)
             {
-                Debug.LogError("AnimatorEventSystem[紧急]：指定【" + animator.name + "】Animator不存在名为【" + name + "】的动画片段！");
-                return null;
+                throw new InvalidOperationException("AnimatorEventSystem[紧急]：指定【" + animator.name + "】Animator不存在名为【" + name + "】的动画片段！");
             }
             if (varclip.Length >= 2)
             {
-                Debug.LogWarningFormat("AnimatorEventSystem[一般]：指定【{0}】Animator存在【{1}】个名为【{2}】的动画片段！\n 建议：若非复用导致的重名，请务必修正！否则，事件将绑定在找的第一个Clip上。", animator.name, varclip.Length, name);
+                if (LogLevels.HasFlag(LogLevel.Warning))
+                {
+                    Debug.LogWarning($"AnimatorEventSystem[一般]：指定【{animator.name}】Animator存在【{varclip.Length}】个名为【{name}】的动画片段！\n 建议：若非复用导致的重名，请务必修正！否则，事件将绑定在找的第一个Clip上。");
+                }
             }
             #endregion
             return varclip[0];
@@ -136,14 +164,13 @@ public static List<Action<AnimationEvent>> GetAction(Animator animator, Animatio
             EventInfo a_EventInfo = eventContainer.Find(v => v.animator == animator && v.animationClip == clip);
             if (null != a_EventInfo)
             {
-                if (a_EventInfo.frameCallBackPairs.ContainsKey(frame))
-                {
-                    actions = new(a_EventInfo.frameCallBackPairs[frame]);
-                    a_EventInfo.frameCallBackPairs[frame] = new(); // just one shot
-                }
-                else
+                if (!a_EventInfo.frameCallBackPairs.TryGetValue(frame, out actions))
                 {
-                    Debug.LogWarning($"{nameof(EventHandler)}: Key [frame = {frame}] dose not exsit! \n {animator.name} - {clip.name}");
+                    actions = new();
+                    if (LogLevels.HasFlag(LogLevel.Warning))
+                    {
+                        Debug.LogWarning($"{nameof(EventHandler)}: Key [frame = {frame}] dose not exsit! \n {animator.name} - {clip.name}");
+                    }
                 }
             }
             return actions;
diff --git a/Assets/MecanimEventSystem/Runtime/EventInfo.cs b/Assets/MecanimEventSystem/Runtime/EventInfo.cs
@@ -25,6 +25,30 @@ public EventInfo(Animator anim, AnimationClip clip)
             //经验表明需要 向下取整 以获取当前的帧数
             totalFrames = Mathf.FloorToInt(animationClip.frameRate * animationClip.length);
         }
+        public void RemoveListener(int frame, Action<AnimationEvent> action)
+        {
+            if (frame == -1)
+            {
+                frame = totalFrames;
+            }
+            if (frameCallBackPairs.ContainsKey(frame))
+            {
+                frameCallBackPairs[frame].Remove(action);
+            }
+        }
+
+        public bool HasAnyListener(int frame)
+        {
+            if (frame == -1)
+            {
+                frame = totalFrames;
+            }
+            if (frameCallBackPairs.TryGetValue(frame, out var list))
+            {
+                return list.Count > 0;
+            }
+            return false;
+        }
 
         /// <summary>清除数据</summary>
         public void Clear()
diff --git a/Assets/MecanimEventSystem/Runtime/EventState.cs b/Assets/MecanimEventSystem/Runtime/EventState.cs
@@ -60,7 +60,10 @@ protected void ConfigEvent(int frame, Action<AnimationEvent> action)
             }
             else
             {
-                Debug.LogWarning($"AnimatorEventSystem[一般]：指定AnimationClip【{a_Event.animationClip.name}】已经订阅了该事件【{action.Method.Name}】！\n 建议：请勿频繁订阅！");
+                if (LogLevels.HasFlag(LogLevel.Warning))
+                {
+                    Debug.LogWarning($"AnimatorEventSystem[一般]：指定AnimationClip【{a_Event.animationClip.name}】已经订阅了该事件【{action.Method.Name}】！\n 建议：请勿频繁订阅！");
+                }
             }
         }
 
diff --git a/Assets/MecanimEventSystem/Runtime/Helper/AnimatorHelper.cs b/Assets/MecanimEventSystem/Runtime/Helper/AnimatorHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ private async void OnButtonClicked()`
`45`	`45`	`{`
`46`	`46`	`button.interactable = false;`
`47`	`47`	`Debug.Log($"{nameof(Test)}: Default is expand , Now start collapse！");`
`48`		`- await callbackClps.SetBoolAsync("Expand", false);`
`49`		`- Debug.Log($"{nameof(Test)}: collapse Completed ！");`
	`48`	`+ var r = await callbackClps.SetBoolAsync("Expand", false);`
	`49`	`+ Debug.Log($"{nameof(Test)}: collapse Completed , clip name = {r.animatorClipInfo.clip.name}！");`
`50`	`50`	`text.text = "collapsed";`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static class MESCustomAwaiter`
`8`	`8`	`public static AnimationAwaiter SetBoolAsync(this EventState state, string paramName, bool value)`
`9`	`9`	`{`
`10`	`10`	`var awaiter = new AnimationAwaiter();`
`11`		`- state.OnCompleted(v => awaiter.Complete());`
	`11`	`+ state.OnCompleted(awaiter.SetResult);`
`12`	`12`	`state.SetBool(paramName, value);`
`13`	`13`	`return awaiter;`
`14`	`14`	`}`
`@@ -34,10 +34,12 @@ public void OnCompleted(Action continuation)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public AnimationAwaiter GetAwaiter() => this;`
`37`		`- public object GetResult() => null;`
`38`		`- public void Complete()`
	`37`	`+ public AnimationEvent GetResult() => animationEvent;`
	`38`	`+ AnimationEvent animationEvent;`
	`39`	`+ public void SetResult(AnimationEvent ae)`
`39`	`40`	`{`
`40`	`41`	`_isDone = true;`
	`42`	`+ animationEvent = ae;`
`41`	`43`	`if (Thread.CurrentThread.ManagedThreadId == id)`
`42`	`44`	`{`
`43`	`45`	`_continuation?.Invoke();`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ protected void ConfigEvent(int frame, Action<AnimationEvent> action)`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{`
`63`		`- Debug.LogWarning($"AnimatorEventSystem[一般]：指定AnimationClip【{a_Event.animationClip.name}】已经订阅了该事件【{action.Method.Name}】！\n 建议：请勿频繁订阅！");`
	`63`	`+ if (LogLevels.HasFlag(LogLevel.Warning))`
	`64`	`+ {`
	`65`	`+ Debug.LogWarning($"AnimatorEventSystem[一般]：指定AnimationClip【{a_Event.animationClip.name}】已经订阅了该事件【{action.Method.Name}】！\n 建议：请勿频繁订阅！");`
	`66`	`+ }`
`64`	`67`	`}`
`65`	`68`	`}`
`66`	`69`