|
@@ -78,7 +78,7 @@ namespace GameLogic.Combat.Skill
|
|
|
/// </summary>
|
|
|
public string ActiveTimeLineGroupName;
|
|
|
|
|
|
- private System.Action finishCallBack;
|
|
|
+ private System.Action<SkillBasic> finishCallBack;
|
|
|
|
|
|
/// <summary>
|
|
|
/// 完成时 是否是要完成的timeGroupName
|
|
@@ -245,7 +245,7 @@ namespace GameLogic.Combat.Skill
|
|
|
}
|
|
|
|
|
|
|
|
|
- public void SetSkillFinishCallBack(System.Action finishCallBack)
|
|
|
+ public void SetSkillFinishCallBack(System.Action<SkillBasic> finishCallBack)
|
|
|
{
|
|
|
this.finishCallBack = finishCallBack;
|
|
|
}
|
|
@@ -405,8 +405,15 @@ namespace GameLogic.Combat.Skill
|
|
|
// });
|
|
|
for (int i = 0; i < currUseAllTimeLineLogic.Count; i++)
|
|
|
{
|
|
|
- currUseAllTimeLineLogic[i].BreakTimeLine();
|
|
|
- _combatHeroEntity.combatHeroTimeLineControl.RemoveEventLogicGroup(currUseAllTimeLineLogic[i]);
|
|
|
+ if (currUseAllTimeLineLogic[i] != null && currUseAllTimeLineLogic[i].CastEntity != CombatHeroEntity)
|
|
|
+ {
|
|
|
+ LogTool.Log("对象以移交");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ currUseAllTimeLineLogic[i].BreakTimeLine(CombatHeroEntity);
|
|
|
+ _combatHeroEntity.combatHeroTimeLineControl.RemoveEventLogicGroup(currUseAllTimeLineLogic[i]);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
currUseAllTimeLineLogic.Clear();
|
|
@@ -444,15 +451,9 @@ namespace GameLogic.Combat.Skill
|
|
|
}
|
|
|
|
|
|
isUse = false;
|
|
|
- // CombatEventManager.Instance.Dispatch(CombatEventType.SkillFinish, new HeroUseSkillEventData()
|
|
|
- // {
|
|
|
- // CombatHeroEntity = CombatHeroEntity,
|
|
|
- // SkillBasic = this
|
|
|
- // });
|
|
|
+ finishCallBack?.Invoke(this);
|
|
|
ProSkillPlayFinish();
|
|
|
- finishCallBack?.Invoke();
|
|
|
finishCallBack = null;
|
|
|
-
|
|
|
_isEarlyWarning = false;
|
|
|
_earlyWarningFristHero = null;
|
|
|
if (_earlyWarningFx != null)
|
|
@@ -472,7 +473,7 @@ namespace GameLogic.Combat.Skill
|
|
|
public void TimeLineTrigger(string groupName, ILifetCycleHitPoint targetEntity,
|
|
|
ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
|
|
|
{
|
|
|
- if (targetEntity == null|| _isDis)
|
|
|
+ if (targetEntity == null || _isDis)
|
|
|
{
|
|
|
return;
|
|
|
}
|