From 53cf3191c2ca142e4e72f2383e1f425f0b80cf37 Mon Sep 17 00:00:00 2001 From: xinian Date: Sun, 8 Mar 2026 18:43:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=88=98=E6=96=97?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E9=94=81=E4=B8=8E=E7=BB=93=E6=9D=9F=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic/service/fight/effect/effect_68.go | 4 ++-- logic/service/fight/fightc.go | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/logic/service/fight/effect/effect_68.go b/logic/service/fight/effect/effect_68.go index e97133db1..350d4f521 100644 --- a/logic/service/fight/effect/effect_68.go +++ b/logic/service/fight/effect/effect_68.go @@ -26,10 +26,10 @@ func (e *Effect68) DamageLockEx(t *info.DamageZone) bool { if t.Type != info.DamageType.Red { return true } - if e.Ctx().Our.CurrentPet.GetHP().Cmp(alpacadecimal.NewFromInt(1)) <= 0 { + if e.Ctx().Our.CurrentPet.GetHP().IntPart() <= 1 { return true } - if t.Damage.Cmp(e.Ctx().Our.CurrentPet.GetHP()) > 0 { + if t.Damage.Cmp(e.Ctx().Our.CurrentPet.GetHP()) >= 0 { t.Damage = e.Ctx().Our.CurrentPet.GetHP().Sub(alpacadecimal.NewFromInt(1)) } diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index f21072aaf..de1e6e301 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -329,9 +329,15 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction) } }) f.Switch = make(map[uint32]*action.ActiveSwitchAction) - // if f.closefight && f.Info.Mode == info.BattleMode.PET_MELEE { - // return - // } + if f.closefight && f.Info.Mode == info.BattleMode.PET_MELEE { + f.Broadcast(func(fighter *input.Input) { + if fighter.UserID != f.WinnerId { + fighter.Player.SendPackCmd(2505, &attackValueResult) + } + + }) + return + } f.Broadcast(func(fighter *input.Input) { fighter.Player.SendPackCmd(2505, &attackValueResult) fighter.CanChange = 0