修改bug

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2826,27 +2826,27 @@
     },
     {
       "ID": 1120110,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120111,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120112,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120113,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120114,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120115,
-      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120120,
@@ -5134,23 +5134,23 @@
     },
     {
       "ID": 1235021,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235022,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235023,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235024,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235025,
-      "txt": "0"
+      "txt": ""
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -15,7 +15,7 @@ namespace Excel2Json
 	public struct SkillConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
-		///技能ID IDGroup+技能等级
+		///所有流血状态造成的伤害会转换成充能值，经过2次金经脉后对全体敌人造成{0}%充能值的伤害
 		/// </summary>
 #if !COMBAT_SERVER
 		public int ID;

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

@@ -9,6 +9,9 @@ namespace Common.Utility.CombatEvent
     {
         public SkillBasic SkillBasic;
         public SkillSlots SkillSlots;
+        /// <summary>
+        /// 金、水、木、火、土 0-4
+        /// </summary>
         public int triggerType;
         public bool isNotUseSkill;
         protected override void ProDispose()

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

@@ -13,6 +13,7 @@ namespace GameLogic.Combat.Skill
     public class S2011 : SkillBasic
     {
         private long addHarm;
+        private int count;
 
         protected override void ProUseSkill()
         {
@@ -22,6 +23,8 @@ namespace GameLogic.Combat.Skill
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
             CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+            count = 0;
+            addHarm = 0;
         }
 
         protected override void ProDispose()
@@ -33,8 +36,20 @@ namespace GameLogic.Combat.Skill
         private void TriggerSkillSlots(IEventData ieventData)
         {
             TriggerSkillSlotsEventData triggerSkillSlotsEventData = ieventData as TriggerSkillSlotsEventData;
-            if (triggerSkillSlotsEventData.SkillBasic == this && addHarm > 0)
+           
+            if (triggerSkillSlotsEventData.SkillBasic == this)
             {
+                if (triggerSkillSlotsEventData.triggerType != 0)
+                {
+                    return;
+                }
+
+                count++;
+                if (count < 2)
+                {
+                    return;
+                }
+
                 long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(addHarm, effectValue[0]);
                 if (v > 0)
                 {

Assets/StreamingAssets/assetBundle.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

XiuXianGame.sln.DotSettings.user

@@ -20,6 +20,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F13_003F4d8b1ee1_003FColor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F1c_003Fee10685f_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F61_003Fdc27fc5d_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACultureInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F69_003F81b4a42b_003FCultureInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACustomRenderTexture_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F8f_003F8149d2e1_003FCustomRenderTexture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>