From c154302af40df5d28a4ddd895206bc09f8ee8bc1 Mon Sep 17 00:00:00 2001 From: xinian Date: Sun, 8 Mar 2026 17:48:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DEffect=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic/service/fight/input/effect.go | 7 +++++-- logic/service/fight/input/input.go | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/logic/service/fight/input/effect.go b/logic/service/fight/input/effect.go index 97dcc478..48f90e09 100644 --- a/logic/service/fight/input/effect.go +++ b/logic/service/fight/input/effect.go @@ -80,9 +80,12 @@ func geteffect[T int | byte | uint16](etype EnumEffectType, id T) Effect { } return nil } -func (our *Input) InitEffect(etype EnumEffectType, id int) Effect { +func (our *Input) InitEffect(etype EnumEffectType, id int, a ...int) Effect { ret := geteffect(etype, id) - ret.SetArgs(our) //输入参数是对方 + if ret != nil { + ret.SetArgs(our, a...) //输入参数是对方 + } + return ret } diff --git a/logic/service/fight/input/input.go b/logic/service/fight/input/input.go index 215b78e6..c0c458ed 100644 --- a/logic/service/fight/input/input.go +++ b/logic/service/fight/input/input.go @@ -70,7 +70,7 @@ func (our *Input) SortPet() { for _, s := range our.AllPet { if s.Info.Hp > 0 { for _, e1 := range s.Info.EffectInfo { - t := our.InitEffect(EffectType.NewSel, int(e1.EID)) + t := our.InitEffect(EffectType.NewSel, int(e1.EID), e1.Args...) if t != nil { ef := t.ID() if cool.Config.ServerInfo.IsDebug != 0 { @@ -82,7 +82,7 @@ func (our *Input) SortPet() { t.ID(ef) t.Duration(-1) - t.SetArgs(our, e1.Args...) //设置入参,施加方永远是我方 + our.AddEffect(our, t) }