|
@@ -22,7 +22,7 @@ namespace GameLogic.Combat.Skill
|
|
{
|
|
{
|
|
currCount = 0;
|
|
currCount = 0;
|
|
|
|
|
|
- ActivationTimeLineData("1301");
|
|
|
|
|
|
+ ActivationTimeLineData("1302");
|
|
ballisticsCount = (int)effectValue[0];
|
|
ballisticsCount = (int)effectValue[0];
|
|
for (int i = 0; i < effectValue[0]; i++)
|
|
for (int i = 0; i < effectValue[0]; i++)
|
|
{
|
|
{
|
|
@@ -34,7 +34,7 @@ namespace GameLogic.Combat.Skill
|
|
Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
|
|
Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
|
|
Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
|
|
Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
|
|
|
|
|
|
- ActivationTimeLineData("1301_fashe", currTarget: currTarget,
|
|
|
|
|
|
+ ActivationTimeLineData("1302_fashe", currTarget: currTarget,
|
|
customizePos: new Vector3[] { p }, indexCount: i);
|
|
customizePos: new Vector3[] { p }, indexCount: i);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -62,12 +62,12 @@ namespace GameLogic.Combat.Skill
|
|
{
|
|
{
|
|
long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
|
|
long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
|
|
effectValue[1]);
|
|
effectValue[1]);
|
|
- CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
|
|
|
|
|
|
+ HarmReturnInfo harmReturnInfo= CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
|
|
wuXingType, skillFeatures,
|
|
wuXingType, skillFeatures,
|
|
HarmType.Default);
|
|
HarmType.Default);
|
|
|
|
|
|
- int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
|
|
|
|
- if (odds < effectValue[2])
|
|
|
|
|
|
+ // int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
|
|
|
|
+ if (harmReturnInfo.isHitHero)
|
|
{
|
|
{
|
|
BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
|
|
BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
|
|
targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
|
|
targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
|