移除了 logic/controller/room.go 中已废弃的房间相关控制器方法,包括获取基地物品、展示精灵及房间家具的方法。同时,在 logic/service/room/FitmentShowInfo.go 中对家具展示信息结构进行了重构,引入了 model.FitmentShowInfo 并新增 SET_FITMENT 和 NullInfo 结构体以支持新的数据协议。另外,在 pet.go 中增加 PetInfo_One_ohter 方法用于查询指定用户的宠物信息,并在 user.go 中为 UserService 添加 RoomService 支持。
55 lines
1.7 KiB
Go
55 lines
1.7 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"blazing/modules/blazing/model"
|
|
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/room"
|
|
)
|
|
|
|
// 获取基地物品
|
|
func (h Controller) OnFitmentUsering(data *room.FitmentUseringInboundInfo, c *player.Player) (result *room.FitmentUseringOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
result = &room.FitmentUseringOutboundInfo{UserId: c.Info.UserID, RoomId: data.TargetUserID}
|
|
result.Fitments = make([]model.FitmentShowInfo, 0)
|
|
result.Fitments = append(result.Fitments, model.FitmentShowInfo{Id: 500001, Status: 1, X: 1, Y: 1, Dir: 1})
|
|
|
|
r := c.Service.Room.Get(data.TargetUserID)
|
|
result.Fitments = append(result.Fitments, r.PlacedItems...)
|
|
|
|
return
|
|
}
|
|
|
|
// 获取基地展示精灵
|
|
func (h Controller) OnGetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *player.Player) (result *room.PetRoomListOutboundInfo, err errorcode.ErrorCode) {
|
|
result = &room.PetRoomListOutboundInfo{}
|
|
result.Pets = make([]room.PetShowInfo, 0)
|
|
r := c.Service.Room.Get(data.TargetUserID)
|
|
for _, v := range r.ShowPokemon {
|
|
pet := c.Service.Pet.PetInfo_One_ohter(data.TargetUserID, v)
|
|
if pet.Data.ID == 0 {
|
|
continue
|
|
}
|
|
result.Pets = append(result.Pets, room.PetShowInfo{CatchTime: v, TypeId: pet.Data.ID})
|
|
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
// 获取自己房间的家具
|
|
func (h Controller) OnGetFitmentAll(data *room.FitmentAllInboundEmpty, c *player.Player) (result *room.FitmentAllOutboundInfo, err errorcode.ErrorCode) {
|
|
result = &room.FitmentAllOutboundInfo{}
|
|
result.Fitments = make([]room.FitmentItemInfo, 0)
|
|
|
|
r := c.Service.Room.Get(c.Info.UserID)
|
|
|
|
for k, v := range r.OwnedItems {
|
|
|
|
result.Fitments = append(result.Fitments, room.FitmentItemInfo{Id: k, AllCount: v, UsedCount: r.UserItems[k]})
|
|
}
|
|
|
|
return
|
|
}
|