昔念
6368e2f2e9
新增 Controller.RoomPetInfo 方法用于获取指定用户的房间宠物详细信息， 同时修复了宠物展示时可能因空数据导致的问题。在设置房间宠物展示和 处理房间装饰时增加对 CatchTime 和 ID
71 lines
2.2 KiB
Go
71 lines
2.2 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"blazing/modules/blazing/model"
|
|
|
|
"blazing/logic/service/pet"
|
|
"blazing/logic/service/player"
|
|
"blazing/logic/service/room"
|
|
|
|
"github.com/jinzhu/copier"
|
|
)
|
|
|
|
// 获取基地物品
|
|
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([]pet.PetShortInfo, 0)
|
|
r := c.Service.Room.Get(data.TargetUserID)
|
|
for _, v := range r.ShowPokemon {
|
|
pet12 := c.Service.Pet.PetInfo_One_ohter(data.TargetUserID, v)
|
|
if pet12.Data.ID == 0 {
|
|
continue
|
|
}
|
|
var pet1 pet.PetShortInfo
|
|
copier.Copy(&pet1, &pet12.Data)
|
|
if pet12.ID != 0 {
|
|
result.Pets = append(result.Pets, pet1)
|
|
}
|
|
|
|
}
|
|
|
|
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
|
|
}
|
|
func (h Controller) RoomPetInfo(data *room.C2S_RoomPetInfo, c *player.Player) (result *pet.RoomPetInfo, err errorcode.ErrorCode) {
|
|
r := c.Service.Pet.PetInfo_One_ohter(data.UserID, data.CatchTime)
|
|
|
|
result = &pet.RoomPetInfo{}
|
|
copier.CopyWithOption(result, &r.Data, copier.Option{DeepCopy: true})
|
|
result.OwnerId = data.UserID
|
|
|
|
return
|
|
}
|