From 687c2722f1f8564eac09e32171776655da83c33b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 12 四月 2019 11:43:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into HazyRegion
---
Fight/Actor/State/SMB/STM_BaseAttack.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/Fight/Actor/State/SMB/STM_BaseAttack.cs b/Fight/Actor/State/SMB/STM_BaseAttack.cs
index fc627f3..038c056 100644
--- a/Fight/Actor/State/SMB/STM_BaseAttack.cs
+++ b/Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -125,6 +125,8 @@
if (owner.ServerInstID == PlayerDatas.Instance.PlayerId)
{
+ GA_Hero.CallOnStateEnter(animator.GetCurrentAnimatorClipInfo(0).Length);
+
if (owner.State == E_ActorState.AutoRun)
{
owner.StopPathFind();
@@ -153,6 +155,8 @@
{
HeadUpSkillName.Popup(cacheSkillID, owner.Root.position, CameraController.Instance.CameraObject);
}
+
+
}
if (_player is GA_Player)
@@ -247,6 +251,11 @@
if (owner.ActorType == GameObjType.gotPlayer)
{
+ if (owner is GA_Hero)
+ {
+ GA_Hero.CallOnStateEnd();
+ }
+
GActorPlayerBase _player = owner as GActorPlayerBase;
if (_player != null)
{
--
Gitblit v1.8.0