diff --git a/logic/controller/nono.go b/logic/controller/nono.go index 8a8a9373..5ca209ef 100644 --- a/logic/controller/nono.go +++ b/logic/controller/nono.go @@ -16,7 +16,7 @@ func (h Controller) NonoFollowOrHome(data *nono.NonoFollowOrHomeInInfo, c *playe SuperStage: data.Flag, Flag: data.Flag, Nick: "", - Color: 0, + Color: c.Info.NONO.NonoColor, Power: 0, } diff --git a/logic/controller/user_action.go b/logic/controller/user_action.go index 8e2a9f04..88ca8f16 100644 --- a/logic/controller/user_action.go +++ b/logic/controller/user_action.go @@ -106,7 +106,7 @@ func (h Controller) ChangeNONOColor(data *user.ChangeNONOColorInboundInfo, playe player.Info.NONO.NonoColor = data.Color result = &user.ChangeNONOColorOutboundInfo{ - Sataus: player.Info.UserID, + UserID: player.Info.UserID, Color: player.Info.Color, } player.GetSpace().Broadcast(player, data.Head.CMD, result) diff --git a/logic/service/fight/effect/effect_status.go b/logic/service/fight/effect/effect_status.go index 7f0e4b29..7dddd2eb 100644 --- a/logic/service/fight/effect/effect_status.go +++ b/logic/service/fight/effect/effect_status.go @@ -99,8 +99,8 @@ type ParasiticSeed struct { } func (e *ParasiticSeed) SwitchOut(in *input.Input) bool { - - if in == e.Ctx().Our { + //如果我放切换 + if in == e.Ctx().Our && e.Ctx().Our.CurrentPet.GetHP().IntPart() != 0 { e.Alive(false) } return true diff --git a/logic/service/user/chat.go b/logic/service/user/chat.go index 0519176b..d7a21d0a 100644 --- a/logic/service/user/chat.go +++ b/logic/service/user/chat.go @@ -44,7 +44,7 @@ type ChangeNONOColorInboundInfo struct { Color uint32 `codec:"color"` // 更改的颜色 rgb (对应Java的@UInt long) } type ChangeNONOColorOutboundInfo struct { - Sataus uint32 `codec:"userId"` // 更改人的用户id (对应Java的@UInt long) + UserID uint32 `codec:"userId"` // 更改人的用户id (对应Java的@UInt long) Color uint32 `codec:"color"` // 前端发来的更改的颜色rgb值 (对应Java的@UInt long) }