修改bug

Assets/Res/Config/BuffConfig.json

@@ -194,7 +194,7 @@
       "buffGroup": 1012,
       "overlayCount": 1,
       "effectValue": [
-        100.0,
+        70.0,
         30.0
       ],
       "timeType": 2,
@@ -517,7 +517,7 @@
       "buffGroup": 1029,
       "overlayCount": 15,
       "effectValue": [
-        3.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -537,7 +537,7 @@
       "buffGroup": 1030,
       "overlayCount": 15,
       "effectValue": [
-        3.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -557,7 +557,7 @@
       "buffGroup": 1031,
       "overlayCount": 15,
       "effectValue": [
-        3.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -577,7 +577,7 @@
       "buffGroup": 1032,
       "overlayCount": 15,
       "effectValue": [
-        3.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -597,7 +597,7 @@
       "buffGroup": 1033,
       "overlayCount": 15,
       "effectValue": [
-        3.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 30.0,

Assets/Res/Config/SkillConfig.json

@@ -2707,6 +2707,7 @@
       "effectValue": [
         2.0,
         90.0,
+        5.0,
         3.0
       ],
       "intensifierIndex": [
@@ -2732,6 +2733,7 @@
       "effectValue": [
         2.0,
         117.0,
+        5.0,
         3.0
       ],
       "intensifierIndex": [
@@ -2766,8 +2768,8 @@
       "effectValue": [
         2.0,
         146.0,
-        3.0,
-        100.0
+        5.0,
+        3.0
       ],
       "intensifierIndex": [
         2
@@ -2801,8 +2803,8 @@
       "effectValue": [
         2.0,
         176.0,
-        3.0,
-        100.0
+        5.0,
+        3.0
       ],
       "intensifierIndex": [
         2
@@ -2836,8 +2838,8 @@
       "effectValue": [
         2.0,
         224.0,
+        5.0,
         3.0,
-        100.0,
         25.0
       ],
       "intensifierIndex": [
@@ -4993,8 +4995,8 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        1.0,
-        20.0
+        5.0,
+        4.0
       ],
       "intensifierIndex": [
         0
@@ -5017,8 +5019,8 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        1.0,
-        20.0
+        5.0,
+        4.0
       ],
       "intensifierIndex": [
         0
@@ -5050,8 +5052,8 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        1.0,
-        20.0
+        5.0,
+        4.0
       ],
       "intensifierIndex": [
         0
@@ -5083,8 +5085,8 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        1.0,
-        20.0
+        5.0,
+        4.0
       ],
       "intensifierIndex": [
         0
@@ -5116,8 +5118,8 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        1.0,
-        20.0
+        5.0,
+        4.0
       ],
       "intensifierIndex": [
         0
@@ -5149,8 +5151,8 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        2.0,
-        20.0,
+        6.0,
+        4.0,
         1.0
       ],
       "intensifierIndex": [

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine;
@@ -21,7 +22,8 @@ namespace GameLogic.Combat.Buff
         }
 
         protected CombatHeroEntity combatHeroEntity;
-        public BuffInfo buffInf;
+
+        // public BuffInfo buffInf;
         protected CombatHeroEntity source;
 
         protected TriggerData _triggerData;
@@ -30,6 +32,9 @@ namespace GameLogic.Combat.Buff
         public System.Action buffFinish;
 
         private List<BuffStackInfo> _buffStackInfos = new List<BuffStackInfo>();
+        public BuffConfig BuffConfig;
+        public float buffTime;
+        public int count;
 
         public int buffCount
         {
@@ -38,12 +43,16 @@ namespace GameLogic.Combat.Buff
 
         protected int _count;
         private float _time;
+        private BuffInfo myBuffInfo;
 
         public void Init(CombatHeroEntity combatHeroEntity, CombatHeroEntity source, BuffInfo buffInfo)
         {
+            myBuffInfo = null;
             _triggerData.Source = this;
             this.combatHeroEntity = combatHeroEntity;
-            this.buffInf = buffInfo;
+            this.BuffConfig = buffInfo.BuffConfig;
+            this.buffTime = buffInfo.buffTime;
+            this.count = buffInfo.count;
             this.source = source;
             ProInit();
             AddBuffCount(source, buffInfo);
@@ -54,6 +63,7 @@ namespace GameLogic.Combat.Buff
             int ac = 0;
             if (buffInfo.BuffConfig.timeType == 1)
             {
+                myBuffInfo = buffInfo;
                 _currTime = 0;
                 int c = buffCount + buffInfo.count;
                 if (c > buffInfo.BuffConfig.overlayCount)
@@ -69,7 +79,7 @@ namespace GameLogic.Combat.Buff
                 {
                     return 0;
                 }
-                
+
                 ac = c;
                 _count += c;
             }
@@ -125,7 +135,7 @@ namespace GameLogic.Combat.Buff
 
         public void ReduceCount(int count)
         {
-            if (buffInf.BuffConfig.timeType == 1)
+            if (BuffConfig.timeType == 1)
             {
                 _count -= count;
                 if (_count <= 0)
@@ -204,8 +214,8 @@ namespace GameLogic.Combat.Buff
             buffFinish = null;
             _currTime = 0;
             ProDormancyObj();
-            CObjectPool.Instance.Recycle(buffInf);
-            buffInf = null;
+            CObjectPool.Instance.Recycle(myBuffInfo);
+            myBuffInfo = null;
             combatHeroEntity = null;
         }
 
@@ -215,10 +225,10 @@ namespace GameLogic.Combat.Buff
 
         public void Update(float t)
         {
-            if (buffInf.BuffConfig.timeType == 1)
+            if (BuffConfig.timeType == 1)
             {
                 _currTime += t;
-                if (buffInf.buffTime > 0 && _currTime > buffInf.buffTime)
+                if (buffTime > 0 && _currTime > buffTime)
                 {
                     DelectBuff();
                     return;
@@ -233,7 +243,7 @@ namespace GameLogic.Combat.Buff
                 }
             }
 
-            if (buffInf == null)
+            if (combatHeroEntity == null)
             {
                 return;
             }
@@ -266,6 +276,8 @@ namespace GameLogic.Combat.Buff
                 combatHeroEntity.BuffControl.RemoveBuff(this);
                 return;
             }
+           
+
 
             UpdateEffect();
         }

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

@@ -52,7 +52,7 @@ namespace GameLogic.Combat.Buff
 
                 _allBuff.Add(buffBasic);
                 buffBasic.Init(_combatHeroEntity, source, buffInfo);
-                if (buffBasic.buffInf != null)
+                if (buffBasic != null)
                 {
                     BuffEventData buffEventData = BuffEventData.Create();
                     buffEventData.BuffBasic = buffBasic;
@@ -78,7 +78,7 @@ namespace GameLogic.Combat.Buff
                 buffEventData.BuffInfo = buffInfo;
                 int c = buffBasic.AddBuffCount(source, buffInfo);
                 
-                if (c > 0 && buffBasic.buffInf != null)
+                if (c > 0 && buffBasic != null)
                 {
                     buffEventData.addCount = c;
                     CombatEventManager.Instance.Dispatch(CombatEventType.AddBuff, buffEventData);
@@ -135,13 +135,13 @@ namespace GameLogic.Combat.Buff
             for (int i = 0; i < _allBuff.Count; i++)
             {
                 BuffBasic b = _allBuff[i];
-                if (b.buffInf.BuffConfig.buffType == buffType)
+                if (b.BuffConfig.buffType == buffType)
                 {
-                    if (clearType ==1&& b.buffInf.BuffConfig.dispelType != 1)
+                    if (clearType ==1&& b.BuffConfig.dispelType != 1)
                     {
                         continue;
                     }
-                    if (clearType ==2&& b.buffInf.BuffConfig.dispelType != 2)
+                    if (clearType ==2&& b.BuffConfig.dispelType != 2)
                     {
                         continue;
                     }
@@ -157,7 +157,7 @@ namespace GameLogic.Combat.Buff
             for (int i = 0; i < _allBuff.Count; i++)
             {
                 BuffBasic b = _allBuff[i];
-                if (b.buffInf.BuffConfig.buffGroup == idGroup)
+                if (b.BuffConfig.buffGroup == idGroup)
                 {
                     return b;
                 }
@@ -181,7 +181,7 @@ namespace GameLogic.Combat.Buff
             int c = 0;
             for (int i = 0; i < _allBuff.Count; i++)
             {
-                if (_allBuff[i].buffInf.BuffConfig.buffType == buffType)
+                if (_allBuff[i].BuffConfig.buffType == buffType)
                 {
                     c++;
                 }

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

@@ -20,7 +20,7 @@ namespace GameLogic.Combat.Buff
         {
             combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += lasetAddValue;
             lasetAddValue = 0;
-            lasetAddValue = buffCount * buffInf.BuffConfig.effectValue[0];
+            lasetAddValue = buffCount * BuffConfig.effectValue[0];
             lasetAddValue += CombatCalculateTool.Instance.GetVlaueRatioForFloat(
                 lasetAddValue, source.CurrCombatHeroInfo.Water_Proficient);
             combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;

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

@@ -22,7 +22,7 @@ namespace GameLogic.Combat.Buff
             AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
             if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
             {
-                if (buffCount < buffInf.BuffConfig.effectValue[1])
+                if (buffCount < BuffConfig.effectValue[1])
                 {
                     return;
                 }
@@ -60,7 +60,7 @@ namespace GameLogic.Combat.Buff
             if (_time >= 1)
             {
                 _time -= 1;
-                float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+                float harmbl = buffCount * BuffConfig.effectValue[0];
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(

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

@@ -21,12 +21,12 @@ namespace GameLogic.Combat.Buff
             AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
             if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
             {
-                if (buffCount < buffInf.BuffConfig.overlayCount)
+                if (buffCount < BuffConfig.overlayCount)
                 {
                     return;
                 }
 
-                float harmbl =  buffInf.BuffConfig.effectValue[1];
+                float harmbl =  BuffConfig.effectValue[1];
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.hp.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
@@ -42,7 +42,7 @@ namespace GameLogic.Combat.Buff
             if (_time >= 1)
             {
                 _time -= 1;
-                float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+                float harmbl = buffCount * BuffConfig.effectValue[0];
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(

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

@@ -21,7 +21,7 @@ namespace GameLogic.Combat.Buff
         //     AddUseGongFaEventData data = (AddUseGongFaEventData)eventData;
         //     if (data.SkillBasic.CombatHeroEntity == combatHeroEntity)
         //     {
-        //         float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+        //         float harmbl = buffCount * BuffConfig.effectValue[0];
         //         long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
         //             source.CurrCombatHeroInfo.hp.Value, harmbl);
         //         CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,

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

@@ -22,12 +22,12 @@ namespace GameLogic.Combat.Buff
 
         protected override void UpdateJumping()
         {
-            float addHarm = buffInf.BuffConfig.effectValue[0];
+            float addHarm = BuffConfig.effectValue[0];
             b_1012 b1012 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1012>();
             if (b1012 != null)
             {
                 addHarm += CombatCalculateTool.Instance.GetVlaueRatioForFloat(addHarm,
-                    b1012.buffInf.BuffConfig.effectValue[1]);
+                    b1012.BuffConfig.effectValue[1]);
             }
 
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
@@ -40,10 +40,15 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProUpdate(float t)
         {
-            if (buffCount >= buffInf.BuffConfig.overlayCount)
+            if (BuffConfig.ID <= 0)
+            {
+                return;
+            }
+
+            if (buffCount >= BuffConfig.overlayCount)
             {
                 float currTime = CombatController.currActiveCombat.combatTime;
-                if (currTime - lasetAddBuffTime >= buffInf.BuffConfig.effectValue[1])
+                if (currTime - lasetAddBuffTime >= BuffConfig.effectValue[1])
                 {
                     lasetAddBuffTime = currTime;
                     b_1012 b1012 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1012>();

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

@@ -16,7 +16,7 @@ namespace GameLogic.Combat.Buff
         public void FangXue()
         {
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
-                buffInf.BuffConfig.effectValue[0]);
+                BuffConfig.effectValue[0]);
             CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
                 WuXingType.Gold,null);
             _currTime = 0;

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

@@ -20,7 +20,7 @@ namespace GameLogic.Combat.Buff
         {
             combatHeroEntity.CurrCombatHeroInfo.defense += _addValue;
             _addValue = 0;
-            float b = buffCount * (buffInf.BuffConfig.effectValue[0] + extraEffect);
+            float b = buffCount * (BuffConfig.effectValue[0] + extraEffect);
             _addValue = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                 combatHeroEntity.MaxCombatHeroInfo.defense.Value, b);
             combatHeroEntity.CurrCombatHeroInfo.defense -= _addValue;

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

@@ -19,7 +19,7 @@ namespace GameLogic.Combat.Buff
         {
             combatHeroEntity.CurrCombatHeroInfo.defense += _addValue;
             _addValue = 0;
-            float b = buffCount * (buffInf.BuffConfig.effectValue[0] + extraEffect);
+            float b = buffCount * (BuffConfig.effectValue[0] + extraEffect);
             _addValue = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                 combatHeroEntity.MaxCombatHeroInfo.defense.Value, b);
             combatHeroEntity.CurrCombatHeroInfo.defense -= _addValue;

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

@@ -24,7 +24,7 @@ namespace GameLogic.Combat.Buff
 
         protected override void UpdateJumping()
         {
-            float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
+            float harmbl = buffCount * BuffConfig.effectValue[0];
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                 source.CurrCombatHeroInfo.attack.Value, harmbl);
             CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
@@ -35,7 +35,7 @@ namespace GameLogic.Combat.Buff
         {
             source.CurrCombatHeroInfo.attack += addAtt;
             addAtt = 0;
-            float addAttbl = buffCount * buffInf.BuffConfig.effectValue[1];
+            float addAttbl = buffCount * BuffConfig.effectValue[1];
             addAtt = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
                 addAttbl);
             source.CurrCombatHeroInfo.attack -= addAtt;

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

@@ -22,7 +22,7 @@ namespace GameLogic.Combat.Buff
             if (triggerSkillSlotsEventData.SkillBasic != null &&
                 triggerSkillSlotsEventData.SkillBasic.CombatHeroEntity == combatHeroEntity)
             {
-                int triggerOdds = (int)(buffInf.BuffConfig.effectValue[0] * buffCount);
+                int triggerOdds = (int)(BuffConfig.effectValue[0] * buffCount);
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= triggerOdds)
                 {

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

@@ -13,7 +13,7 @@ namespace GameLogic.Combat.Buff
         public void Trigger(CombatHeroEntity heroEntity)
         {
             long att = heroEntity.CurrCombatHeroInfo.attack.Value;
-            float harmBl = buffCount * buffInf.BuffConfig.effectValue[0];
+            float harmBl = buffCount * BuffConfig.effectValue[0];
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, harmBl);
             CombatCalculateTool.Instance.Harm(heroEntity, combatHeroEntity, harm, AttType.Buff, _triggerData,
                 WuXingType.Null, null);

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

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

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

@@ -10,7 +10,7 @@
         protected override void ProUpdateEffect()
         {
             combatHeroEntity.CurrCombatHeroInfo.Metal_Injury -= lasetV;
-            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            lasetV = (int)(buffCount * BuffConfig.effectValue[0]);
             combatHeroEntity.CurrCombatHeroInfo.Metal_Injury += lasetV;
         }
 

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

@@ -10,7 +10,7 @@
         protected override void ProUpdateEffect()
         {
             combatHeroEntity.CurrCombatHeroInfo.Wood_Injury -= lasetV;
-            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            lasetV = (int)(buffCount * BuffConfig.effectValue[0]);
             combatHeroEntity.CurrCombatHeroInfo.Wood_Injury += lasetV;
         }
 

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

@@ -10,7 +10,7 @@
         protected override void ProUpdateEffect()
         {
             combatHeroEntity.CurrCombatHeroInfo.Water_Injury -= lasetV;
-            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            lasetV = (int)(buffCount * BuffConfig.effectValue[0]);
             combatHeroEntity.CurrCombatHeroInfo.Water_Injury += lasetV;
         }
 

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

@@ -10,7 +10,7 @@
         protected override void ProUpdateEffect()
         {
             combatHeroEntity.CurrCombatHeroInfo.Fire_Injury -= lasetV;
-            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            lasetV = (int)(buffCount * BuffConfig.effectValue[0]);
             combatHeroEntity.CurrCombatHeroInfo.Fire_Injury += lasetV;
         }
 

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

@@ -10,7 +10,7 @@
         protected override void ProUpdateEffect()
         {
             combatHeroEntity.CurrCombatHeroInfo.Earth_Injury -= lasetV;
-            lasetV = (int)(buffCount * buffInf.BuffConfig.effectValue[0]);
+            lasetV = (int)(buffCount * BuffConfig.effectValue[0]);
             combatHeroEntity.CurrCombatHeroInfo.Earth_Injury += lasetV;
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportEntityInfo.cs

@@ -188,8 +188,8 @@ namespace GameLogic.Combat.CombatTool.CombatReport
             if (buffEventData.target == CombatHeroEntity)
             {
                 string msg =
-                    $"移除了一个buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
-                    $"  数量  {buffEventData.BuffBasic.buffInf.count}";
+                    $"移除了一个buff  {buffEventData.BuffBasic.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.count}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
             }
@@ -202,16 +202,16 @@ namespace GameLogic.Combat.CombatTool.CombatReport
             if (buffEventData.target == CombatHeroEntity)
             {
                 string msg =
-                    $"获得buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
-                    $"  数量  {buffEventData.BuffBasic.buffInf.count} 施放者{buffEventData.source.CurrCombatHeroInfo.modelID}";
+                    $"获得buff  {buffEventData.BuffBasic.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.count} 施放者{buffEventData.source.CurrCombatHeroInfo.modelID}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
             }
             else if (buffEventData.source == CombatHeroEntity)
             {
                 string msg =
-                    $"施加buff  {buffEventData.BuffBasic.buffInf.BuffConfig.scriptsName}" +
-                    $"  数量  {buffEventData.BuffBasic.buffInf.count} 目标{buffEventData.target.CurrCombatHeroInfo.modelID}";
+                    $"施加buff  {buffEventData.BuffBasic.BuffConfig.scriptsName}" +
+                    $"  数量  {buffEventData.BuffBasic.count} 目标{buffEventData.target.CurrCombatHeroInfo.modelID}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
             }
@@ -238,7 +238,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = recoverUpdateEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.buffInf.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
                 }
 
                 allZhiLiao += recoverUpdateEventData.HarmReturnInfo.att;
@@ -262,7 +262,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = recoverUpdateEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.buffInf.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
                 }
 
                 allBeiZhiLiao += recoverUpdateEventData.HarmReturnInfo.att;
@@ -286,12 +286,12 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.buffInf.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
                 }
 
                 string msg =
                     $"我攻击了目标  {heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo.heroName} 来源{harmKey} 原始伤害{heroInjuredEventData.HarmReturnInfo.yuanShiAtt}" +
-                    $"  造成伤害  {heroInjuredEventData.HarmReturnInfo.att} 伤害类型 {heroInjuredEventData.HarmReturnInfo.attType} 强度{heroInjuredEventData.HarmReturnInfo.QiangDu}";
+                    $"  造成伤害  {heroInjuredEventData.HarmReturnInfo.att} 攻击类型 {heroInjuredEventData.HarmReturnInfo.attType} 伤害类型{heroInjuredEventData.HarmReturnInfo.harmType} 强度{heroInjuredEventData.HarmReturnInfo.QiangDu}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
 
@@ -311,7 +311,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.buffInf.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
                 }
 
                 string msg =

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

@@ -35,7 +35,7 @@ namespace GameLogic.Combat.Skill
                 if (skillBasic != null && IsPassiveActivateSkill(skillBasic))
                 {
                     int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-                    if (odds < 5)
+                    if (odds < effectValue[0])
                     {
                         BuffInfo buffInfo = null;
                         switch (skillBasic.wuXingType)

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

@@ -14,8 +14,6 @@ namespace GameLogic.Combat.Skill
     {
         private int _currAddCount;
 
-        private int hd = 216;
-        private int lastJingGuo;
 
         protected override void ProUseSkill()
         {
@@ -26,34 +24,27 @@ namespace GameLogic.Combat.Skill
             _currAddCount = 0;
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
-            
         }
 
         protected override void ProActiveSkill()
         {
-            // if (angle > hd)
-            // {
-            //     lastJingGuo += 360;
-            // }
-            // else
-            // {
-            //     lastJingGuo = hd;
-            // }
-
             CombatEventManager.Instance.AddEventListener(CombatEventType.StartInjured, StartInjured);
             CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
         }
 
-     
 
         private void TriggerSkillSlots(IEventData iEventData)
         {
             TriggerSkillSlotsEventData triggerSkillSlotsEventData = iEventData as TriggerSkillSlotsEventData;
             if (triggerSkillSlotsEventData.SkillBasic == this)
             {
-                if (triggerSkillSlotsEventData.triggerType == 3)//触发到火的位置
+                if (triggerSkillSlotsEventData.triggerType == 3) //触发到火的位置
                 {
                     _currAddCount++;
+                    if (_currAddCount > effectValue[1])
+                    {
+                        _currAddCount = (int)effectValue[1];
+                    }
                 }
             }
         }

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

@@ -43,6 +43,7 @@ namespace GameLogic.Combat.Skill
             isTrgger = true;
             shel = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.MaxCombatHeroInfo.hp.Value,
                 effectValue[0]);
+            isActive = false;
         }
 
         // private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
@@ -94,6 +95,7 @@ namespace GameLogic.Combat.Skill
             shel -= harmReturnInfo.att;
             if (shel <= 0)
             {
+                isActive = true;
                 _timeLineEventLogicGroupBasic?.CloseLoopFx();
                 _timeLineEventLogicGroupBasic = null;
             }

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -328,6 +328,7 @@ namespace Common.Combat.FxAILogic
                 TimeLineEventParticleLogicBasic.ITimeLineTriggerEntity as ITimeLineTriggerEvent;
             if (timeLineTriggerEvent != null)
             {
+                triggerData.IBarrier = null;
                 isUpdateDir = false;
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
                     target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData, SkillFeaturesData);

Assets/Scripts/GameUI/UI/CombatPanel/BuffWidget.cs

@@ -32,8 +32,8 @@ namespace Fort23.Mono
         {
             myButton.onClick.AddListener(() =>
             {
-                SkillMassgePanel.OpenSkillSelectPanel(buffBasic.buffInf.BuffConfig.nameTest,
-                    buffBasic.buffInf.BuffConfig.decTest);
+                SkillMassgePanel.OpenSkillSelectPanel(buffBasic.BuffConfig.nameTest,
+                    buffBasic.BuffConfig.decTest);
             });
         }
 
@@ -48,14 +48,14 @@ namespace Fort23.Mono
 
         public bool Update()
         {
-            if (buffBasic == null||buffBasic.buffInf==null)
+            if (buffBasic == null||buffBasic.CombatHeroEntity==null)
             {
                 return false;
             }
 
-            if (buffBasic.buffInf.buffTime > 0)
+            if (buffBasic.buffTime > 0)
             {
-                cd.fillAmount = 1 - buffBasic._currTime / buffBasic.buffInf.buffTime;
+                cd.fillAmount = 1 - buffBasic._currTime / buffBasic.buffTime;
             }
             else
             {