From cbb4009abdf84cf020be9cfc1de88dc436652bb3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 07 一月 2019 10:44:07 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss
---
Fight/Actor/State/SMB/STM_BaseAttack.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Fight/Actor/State/SMB/STM_BaseAttack.cs b/Fight/Actor/State/SMB/STM_BaseAttack.cs
index 67cc271..e2bda03 100644
--- a/Fight/Actor/State/SMB/STM_BaseAttack.cs
+++ b/Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -231,7 +231,7 @@
if (_fight == null)
{
#if UNITY_EDITOR
- Debug.LogErrorFormat("owner: {0} 绫诲瀷闂: {1}" ,owner.ServerInstID, owner.GetType());
+ Debug.LogErrorFormat("owner: {0} 绫诲瀷闂: {1}", owner.ServerInstID, owner.GetType());
#endif
return;
}
@@ -367,8 +367,11 @@
{
_target.Die(owner.ServerInstID);
}
+ else
+ {
+ _target.ActorInfo.ResetHp((int)_target.ActorInfo.SyncServerHp, (short)_target.ActorInfo.SyncServerHpEx);
+ }
- _target.ActorInfo.ResetHp((int)_target.ActorInfo.SyncServerHp, (short)_target.ActorInfo.SyncServerHpEx);
// 涓昏琛�閲忔墸闄ょ殑琛ュ厖
if (_target.ServerInstID == PlayerDatas.Instance.PlayerId)
{
--
Gitblit v1.8.0