From a8ca0f1a2fd8c0e09ea079f8acbc50e248e1bd4c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 22 五月 2019 18:09:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/Actor/Skill/AttackHandler.cs | 11 +++++++++--
System/Alchemy/AlchemyUseDrugCell.cs | 3 +++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Fight/Actor/Skill/AttackHandler.cs b/Fight/Actor/Skill/AttackHandler.cs
index 51c740f..cb2c100 100644
--- a/Fight/Actor/Skill/AttackHandler.cs
+++ b/Fight/Actor/Skill/AttackHandler.cs
@@ -211,7 +211,7 @@
if (attacker is GA_NpcClientFightNorm)
{
- if ((target.ActorInfo.RealHp - (ulong)hurtValue) <= (target.ActorInfo.RealMaxHp * .5f))
+ if ((target.ActorInfo.RealHp - (ulong)realHurtValue) <= (target.ActorInfo.RealMaxHp * .5f))
{
hurtValue = 0;
realHurtValue = 0;
@@ -242,7 +242,14 @@
if (_doReduceHp)
{
- target.ActorInfo.ReduceHp((uint)realHurtValue);
+ if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)
+ {
+ target.ActorInfo.ReduceHp((uint)hurtValue);
+ }
+ else
+ {
+ target.ActorInfo.ReduceHp((uint)realHurtValue);
+ }
}
if (target.ServerInstID == PlayerDatas.Instance.baseData.PlayerID)
diff --git a/System/Alchemy/AlchemyUseDrugCell.cs b/System/Alchemy/AlchemyUseDrugCell.cs
index 978d2e7..715e9de 100644
--- a/System/Alchemy/AlchemyUseDrugCell.cs
+++ b/System/Alchemy/AlchemyUseDrugCell.cs
@@ -31,6 +31,9 @@
ItemTipUtility.Show(itemId);
});
+ m_Item.countText.gameObject.SetActive(count > 0);
+ m_Item.countText.text = count.ToString();
+
var eatTimes = 0;
AlchemyDrugUseLimit drugUseLimit;
--
Gitblit v1.8.0