diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 4d0701a6..c2266f38 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -264,7 +264,14 @@ func (c *ChargeMod) BackData() *msg.ResCharge { ChessId: int32(v.Id), } } - + resWish := &msg.WishList{} + if c.WishList != nil { + resWish = &msg.WishList{ + Id: int32(c.WishList.ItemId), + Count: int32(c.WishList.Count), + Uid: c.WishList.SendList, + } + } return &msg.ResCharge{ Charge: float32(c.Charge), Total: int32(c.Total), @@ -278,11 +285,7 @@ func (c *ChargeMod) BackData() *msg.ResCharge { SpecialChargeWeek: int32(GoUtil.FullWeeksSince(c.LastSpecialCharge)), TodayCharge: float32(c.TodayCharge), MonthCharge: float32(c.MonthCharge), - Wish: &msg.WishList{ - Id: int32(c.WishList.ItemId), - Count: int32(c.WishList.Count), - Uid: c.WishList.SendList, - }, + Wish: resWish, } }