modifier配置增加Tag

Server/Hotfix/Game/SkillSystem/NewSkill/Component/SkillOptions/SkillOptionLogic_创建携带Modifier的子弹.cs

@@ -40,7 +40,16 @@ namespace ET
                     var _target = skillSender.caster.GetComponent<TargetableUnitComponent>().currTarget;
                     await TimerComponent.Instance.WaitAsync(skillOption.time);
                     var targetComponent = skillSender.caster.GetComponent<TargetableUnitComponent>();
-                    if (targetComponent == null) return;
+                    if (!_target)
+                    {
+                        Log.Error($"taget is null where id is {target?.Id}");
+                        return;
+                    }
+                    if (!skillSender.caster)
+                    {
+                        Log.Error($"caster is null where id is {target?.Id}");
+                        return;
+                    }
                     var oldTarget = targetComponent.currTarget;
                     targetComponent.currTarget = _target;
                     foreach (var Id in skillOption.modifierIds)

Server/Hotfix/Game/SkillSystem/NewSkill/Component/SkillOptions/SkillOptionLogic_延迟操作.cs

@@ -18,6 +18,16 @@ namespace ET
                 return;
             var target = skillSender.caster.GetComponent<TargetableUnitComponent>().currTarget;
             await TimerComponent.Instance.WaitAsync((long)delayTime * 1000);
+            if (!target)
+            {
+                Log.Error($"taget is null where id is {target?.Id}");
+                return;
+            }
+            if (!skillSender.caster)
+            {
+                Log.Error($"caster is null where id is {target?.Id}");
+                return;
+            }
             var targetComponent = skillSender.caster.GetComponent<TargetableUnitComponent>();
             var oldTarget = targetComponent.currTarget;
             targetComponent.currTarget = target;

Server/Hotfix/Game/SkillSystem/NewSkill/System/ModifierContainerComponentSystem.cs

@@ -538,7 +538,6 @@ namespace ET
                 Log.Error(e);
             }
         }
-        private static List<(ModifierEventCondition, ModifierLogic)> needRemoveModifierSet = new List<(ModifierEventCondition, ModifierLogic)>();
         public static void RemoveModifier(this ModifierContainerComponent self, ModifierLogic modifierLogic)
         {
             try
@@ -585,7 +584,8 @@ namespace ET
 
                 self.timeDic.Remove(modifierId);
 
-                needRemoveModifierSet.Clear();
+                using var listComponent = ListComponent<(ModifierEventCondition, ModifierLogic)>.Create();
+                var needRemoveModifierSet = listComponent.List;
                 foreach (var kv in self.modifierOptionByConditionDic.GetDictionary())
                 {
                     foreach (var _logic in kv.Value)

Unity/Assets/Hotfix/Logic/Model/Game/Common/SkillEventType.cs

@@ -211,6 +211,38 @@ namespace Cal
         根据人数改变伤害,
         改变释放次数,
     }
+    public enum ModifierTag
+    {
+        无=0,
+        控制 =1,
+        护盾,
+        持续治疗,
+        毒,
+        流血,
+        燃烧,
+        攻击力增加,
+        攻击力减少,
+        防御力增加,
+        防御力减少,
+        最大生命增加,
+        最大生命减少,
+        最大精力增加,
+        最大精力减少,
+        暴击系数增加,
+        暴击系数减少,
+        暴击效果增加,
+        暴击效果减少,
+        抗暴击系数增加,
+        抗暴击系数减少,
+        抗暴击效果增加,
+        抗暴击效果减少,
+        辅助值增加,
+        辅助值减少,
+        减伤增加,
+        减伤减少,
+        增伤增加,
+        增伤减少,
+    }
     [Flags]
     public enum ModifierAttribute
     {

Unity/Assets/Model/Module/Numeric/NumericType.cs

@@ -144,11 +144,15 @@
         HpRecover = 1044,
         HpRecoverBase = HpRecover * 10 + 1,
         HpRecoverAdd = HpRecover * 10 + 2,
-
+		/// <summary>
+		/// 物理加成
+		/// </summary>
         PhyDA = 1045,
         PhyDABase = PhyDA * 10 + 1,
         PhyDAAdd = PhyDA * 10 + 2,
-
+		/// <summary>
+		/// 精神加成
+		/// </summary>
         MicDA = 1046,
         MicDABase = MicDA * 10 + 1,
         MicDAAdd = MicDA * 10 + 2,

Unity/Assets/XNodeDemo/Assets/Skill/100001.asset

@@ -223,6 +223,8 @@ MonoBehaviour:
       Value: 10000113
     name: "\u62A4\u76FE"
     levelList: 01000000
+    tag: 2
+    immuneTag: 2
     attribute: 8
     overlayType: 0
     perOverlay:
@@ -512,6 +514,8 @@ MonoBehaviour:
       Value: 10000112
     name: 
     levelList: 01000000
+    tag: 0
+    immuneTag: 0
     attribute: 8
     overlayType: 0
     perOverlay:
@@ -1863,6 +1867,8 @@ MonoBehaviour:
       Value: 10000114
     name: "\u53CD\u51FB"
     levelList: 01000000
+    tag: 0
+    immuneTag: 0
     attribute: 8
     overlayType: 0
     perOverlay:

Unity/Assets/XNodeDemo/NewSkill/RunTime/ModifierConfig.cs

@@ -155,6 +155,13 @@ namespace Cal
         [LabelText("包括的等级"), PropertyOrder(3)]
         public List<int> levelList = new List<int> { 1 };
 
+        [FoldoutGroup("属性")]
+        [LabelText("Tag"), PropertyOrder(4)]
+        public ModifierTag tag;
+        [FoldoutGroup("属性")]
+        [LabelText("免疫的Tag"), PropertyOrder(4)]
+        public ModifierTag immuneTag;
+
         [FoldoutGroup("属性")]
         [LabelText("属性"), PropertyOrder(4)]
         public ModifierAttribute attribute = ModifierAttribute.可刷新;