From bf79c0fd6ad0bf9a40b4edf0d772d002e204445b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <12574910+72wo@users.noreply.github.com> Date: Wed, 4 Mar 2026 14:45:52 +0800 Subject: [PATCH] =?UTF-8?q?```=20refactor(fight):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=89=93=E5=8D=B0=E8=AF=AD=E5=8F=A5=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=98=BB=E5=A1=9E=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除了effect_attr.go中的调试println语句,将注释掉相关的日志输出, 同时在pack.go中更新了锁策略,从SleepBlockStrategy切换到 ConditionBlockStrategy,并移除了未使用的time包导入 ``` --- logic/service/fight/effect/effect_attr.go | 6 +++--- logic/service/player/pack.go | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/logic/service/fight/effect/effect_attr.go b/logic/service/fight/effect/effect_attr.go index 6cb0c28cc..1b4885c07 100644 --- a/logic/service/fight/effect/effect_attr.go +++ b/logic/service/fight/effect/effect_attr.go @@ -99,7 +99,7 @@ func (e *EffectPropSyncReverse) OnSkill() bool { e.opppet = e.Ctx().Opp.CurrentPet e.can = true e.active(true) - + return true } @@ -136,7 +136,7 @@ func (e *EffectPropSyncReverse) active(is bool) { // 还原反转的属性类型(恢复双方原始值) e.ourpet.PetInfo.Type = e.ctx.oldOurType e.ourpet.PetInfo.Type = e.ctx.oldOppType - println("Effect55_o取消效果", e.ourpet.PetInfo.Type, e.opppet.PetInfo.Type) + // println("Effect55_o取消效果", e.ourpet.PetInfo.Type, e.opppet.PetInfo.Type) case opTypeSync: // 还原同步的属性类型 e.ourpet.PetInfo.Type = e.ctx.oldOurType @@ -159,7 +159,7 @@ func (e *EffectPropSyncReverse) active(is bool) { e.ctx.oldOurType = e.ourpet.PetInfo.Type e.ctx.oldOppType = e.opppet.PetInfo.Type e.ourpet.PetInfo.Type, e.opppet.PetInfo.Type = e.opppet.PetInfo.Type, e.ourpet.PetInfo.Type - println("Effect55_o激活效果", e.ourpet.PetInfo.Type, e.opppet.PetInfo.Type) + // println("Effect55_o激活效果", e.ourpet.PetInfo.Type, e.opppet.PetInfo.Type) case opTypeSync: // 同步属性类型:保存我方原始值,覆盖为对方值 e.ctx.oldOurType = e.ourpet.PetInfo.Type diff --git a/logic/service/player/pack.go b/logic/service/player/pack.go index 7eb97cc98..6c72adc90 100644 --- a/logic/service/player/pack.go +++ b/logic/service/player/pack.go @@ -7,7 +7,6 @@ import ( "encoding/binary" "encoding/hex" "sync" - "time" "context" @@ -245,7 +244,7 @@ func NewClientData(c gnet.Conn) *ClientData { cd.LF = lockfree.NewLockfree( 8, cd, - lockfree.NewSleepBlockStrategy(time.Millisecond), + lockfree.NewConditionBlockStrategy(), ) // // // 启动Lockfree if err := cd.LF.Start(); err != nil {