```
refactor(common): 统一使用 common.TomeeHeader 替代 player.TomeeHeader 将多处
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
package user
|
||||
|
||||
import "blazing/logic/service/player"
|
||||
import "blazing/logic/service/common"
|
||||
|
||||
type CreatePlayerInboundInfo struct { //这里直接使用组合来实现将传入的原始头部数据和结构体参数序列化
|
||||
Head player.TomeeHeader `cmd:"108" struc:"[0]pad"` //玩家登录
|
||||
Head common.TomeeHeader `cmd:"108" struc:"[0]pad"` //玩家登录
|
||||
|
||||
// 玩家昵称,@ArraySerialize注解
|
||||
Nickname string `struc:"[16]byte"` // 固定长度16字节
|
||||
@@ -17,7 +17,7 @@ type CreatePlayerOutInfo struct {
|
||||
}
|
||||
|
||||
type ChangePlayerNameInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2061" struc:"[0]pad"` //玩家登录
|
||||
Head common.TomeeHeader `cmd:"2061" struc:"[0]pad"` //玩家登录
|
||||
|
||||
// 玩家昵称
|
||||
Nickname string `struc:"[16]byte"` // 固定长度16字节
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"blazing/logic/service/player"
|
||||
)
|
||||
import "blazing/logic/service/common"
|
||||
|
||||
//var _ entity.Blazingservice = (*SidInfo)(nil)
|
||||
|
||||
type SidInfo struct { //这里直接使用组合来实现将传入的原始头部数据和结构体参数序列化
|
||||
Head player.TomeeHeader `cmd:"105" struc:"[0]pad"` //玩家登录
|
||||
Head common.TomeeHeader `cmd:"105" struc:"[0]pad"` //玩家登录
|
||||
|
||||
Sid []byte `struc:"[20]byte"` // 登录会话ID,固定长度16字节
|
||||
// ret []byte `struc:"[0]pad"`
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"blazing/logic/service/player"
|
||||
"blazing/logic/service/common"
|
||||
"blazing/modules/blazing/model"
|
||||
)
|
||||
|
||||
type SimUserInfoInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2051" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2051" struc:"[0]pad"`
|
||||
UserId uint32 `fieldDescription:"米米号" uint:"true" codec:"true"`
|
||||
}
|
||||
type SimUserInfoOutboundInfo struct {
|
||||
@@ -71,7 +71,7 @@ type SimUserInfoOutboundInfo struct {
|
||||
Clothes []model.PeopleItemInfo `codec:"true"`
|
||||
}
|
||||
type MoreUserInfoInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2052" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2052" struc:"[0]pad"`
|
||||
UserId uint32 `fieldDescription:"米米号" uint:"true" codec:"true"`
|
||||
}
|
||||
type MoreUserInfoOutboundInfo struct {
|
||||
@@ -121,7 +121,7 @@ type MoreUserInfoOutboundInfo struct {
|
||||
|
||||
// AimatInboundInfo 对应Java的AimatInboundInfo类
|
||||
type AimatInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2104" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2104" struc:"[0]pad"`
|
||||
ItemId uint32 `description:"物品id 射击激光 物品id为0" codec:"auto" uint:"true"`
|
||||
ShootType uint32 `description:"射击类型 未知 给0" codec:"auto" uint:"true"`
|
||||
Point model.Pos `description:"射击的坐标 x y" codec:"auto"` // 默认值对应@Builder.Default
|
||||
|
||||
@@ -2,7 +2,7 @@ package user
|
||||
|
||||
import (
|
||||
"blazing/common/data/share"
|
||||
"blazing/logic/service/player"
|
||||
"blazing/logic/service/common"
|
||||
|
||||
"blazing/modules/blazing/model"
|
||||
"context"
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
|
||||
// LoginSidInfo 登录携带的凭证结构体
|
||||
type MAIN_LOGIN_IN struct { //这里直接使用组合来实现将传入的原始头部数据和结构体参数序列化
|
||||
Head player.TomeeHeader `cmd:"1001" struc:"[0]pad"` //玩家登录
|
||||
Head common.TomeeHeader `cmd:"1001" struc:"[0]pad"` //玩家登录
|
||||
|
||||
Sid []byte `struc:"[16]byte"` // 登录会话ID,固定长度16字节
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package user
|
||||
|
||||
import "blazing/logic/service/player"
|
||||
import "blazing/logic/service/common"
|
||||
|
||||
type ChatInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2102" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2102" struc:"[0]pad"`
|
||||
Reserve uint32 `json:"reserve" fieldDescription:"填充 默认值为0" uint:"true"` // @UInt long reserve,无符号长整数
|
||||
MessageLen uint32 `struc:"sizeof=Message"`
|
||||
Message string `json:"message" fieldDescription:"消息内容, 结束符为utf-8的数字0"` // 消息内容,包含utf-8空字符('\x00')作为结束符
|
||||
@@ -16,7 +16,7 @@ type ChatOutboundInfo struct {
|
||||
Message string `description:"这里的内容没有结束符" codec:"string"` // String -> string
|
||||
}
|
||||
type ChangeColorInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2063" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2063" struc:"[0]pad"`
|
||||
|
||||
Color uint32 `codec:"color"` // 更改的颜色 rgb (对应Java的@UInt long)
|
||||
}
|
||||
@@ -27,7 +27,7 @@ type ChangeColorOutboundInfo struct {
|
||||
Coins uint32 `codec:"coins"` // 扣除200豆子后返回的剩余豆子 (对应Java的@UInt long)
|
||||
}
|
||||
type ChangeDoodleInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"2062" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"2062" struc:"[0]pad"`
|
||||
Id uint32 `codec:"id"` // 涂鸦ID (对应Java的@UInt long)
|
||||
Color uint32 `codec:"color"` // 前端发来的更改的颜色rgb值 (对应Java的@UInt long)
|
||||
}
|
||||
@@ -39,7 +39,7 @@ type ChangeDoodleOutboundInfo struct {
|
||||
Coins uint32 `codec:"coins"` // 扣除对应豆子后返回的剩余豆子 (对应Java的@UInt long)
|
||||
}
|
||||
type ChangeNONOColorInboundInfo struct {
|
||||
Head player.TomeeHeader `cmd:"9012" struc:"[0]pad"`
|
||||
Head common.TomeeHeader `cmd:"9012" struc:"[0]pad"`
|
||||
|
||||
Color uint32 `codec:"color"` // 更改的颜色 rgb (对应Java的@UInt long)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user