From c608d2e90f7b43621bb46652d5f584e1db2ac7dc Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 22 Aug 2023 16:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E8=A1=80=E5=8A=A0=E8=A1=80=20?=
 =?UTF-8?q?=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/stonehenge/api_event.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go
index 0aeb35a4d..7de2b760a 100644
--- a/modules/stonehenge/api_event.go
+++ b/modules/stonehenge/api_event.go
@@ -231,6 +231,10 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 			objId := szHero[v]
 			maxHp := stone.Hero[objId].Property[battle.AttributesTransBase("hp")]
 			stone.Hero[objId].Currhp += int32(math.Floor(float64(maxHp*eventConf.Value1) / 1000)) // 回血
+			// 血量上限处理
+			if stone.Hero[objId].Currhp > maxHp {
+				stone.Hero[objId].Currhp = maxHp
+			}
 		}
 		update["hero"] = stone.Hero
 	case EventType19:
@@ -245,6 +249,9 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		for _, v := range comm.GetRandWs(sz, eventConf.Value2) {
 			objId := szHero[v]
 			stone.Hero[objId].Currhp -= int32(math.Floor(float64(stone.Hero[objId].Currhp*eventConf.Value1) / 1000)) // 扣除当前生命值X（千分比）
+			if stone.Hero[objId].Currhp <= 0 {                                                                       // 不能扣死英雄
+				stone.Hero[objId].Currhp = 1
+			}
 		}
 		update["hero"] = stone.Hero
 	case EventType20: // 克隆一名英雄