昔念
648e963562
feat(room): 更新房间宠物展示逻辑并优化数据结构 - 修改 `OnGetRoomPetShowInfo` 方法，使用 `pet.PetShortInfo` 替代原有的 `room.PetShowInfo` 结构体 - 引入 `github.com/jinzhu/copier` 实现结构体字段自动复制 - 调整 `SET_Pet` 接口实现逻辑以支持批量设置展示中的宠物 - 更新 `PetRoomListOutboundInfo` 中 Pets 字段类型为 `[]pet.PetShortInfo` - 将 `RoomService.Show` 方法参数由单个 uint32 改为切片 []uint32 以支持多宠物展示 - 修改数据库表名常量 `TableNameBaseHouse` 从 "base_house" 更名为 "room_house
42 lines
976 B
Go
42 lines
976 B
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"blazing/logic/service/pet"
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/room"
|
|
|
|
"github.com/jinzhu/copier"
|
|
)
|
|
|
|
// 基地设置
|
|
func (h Controller) SET_FITMENT(data *room.SET_FITMENT, c *player.Player) (result *room.NullInfo, err errorcode.ErrorCode) {
|
|
|
|
c.Service.Room.Set(data.Fitments)
|
|
|
|
return
|
|
}
|
|
|
|
func (h Controller) SET_Pet(data *room.C2S_PET_ROOM_SHOW, c *player.Player) (result *room.S2C_PET_ROOM_SHOW, err errorcode.ErrorCode) {
|
|
var showpet []uint32
|
|
for _, v := range data.PetShowList {
|
|
showpet = append(showpet, v.CatchTime)
|
|
|
|
}
|
|
c.Service.Room.Show(showpet)
|
|
result = &room.S2C_PET_ROOM_SHOW{}
|
|
|
|
result.PetShowList = make([]pet.PetShortInfo, len(showpet))
|
|
for _, v := range showpet {
|
|
r1 := c.Service.Pet.PetInfo_One(v)
|
|
if r1.Data.ID == 0 {
|
|
continue
|
|
|
|
}
|
|
var r12 pet.PetShortInfo
|
|
copier.Copy(&r12, &r1.Data)
|
|
result.PetShowList = append(result.PetShowList, r12)
|
|
}
|
|
return
|
|
}
|