浏览代码

修改bug

DESKTOP-FB72PO8\Administrator 2 天之前
父节点
当前提交
da9b61a570

+ 6 - 0
Assets/Res/Config/SkillConfig.json

@@ -5692,6 +5692,7 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
+        100.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5715,6 +5716,7 @@
       "SkillType": 3,
       "level": 2,
       "effectValue": [
+        120.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5747,6 +5749,7 @@
       "SkillType": 3,
       "level": 3,
       "effectValue": [
+        140.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5781,6 +5784,7 @@
       "SkillType": 3,
       "level": 4,
       "effectValue": [
+        160.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5815,6 +5819,7 @@
       "SkillType": 3,
       "level": 5,
       "effectValue": [
+        180.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5849,6 +5854,7 @@
       "SkillType": 3,
       "level": 6,
       "effectValue": [
+        200.0,
         9.0,
         15.0
       ],

+ 2 - 2
Assets/Scenes/testCombat.scene

@@ -2246,7 +2246,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2366,7 +2366,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size

+ 10 - 14
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs

@@ -43,17 +43,17 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         private void Finish()
         {
-            BuffInfo buffInfo = BuffInfo.GetBuffInfo(10091, effectValue[0], 1);
+            BuffInfo buffInfo = BuffInfo.GetBuffInfo(10091, effectValue[1], 1);
             BuffBasic buffBasic = target.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             if (buffBasic != null && SelfSkillConfig.level > 5)
             {
-                float v = effectValue[0];
+                float v = effectValue[2];
                 target.CurrCombatHeroInfo.Metal -= v;
                 target.CurrCombatHeroInfo.Wood -= v;
                 target.CurrCombatHeroInfo.Water -= v;
                 target.CurrCombatHeroInfo.Fire -= v;
                 target.CurrCombatHeroInfo.Earth -= v;
-                buffBasic.buffFinish=delegate ()
+                buffBasic.buffFinish = delegate()
                 {
                     target.CurrCombatHeroInfo.Metal += v;
                     target.CurrCombatHeroInfo.Wood += v;
@@ -71,21 +71,17 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 SkillPlayFinish();
                 return;
             }
-            
+
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
             ActivationTimeLineData("sk1_hit", currTarget: cBetterList);
             SkillPlayFinish();
-            
-            // HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
-            // harmReturnInfo.source = CombatHeroEntity;
-            // harmReturnInfo.target = target.GetMainHotPoin<CombatHeroHitPoint>();
-            // harmReturnInfo.att = 200;
-            // harmReturnInfo.attType = AttType.Normal;
-            // harmReturnInfo.harmType = HarmType.Default;
-            // harmReturnInfo.triggerData = triggerData;
-            // target.HeroHurt(harmReturnInfo);
-            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity, lifetCycleHitPoint as CombatHeroHitPoint, 1, AttType.FaBao, triggerData,wuXingType,null,
+
+    
+            long att = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.attack.Value;
+            long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, effectValue[0]);
+            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,
+                lifetCycleHitPoint as CombatHeroHitPoint, harm, AttType.FaBao, triggerData, wuXingType, null,
                 HarmType.Default);
         }
     }

二进制
Excel2Json/Excel/skill.xlsx