From c252d6b5f937933267e83b74474850e5e8012220 Mon Sep 17 00:00:00 2001 From: xinian Date: Sun, 8 Mar 2026 18:25:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic/service/fight/effect/effect_68.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/logic/service/fight/effect/effect_68.go b/logic/service/fight/effect/effect_68.go index fb758b066..e97133db1 100644 --- a/logic/service/fight/effect/effect_68.go +++ b/logic/service/fight/effect/effect_68.go @@ -26,7 +26,12 @@ func (e *Effect68) DamageLockEx(t *info.DamageZone) bool { if t.Type != info.DamageType.Red { return true } - t.Damage = alpacadecimal.Min(e.Ctx().Our.CurrentPet.GetHP().Sub(alpacadecimal.NewFromInt(1)), t.Damage) + if e.Ctx().Our.CurrentPet.GetHP().Cmp(alpacadecimal.NewFromInt(1)) <= 0 { + return true + } + if t.Damage.Cmp(e.Ctx().Our.CurrentPet.GetHP()) > 0 { + t.Damage = e.Ctx().Our.CurrentPet.GetHP().Sub(alpacadecimal.NewFromInt(1)) + } return true }