1

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,
 	}
 

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)

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

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)
 
 }