refactor(socket): 重构 socket 模块
- 移除 common/data/socket 目录下的大部分文件 - 新增 service 目录,将 Player 和 Conn 结构体移至该目录 - 更新 LogicClient 中的方法签名,使用 service 包的类型 - 重构 Controller 中的方法,适应新的 service 包结构
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"blazing/common/data/socket"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/logic/service"
|
||||
"blazing/logic/service/pet"
|
||||
"blazing/modules/blazing/service"
|
||||
|
||||
blservice "blazing/modules/blazing/service"
|
||||
|
||||
"github.com/jinzhu/copier"
|
||||
@@ -13,10 +13,10 @@ import (
|
||||
// 获取精灵信息
|
||||
func (h *Controller) GetPetInfo(
|
||||
data *pet.InInfo,
|
||||
c *socket.Player) (result *pet.OutInfo,
|
||||
c *service.Player) (result *pet.OutInfo,
|
||||
err errorcode.ErrorCode) { //这个时候player应该是空的
|
||||
|
||||
t := service.NewUserService(c.Info.UserID).GetPetInfo(data.CatchTime)
|
||||
t := blservice.NewUserService(c.Info.UserID).GetPetInfo(data.CatchTime)
|
||||
return &pet.OutInfo{
|
||||
PetInfo: t,
|
||||
}, 0
|
||||
@@ -25,7 +25,7 @@ func (h *Controller) GetPetInfo(
|
||||
// 获取仓库列表
|
||||
func (h *Controller) GetPetList(
|
||||
data *pet.GetPetListInboundEmpty,
|
||||
c *socket.Player) (result *pet.GetPetListOutboundInfo,
|
||||
c *service.Player) (result *pet.GetPetListOutboundInfo,
|
||||
err errorcode.ErrorCode) { //这个时候player应该是空的
|
||||
result = &pet.GetPetListOutboundInfo{}
|
||||
|
||||
@@ -43,7 +43,7 @@ func (h *Controller) GetPetList(
|
||||
// 精灵背包仓库切换
|
||||
func (h *Controller) PetRelease(
|
||||
data *pet.PetReleaseInboundInfo,
|
||||
c *socket.Player) (
|
||||
c *service.Player) (
|
||||
result *pet.PetReleaseOutboundInfo,
|
||||
err errorcode.ErrorCode) { //这个时候player应该是空的
|
||||
//放入背包=数据库置1+添加到背包+pet release发包 仓库=数据库置0+移除背包 设置首发等于取到首发精灵后重新排序
|
||||
@@ -51,7 +51,7 @@ func (h *Controller) PetRelease(
|
||||
result = &pet.PetReleaseOutboundInfo{}
|
||||
result.Flag = uint32(data.Flag)
|
||||
|
||||
t := service.NewUserService(c.Info.UserID).PetM(int(data.CatchTime), int(data.Flag))
|
||||
t := blservice.NewUserService(c.Info.UserID).PetM(int(data.CatchTime), int(data.Flag))
|
||||
switch data.Flag {
|
||||
case 0:
|
||||
//todo 仓库
|
||||
|
||||
Reference in New Issue
Block a user