diff --git a/logic/controller/pet.go b/logic/controller/pet.go index 03ea1010f..cf701ec6b 100644 --- a/logic/controller/pet.go +++ b/logic/controller/pet.go @@ -6,6 +6,8 @@ import ( "blazing/logic/service/pet" "blazing/modules/blazing/service" blservice "blazing/modules/blazing/service" + + "github.com/jinzhu/copier" ) // 获取精灵信息 @@ -30,13 +32,11 @@ func (h *Controller) GetPetList( tt := blservice.NewUserService(c.Info.UserID).GetPetList(0) //获得未放生的精灵 result.ShortInfoList = make([]pet.PetShortInfo, len(tt)) for i, v := range tt { - result.ShortInfoList[i] = pet.PetShortInfo{ - TypeId: v.ID, - CatchTime: v.CatchTime, - } + copier.Copy(&result.ShortInfoList[i], &v) + } - return + return result, 0 } diff --git a/logic/service/pet/list.go b/logic/service/pet/list.go index 56d7eb491..6eb3feb9e 100644 --- a/logic/service/pet/list.go +++ b/logic/service/pet/list.go @@ -12,6 +12,9 @@ type GetPetListOutboundInfo struct { // PetShortInfo 精灵简要信息结构体 type PetShortInfo struct { - TypeId uint32 // 精灵类型ID + ID uint32 // 精灵类型ID(对应Java中的id) CatchTime uint32 // 精灵生成时间 + Level uint32 // 精灵等级 + SkinID uint32 // 精灵皮肤ID + Shiny uint32 // 精灵是否闪光(0=否,1=是) }