优化InteruptBuff相关逻辑

Author: NoSLoofah

Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffHandler/BuffHandler.cs

@@ -92,22 +92,24 @@ private void AddBuff(IBuff buff, GameObject caster)
             }
         }
         /// <summary>
-        /// 移除一个Buff，移除后执行OnBuffDestroy
+        /// 移除一个Buff，移除后执行OnBuffRemove
         /// </summary>
         /// <param name="buff">要移除的Buff</param>
         private void RemoveBuff(IBuff buff)
         {
-            InteruptBuff(buff);
-            forOnBuffDestroy += ((Buff)buff).OnBuffDestroy;
+            Buff bf = (Buff)buff;
+            bf.SetEffective(false);
         }
         /// <summary>
-        /// 移除一个Buff，移除后不执行OnBuffDestroy
+        /// 移除一个Buff，移除后不执行OnBuffRemove
         /// </summary>
         /// <param name="buff">要移除的Buff</param>
         private void InteruptBuff(IBuff buff)
         {
             Buff bf = (Buff)buff;
             bf.SetEffective(false);
+            buffs.Remove(bf);
+            forOnBuffDestroy += ((Buff)buff).OnBuffDestroy;
         }
         #endregion
         public void AddBuff(int buffId, GameObject caster)
@@ -151,7 +153,7 @@ public void InteruptBuff(int buffId, bool removeAll = true)
                     InteruptBuff(bf);
                 }
             }
-            InteruptBuff(b);
+            else InteruptBuff(b);
         }
 
         private bool updated = false;
@@ -170,6 +172,7 @@ private void LateUpdate()
         {
             updated = false;
             Buff bf;
+            bool buffRemoved = false;
             for (int i = buffs.Count - 1; i >= 0; i--)
             {
                 bf = buffs[i];
@@ -178,11 +181,12 @@ private void LateUpdate()
                 if (!bf.IsEffective)
                 {
                     bf.OnBuffRemove();
-                    onRemoveBuff?.Invoke();
+                    buffRemoved = true;
                     buffs.Remove(bf);
                     forOnBuffDestroy += bf.OnBuffDestroy;
                 }
             }
+            if (buffRemoved) onRemoveBuff?.Invoke();
         }
     }
 }

Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffHandler/IBuffHandler.cs

@@ -21,7 +21,7 @@ public interface IBuffHandler
         /// <param name="removeAll">如果对象同时存在多个同id的buff，是否将所有一并移除</param>
         public void RemoveBuff(int buffId, bool removeAll = true);
         /// <summary>
-        /// 移除Buff（不执行OnBuffDestroy）
+        /// 移除Buff（不执行OnBuffRemove）
         /// </summary>
         /// <param name="buffId">要移除的Buff id</param>
         /// <param name="removeAll">如果对象同时存在多个同id的buff，是否将所有一并移除</param>

Assets/NoSLoofah_BuffSystem/Example/Scripts/CustomBuff/Buff_Fragile.cs

@@ -14,18 +14,18 @@ public override void OnBuffDestroy()
     }
 
     public override void OnBuffModifyLayer(int change)
-    {        
+    {
         targetEntity.ModifyDamageMultiplier(hurtIncreaseRate * change);
     }
 
     public override void OnBuffRemove()
     {
-        
+        Debug.Log("OnRemove");
     }
 
     public override void OnBuffStart()
     {
-        targetEntity = Target.GetComponent<Entity1>();        
+        targetEntity = Target.GetComponent<Entity1>();
     }
 
     public override void Reset()

Assets/NoSLoofah_BuffSystem/Example/Scripts/UI/BuffButton.cs

@@ -25,6 +25,6 @@ public void InteruptBuff()
     {
         int i;
         if (!int.TryParse(inputField.text, out i)) return;
-        buffHandler.RemoveBuff(i);
+        buffHandler.InteruptBuff(i);
     }
 }