修改bug

Assets/Editor/CombatEditor/CombatPeportMassgeModle.cs

@@ -12,7 +12,7 @@ namespace xy002Editor.CombatEditor
 
         private StringBuilder stringBuilder;
         private CombatReportEntityInfo combatReportEntityInfo;
-
+        private int index = 0;
         public void Init(VisualElement root, CombatReportEntityInfo combatReportEntityInfo,
             CombaReportEnditorManager combaReportEnditorManager)
         {
@@ -21,6 +21,30 @@ namespace xy002Editor.CombatEditor
             textField.label = "筛选信息";
             textField.RegisterValueChangedCallback((e) => { sxV = e.newValue; });
             root.Add(textField);
+            
+            Button button = new Button();
+            button.text = "上一页";
+            button.clicked+= () =>
+            {
+                index--;
+                if (index < 0)
+                {
+                    index = 0;
+                }
+            };
+      
+            root.Add(button);
+            button = new Button();
+            button.text = "下一页";
+            button.clicked += () =>
+            {
+                index++;
+                if (index > combatReportEntityInfo.MsgModule.ReportFightMassgeLogDatas.Count / 20)
+                {
+                    index = combatReportEntityInfo.MsgModule.ReportFightMassgeLogDatas.Count / 20 + 1;
+                }
+            };
+            root.Add(button);
             ScrollView miaoshu = combaReportEnditorManager.Copy<ScrollView>("value_scrollview");
             root.Add(miaoshu);
             label = new Label();
@@ -31,8 +55,13 @@ namespace xy002Editor.CombatEditor
         public void OnGui()
         {
             stringBuilder.Clear();
-            for (int i = 0; i < combatReportEntityInfo.MsgModule.ReportFightMassgeLogDatas.Count; i++)
+            for (int i = index*20; i < index*20+20; i++)
             {
+                if (combatReportEntityInfo.MsgModule.ReportFightMassgeLogDatas.Count <= i)
+                {
+                    break;
+                }
+
                 ReportFightMassgeLogData reportFightMassgeLogData =
                     combatReportEntityInfo.MsgModule.ReportFightMassgeLogDatas[i];
                 if (!string.IsNullOrEmpty(sxV))

Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -127,6 +127,7 @@ namespace xy002Editor.CombatEditor
             visualElement_h.Add(miaoShuFoldout);
             VisualElement miaoshuve = combaReportEnditorManager.Copy<VisualElement>("miaoshuve"); //英雄信息
             miaoShuFoldout.Add(miaoshuve);
+          
             combatPeportMassgeModle = new CombatPeportMassgeModle();
             combatPeportMassgeModle.Init(miaoshuve, combatReportEntityInfo, combaReportEnditorManager);
         }

Assets/Res/Config/HeroModelConfig.json

@@ -12,7 +12,7 @@
       "heroType": 1,
       "profession": 1,
       "itemID": 1004,
-      "hp": 100,
+      "hp": 1000,
       "attack": 100,
       "def": 50,
       "shield": 100,
@@ -160,7 +160,7 @@
       "heroType": 4,
       "profession": 1,
       "itemID": 1004,
-      "hp": 200,
+      "hp": 1000,
       "attack": 100,
       "def": 50,
       "shield": 200,

Assets/Res/Config/SkillConfig.json

@@ -2196,7 +2196,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -2220,7 +2220,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -2247,7 +2247,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -2277,7 +2277,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -2304,7 +2304,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -2334,7 +2334,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -2359,12 +2359,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        6.0,
-        90.0
+        2.0,
+        200.0
       ],
       "intensifierIndex": [
         2
@@ -2382,12 +2382,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        6.0,
-        90.0,
+        2.0,
+        200.0,
         2.0
       ],
       "intensifierIndex": [
@@ -2406,12 +2406,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        6.0,
-        90.0,
+        2.0,
+        200.0,
         2.0
       ],
       "intensifierIndex": [
@@ -2436,12 +2436,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        8.0,
-        90.0,
+        3.0,
+        200.0,
         2.0,
         100.0
       ],
@@ -2464,12 +2464,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        8.0,
-        90.0,
+        3.0,
+        200.0,
         2.0,
         100.0
       ],
@@ -2495,12 +2495,12 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        8.0,
-        90.0,
+        3.0,
+        200.0,
         2.0,
         100.0,
         25.0
@@ -2521,7 +2521,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -2545,7 +2545,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -2570,7 +2570,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -2601,7 +2601,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -2626,7 +2626,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -2657,7 +2657,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 2.0,
+      "cd": 1.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -2688,7 +2688,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        100.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -2712,7 +2712,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        100.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -2744,7 +2744,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        100.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -2771,7 +2771,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        100.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -2803,7 +2803,7 @@
       "level": 5,
       "effectValue": [
         5.0,
-        100.0,
+        70.0,
         20.0
       ],
       "intensifierIndex": [
@@ -2862,7 +2862,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -2885,7 +2885,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -2916,7 +2916,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -2942,7 +2942,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -2973,7 +2973,7 @@
       "level": 5,
       "effectValue": [
         5.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -6472,7 +6472,7 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        50.0,
+        190.0,
         5.0,
         1.0,
         10.0,
@@ -6500,7 +6500,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        10.0
+        10.0,
+        70.0
       ],
       "intensifierIndex": [
         0

Assets/Scenes/testCombat.scene

@@ -2185,7 +2185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 1405500
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
@@ -2237,7 +2237,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

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

@@ -21,7 +21,7 @@ namespace GameLogic.Combat.Buff
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Null,HarmType.Buff);
+                    WuXingType.Null,null,HarmType.Buff);
             }
         }
 

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

@@ -28,7 +28,7 @@ namespace GameLogic.Combat.Buff
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Fire,HarmType.Buff);
+                    WuXingType.Fire,null,HarmType.Buff);
             }
         }
      

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

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.Buff
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.hp.Value, harmbl);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Fire,HarmType.Buff);
+                    WuXingType.Fire,null,HarmType.Buff);
             }
         }
 

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

@@ -27,7 +27,7 @@ namespace GameLogic.Combat.Buff
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                WuXingType.Gold);
+                WuXingType.Gold,null);
         }
 
         protected override void ProUpdateEffect()

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

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

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

@@ -74,10 +74,11 @@ namespace GameLogic.Combat.CombatTool
         }
 
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroEntity target, long att, AttType attType,
-            TriggerData triggerData, WuXingType WuXingType, HarmType harmType = HarmType.Null)
+            TriggerData triggerData, WuXingType WuXingType, ISkillFeatures skillFeatures,
+            HarmType harmType = HarmType.Null)
         {
             return Harm(source, target.GetMainHotPoin<CombatHeroHitPoint>(), att,
-                attType, triggerData, WuXingType, harmType);
+                attType, triggerData, WuXingType, skillFeatures, harmType);
         }
 
 
@@ -88,7 +89,7 @@ namespace GameLogic.Combat.CombatTool
         /// <param name="target">被攻击方</param>
         /// <param name="att">伤害值</param>
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroHitPoint target, long att,
-            AttType attType, TriggerData triggerData, WuXingType WuXingType,
+            AttType attType, TriggerData triggerData, WuXingType WuXingType, ISkillFeatures skillFeatures,
             HarmType harmType = HarmType.Default)
         {
             HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
@@ -111,6 +112,15 @@ namespace GameLogic.Combat.CombatTool
                 return harmReturnInfo;
             }
 
+            float qiangDu = 100;
+            SkillFeaturesData skillFeaturesData = skillFeatures as SkillFeaturesData;
+            if (skillFeaturesData != null)
+            {
+                qiangDu = (skillFeaturesData.hp * 100) / skillFeaturesData.maxHp;
+            }
+
+            harmReturnInfo.QiangDu = qiangDu;
+            att = GetVlaueRatioForLong(att, qiangDu);
             float wuxing = source.CurrCombatHeroInfo.GetWuXingShuXing(WuXingType);
             // int index = GeWuXingTypeIndex(WuXingType);
             // WuXingType kzWuXing = Restrain[index];
@@ -366,12 +376,12 @@ namespace GameLogic.Combat.CombatTool
             if (c < 0) //a被压制
             {
                 p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_b - lg_a));
-                targetHp = (long)(targetHp * p2);
+                targetHp = GetVlaueRatioForLong(targetHp, p2);
             }
             else if (c > 0)
             {
                 p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_a - lg_b));
-                myHp = (long)(myHp * p2);
+                myHp = GetVlaueRatioForLong(myHp, p2);
             }
 
 

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

@@ -243,7 +243,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 }
                 string msg =
                     $"我攻击了目标  {heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.CurrCombatHeroInfo.heroName} 来源{harmKey} 原始伤害{  heroInjuredEventData.HarmReturnInfo.yuanShiAtt }" +
-                    $"  造成伤害  {heroInjuredEventData.HarmReturnInfo.att} 伤害类型 {heroInjuredEventData.HarmReturnInfo.attType}";
+                    $"  造成伤害  {heroInjuredEventData.HarmReturnInfo.att} 伤害类型 {heroInjuredEventData.HarmReturnInfo.attType} 强度{heroInjuredEventData.HarmReturnInfo.QiangDu}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
                 
@@ -268,7 +268,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 }
                 string msg =
                     $"被攻击  {heroInjuredEventData.HarmReturnInfo.source.CurrCombatHeroInfo.heroName} 来源{harmKey} 原始伤害{  heroInjuredEventData.HarmReturnInfo.yuanShiAtt }" +
-                    $"  受到伤害  {heroInjuredEventData.HarmReturnInfo.att} 伤害类型 {heroInjuredEventData.HarmReturnInfo.attType}";
+                    $"  受到伤害  {heroInjuredEventData.HarmReturnInfo.att} 伤害类型 {heroInjuredEventData.HarmReturnInfo.attType} 强度{heroInjuredEventData.HarmReturnInfo.QiangDu}";
                 float t = CombatController.currActiveCombat.combatTime;
                 MsgModule.Add(t, msg);
                 allChengShang += heroInjuredEventData.HarmReturnInfo.att;

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

@@ -23,6 +23,7 @@ namespace GameLogic.Combat.CombatTool
         public HarmType harmType = HarmType.Default;
         public WuXingType WuXingType;
 
+        public float QiangDu;
         /// <summary>
         /// 是否命中英雄
         /// </summary>

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

@@ -107,7 +107,7 @@ namespace GameLogic.Combat.CombatTool
             }
 
             _isPengZhuang = true;
-            if (triigerCount >= 2)
+            if (triigerCount >= 1)
             {
                 MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
                     CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -208,7 +208,7 @@ namespace GameLogic.Combat.Hero
                 if (b1008 == null)
                 {
                     cd -= t;
-                    if (IsCanUse())
+                    if (_rootMagicWeaponControl.isAutoUse&&IsCanUse())
                     {
                         UseMagicWeapon();
                     }

Assets/Scripts/GameLogic/Combat/Hero/SubStatus/FightIdleSubState.cs

@@ -33,6 +33,7 @@ namespace GameLogic.Combat.Hero.SubStatus
 
         protected override void ProUpdate(float t)
         {
+            return;
             allTime += t * 2f;
             allTimeX += t * 1f;
             Vector3 p = Vector3.Lerp(startPos, targetPos, allTime);

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

@@ -34,10 +34,10 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value, AttType.Normal, triggerData);
+                CombatHeroEntity.CurrCombatHeroInfo.attack.Value, AttType.Normal, triggerData,skillFeatures);
         }
     }
 }

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

@@ -34,7 +34,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float harmBl = effectValue[1];
             // CombatC
@@ -48,7 +48,7 @@ namespace GameLogic.Combat.Skill
                 harmBl);
 
             CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -33,7 +33,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             if (SelfSkillConfig.level > 1)
@@ -52,7 +52,7 @@ namespace GameLogic.Combat.Skill
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             // int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             // if (odds <= effectValue[2])

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

@@ -34,7 +34,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             if (SelfSkillConfig.level > 5)
@@ -51,7 +51,7 @@ namespace GameLogic.Combat.Skill
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {

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

@@ -29,14 +29,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -31,14 +31,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {

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

@@ -39,12 +39,12 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
             CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds <= effectValue[2])

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

@@ -46,7 +46,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             if (groupName.Equals("1202"))
             {
@@ -57,7 +57,7 @@ namespace GameLogic.Combat.Skill
                 long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                     effectValue[1]);
                 CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
-                    wuXingType,
+                    wuXingType,skillFeatures,
                     HarmType.Default);
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
                 if (odds <= effectValue[2])

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

@@ -26,14 +26,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -26,14 +26,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -55,12 +55,12 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
             CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             
             int odds= Random.Range(0, 100);

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

@@ -26,14 +26,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -26,14 +26,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -27,11 +27,11 @@ namespace GameLogic.Combat.Skill
 
         protected void ProDefaultTimeLineTrigger_ZD(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (odds <= effectValue[2])
@@ -46,14 +46,14 @@ namespace GameLogic.Combat.Skill
                     CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                     effectValue[3]);
                 CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2, AttType.Skill, triggerData,
-                    wuXingType,
+                    wuXingType,skillFeatures,
                     HarmType.Default);
             }
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             for (int i = 0; i < effectValue[0]; i++)
             {

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

@@ -43,12 +43,12 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[1]);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData, wuXingType,
+                AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
 
             if (harmReturnInfo.isHitHero)
@@ -75,7 +75,7 @@ namespace GameLogic.Combat.Skill
                         CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                         effectValue[4]);
                     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v2,
-                        AttType.Skill, triggerData, wuXingType,
+                        AttType.Skill, triggerData, wuXingType,skillFeatures,
                         HarmType.Default);
                 }
             }

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

@@ -21,13 +21,17 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
-            for (int i = 0; i < effectValue[0]; i++)
+            for (int j = 0; j < 5; j++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
-                ActivationTimeLineData("1403_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (j + 2));
+                for (int i = 0; i < effectValue[0]; i++)
+                {
+                    ActivationTimeLineData("1403_fashe", currTarget: currTarget,
+                        customizePos: new Vector3[] { specialDotInfo.GetWorlPos() },startTime:i*-0.2f);
+                }
             }
 
+
             ActivationTimeLineData("1403");
         }
 
@@ -38,7 +42,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             if (SelfSkillConfig.level > 1)
@@ -58,7 +62,7 @@ namespace GameLogic.Combat.Skill
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData, wuXingType,
+                AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
 
             if (harmReturnInfo.isHitHero)

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

@@ -31,14 +31,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.isHitHero)
             {

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

@@ -30,14 +30,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -48,14 +48,14 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float addHarm = effectValue[1];
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
-                wuXingType,
+                wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             count = 0;
             hitCount = 0;
@@ -47,7 +47,7 @@ namespace GameLogic.Combat.Skill
 
         private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             float hv = effectValue[0];
             b_1007 b1007 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1007>();
@@ -60,7 +60,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,
+                AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
             if (harmReturnInfo.triggerData.IBarrier == null)
             {

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

@@ -2,12 +2,13 @@ using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Core.Triiger;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using GameLogic.Player;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// （2转，防御型技能）：身体周围围绕多丙剑飞行，可以阻挡敌人的功法.抵挡{0}最大生命值的伤害
+    /// （2转，防御型技能）：身体周围围绕多丙剑飞行，可以阻挡敌人的功法.抵挡{0}最大生命值的伤害 改剑阵收到火系伤害时会升温，升温后会融化。（受到的火系伤害提升60%）
     /// </summary>
     public class S9002 : SkillBasic, IBarrier
     {
@@ -16,7 +17,7 @@ namespace GameLogic.Combat.Skill
         public long shel;
 
         protected TimeLineEventLogicGroupBasic _timeLineEventLogicGroupBasic;
-        
+
         protected override void ProInitSkill()
         {
             AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
@@ -25,13 +26,13 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             CombatHeroEntity.CloseLoopFx();
-            _timeLineEventLogicGroupBasic=  ActivationTimeLineData("sk2");
+            _timeLineEventLogicGroupBasic = ActivationTimeLineData("sk2");
             Own = CombatHeroEntity;
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             // count = 0;
             SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("sk2_trigger");
@@ -46,11 +47,11 @@ namespace GameLogic.Combat.Skill
 
         private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
         }
 
@@ -84,6 +85,12 @@ namespace GameLogic.Combat.Skill
 
         public long Harm(HarmReturnInfo harmReturnInfo)
         {
+            if (harmReturnInfo.WuXingType.HasFlag(WuXingType.Fire))
+            {
+                harmReturnInfo.att +=
+                    CombatCalculateTool.Instance.GetVlaueRatioForLong(harmReturnInfo.att, effectValue[1]);
+            }
+
             shel -= harmReturnInfo.att;
             if (shel <= 0)
             {

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

@@ -17,11 +17,11 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -14,11 +14,11 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+            TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
                 HarmType.Default);
         }
     }

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

@@ -69,9 +69,9 @@ namespace GameLogic.Combat.Skill
 
         private CombatHeroEntity _combatHeroEntity;
 
-        private Map<string, System.Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData>>
+        private Map<string, System.Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData,ISkillFeatures>>
             _triggerCallBack =
-                new Map<string, Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData>>();
+                new Map<string, Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData,ISkillFeatures>>();
 
         public SkillConfig SelfSkillConfig;
 
@@ -315,14 +315,14 @@ namespace GameLogic.Combat.Skill
 
 
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroHitPoint target, long att, AttType attType,
-            TriggerData triggerData, HarmType harmType = HarmType.Null)
+            TriggerData triggerData,ISkillFeatures skillFeatures, HarmType harmType = HarmType.Null)
         {
             if (target == null || target.combatHeroEntity == null)
             {
                 return null;
             }
 
-            return CombatCalculateTool.Instance.Harm(source, target, att, attType, triggerData, wuXingType,
+            return CombatCalculateTool.Instance.Harm(source, target, att, attType, triggerData, wuXingType,skillFeatures,
                 harmType);
         }
 
@@ -424,7 +424,7 @@ namespace GameLogic.Combat.Skill
         /// <param name="groupName"></param>
         /// <param name="callBack"></param>
         protected void AddTriggerCallBack(string groupName,
-            System.Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData> callBack)
+            System.Action<string, CombatHeroHitPoint, ITimelineFxLogic, TriggerData,ISkillFeatures> callBack)
         {
             if (!_triggerCallBack.ContainsKey(groupName))
             {
@@ -574,7 +574,7 @@ namespace GameLogic.Combat.Skill
         /// <param name="targetEntity">目标对象（敌人）</param>
         /// <param name="triggerData">触发的额外数据——透传数据</param>
         public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
+            ITimelineFxLogic timelineFxLogic, TriggerData triggerData,ISkillFeatures skillFeatures)
         {
             if (targetEntity == null || _isDis)
             {
@@ -585,13 +585,13 @@ namespace GameLogic.Combat.Skill
             {
                 _triggerCallBack[groupName]?.Invoke(groupName,
                     targetEntity != null ? targetEntity.This<CombatHeroHitPoint>() : null, timelineFxLogic,
-                    triggerData);
+                    triggerData,skillFeatures);
             }
             else
             {
                 ProDefaultTimeLineTrigger(groupName,
                     targetEntity != null ? targetEntity.This<CombatHeroHitPoint>() : null, timelineFxLogic,
-                    triggerData);
+                    triggerData,skillFeatures);
             }
         }
 
@@ -719,7 +719,7 @@ namespace GameLogic.Combat.Skill
         /// <param name="targetEntity"></param>
         /// <param name="triggerData"></param>
         protected virtual void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
+            ITimelineFxLogic timelineFxLogic, TriggerData triggerData,ISkillFeatures skillFeatures)
         {
         }
 

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

@@ -2,10 +2,11 @@ using System;
 using Common.Combat.FxAILogic;
 using Fort23.Core;
 using GameLogic.Player;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
 {
-    public class SkillFeaturesData : CObject
+    public class SkillFeaturesData : CObject,ISkillFeatures
     {
         /// <summary>
         /// 生命值

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

@@ -87,7 +87,7 @@ namespace Common.Combat.FxAILogic
             if (timeLineTriggerEvent != null)
             {
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
+                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
                 if (!string.IsNullOrEmpty(hitFxName))
                 {
                     FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);

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

@@ -75,7 +75,7 @@ public class FxNavigationLogic : FxAILogicBasic
         if (timeLineTriggerEvent != null)
         {
             timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
+                target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
             if (!string.IsNullOrEmpty(hitFxName))
             {
                 CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,

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

@@ -262,7 +262,7 @@ namespace Common.Combat.FxAILogic
                 {
                     timeLineTriggerEvent.TimeLineTrigger(
                         TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
+                        target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
                     if (!BarrierTriggerData.isPenetrate)
                     {
                         if (!string.IsNullOrEmpty(hitFxName))
@@ -305,7 +305,7 @@ namespace Common.Combat.FxAILogic
             if (timeLineTriggerEvent != null)
             {
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
-                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
+                    target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData,SkillFeaturesData);
                 if (!string.IsNullOrEmpty(hitFxName))
                 {
                     FinishHit(collision.ClosestPoint(gameObject.transform.position), hitFxName);

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineTimeTriggerEventLogicBasic.cs

@@ -21,7 +21,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 BetterList<ILifetCycleHitPoint> timeLineEntities = GetSkillTarget();
                 for (int i = 0; i < timeLineEntities.Count; i++)
                 {
-                    trigger.TimeLineTrigger(mTimeLineAssetSerialization.groupName,  timeLineEntities[i],null,extraData);
+                    trigger.TimeLineTrigger(mTimeLineAssetSerialization.groupName,  timeLineEntities[i],null,extraData,null);
                 }
             }
         }

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ISkillFeatures.cs

@@ -0,0 +1,7 @@
+namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
+{
+    public interface ISkillFeatures
+    {
+        
+    }
+}

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ISkillFeatures.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e0ed1b2116f34115b51dc9bdde109062
+timeCreated: 1747730053

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineTriggerEvent.cs

@@ -11,7 +11,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
         /// EntityBasic 触发的目标对象
         /// object 额外数据由Skill带出
         /// </summary>
-        public void TimeLineTrigger(string groupName,  ILifetCycleHitPoint targetEntity,ITimelineFxLogic timelineFxLogic,TriggerData triggerData);
+        public void TimeLineTrigger(string groupName,  ILifetCycleHitPoint targetEntity,ITimelineFxLogic timelineFxLogic,TriggerData triggerData,ISkillFeatures skillFeatures);
         public void TimelineFxLogicInit(string groupName,ITimelineFxLogic timelineFxLogic,TriggerData triggerData);
         public void TimeLineTriggerGround(string groupName,ITimelineFxLogic timelineFxLogic,TriggerData triggerData);
      

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TriggerData.cs

@@ -29,5 +29,6 @@
         /// 障碍
         /// </summary>
         public object IBarrier;
+        
     }
 }

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -22,7 +22,7 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 2560
-    height: 1307
+    height: 1299
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
@@ -48,10 +48,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 468
+    x: 648
     y: 73
-    width: 955
-    height: 779
+    width: 559
+    height: 803
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -104,23 +104,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 955
-      height: 758
-    m_Scale: {x: 0.46674877, y: 0.46674877}
-    m_Translation: {x: 477.5, y: 379}
+      width: 559
+      height: 782
+    m_Scale: {x: 0.4815271, y: 0.4815271}
+    m_Translation: {x: 279.5, y: 391}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1023.0343
+      x: -580.445
       y: -812
-      width: 2046.0686
+      width: 1160.89
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.46674877
-  m_LastWindowPixelSize: {x: 955, y: 779}
+  m_defaultScale: 0.4815271
+  m_LastWindowPixelSize: {x: 559, y: 803}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -145,8 +145,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1425
-    height: 1307
+    width: 1209
+    height: 1299
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
@@ -171,8 +171,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1425
-    height: 800
+    width: 1209
+    height: 824
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
@@ -195,10 +195,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 468
-    height: 800
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 648
+    height: 824
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 6}
   m_Panes:
   - {fileID: 6}
@@ -226,8 +226,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 467
-    height: 779
+    width: 647
+    height: 803
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -262,12 +262,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 468
+    x: 648
     y: 0
-    width: 957
-    height: 800
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 561
+    height: 824
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 2}
@@ -289,9 +289,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 800
-    width: 1425
-    height: 507
+    y: 824
+    width: 1209
+    height: 475
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 9}
@@ -321,9 +321,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 873
-    width: 1424
-    height: 486
+    y: 897
+    width: 1208
+    height: 454
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -559,7 +559,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -684,16 +684,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 0
-      containerId: Floating
-      floating: 1
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -200, y: -140}
+      snapOffset: {x: -200, y: -55}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Hot Reload
-      index: 0
+      index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -708,9 +708,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.2846545, y: 22.955175, z: 25.849655}
+    m_Target: {x: -2.1948211, y: -0.36974016, z: -1.5867624}
     speed: 2
-    m_Value: {x: 0.2846545, y: 22.955175, z: 25.849655}
+    m_Value: {x: -2.1948211, y: -0.36974016, z: -1.5867624}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -756,13 +756,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.11840048, y: -0.6923478, z: 0.116422184, w: 0.70232755}
+    m_Target: {x: 0.1979092, y: -0.33040512, z: 0.07096026, w: 0.920219}
     speed: 2
-    m_Value: {x: 0.118389696, y: -0.69228476, z: 0.11641158, w: 0.7022636}
+    m_Value: {x: 0.19789201, y: -0.33037642, z: 0.07095409, w: 0.920139}
   m_Size:
-    m_Target: 4.2953744
+    m_Target: 2.8208847
     speed: 2
-    m_Value: 4.2953744
+    m_Value: 2.8208847
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -892,10 +892,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1425
+    x: 1209
     y: 0
-    width: 223
-    height: 1307
+    width: 372
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 12}
@@ -923,10 +923,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1425
+    x: 1209
     y: 73
-    width: 221
-    height: 1286
+    width: 370
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -940,23 +940,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: d6a0f8ff
-      m_LastClickedID: -483114
-      m_ExpandedIDs: 4636f8ff4c36f8ff54b2f8ffbc83faff14a8faff6ac6fdffc23dffff
+      m_SelectedIDs: 32aaffff
+      m_LastClickedID: -21966
+      m_ExpandedIDs: 9afdfbffa0fdfbff8a3dfdff903dfdfffe8effff048fffff32aaffff64b9ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: TestCombat
+        m_OriginalName: TestCombat
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -25552
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 11}
       m_SearchString: 
@@ -981,10 +981,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1648
+    x: 1581
     y: 0
-    width: 337
-    height: 1307
+    width: 404
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 14}
@@ -1012,10 +1012,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1648
+    x: 1581
     y: 73
-    width: 335
-    height: 1286
+    width: 402
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1027,7 +1027,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 3402
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1037,24 +1037,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/CombatScenesTool
+    - Packages/com.unity.2d.spriteshape
     m_Globs: []
-    m_OriginalText: 3402
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/CombatScenesTool
+  - Packages/com.unity.2d.spriteshape
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\Server\NetServer\NetServer\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 28840100
-    m_LastClickedID: 99368
-    m_ExpandedIDs: 00000000246b0000828201008482010086820100888201008a8201008c8201008e82010090820100928201009482010096820100988201009a8201009c820100a683010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 934}
+    m_SelectedIDs: b8dd0000
+    m_LastClickedID: 56760
+    m_ExpandedIDs: 0000000052da000054da000056da000058da00005ada00005cda00005eda000060da000062da000064da000066da000068da00006ada00006cda00006eda000070da000072da000074da000076da000078da00007ada00007cda000098dd00006ade000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1082,7 +1082,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000246b0000828201008482010086820100888201008a8201008c8201008e82010090820100928201009482010096820100988201009a8201009c82010000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000052da000054da000056da000058da00005ada00005cda00005eda000060da000062da000064da000066da000068da00006ada00006cda00006eda000070da000072da000074da000076da000078da00007ada00007cda0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1107,8 +1107,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: d6a0f8ff
-    m_LastClickedInstanceID: -483114
+    m_SelectedInstanceIDs: 32aaffff
+    m_LastClickedInstanceID: -21966
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 00000000d8e00000
     m_RenameOverlay:
@@ -1137,7 +1137,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 201
+  m_DirectoriesAreaWidth: 233
 --- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -1156,7 +1156,7 @@ MonoBehaviour:
     x: 1985
     y: 0
     width: 575
-    height: 1307
+    height: 1299
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
@@ -1187,10 +1187,10 @@ MonoBehaviour:
     x: 1985
     y: 73
     width: 574
-    height: 1286
+    height: 1278
   m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
+    m_DataMode: 3
+    m_PreferredDataMode: 3
     m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}