添加伤势buff

Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -69,8 +69,7 @@ namespace GameLogic.Combat.Buff
                 {
                     return 0;
                 }
-
-                CObjectPool.Instance.Recycle(buffInfo);
+                
                 ac = c;
                 _count += c;
             }

Assets/Scripts/GameLogic/Combat/Buff/BuffControl.cs

@@ -61,6 +61,7 @@ namespace GameLogic.Combat.Buff
                     buffEventData.addActionsType = addActionsType;
                     buffEventData.addCount = buffInfo.count;
                     buffEventData.id = buffInfo.BuffConfig.ID;
+                    buffEventData.BuffInfo = buffInfo;
                     CombatEventManager.Instance.Dispatch(CombatEventType.AddBuff, buffEventData);
                 }
             }
@@ -74,11 +75,19 @@ namespace GameLogic.Combat.Buff
                 buffEventData.addActionsType = addActionsType;
                 buffEventData.addCount = buffInfo.count;
                 buffEventData.id = buffInfo.BuffConfig.ID;
+                buffEventData.BuffInfo = buffInfo;
                 int c = buffBasic.AddBuffCount(source, buffInfo);
+                
                 if (c > 0 && buffBasic.buffInf != null)
                 {
+                    buffEventData.addCount = c;
                     CombatEventManager.Instance.Dispatch(CombatEventType.AddBuff, buffEventData);
                 }
+
+                if (buffInfo.BuffConfig.timeType == 1)
+                {
+                    CObjectPool.Instance.Recycle(buffInfo);
+                }
             }
 
             return buffBasic;

Assets/Scripts/GameLogic/Combat/Buff/BuffInfo.cs

@@ -6,17 +6,23 @@ namespace GameLogic.Combat.Buff
 {
     public class BuffInfo: CObject
     {
-        public static BuffInfo GetBuffInfo(int id, float buffTime,int count)
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public object source;
+        public static BuffInfo GetBuffInfo(int id, float buffTime,int count,object  source)
         {
             BuffInfo buffInfo=  CObjectPool.Instance.Fetch<BuffInfo>();
             buffInfo.Init(id, buffTime,count);
+            buffInfo.source = source;
             return buffInfo;
         }
-        public static BuffInfo GetBuffInfo(int id, int count)
+        public static BuffInfo GetBuffInfo(int id, int count,object  source)
         {
             BuffInfo buffInfo=  CObjectPool.Instance.Fetch<BuffInfo>();
             BuffConfig buffConfig=  ConfigComponent.Instance.Get<BuffConfig>(id);
             buffInfo.Init(id, buffConfig.buffTime,count);
+            buffInfo.source = source;
             return buffInfo;
         }
         public BuffConfig BuffConfig;
@@ -37,7 +43,7 @@ namespace GameLogic.Combat.Buff
 
         public override void DormancyObj()
         {
-           
+            source = null;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs

@@ -1,3 +1,5 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Player;
 using UnityEngine;
@@ -11,6 +13,47 @@ namespace GameLogic.Combat.Buff
     {
         private float _time;
 
+        protected override void ProInit()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        }
+        private void AddUseGongFa(IEventData eventData)
+        {
+            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
+            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
+            {
+                if (buffCount < buffInf.BuffConfig.effectValue[1])
+                {
+                    return;
+                }
+
+                BuffInfo buffInfo = null;
+                switch (data.SkillBasic.wuXingType)
+                {
+                    case WuXingType.Gold:
+                         buffInfo = BuffInfo.GetBuffInfo(10291, 1,this);
+                        break;
+                    case WuXingType.Fire:
+                        buffInfo = BuffInfo.GetBuffInfo(10321, 1,this);
+                        break;
+                    case WuXingType.Wood:
+                        buffInfo = BuffInfo.GetBuffInfo(10301, 1,this);
+                        break;
+                    case WuXingType.Earth:
+                        buffInfo = BuffInfo.GetBuffInfo(10331, 1,this);
+                        break;
+                    case WuXingType.Water:
+                        buffInfo = BuffInfo.GetBuffInfo(10311, 1,this);
+                        break;
+                }
+                combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
+            }
+        }
+        
+        protected override void ProDormancyObj()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        }
         protected override void ProUpdate(float t)
         {
             _time += t;
@@ -29,10 +72,7 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProUpdateEffect()
         {
-            if (buffCount >= 10)
-            {
-                Debug.Log("添加噬魂");
-            }
+            
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1004.cs

@@ -10,40 +10,40 @@ namespace GameLogic.Combat.Buff
     /// </summary>
     public class b_1004 : BuffBasic
     {
-        protected override void ProInit()
-        {
-            CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-        }
-
-        private void AddUseGongFa(IEventData eventData)
-        {
-            AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
-            if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
-            {
-                switch (data.SkillBasic.wuXingType)
-                {
-                    case WuXingType.Gold:
-                        combatHeroEntity.CurrCombatHeroInfo.Metal_Injury += 1;
-                        break;
-                    case WuXingType.Fire:
-                        combatHeroEntity.CurrCombatHeroInfo.Fire_Injury += 1;
-                        break;
-                    case WuXingType.Wood:
-                        combatHeroEntity.CurrCombatHeroInfo.Wood_Injury += 1;
-                        break;
-                    case WuXingType.Earth:
-                        combatHeroEntity.CurrCombatHeroInfo.Earth_Injury += 1;
-                        break;
-                    case WuXingType.Water:
-                        combatHeroEntity.CurrCombatHeroInfo.Water_Injury += 1;
-                        break;
-                }
-            }
-        }
-
-        protected override void ProDormancyObj()
-        {
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
-        }
+        // protected override void ProInit()
+        // {
+        //     CombatEventManager.Instance.AddEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        // }
+        //
+        // private void AddUseGongFa(IEventData eventData)
+        // {
+        //     AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
+        //     if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
+        //     {
+        //         switch (data.SkillBasic.wuXingType)
+        //         {
+        //             case WuXingType.Gold:
+        //                 combatHeroEntity.CurrCombatHeroInfo.Metal_Injury += 1;
+        //                 break;
+        //             case WuXingType.Fire:
+        //                 combatHeroEntity.CurrCombatHeroInfo.Fire_Injury += 1;
+        //                 break;
+        //             case WuXingType.Wood:
+        //                 combatHeroEntity.CurrCombatHeroInfo.Wood_Injury += 1;
+        //                 break;
+        //             case WuXingType.Earth:
+        //                 combatHeroEntity.CurrCombatHeroInfo.Earth_Injury += 1;
+        //                 break;
+        //             case WuXingType.Water:
+        //                 combatHeroEntity.CurrCombatHeroInfo.Water_Injury += 1;
+        //                 break;
+        //         }
+        //     }
+        // }
+        //
+        // protected override void ProDormancyObj()
+        // {
+        //     CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
+        // }
     }
 }

Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -43,7 +43,7 @@ namespace GameLogic.Combat.Buff
                     return;
                 }
 
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1,this);
                 combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
                 // combatHeroEntity.BuffControl.RemoveBuff(this);
             }

Assets/Scripts/GameLogic/Combat/Buff/b_1011.cs

@@ -42,7 +42,7 @@ namespace GameLogic.Combat.Buff
                     return;
                 }
 
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1,this);
                 combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
                 combatHeroEntity.BuffControl.RemoveBuff(this);
             }

Assets/Scripts/GameLogic/Combat/Buff/b_1016.cs

@@ -25,14 +25,14 @@ namespace GameLogic.Combat.Buff
                 if (heroInjuredEventData.HarmReturnInfo.attType.HasFlag(AttType.Skill) &&
                     !heroInjuredEventData.HarmReturnInfo.attType.HasFlag(AttType.FanJi))
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                     BuffBasic buffBasic =
                         heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(
                             combatHeroEntity, buffInfo);
                     if (buffBasic.buffCount >= buffInfo.BuffConfig.effectValue[0])
                     {
                         heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.RemoveBuff(buffBasic);
-                        BuffInfo buffInfo2 = BuffInfo.GetBuffInfo(10021, buffInfo.BuffConfig.effectValue[1], 1);
+                        BuffInfo buffInfo2 = BuffInfo.GetBuffInfo(10021, buffInfo.BuffConfig.effectValue[1], 1,this);
                         heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(
                             combatHeroEntity, buffInfo2);
                     }

Assets/Scripts/GameLogic/Combat/Buff/b_1028.cs

@@ -9,7 +9,7 @@ namespace GameLogic.Combat.Buff
         {
             if (buffCount >= buffInf.BuffConfig.overlayCount)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10021, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10021, 1,this);
                 combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
                 combatHeroEntity.BuffControl.RemoveBuff(this);
             }

Assets/Scripts/GameLogic/Combat/Buff/b_1029.cs

@@ -0,0 +1,23 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 金伤势
+    /// </summary>
+    public class b_1029 : BuffBasic
+    {
+        protected int lasetV;
+
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Metal_Injury -= lasetV;
+            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            combatHeroEntity.CurrCombatHeroInfo.Metal_Injury += lasetV;
+        }
+
+        protected override void ProDormancyObj()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Metal_Injury -= lasetV;
+            lasetV = 0;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1029.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4703fbe48af440f59fd3fdf5ec1bf42e
+timeCreated: 1753868596

Assets/Scripts/GameLogic/Combat/Buff/b_1030.cs

@@ -0,0 +1,23 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 木伤势
+    /// </summary>
+    public class b_1030 : BuffBasic
+    {
+        protected int lasetV;
+
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Wood_Injury -= lasetV;
+            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            combatHeroEntity.CurrCombatHeroInfo.Wood_Injury += lasetV;
+        }
+
+        protected override void ProDormancyObj()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Wood_Injury -= lasetV;
+            lasetV = 0;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1030.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 975ff8799dfd4ef3990fc965d40870bb
+timeCreated: 1753870764

Assets/Scripts/GameLogic/Combat/Buff/b_1031.cs

@@ -0,0 +1,23 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 水伤势
+    /// </summary>
+    public class b_1031: BuffBasic
+    {
+        protected int lasetV;
+
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Water_Injury -= lasetV;
+            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            combatHeroEntity.CurrCombatHeroInfo.Water_Injury += lasetV;
+        }
+
+        protected override void ProDormancyObj()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Water_Injury -= lasetV;
+            lasetV = 0;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1031.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3c43f1624e024e6eaf37d7b372e0f256
+timeCreated: 1753870810

Assets/Scripts/GameLogic/Combat/Buff/b_1032.cs

@@ -0,0 +1,23 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 火伤势
+    /// </summary>
+    public class b_1032: BuffBasic
+    {
+        protected int lasetV;
+
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Fire_Injury -= lasetV;
+            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            combatHeroEntity.CurrCombatHeroInfo.Fire_Injury += lasetV;
+        }
+
+        protected override void ProDormancyObj()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Fire_Injury -= lasetV;
+            lasetV = 0;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1032.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7c5e3aeee5de41148aa26af21feea515
+timeCreated: 1753870818

Assets/Scripts/GameLogic/Combat/Buff/b_1033.cs

@@ -0,0 +1,23 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 土伤势
+    /// </summary>
+    public class b_1033 : BuffBasic
+    {
+        protected int lasetV;
+
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Earth_Injury -= lasetV;
+            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            combatHeroEntity.CurrCombatHeroInfo.Earth_Injury += lasetV;
+        }
+
+        protected override void ProDormancyObj()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.Earth_Injury -= lasetV;
+            lasetV = 0;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Buff/b_1033.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 473cfd1c2e2a4b2380fe86ceccdde794
+timeCreated: 1753870884

Assets/Scripts/GameLogic/Combat/CombatEvent/BuffEventData.cs

@@ -12,6 +12,7 @@ namespace Common.Utility.CombatEvent
         public AddActionsType addActionsType;
         public int id;
         public int addCount;
+        public BuffInfo BuffInfo;
 
         protected override void ProDispose()
         {
@@ -19,6 +20,7 @@ namespace Common.Utility.CombatEvent
             target = null;
             BuffBasic = null;
             isSuperimposing = false;
+            BuffInfo = null;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -5,6 +5,7 @@ using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat.Buff;
 using GameLogic.Combat.Hero;
 using GameLogic.Combat.Skill;
 using GameLogic.Player;
@@ -244,27 +245,7 @@ namespace GameLogic.Combat.CombatTool
             return harmReturnInfo;
         }
 
-        public void ShangSHi(WuXingType wuXingType, ShowBaiscEntity target, int vInjury)
-        {
-            switch (wuXingType)
-            {
-                case WuXingType.Gold:
-                    target.CurrCombatHeroInfo.Metal_Injury += vInjury;
-                    break;
-                case WuXingType.Wood:
-                    target.CurrCombatHeroInfo.Wood_Injury += vInjury;
-                    break;
-                case WuXingType.Water:
-                    target.CurrCombatHeroInfo.Water_Injury += vInjury;
-                    break;
-                case WuXingType.Fire:
-                    target.CurrCombatHeroInfo.Fire_Injury += vInjury;
-                    break;
-                case WuXingType.Earth:
-                    target.CurrCombatHeroInfo.Earth_Injury += vInjury;
-                    break;
-            }
-        }
+      
 
         public ILifetCycleHitPoint[] GetMinHpHero(ILifetCycleHitPoint[] allLifetCycleHitPoints, int count)
         {

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs

@@ -43,7 +43,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         private void Finish()
         {
-            BuffInfo buffInfo = BuffInfo.GetBuffInfo(10091, effectValue[1], 1);
+            BuffInfo buffInfo = BuffInfo.GetBuffInfo(10091, effectValue[1], 1,this);
             BuffBasic buffBasic = target.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             if (buffBasic != null && SelfSkillConfig.level > 5)
             {

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3203.cs

@@ -63,7 +63,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             {
                 int index = CombatCalculateTool.Instance.GetOdd(0, buffId.Count);
                 int id = buffId[index];
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(id, effectValue[2], 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(id, effectValue[2], 1,this);
                 BuffBasic buffBasic = target.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 buffId.RemoveAt(index);
             }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3301.cs

@@ -59,7 +59,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
                     if (maxCount > 0)
                     {
                         int index = Random.Range(0, maxCount);
-                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10081, effectValue[1], 1);
+                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10081, effectValue[1], 1,this);
                         CombatMagicWeaponEntity combatMagicWeaponEntity = currAllMagicWeapon[index];
                         combatMagicWeaponEntity.BuffControl.AddBuff(
                             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,

Assets/Scripts/GameLogic/Combat/Skill/S1102.cs

@@ -71,7 +71,7 @@ namespace GameLogic.Combat.Skill
                 b_1012 b1012 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1012>();
                 if (b1012 == null)
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10121, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S1103.cs

@@ -65,7 +65,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
 

Assets/Scripts/GameLogic/Combat/Skill/S1105.cs

@@ -46,7 +46,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S1201.cs

@@ -50,7 +50,7 @@ namespace GameLogic.Combat.Skill
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds <= effectValue[2])
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S1202.cs

@@ -63,7 +63,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S1301.cs

@@ -67,7 +67,7 @@ namespace GameLogic.Combat.Skill
             int odds= Random.Range(0, 100);
             if (odds < effectValue[2])
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
 

Assets/Scripts/GameLogic/Combat/Skill/S1302.cs

@@ -68,7 +68,7 @@ namespace GameLogic.Combat.Skill
             // int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S1401.cs

@@ -48,7 +48,7 @@ namespace GameLogic.Combat.Skill
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds <= effectValue[2])
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
 

Assets/Scripts/GameLogic/Combat/Skill/S1402.cs

@@ -62,14 +62,14 @@ namespace GameLogic.Combat.Skill
                     b_1010 b1010 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
                     if (b1010 != null)
                     {
-                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10061, effectValue[2], 1); //眩晕敌人
+                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10061, effectValue[2], 1,this); //眩晕敌人
                         targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                     }
                 }
 
                 if (SelfSkillConfig.level > 3)
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1); //试驾灼热
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,this); //试驾灼热
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
 

Assets/Scripts/GameLogic/Combat/Skill/S1403.cs

@@ -70,7 +70,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S1404.cs

@@ -46,7 +46,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S1502.cs

@@ -68,7 +68,7 @@ namespace GameLogic.Combat.Skill
             int odds = Random.Range(0, 100);
             if (odds < effectValue[2])
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S2003.cs

@@ -1,5 +1,6 @@
 using Common.Utility.CombatEvent;
 using Fort23.Core;
+using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Player;
 
@@ -31,34 +32,33 @@ namespace GameLogic.Combat.Skill
             if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity)
             {
                 SkillBasic skillBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as SkillBasic;
-                if (skillBasic != null&&IsPassiveActivateSkill(skillBasic))
+                if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
                     int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                     if (odds < 5)
                     {
+                        BuffInfo buffInfo = null;
                         switch (skillBasic.wuXingType)
                         {
+                            case WuXingType.Gold:
+                                buffInfo = BuffInfo.GetBuffInfo(10291, 1, this);
+                                break;
                             case WuXingType.Fire:
-                                heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo
-                                    .Fire_Injury += 1;
+                                buffInfo = BuffInfo.GetBuffInfo(10321, 1, this);
                                 break;
                             case WuXingType.Wood:
-                                heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo
-                                    .Wood_Injury += 1;
-                                break;
-                            case WuXingType.Water:
-                                heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo
-                                    .Water_Injury += 1;
+                                buffInfo = BuffInfo.GetBuffInfo(10301, 1, this);
                                 break;
                             case WuXingType.Earth:
-                                heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo
-                                    .Earth_Injury += 1;
+                                buffInfo = BuffInfo.GetBuffInfo(10331, 1, this);
                                 break;
-                            case WuXingType.Gold:
-                                heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo
-                                    .Metal_Injury += 1;
+                            case WuXingType.Water:
+                                buffInfo = BuffInfo.GetBuffInfo(10311, 1, this);
                                 break;
                         }
+
+                        heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(
+                            CombatHeroEntity, buffInfo);
                     }
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S2012.cs

@@ -29,7 +29,7 @@ namespace GameLogic.Combat.Skill
                 SkillBasic skillBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as SkillBasic;
                 if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10111, 1,skillBasic);
                     heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity,
                         buffInfo);
                 }

Assets/Scripts/GameLogic/Combat/Skill/S2013.cs

@@ -38,7 +38,7 @@ namespace GameLogic.Combat.Skill
                         buffCount += 1;
                     }
 
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, buffCount);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, buffCount,skillBasic);
                     target.BuffControl.AddBuff(CombatHeroEntity,
                         buffInfo);
                 }

Assets/Scripts/GameLogic/Combat/Skill/S2015.cs

@@ -7,7 +7,7 @@ namespace GameLogic.Combat.Skill
 {
     /// <summary>
     /// 异常转移
-    ///对目标造成的异常状态有20%概率转移到下一个目标，不会来回转移
+    ///后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移
     /// </summary>
     public class S2015 : SkillBasic
     {
@@ -31,16 +31,21 @@ namespace GameLogic.Combat.Skill
             if (buffEventData.source == CombatHeroEntity &&
                 !buffEventData.addActionsType.HasFlag(AddActionsType.JianJie))
             {
-                CombatHeroEntity[] allHero =
-                    CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-                if (allHero != null)
+                SkillBasic skillBasic = buffEventData.BuffInfo.source as SkillBasic;
+                if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
-                    for (int i = 0; i < allHero.Length; i++)
+                    CombatHeroEntity[] allHero =
+                        CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+                    if (allHero != null)
                     {
-                        if (allHero[i] != buffEventData.target)
+                        for (int i = 0; i < allHero.Length; i++)
                         {
-                            BuffInfo buffInfo = BuffInfo.GetBuffInfo(buffEventData.id, buffEventData.addCount);
-                            allHero[i].BuffControl.AddBuff(CombatHeroEntity, buffInfo, AddActionsType.JianJie);
+                            if (allHero[i] != buffEventData.target)
+                            {
+                                BuffInfo buffInfo =
+                                    BuffInfo.GetBuffInfo(buffEventData.id, buffEventData.addCount, this);
+                                allHero[i].BuffControl.AddBuff(CombatHeroEntity, buffInfo, AddActionsType.JianJie);
+                            }
                         }
                     }
                 }

Assets/Scripts/GameLogic/Combat/Skill/S2016.cs

@@ -40,13 +40,13 @@ namespace GameLogic.Combat.Skill
                     b_1001 b1001 = target.BuffControl.GetBuffBasicForType<b_1001>();
                     if (b1001 != null)
                     {
-                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10281, 1);
+                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10281, 1,this);
                         target.BuffControl.AddBuff(CombatHeroEntity,
                             buffInfo);
                     }
                     else
                     {
-                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10271, 1);
+                        BuffInfo buffInfo = BuffInfo.GetBuffInfo(10271, 1,this);
                         target.BuffControl.AddBuff(CombatHeroEntity,
                             buffInfo);
                     }

Assets/Scripts/GameLogic/Combat/Skill/S2017.cs

@@ -56,7 +56,7 @@ namespace GameLogic.Combat.Skill
                 {
                     CombatHeroEntity target =
                         heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity as CombatHeroEntity;
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,skillBasic);
                     target.BuffControl.AddBuff(CombatHeroEntity,
                         buffInfo);
                 }

Assets/Scripts/GameLogic/Combat/Skill/S2019.cs

@@ -42,7 +42,7 @@ namespace GameLogic.Combat.Skill
                 SkillBasic skillBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as SkillBasic;
                 if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10131, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10131, 1,skillBasic);
                     b_1013 b_1013 =
                         heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(
                             CombatHeroEntity,

Assets/Scripts/GameLogic/Combat/Skill/S9001.cs

@@ -37,7 +37,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             count = 0;
             hitCount = 0;
@@ -48,7 +48,7 @@ namespace GameLogic.Combat.Skill
 
         private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
+            TriggerData triggerData, ISkillFeatures skillFeatures)
         {
             float hv = effectValue[0];
             b_1007 b1007 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1007>();
@@ -61,7 +61,7 @@ namespace GameLogic.Combat.Skill
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 hv);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData, wuXingType,skillFeatures,
+                AttType.Skill, triggerData, wuXingType, skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.triggerData.IBarrier == null)
             {
@@ -83,15 +83,41 @@ namespace GameLogic.Combat.Skill
                 {
                     shangShiCount = 0;
                     int vInjury = (int)effectValue[4];
-                    CombatCalculateTool.Instance.ShangSHi(WuXingType.Gold, targetEntity.combatHeroEntity, vInjury);
-                    CombatCalculateTool.Instance.ShangSHi(WuXingType.Wood, targetEntity.combatHeroEntity, vInjury);
-                    CombatCalculateTool.Instance.ShangSHi(WuXingType.Water, targetEntity.combatHeroEntity, vInjury);
-                    CombatCalculateTool.Instance.ShangSHi(WuXingType.Fire, targetEntity.combatHeroEntity, vInjury);
-                    CombatCalculateTool.Instance.ShangSHi(WuXingType.Earth, targetEntity.combatHeroEntity, vInjury);
+
+                    ShangSHi(WuXingType.Gold, CombatHeroEntity, targetEntity.combatHeroEntity, vInjury);
+                    ShangSHi(WuXingType.Wood, CombatHeroEntity, targetEntity.combatHeroEntity, vInjury);
+                    ShangSHi(WuXingType.Water, CombatHeroEntity, targetEntity.combatHeroEntity, vInjury);
+                    ShangSHi(WuXingType.Fire, CombatHeroEntity, targetEntity.combatHeroEntity, vInjury);
+                    ShangSHi(WuXingType.Earth, CombatHeroEntity, targetEntity.combatHeroEntity, vInjury);
                 }
             }
         }
 
+        public void ShangSHi(WuXingType wuXingType, CombatHeroEntity source, ShowBaiscEntity target, int vInjury)
+        {
+            BuffInfo buffInfo = null;
+            switch (wuXingType)
+            {
+                case WuXingType.Gold:
+                    buffInfo = BuffInfo.GetBuffInfo(10291, vInjury, this);
+                    break;
+                case WuXingType.Fire:
+                    buffInfo = BuffInfo.GetBuffInfo(10321, vInjury, this);
+                    break;
+                case WuXingType.Wood:
+                    buffInfo = BuffInfo.GetBuffInfo(10301, vInjury, this);
+                    break;
+                case WuXingType.Earth:
+                    buffInfo = BuffInfo.GetBuffInfo(10331, vInjury, this);
+                    break;
+                case WuXingType.Water:
+                    buffInfo = BuffInfo.GetBuffInfo(10311, vInjury, this);
+                    break;
+            }
+
+            target.BuffControl.AddBuff(source, buffInfo);
+        }
+
         protected override void ProCombatUpdate(float time)
         {
             if (!isTrgger)

Assets/Scripts/GameLogic/Combat/Skill/S9011.cs

@@ -2,7 +2,7 @@ using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -43,7 +43,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9014.cs

@@ -59,7 +59,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9024.cs

@@ -44,7 +44,7 @@ namespace GameLogic.Combat.Skill
             {
                 if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity&&!heroInjuredEventData.HarmReturnInfo.attType.HasFlag(AttType.Buff))
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10011, 1,this);
                     heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
 

Assets/Scripts/GameLogic/Combat/Skill/S9031.cs

@@ -47,7 +47,7 @@ namespace GameLogic.Combat.Skill
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])
                 {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
                     targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
                 }
             }

Assets/Scripts/GameLogic/Combat/Skill/S9041.cs

@@ -43,7 +43,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9043.cs

@@ -38,7 +38,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9044.cs

@@ -43,7 +43,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10171, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9052.cs

@@ -44,7 +44,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10181, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10181, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

Assets/Scripts/GameLogic/Combat/Skill/S9081.cs

@@ -44,7 +44,7 @@ namespace GameLogic.Combat.Skill
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10051, 1,this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }