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 {