移除了 logic/controller/room.go 中已废弃的房间相关控制器方法,包括获取基地物品、展示精灵及房间家具的方法。同时,在 logic/service/room/FitmentShowInfo.go 中对家具展示信息结构进行了重构,引入了 model.FitmentShowInfo 并新增 SET_FITMENT 和 NullInfo 结构体以支持新的数据协议。另外,在 pet.go 中增加 PetInfo_One_ohter 方法用于查询指定用户的宠物信息,并在 user.go 中为 UserService 添加 RoomService 支持。
35 lines
884 B
Go
35 lines
884 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_PetShowList, c *player.Player) (result *room.S2C_PET_ROOM_SHOW, err errorcode.ErrorCode) {
|
|
|
|
c.Service.Room.Show(data.CatchTime)
|
|
result = &room.S2C_PET_ROOM_SHOW{}
|
|
r := c.Service.Room.Get(c.Info.UserID)
|
|
result.PetShowList = make([]pet.PetShortInfo, len(r.ShowPokemon))
|
|
for _, v := range r.ShowPokemon {
|
|
r1 := c.Service.Pet.PetInfo_One(v)
|
|
var r12 pet.PetShortInfo
|
|
copier.Copy(&r12, &r1)
|
|
result.PetShowList = append(result.PetShowList, r12)
|
|
}
|
|
|
|
return
|
|
}
|