|
@@ -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);
|
|
|
}
|
|
|
}
|