2
0
Fork 0

fix timeline中断问题

master
cd 2 years ago
parent 165bf1b548
commit 6b5f855b1b

@ -21,6 +21,6 @@ MonoBehaviour:
mLastUsedPackagesHash: 1177269412 mLastUsedPackagesHash: 1177269412
mLastUsedPackagesCount: 1 mLastUsedPackagesCount: 1
mLastBuildCode: 1 mLastBuildCode: 1
mLastEditorStartupTimeTicks: 638222589413001092 mLastEditorStartupTimeTicks: 638222589423104105
mNewVersionAvailable: 1 mNewVersionAvailable: 1
mLastAttachedFlowPlayerValue: 0 mLastAttachedFlowPlayerValue: 0

@ -49,7 +49,6 @@ public class ComboSystem : IExecuteSystem, IInitializeSystem
{ {
var combo = entity.combo; var combo = entity.combo;
var skill = entity.skill; var skill = entity.skill;
var move = entity.move;
var isGround = entity.move.IsGroundLogic; var isGround = entity.move.IsGroundLogic;
if (combo.Stance == EComboStance.Idle || combo.Stance == EComboStance.AirIdle) if (combo.Stance == EComboStance.Idle || combo.Stance == EComboStance.AirIdle)
{ {

@ -69,7 +69,7 @@ public class SettleSystem : IExecuteSystem, IInitializeSystem
if (!(hitInfo.SkillParam.throwTimeline is null)) if (!(hitInfo.SkillParam.throwTimeline is null))
{ {
entity.skill.ThrowTarget = target.ID(); entity.skill.ThrowTarget = target.ID();
TimelineManager.Instance.RunSkillTimeline(entity, hitInfo.SkillParam.throwTimeline.name); Util.CastSkill(entity, hitInfo.SkillId, hitInfo.SkillParam.throwTimeline.name, entity.skill.CastDir);
return true; return true;
} }

@ -44,8 +44,13 @@ namespace Game
//投技 无需检测 //投技 无需检测
var targetId = Owner.skill.ThrowTarget; var targetId = Owner.skill.ThrowTarget;
var target = Util.GetEntity(targetId); var target = Util.GetEntity(targetId);
if (!(target is null)) if (target is null) return;
{
//排除重复命中
var hitKey = new Tuple<int, int>(target.ID(), param.hitId);
if (skill.HitSet.Contains(hitKey)) return;
skill.HitSet.Add(hitKey);
var skillHitInfo = new SkillHitInfo var skillHitInfo = new SkillHitInfo
{ {
SkillParam = param, SkillParam = param,
@ -71,8 +76,9 @@ namespace Game
skillHitInfo.StunkRate = featureSkill.StunRate; skillHitInfo.StunkRate = featureSkill.StunRate;
} }
} }
skill.HitInfo.Enqueue(skillHitInfo); skill.HitInfo.Enqueue(skillHitInfo);
}
return; return;
} }

Loading…
Cancel
Save