重命名KeyOrValueChanged，消除歧义

KumoKyaku · Dec 6, 2023 · c5c7dce · c5c7dce
1 parent 748132c
commit c5c7dce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Megumin.Explosion/Megumin/Class/Multiple.cs b/Megumin.Explosion/Megumin/Class/Multiple.cs
@@ -14,7 +14,7 @@ public abstract partial class Multiple<K, V> : IMultiple<K, V>
         protected readonly Dictionary<K, V> ElementDic = new Dictionary<K, V>();
         public event OnValueChanged<V> ValueChanged;
         public event OnValueChanged<(K Key, V Value)> ValueChangedKV;
-        public event OnValueChanged<(K Key, V Value)> KeyValueChanged;
+        public event OnValueChanged<(K Key, V Value)> KeyOrValueChanged;
 
         public abstract K DefaultKey { get; }
         public abstract V DefaultValue { get; }
@@ -52,7 +52,7 @@ protected virtual void ApplyValue(bool forceRaiseEvent = false)
 
             if (!flagV || !EqualsKey(oldKey, newKey) || forceRaiseEvent)
             {
-                OnKeyValueChanged((newKey, newValue), (oldKey, oldValue));
+                OnKeyOrValueChanged((newKey, newValue), (oldKey, oldValue));
             }
         }
 
@@ -134,9 +134,9 @@ protected void OnValueChangedKV((K, V) newValue, (K, V) oldValue)
             ValueChangedKV?.Invoke(newValue, oldValue);
         }
 
-        protected void OnKeyValueChanged((K, V) newValue, (K, V) oldValue)
+        protected void OnKeyOrValueChanged((K, V) newValue, (K, V) oldValue)
         {
-            KeyValueChanged?.Invoke(newValue, oldValue);
+            KeyOrValueChanged?.Invoke(newValue, oldValue);
         }
 
         public V Add(K key, V value, bool forceRaiseEvent = false)
@@ -230,17 +230,17 @@ internal void Subscribe(Multiple<K, V> multiple, IObserver<(K Source, V Value)>
             {
                 this.Multiple = multiple;
                 this.Observer = observer;
-                Multiple.KeyValueChanged += this.OnKeyValueChanged;
+                Multiple.KeyOrValueChanged += this.OnKeyOrValueChanged;
             }
 
-            private void OnKeyValueChanged((K Key, V Value) newValue, (K Key, V Value) oldValue)
+            private void OnKeyOrValueChanged((K Key, V Value) newValue, (K Key, V Value) oldValue)
             {
                 Observer.OnNext(newValue);
             }
 
             public void Dispose()
             {
-                Multiple.KeyValueChanged -= this.OnKeyValueChanged;
+                Multiple.KeyOrValueChanged -= this.OnKeyOrValueChanged;
             }
         }
 

diff --git a/Megumin.Explosion/Megumin/Interface/IMultiple.cs b/Megumin.Explosion/Megumin/Interface/IMultiple.cs
@@ -65,6 +65,6 @@ public interface IMultiple<K, V>
         /// <summary>
         /// 当前键值任一发生改变时被调用
         /// </summary>
-        event OnValueChanged<(K Key, V Value)> KeyValueChanged;
+        event OnValueChanged<(K Key, V Value)> KeyOrValueChanged;
     }
 }