liuxiaobo/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除package pb。添加帐号不存在错误

Browse Source
This commit is contained in:
liuxiaobo 2025-07-05 15:47:21 +08:00
parent 04d2adf592
commit e6c04a248a
13 changed files with 296 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pb

@ -1 +1 @@
Subproject commit 69251e972aa796db84661a9a8c73150c7fa9e34f Subproject commit 3f1fff3055f57b712b4fbcc005c067594867463f

34
common/proto/pb/chat.pb.go
View File

@ -79,8 +79,8 @@ type ReqChat struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
SrcUser *ChatUser `protobuf:"bytes,1,opt,name=srcUser,proto3" json:"srcUser,omitempty"` // 说话的人 SrcUser *ChatUser `protobuf:"bytes,1,opt,name=srcUser,proto3" json:"srcUser,omitempty"` // 说话的人
DstUser *ChatUser `protobuf:"bytes,2,opt,name=dstUser,proto3" json:"dstUser,omitempty"` // 接收者 DstUser *ChatUser `protobuf:"bytes,2,opt,name=dstUser,proto3" json:"dstUser,omitempty"` // 接收者
Type ChatType `protobuf:"varint,3,opt,name=type,proto3,enum=pb.ChatType" json:"type,omitempty"` // 聊天类型 Type ChatType `protobuf:"varint,3,opt,name=type,proto3,enum=ChatType" json:"type,omitempty"` // 聊天类型
GameId ServiceTypeId `protobuf:"varint,4,opt,name=gameId,proto3,enum=pb.ServiceTypeId" json:"gameId,omitempty"` // 游戏id，只在本玩法中显示的聊天信息 GameId ServiceTypeId `protobuf:"varint,4,opt,name=gameId,proto3,enum=ServiceTypeId" json:"gameId,omitempty"` // 游戏id，只在本玩法中显示的聊天信息
Content string `protobuf:"bytes,5,opt,name=content,proto3" json:"content,omitempty"` // 内容 Content string `protobuf:"bytes,5,opt,name=content,proto3" json:"content,omitempty"` // 内容
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -156,13 +156,13 @@ var File_chat_proto protoreflect.FileDescriptor
const file_chat_proto_rawDesc = "" + const file_chat_proto_rawDesc = "" +
"\n" + "\n" +
"\n" + "\n" +
"chat.proto\x12\x02pb\x1a\n" + "chat.proto\x1a\n" +
"user.proto\x1a\rservice.proto\"\xc0\x01\n" + "user.proto\x1a\rservice.proto\"\xb4\x01\n" +
"\aReqChat\x12&\n" + "\aReqChat\x12#\n" +
"\asrcUser\x18\x01 \x01(\v2\f.pb.ChatUserR\asrcUser\x12&\n" + "\asrcUser\x18\x01 \x01(\v2\t.ChatUserR\asrcUser\x12#\n" +
"\adstUser\x18\x02 \x01(\v2\f.pb.ChatUserR\adstUser\x12 \n" + "\adstUser\x18\x02 \x01(\v2\t.ChatUserR\adstUser\x12\x1d\n" +
"\x04type\x18\x03 \x01(\x0e2\f.pb.ChatTypeR\x04type\x12)\n" + "\x04type\x18\x03 \x01(\x0e2\t.ChatTypeR\x04type\x12&\n" +
"\x06gameId\x18\x04 \x01(\x0e2\x11.pb.ServiceTypeIdR\x06gameId\x12\x18\n" + "\x06gameId\x18\x04 \x01(\x0e2\x0e.ServiceTypeIdR\x06gameId\x12\x18\n" +
"\acontent\x18\x05 \x01(\tR\acontent*H\n" + "\acontent\x18\x05 \x01(\tR\acontent*H\n" +
"\bChatType\x12\x0e\n" + "\bChatType\x12\x0e\n" +
"\n" + "\n" +
@ -188,16 +188,16 @@ func file_chat_proto_rawDescGZIP() []byte {
var file_chat_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_chat_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_chat_proto_goTypes = []any{ var file_chat_proto_goTypes = []any{
(ChatType)(0), // 0: pb.ChatType (ChatType)(0), // 0: ChatType
(*ReqChat)(nil), // 1: pb.ReqChat (*ReqChat)(nil), // 1: ReqChat
(*ChatUser)(nil), // 2: pb.ChatUser (*ChatUser)(nil), // 2: ChatUser
(ServiceTypeId)(0), // 3: pb.ServiceTypeId (ServiceTypeId)(0), // 3: ServiceTypeId
} }
var file_chat_proto_depIdxs = []int32{ var file_chat_proto_depIdxs = []int32{
2, // 0: pb.ReqChat.srcUser:type_name -> pb.ChatUser 2, // 0: ReqChat.srcUser:type_name -> ChatUser
2, // 1: pb.ReqChat.dstUser:type_name -> pb.ChatUser 2, // 1: ReqChat.dstUser:type_name -> ChatUser
0, // 2: pb.ReqChat.type:type_name -> pb.ChatType 0, // 2: ReqChat.type:type_name -> ChatType
3, // 3: pb.ReqChat.gameId:type_name -> pb.ServiceTypeId 3, // 3: ReqChat.gameId:type_name -> ServiceTypeId
4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension type_name

14
common/proto/pb/client.pb.go
View File

@ -23,7 +23,7 @@ const (
type ClientMsg struct { type ClientMsg struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
ServiceTid ServiceTypeId `protobuf:"varint,1,opt,name=service_tid,json=serviceTid,proto3,enum=pb.ServiceTypeId" json:"service_tid,omitempty"` // 服务id ServiceTid ServiceTypeId `protobuf:"varint,1,opt,name=service_tid,json=serviceTid,proto3,enum=ServiceTypeId" json:"service_tid,omitempty"` // 服务id
ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` // 具体的服务节点名(客户端进入新的场景，保存该节点名，提高路由速度) ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` // 具体的服务节点名(客户端进入新的场景，保存该节点名，提高路由速度)
UserId int64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // 玩家id UserId int64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` // 玩家id
MsgId int32 `protobuf:"varint,4,opt,name=msg_id,json=msgId,proto3" json:"msg_id,omitempty"` // 消息id MsgId int32 `protobuf:"varint,4,opt,name=msg_id,json=msgId,proto3" json:"msg_id,omitempty"` // 消息id
@ -101,9 +101,9 @@ var File_client_proto protoreflect.FileDescriptor
const file_client_proto_rawDesc = "" + const file_client_proto_rawDesc = "" +
"\n" + "\n" +
"\fclient.proto\x12\x02pb\x1a\rservice.proto\"\xa6\x01\n" + "\fclient.proto\x1a\rservice.proto\"\xa3\x01\n" +
"\tClientMsg\x122\n" + "\tClientMsg\x12/\n" +
"\vservice_tid\x18\x01 \x01(\x0e2\x11.pb.ServiceTypeIdR\n" + "\vservice_tid\x18\x01 \x01(\x0e2\x0e.ServiceTypeIdR\n" +
"serviceTid\x12!\n" + "serviceTid\x12!\n" +
"\fservice_name\x18\x02 \x01(\tR\vserviceName\x12\x17\n" + "\fservice_name\x18\x02 \x01(\tR\vserviceName\x12\x17\n" +
"\auser_id\x18\x03 \x01(\x03R\x06userId\x12\x15\n" + "\auser_id\x18\x03 \x01(\x03R\x06userId\x12\x15\n" +
@ -124,11 +124,11 @@ func file_client_proto_rawDescGZIP() []byte {
var file_client_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_client_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_client_proto_goTypes = []any{ var file_client_proto_goTypes = []any{
(*ClientMsg)(nil), // 0: pb.ClientMsg (*ClientMsg)(nil), // 0: ClientMsg
(ServiceTypeId)(0), // 1: pb.ServiceTypeId (ServiceTypeId)(0), // 1: ServiceTypeId
} }
var file_client_proto_depIdxs = []int32{ var file_client_proto_depIdxs = []int32{
1, // 0: pb.ClientMsg.service_tid:type_name -> pb.ServiceTypeId 1, // 0: ClientMsg.service_tid:type_name -> ServiceTypeId
1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name 1, // [1:1] is the sub-list for extension type_name

10
common/proto/pb/code.pb.go
View File

@ -28,6 +28,7 @@ const (
ErrCode_SystemErr ErrCode = 1 // 系统错误 ErrCode_SystemErr ErrCode = 1 // 系统错误
ErrCode_ParamErr ErrCode = 2 // 参数错误 ErrCode_ParamErr ErrCode = 2 // 参数错误
ErrCode_LoginDiffLoc ErrCode = 100 // 帐号在其它地方登陆 ErrCode_LoginDiffLoc ErrCode = 100 // 帐号在其它地方登陆
ErrCode_AccountNotExist ErrCode = 101 // 没有该帐号
ErrCode_LoginUserOrPwdErr ErrCode = 102 // 帐号或密码错误 ErrCode_LoginUserOrPwdErr ErrCode = 102 // 帐号或密码错误
ErrCode_AccountFrozen ErrCode = 103 // 帐号已冻结 ErrCode_AccountFrozen ErrCode = 103 // 帐号已冻结
ErrCode_AccountBanned ErrCode = 104 // 帐号已封禁 ErrCode_AccountBanned ErrCode = 104 // 帐号已封禁
@ -49,6 +50,7 @@ var (
1: "SystemErr", 1: "SystemErr",
2: "ParamErr", 2: "ParamErr",
100: "LoginDiffLoc", 100: "LoginDiffLoc",
101: "AccountNotExist",
102: "LoginUserOrPwdErr", 102: "LoginUserOrPwdErr",
103: "AccountFrozen", 103: "AccountFrozen",
104: "AccountBanned", 104: "AccountBanned",
@ -66,6 +68,7 @@ var (
"SystemErr": 1, "SystemErr": 1,
"ParamErr": 2, "ParamErr": 2,
"LoginDiffLoc": 100, "LoginDiffLoc": 100,
"AccountNotExist": 101,
"LoginUserOrPwdErr": 102, "LoginUserOrPwdErr": 102,
"AccountFrozen": 103, "AccountFrozen": 103,
"AccountBanned": 104, "AccountBanned": 104,
@ -112,12 +115,13 @@ var File_code_proto protoreflect.FileDescriptor
const file_code_proto_rawDesc = "" + const file_code_proto_rawDesc = "" +
"\n" + "\n" +
"\n" + "\n" +
"code.proto\x12\x02pb*\xa0\x02\n" + "code.proto*\xb5\x02\n" +
"\aErrCode\x12\x06\n" + "\aErrCode\x12\x06\n" +
"\x02OK\x10\x00\x12\r\n" + "\x02OK\x10\x00\x12\r\n" +
"\tSystemErr\x10\x01\x12\f\n" + "\tSystemErr\x10\x01\x12\f\n" +
"\bParamErr\x10\x02\x12\x10\n" + "\bParamErr\x10\x02\x12\x10\n" +
"\fLoginDiffLoc\x10d\x12\x15\n" + "\fLoginDiffLoc\x10d\x12\x13\n" +
"\x0fAccountNotExist\x10e\x12\x15\n" +
"\x11LoginUserOrPwdErr\x10f\x12\x11\n" + "\x11LoginUserOrPwdErr\x10f\x12\x11\n" +
"\rAccountFrozen\x10g\x12\x11\n" + "\rAccountFrozen\x10g\x12\x11\n" +
"\rAccountBanned\x10h\x12\x15\n" + "\rAccountBanned\x10h\x12\x15\n" +
@ -144,7 +148,7 @@ func file_code_proto_rawDescGZIP() []byte {
var file_code_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_code_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_code_proto_goTypes = []any{ var file_code_proto_goTypes = []any{
(ErrCode)(0), // 0: pb.ErrCode (ErrCode)(0), // 0: ErrCode
} }
var file_code_proto_depIdxs = []int32{ var file_code_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method output_type

306
common/proto/pb/colorgame.pb.go
View File

@ -343,7 +343,7 @@ func (ColorPrizeType) EnumDescriptor() ([]byte, []int) {
// 投注区域赔率范围配置信息 // 投注区域赔率范围配置信息
type ColorPrizeAreaRange struct { type ColorPrizeAreaRange struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Pos ColorPrizeArea `protobuf:"varint,1,opt,name=pos,proto3,enum=pb.ColorPrizeArea" json:"pos,omitempty"` // 下注区域为单色区0-2时，该值表明是单色还是双色，三色不同的赔率 Pos ColorPrizeArea `protobuf:"varint,1,opt,name=pos,proto3,enum=ColorPrizeArea" json:"pos,omitempty"` // 下注区域为单色区0-2时，该值表明是单色还是双色，三色不同的赔率
MinMul int64 `protobuf:"varint,2,opt,name=minMul,proto3" json:"minMul,omitempty"` MinMul int64 `protobuf:"varint,2,opt,name=minMul,proto3" json:"minMul,omitempty"`
MaxMul int64 `protobuf:"varint,3,opt,name=maxMul,proto3" json:"maxMul,omitempty"` MaxMul int64 `protobuf:"varint,3,opt,name=maxMul,proto3" json:"maxMul,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -751,7 +751,7 @@ func (x *ColorRoomSettle) GetSettle() *NtfColorSettle {
// 进房间发送房间当前所有信息及状态 // 进房间发送房间当前所有信息及状态
type NtfColorRoomInfo struct { type NtfColorRoomInfo struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Status ColorGameStatus `protobuf:"varint,1,opt,name=status,proto3,enum=pb.ColorGameStatus" json:"status,omitempty"` Status ColorGameStatus `protobuf:"varint,1,opt,name=status,proto3,enum=ColorGameStatus" json:"status,omitempty"`
EndTime int64 `protobuf:"varint,2,opt,name=endTime,proto3" json:"endTime,omitempty"` // 该状态结束时间 EndTime int64 `protobuf:"varint,2,opt,name=endTime,proto3" json:"endTime,omitempty"` // 该状态结束时间
Config *ColorRoomConfig `protobuf:"bytes,101,opt,name=config,proto3" json:"config,omitempty"` // 房间配置 Config *ColorRoomConfig `protobuf:"bytes,101,opt,name=config,proto3" json:"config,omitempty"` // 房间配置
User *ColorUser `protobuf:"bytes,100,opt,name=user,proto3" json:"user,omitempty"` User *ColorUser `protobuf:"bytes,100,opt,name=user,proto3" json:"user,omitempty"`
@ -963,7 +963,7 @@ func (x *NtfColorBetting) GetEndTime() int64 {
type ReqColorBetting struct { type ReqColorBetting struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=pb.ColorBetArea" json:"area,omitempty"` Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=ColorBetArea" json:"area,omitempty"`
Bet int64 `protobuf:"varint,2,opt,name=bet,proto3" json:"bet,omitempty"` Bet int64 `protobuf:"varint,2,opt,name=bet,proto3" json:"bet,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -1015,7 +1015,7 @@ func (x *ReqColorBetting) GetBet() int64 {
type RspColorBetting struct { type RspColorBetting struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
AreaInfo *ColorBetAreaInfo `protobuf:"bytes,2,opt,name=areaInfo,proto3" json:"areaInfo,omitempty"` AreaInfo *ColorBetAreaInfo `protobuf:"bytes,2,opt,name=areaInfo,proto3" json:"areaInfo,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -1067,7 +1067,7 @@ func (x *RspColorBetting) GetAreaInfo() *ColorBetAreaInfo {
type ColorBetAreaInfo struct { type ColorBetAreaInfo struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=pb.ColorBetArea" json:"area,omitempty"` // 投注区域 Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=ColorBetArea" json:"area,omitempty"` // 投注区域
TotalBet int64 `protobuf:"varint,2,opt,name=totalBet,proto3" json:"totalBet,omitempty"` // 所有玩家总投注金额 TotalBet int64 `protobuf:"varint,2,opt,name=totalBet,proto3" json:"totalBet,omitempty"` // 所有玩家总投注金额
PlayerNum int32 `protobuf:"varint,3,opt,name=playerNum,proto3" json:"playerNum,omitempty"` // 投注该区域人数 PlayerNum int32 `protobuf:"varint,3,opt,name=playerNum,proto3" json:"playerNum,omitempty"` // 投注该区域人数
MyBet int64 `protobuf:"varint,4,opt,name=myBet,proto3" json:"myBet,omitempty"` // 我的投注金额 MyBet int64 `protobuf:"varint,4,opt,name=myBet,proto3" json:"myBet,omitempty"` // 我的投注金额
@ -1181,9 +1181,9 @@ func (x *NtfColorBetAreaInfo) GetAreaInfos() []*ColorBetAreaInfo {
// 投注区域实际赔率，奖励类型 // 投注区域实际赔率，奖励类型
type ColorBetAreaMul struct { type ColorBetAreaMul struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=pb.ColorBetArea" json:"area,omitempty"` // 区域位置 Area ColorBetArea `protobuf:"varint,1,opt,name=area,proto3,enum=ColorBetArea" json:"area,omitempty"` // 区域位置
PrizeArea ColorPrizeArea `protobuf:"varint,2,opt,name=prizeArea,proto3,enum=pb.ColorPrizeArea" json:"prizeArea,omitempty"` // 奖励档位 PrizeArea ColorPrizeArea `protobuf:"varint,2,opt,name=prizeArea,proto3,enum=ColorPrizeArea" json:"prizeArea,omitempty"` // 奖励档位
PrizeType ColorPrizeType `protobuf:"varint,3,opt,name=prizeType,proto3,enum=pb.ColorPrizeType" json:"prizeType,omitempty"` // 奖励类型 PrizeType ColorPrizeType `protobuf:"varint,3,opt,name=prizeType,proto3,enum=ColorPrizeType" json:"prizeType,omitempty"` // 奖励类型
Mul int64 `protobuf:"varint,4,opt,name=mul,proto3" json:"mul,omitempty"` // 赔率 Mul int64 `protobuf:"varint,4,opt,name=mul,proto3" json:"mul,omitempty"` // 赔率
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -1310,9 +1310,9 @@ func (x *NtfColorEndBetting) GetJackpot() int64 {
type NtfColorOpenThreeDice struct { type NtfColorOpenThreeDice struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Color []ColorType `protobuf:"varint,1,rep,packed,name=color,proto3,enum=pb.ColorType" json:"color,omitempty"` // 骰子开出颜色 3个 Color []ColorType `protobuf:"varint,1,rep,packed,name=color,proto3,enum=ColorType" json:"color,omitempty"` // 骰子开出颜色 3个
AniRouteIndex int32 `protobuf:"varint,3,opt,name=aniRouteIndex,proto3" json:"aniRouteIndex,omitempty"` // 动画路径 AniRouteIndex int32 `protobuf:"varint,3,opt,name=aniRouteIndex,proto3" json:"aniRouteIndex,omitempty"` // 动画路径
WinArea []ColorBetArea `protobuf:"varint,4,rep,packed,name=winArea,proto3,enum=pb.ColorBetArea" json:"winArea,omitempty"` // 中奖区域高亮 WinArea []ColorBetArea `protobuf:"varint,4,rep,packed,name=winArea,proto3,enum=ColorBetArea" json:"winArea,omitempty"` // 中奖区域高亮
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@ -1372,7 +1372,7 @@ func (x *NtfColorOpenThreeDice) GetWinArea() []ColorBetArea {
type NtfColorSettle struct { type NtfColorSettle struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
UserAreaWin []*NtfColorSettle_UserBetAreaMul `protobuf:"bytes,1,rep,name=userAreaWin,proto3" json:"userAreaWin,omitempty"` // 每个投注区域的下注及输赢 UserAreaWin []*NtfColorSettle_UserBetAreaMul `protobuf:"bytes,1,rep,name=userAreaWin,proto3" json:"userAreaWin,omitempty"` // 每个投注区域的下注及输赢
ThreeDice []ColorType `protobuf:"varint,2,rep,packed,name=threeDice,proto3,enum=pb.ColorType" json:"threeDice,omitempty"` // 骰子开出颜色 ThreeDice []ColorType `protobuf:"varint,2,rep,packed,name=threeDice,proto3,enum=ColorType" json:"threeDice,omitempty"` // 骰子开出颜色
TotalWin int64 `protobuf:"varint,3,opt,name=totalWin,proto3" json:"totalWin,omitempty"` // 总输赢,税后包含本金 TotalWin int64 `protobuf:"varint,3,opt,name=totalWin,proto3" json:"totalWin,omitempty"` // 总输赢,税后包含本金
TotalBet int64 `protobuf:"varint,4,opt,name=totalBet,proto3" json:"totalBet,omitempty"` // 总投注 TotalBet int64 `protobuf:"varint,4,opt,name=totalBet,proto3" json:"totalBet,omitempty"` // 总投注
TotalWinBaseBet int64 `protobuf:"varint,6,opt,name=totalWinBaseBet,proto3" json:"totalWinBaseBet,omitempty"` // 赢钱区域的总投注 TotalWinBaseBet int64 `protobuf:"varint,6,opt,name=totalWinBaseBet,proto3" json:"totalWinBaseBet,omitempty"` // 赢钱区域的总投注
@ -1812,7 +1812,7 @@ func (x *NtfColorSettle_UserBetAreaMul) GetRealWin() int64 {
type NtfColorTrend_ColorRate struct { type NtfColorTrend_ColorRate struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Color ColorType `protobuf:"varint,1,opt,name=color,proto3,enum=pb.ColorType" json:"color,omitempty"` Color ColorType `protobuf:"varint,1,opt,name=color,proto3,enum=ColorType" json:"color,omitempty"`
Rate int32 `protobuf:"varint,2,opt,name=rate,proto3" json:"rate,omitempty"` Rate int32 `protobuf:"varint,2,opt,name=rate,proto3" json:"rate,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -1866,81 +1866,84 @@ var File_colorgame_proto protoreflect.FileDescriptor
const file_colorgame_proto_rawDesc = "" + const file_colorgame_proto_rawDesc = "" +
"\n" + "\n" +
"\x0fcolorgame.proto\x12\x02pb\x1a\n" + "\x0fcolorgame.proto\x1a\n" +
"code.proto\"k\n" + "code.proto\"h\n" +
"\x13ColorPrizeAreaRange\x12$\n" + "\x13ColorPrizeAreaRange\x12!\n" +
"\x03pos\x18\x01 \x01(\x0e2\x12.pb.ColorPrizeAreaR\x03pos\x12\x16\n" + "\x03pos\x18\x01 \x01(\x0e2\x0f.ColorPrizeAreaR\x03pos\x12\x16\n" +
"\x06minMul\x18\x02 \x01(\x03R\x06minMul\x12\x16\n" + "\x06minMul\x18\x02 \x01(\x03R\x06minMul\x12\x16\n" +
"\x06maxMul\x18\x03 \x01(\x03R\x06maxMul\"l\n" + "\x06maxMul\x18\x03 \x01(\x03R\x06maxMul\"i\n" +
"\x0fColorRoomConfig\x12\x18\n" + "\x0fColorRoomConfig\x12\x18\n" +
"\abetList\x18\x03 \x03(\x03R\abetList\x12?\n" + "\abetList\x18\x03 \x03(\x03R\abetList\x12<\n" +
"\x0emulRangeConfig\x18\x05 \x03(\v2\x17.pb.ColorPrizeAreaRangeR\x0emulRangeConfig\"?\n" + "\x0emulRangeConfig\x18\x05 \x03(\v2\x14.ColorPrizeAreaRangeR\x0emulRangeConfig\"<\n" +
"\x12ColorRoomWaitStart\x12)\n" + "\x12ColorRoomWaitStart\x12&\n" +
"\x06Trends\x18\x01 \x01(\v2\x11.pb.NtfColorTrendR\x06Trends\"h\n" + "\x06Trends\x18\x01 \x01(\v2\x0e.NtfColorTrendR\x06Trends\"b\n" +
"\x0eColorRoomStart\x12+\n" + "\x0eColorRoomStart\x12(\n" +
"\x05start\x18\x01 \x01(\v2\x15.pb.NtfColorGameStartR\x05start\x12)\n" + "\x05start\x18\x01 \x01(\v2\x12.NtfColorGameStartR\x05start\x12&\n" +
"\x06Trends\x18\x02 \x01(\v2\x11.pb.NtfColorTrendR\x06Trends\"M\n" + "\x06Trends\x18\x02 \x01(\v2\x0e.NtfColorTrendR\x06Trends\"J\n" +
"\x10ColorRoomBetting\x129\n" + "\x10ColorRoomBetting\x126\n" +
"\vbetAreaInfo\x18\x01 \x01(\v2\x17.pb.NtfColorBetAreaInfoR\vbetAreaInfo\"\xad\x01\n" + "\vbetAreaInfo\x18\x01 \x01(\v2\x14.NtfColorBetAreaInfoR\vbetAreaInfo\"\xa4\x01\n" +
"\x0fColorRoomEndBet\x120\n" + "\x0fColorRoomEndBet\x12-\n" +
"\aareaMul\x18\x01 \x01(\v2\x16.pb.NtfColorEndBettingR\aareaMul\x129\n" + "\aareaMul\x18\x01 \x01(\v2\x13.NtfColorEndBettingR\aareaMul\x126\n" +
"\vbetAreaInfo\x18\x02 \x01(\v2\x17.pb.NtfColorBetAreaInfoR\vbetAreaInfo\x12-\n" + "\vbetAreaInfo\x18\x02 \x01(\v2\x14.NtfColorBetAreaInfoR\vbetAreaInfo\x12*\n" +
"\abigUser\x18\x03 \x01(\v2\x13.pb.NtfColorBigUserR\abigUser\"I\n" + "\abigUser\x18\x03 \x01(\v2\x10.NtfColorBigUserR\abigUser\"F\n" +
"\x16ColorRoomOpenThreeDice\x12/\n" + "\x16ColorRoomOpenThreeDice\x12,\n" +
"\x05dices\x18\x01 \x01(\v2\x19.pb.NtfColorOpenThreeDiceR\x05dices\"=\n" + "\x05dices\x18\x01 \x01(\v2\x16.NtfColorOpenThreeDiceR\x05dices\":\n" +
"\x0fColorRoomSettle\x12*\n" + "\x0fColorRoomSettle\x12'\n" +
"\x06settle\x18\x01 \x01(\v2\x12.pb.NtfColorSettleR\x06settle\"\xd5\x03\n" + "\x06settle\x18\x01 \x01(\v2\x0f.NtfColorSettleR\x06settle\"\xba\x03\n" +
"\x10NtfColorRoomInfo\x12+\n" + "\x10NtfColorRoomInfo\x12(\n" +
"\x06status\x18\x01 \x01(\x0e2\x13.pb.ColorGameStatusR\x06status\x12\x18\n" + "\x06status\x18\x01 \x01(\x0e2\x10.ColorGameStatusR\x06status\x12\x18\n" +
"\aendTime\x18\x02 \x01(\x03R\aendTime\x12+\n" + "\aendTime\x18\x02 \x01(\x03R\aendTime\x12(\n" +
"\x06config\x18e \x01(\v2\x13.pb.ColorRoomConfigR\x06config\x12!\n" + "\x06config\x18e \x01(\v2\x10.ColorRoomConfigR\x06config\x12\x1e\n" +
"\x04user\x18d \x01(\v2\r.pb.ColorUserR\x04user\x124\n" + "\x04user\x18d \x01(\v2\n" +
"\twaitStart\x18\x03 \x01(\v2\x16.pb.ColorRoomWaitStartR\twaitStart\x12(\n" + ".ColorUserR\x04user\x121\n" +
"\x05start\x18\x04 \x01(\v2\x12.pb.ColorRoomStartR\x05start\x12.\n" + "\twaitStart\x18\x03 \x01(\v2\x13.ColorRoomWaitStartR\twaitStart\x12%\n" +
"\abetting\x18\x05 \x01(\v2\x14.pb.ColorRoomBettingR\abetting\x12+\n" + "\x05start\x18\x04 \x01(\v2\x0f.ColorRoomStartR\x05start\x12+\n" +
"\x06endBet\x18\x06 \x01(\v2\x13.pb.ColorRoomEndBetR\x06endBet\x12@\n" + "\abetting\x18\x05 \x01(\v2\x11.ColorRoomBettingR\abetting\x12(\n" +
"\ropenThreeDice\x18\a \x01(\v2\x1a.pb.ColorRoomOpenThreeDiceR\ropenThreeDice\x12+\n" + "\x06endBet\x18\x06 \x01(\v2\x10.ColorRoomEndBetR\x06endBet\x12=\n" +
"\x06settle\x18\b \x01(\v2\x13.pb.ColorRoomSettleR\x06settle\"G\n" + "\ropenThreeDice\x18\a \x01(\v2\x17.ColorRoomOpenThreeDiceR\ropenThreeDice\x12(\n" +
"\x06settle\x18\b \x01(\v2\x10.ColorRoomSettleR\x06settle\"G\n" +
"\x11NtfColorGameStart\x12\x18\n" + "\x11NtfColorGameStart\x12\x18\n" +
"\aendTime\x18\x01 \x01(\x03R\aendTime\x12\x18\n" + "\aendTime\x18\x01 \x01(\x03R\aendTime\x12\x18\n" +
"\ajackpot\x18\x02 \x01(\x03R\ajackpot\"+\n" + "\ajackpot\x18\x02 \x01(\x03R\ajackpot\"+\n" +
"\x0fNtfColorBetting\x12\x18\n" + "\x0fNtfColorBetting\x12\x18\n" +
"\aendTime\x18\x01 \x01(\x03R\aendTime\"I\n" + "\aendTime\x18\x01 \x01(\x03R\aendTime\"F\n" +
"\x0fReqColorBetting\x12$\n" + "\x0fReqColorBetting\x12!\n" +
"\x04area\x18\x01 \x01(\x0e2\x10.pb.ColorBetAreaR\x04area\x12\x10\n" + "\x04area\x18\x01 \x01(\x0e2\r.ColorBetAreaR\x04area\x12\x10\n" +
"\x03bet\x18\x02 \x01(\x03R\x03bet\"d\n" + "\x03bet\x18\x02 \x01(\x03R\x03bet\"^\n" +
"\x0fRspColorBetting\x12\x1f\n" + "\x0fRspColorBetting\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\x120\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\x12-\n" +
"\bareaInfo\x18\x02 \x01(\v2\x14.pb.ColorBetAreaInfoR\bareaInfo\"\x88\x01\n" + "\bareaInfo\x18\x02 \x01(\v2\x11.ColorBetAreaInfoR\bareaInfo\"\x85\x01\n" +
"\x10ColorBetAreaInfo\x12$\n" + "\x10ColorBetAreaInfo\x12!\n" +
"\x04area\x18\x01 \x01(\x0e2\x10.pb.ColorBetAreaR\x04area\x12\x1a\n" + "\x04area\x18\x01 \x01(\x0e2\r.ColorBetAreaR\x04area\x12\x1a\n" +
"\btotalBet\x18\x02 \x01(\x03R\btotalBet\x12\x1c\n" + "\btotalBet\x18\x02 \x01(\x03R\btotalBet\x12\x1c\n" +
"\tplayerNum\x18\x03 \x01(\x05R\tplayerNum\x12\x14\n" + "\tplayerNum\x18\x03 \x01(\x05R\tplayerNum\x12\x14\n" +
"\x05myBet\x18\x04 \x01(\x03R\x05myBet\"I\n" + "\x05myBet\x18\x04 \x01(\x03R\x05myBet\"F\n" +
"\x13NtfColorBetAreaInfo\x122\n" + "\x13NtfColorBetAreaInfo\x12/\n" +
"\tareaInfos\x18\x01 \x03(\v2\x14.pb.ColorBetAreaInfoR\tareaInfos\"\xad\x01\n" + "\tareaInfos\x18\x01 \x03(\v2\x11.ColorBetAreaInfoR\tareaInfos\"\xa4\x01\n" +
"\x0fColorBetAreaMul\x12$\n" + "\x0fColorBetAreaMul\x12!\n" +
"\x04area\x18\x01 \x01(\x0e2\x10.pb.ColorBetAreaR\x04area\x120\n" + "\x04area\x18\x01 \x01(\x0e2\r.ColorBetAreaR\x04area\x12-\n" +
"\tprizeArea\x18\x02 \x01(\x0e2\x12.pb.ColorPrizeAreaR\tprizeArea\x120\n" + "\tprizeArea\x18\x02 \x01(\x0e2\x0f.ColorPrizeAreaR\tprizeArea\x12-\n" +
"\tprizeType\x18\x03 \x01(\x0e2\x12.pb.ColorPrizeTypeR\tprizeType\x12\x10\n" + "\tprizeType\x18\x03 \x01(\x0e2\x0f.ColorPrizeTypeR\tprizeType\x12\x10\n" +
"\x03mul\x18\x04 \x01(\x03R\x03mul\"w\n" + "\x03mul\x18\x04 \x01(\x03R\x03mul\"t\n" +
"\x12NtfColorEndBetting\x12\x18\n" + "\x12NtfColorEndBetting\x12\x18\n" +
"\aendTime\x18\x01 \x01(\x03R\aendTime\x12-\n" + "\aendTime\x18\x01 \x01(\x03R\aendTime\x12*\n" +
"\aareaMul\x18\x02 \x03(\v2\x13.pb.ColorBetAreaMulR\aareaMul\x12\x18\n" + "\aareaMul\x18\x02 \x03(\v2\x10.ColorBetAreaMulR\aareaMul\x12\x18\n" +
"\ajackpot\x18\x03 \x01(\x03R\ajackpot\"\x8e\x01\n" + "\ajackpot\x18\x03 \x01(\x03R\ajackpot\"\x88\x01\n" +
"\x15NtfColorOpenThreeDice\x12#\n" + "\x15NtfColorOpenThreeDice\x12 \n" +
"\x05color\x18\x01 \x03(\x0e2\r.pb.ColorTypeR\x05color\x12$\n" + "\x05color\x18\x01 \x03(\x0e2\n" +
"\raniRouteIndex\x18\x03 \x01(\x05R\raniRouteIndex\x12*\n" + ".ColorTypeR\x05color\x12$\n" +
"\awinArea\x18\x04 \x03(\x0e2\x10.pb.ColorBetAreaR\awinArea\"\xf5\x02\n" + "\raniRouteIndex\x18\x03 \x01(\x05R\raniRouteIndex\x12'\n" +
"\x0eNtfColorSettle\x12C\n" + "\awinArea\x18\x04 \x03(\x0e2\r.ColorBetAreaR\awinArea\"\xec\x02\n" +
"\vuserAreaWin\x18\x01 \x03(\v2!.pb.NtfColorSettle.UserBetAreaMulR\vuserAreaWin\x12+\n" + "\x0eNtfColorSettle\x12@\n" +
"\tthreeDice\x18\x02 \x03(\x0e2\r.pb.ColorTypeR\tthreeDice\x12\x1a\n" + "\vuserAreaWin\x18\x01 \x03(\v2\x1e.NtfColorSettle.UserBetAreaMulR\vuserAreaWin\x12(\n" +
"\tthreeDice\x18\x02 \x03(\x0e2\n" +
".ColorTypeR\tthreeDice\x12\x1a\n" +
"\btotalWin\x18\x03 \x01(\x03R\btotalWin\x12\x1a\n" + "\btotalWin\x18\x03 \x01(\x03R\btotalWin\x12\x1a\n" +
"\btotalBet\x18\x04 \x01(\x03R\btotalBet\x12(\n" + "\btotalBet\x18\x04 \x01(\x03R\btotalBet\x12(\n" +
"\x0ftotalWinBaseBet\x18\x06 \x01(\x03R\x0ftotalWinBaseBet\x12\x10\n" + "\x0ftotalWinBaseBet\x18\x06 \x01(\x03R\x0ftotalWinBaseBet\x12\x10\n" +
"\x03tax\x18\x05 \x01(\x03R\x03tax\x1a}\n" + "\x03tax\x18\x05 \x01(\x03R\x03tax\x1az\n" +
"\x0eUserBetAreaMul\x12-\n" + "\x0eUserBetAreaMul\x12*\n" +
"\aareaMul\x18\x01 \x01(\v2\x13.pb.ColorBetAreaMulR\aareaMul\x12\x10\n" + "\aareaMul\x18\x01 \x01(\v2\x10.ColorBetAreaMulR\aareaMul\x12\x10\n" +
"\x03bet\x18\x02 \x01(\x03R\x03bet\x12\x10\n" + "\x03bet\x18\x02 \x01(\x03R\x03bet\x12\x10\n" +
"\x03win\x18\x03 \x01(\x03R\x03win\x12\x18\n" + "\x03win\x18\x03 \x01(\x03R\x03win\x12\x18\n" +
"\arealWin\x18\x04 \x01(\x03R\arealWin\"y\n" + "\arealWin\x18\x04 \x01(\x03R\arealWin\"y\n" +
@ -1949,13 +1952,14 @@ const file_colorgame_proto_rawDesc = "" +
"\x04Head\x18\x02 \x01(\tR\x04Head\x12\x14\n" + "\x04Head\x18\x02 \x01(\tR\x04Head\x12\x14\n" +
"\x05Score\x18\x03 \x01(\x03R\x05Score\x12\x16\n" + "\x05Score\x18\x03 \x01(\x03R\x05Score\x12\x16\n" +
"\x06SeatId\x18\x04 \x01(\x05R\x06SeatId\x12\x16\n" + "\x06SeatId\x18\x04 \x01(\x05R\x06SeatId\x12\x16\n" +
"\x06UserID\x18\x05 \x01(\x03R\x06UserID\"=\n" + "\x06UserID\x18\x05 \x01(\x03R\x06UserID\":\n" +
"\x0fNtfColorBigUser\x12*\n" + "\x0fNtfColorBigUser\x12'\n" +
"\abigUser\x18\" \x03(\v2\x10.pb.ColorBigUserR\abigUser\"\x90\x01\n" + "\abigUser\x18\" \x03(\v2\r.ColorBigUserR\abigUser\"\x8a\x01\n" +
"\rNtfColorTrend\x129\n" + "\rNtfColorTrend\x126\n" +
"\tcolorRate\x18\x01 \x03(\v2\x1b.pb.NtfColorTrend.ColorRateR\tcolorRate\x1aD\n" + "\tcolorRate\x18\x01 \x03(\v2\x18.NtfColorTrend.ColorRateR\tcolorRate\x1aA\n" +
"\tColorRate\x12#\n" + "\tColorRate\x12 \n" +
"\x05color\x18\x01 \x01(\x0e2\r.pb.ColorTypeR\x05color\x12\x12\n" + "\x05color\x18\x01 \x01(\x0e2\n" +
".ColorTypeR\x05color\x12\x12\n" +
"\x04rate\x18\x02 \x01(\x05R\x04rate\"v\n" + "\x04rate\x18\x02 \x01(\x05R\x04rate\"v\n" +
"\fColorBigUser\x12\x1a\n" + "\fColorBigUser\x12\x1a\n" +
"\bnickName\x18\x05 \x01(\tR\bnickName\x12\x16\n" + "\bnickName\x18\x05 \x01(\tR\bnickName\x12\x16\n" +
@ -2035,77 +2039,77 @@ func file_colorgame_proto_rawDescGZIP() []byte {
var file_colorgame_proto_enumTypes = make([]protoimpl.EnumInfo, 5) var file_colorgame_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
var file_colorgame_proto_msgTypes = make([]protoimpl.MessageInfo, 26) var file_colorgame_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
var file_colorgame_proto_goTypes = []any{ var file_colorgame_proto_goTypes = []any{
(ColorPrizeArea)(0), // 0: pb.ColorPrizeArea (ColorPrizeArea)(0), // 0: ColorPrizeArea
(ColorType)(0), // 1: pb.ColorType (ColorType)(0), // 1: ColorType
(ColorBetArea)(0), // 2: pb.ColorBetArea (ColorBetArea)(0), // 2: ColorBetArea
(ColorGameStatus)(0), // 3: pb.ColorGameStatus (ColorGameStatus)(0), // 3: ColorGameStatus
(ColorPrizeType)(0), // 4: pb.ColorPrizeType (ColorPrizeType)(0), // 4: ColorPrizeType
(*ColorPrizeAreaRange)(nil), // 5: pb.ColorPrizeAreaRange (*ColorPrizeAreaRange)(nil), // 5: ColorPrizeAreaRange
(*ColorRoomConfig)(nil), // 6: pb.ColorRoomConfig (*ColorRoomConfig)(nil), // 6: ColorRoomConfig
(*ColorRoomWaitStart)(nil), // 7: pb.ColorRoomWaitStart (*ColorRoomWaitStart)(nil), // 7: ColorRoomWaitStart
(*ColorRoomStart)(nil), // 8: pb.ColorRoomStart (*ColorRoomStart)(nil), // 8: ColorRoomStart
(*ColorRoomBetting)(nil), // 9: pb.ColorRoomBetting (*ColorRoomBetting)(nil), // 9: ColorRoomBetting
(*ColorRoomEndBet)(nil), // 10: pb.ColorRoomEndBet (*ColorRoomEndBet)(nil), // 10: ColorRoomEndBet
(*ColorRoomOpenThreeDice)(nil), // 11: pb.ColorRoomOpenThreeDice (*ColorRoomOpenThreeDice)(nil), // 11: ColorRoomOpenThreeDice
(*ColorRoomSettle)(nil), // 12: pb.ColorRoomSettle (*ColorRoomSettle)(nil), // 12: ColorRoomSettle
(*NtfColorRoomInfo)(nil), // 13: pb.NtfColorRoomInfo (*NtfColorRoomInfo)(nil), // 13: NtfColorRoomInfo
(*NtfColorGameStart)(nil), // 14: pb.NtfColorGameStart (*NtfColorGameStart)(nil), // 14: NtfColorGameStart
(*NtfColorBetting)(nil), // 15: pb.NtfColorBetting (*NtfColorBetting)(nil), // 15: NtfColorBetting
(*ReqColorBetting)(nil), // 16: pb.ReqColorBetting (*ReqColorBetting)(nil), // 16: ReqColorBetting
(*RspColorBetting)(nil), // 17: pb.RspColorBetting (*RspColorBetting)(nil), // 17: RspColorBetting
(*ColorBetAreaInfo)(nil), // 18: pb.ColorBetAreaInfo (*ColorBetAreaInfo)(nil), // 18: ColorBetAreaInfo
(*NtfColorBetAreaInfo)(nil), // 19: pb.NtfColorBetAreaInfo (*NtfColorBetAreaInfo)(nil), // 19: NtfColorBetAreaInfo
(*ColorBetAreaMul)(nil), // 20: pb.ColorBetAreaMul (*ColorBetAreaMul)(nil), // 20: ColorBetAreaMul
(*NtfColorEndBetting)(nil), // 21: pb.NtfColorEndBetting (*NtfColorEndBetting)(nil), // 21: NtfColorEndBetting
(*NtfColorOpenThreeDice)(nil), // 22: pb.NtfColorOpenThreeDice (*NtfColorOpenThreeDice)(nil), // 22: NtfColorOpenThreeDice
(*NtfColorSettle)(nil), // 23: pb.NtfColorSettle (*NtfColorSettle)(nil), // 23: NtfColorSettle
(*ColorUser)(nil), // 24: pb.ColorUser (*ColorUser)(nil), // 24: ColorUser
(*NtfColorBigUser)(nil), // 25: pb.NtfColorBigUser (*NtfColorBigUser)(nil), // 25: NtfColorBigUser
(*NtfColorTrend)(nil), // 26: pb.NtfColorTrend (*NtfColorTrend)(nil), // 26: NtfColorTrend
(*ColorBigUser)(nil), // 27: pb.ColorBigUser (*ColorBigUser)(nil), // 27: ColorBigUser
(*NtfColorMaintain)(nil), // 28: pb.NtfColorMaintain (*NtfColorMaintain)(nil), // 28: NtfColorMaintain
(*NtfColorSettle_UserBetAreaMul)(nil), // 29: pb.NtfColorSettle.UserBetAreaMul (*NtfColorSettle_UserBetAreaMul)(nil), // 29: NtfColorSettle.UserBetAreaMul
(*NtfColorTrend_ColorRate)(nil), // 30: pb.NtfColorTrend.ColorRate (*NtfColorTrend_ColorRate)(nil), // 30: NtfColorTrend.ColorRate
(ErrCode)(0), // 31: pb.ErrCode (ErrCode)(0), // 31: ErrCode
} }
var file_colorgame_proto_depIdxs = []int32{ var file_colorgame_proto_depIdxs = []int32{
0, // 0: pb.ColorPrizeAreaRange.pos:type_name -> pb.ColorPrizeArea 0, // 0: ColorPrizeAreaRange.pos:type_name -> ColorPrizeArea
5, // 1: pb.ColorRoomConfig.mulRangeConfig:type_name -> pb.ColorPrizeAreaRange 5, // 1: ColorRoomConfig.mulRangeConfig:type_name -> ColorPrizeAreaRange
26, // 2: pb.ColorRoomWaitStart.Trends:type_name -> pb.NtfColorTrend 26, // 2: ColorRoomWaitStart.Trends:type_name -> NtfColorTrend
14, // 3: pb.ColorRoomStart.start:type_name -> pb.NtfColorGameStart 14, // 3: ColorRoomStart.start:type_name -> NtfColorGameStart
26, // 4: pb.ColorRoomStart.Trends:type_name -> pb.NtfColorTrend 26, // 4: ColorRoomStart.Trends:type_name -> NtfColorTrend
19, // 5: pb.ColorRoomBetting.betAreaInfo:type_name -> pb.NtfColorBetAreaInfo 19, // 5: ColorRoomBetting.betAreaInfo:type_name -> NtfColorBetAreaInfo
21, // 6: pb.ColorRoomEndBet.areaMul:type_name -> pb.NtfColorEndBetting 21, // 6: ColorRoomEndBet.areaMul:type_name -> NtfColorEndBetting
19, // 7: pb.ColorRoomEndBet.betAreaInfo:type_name -> pb.NtfColorBetAreaInfo 19, // 7: ColorRoomEndBet.betAreaInfo:type_name -> NtfColorBetAreaInfo
25, // 8: pb.ColorRoomEndBet.bigUser:type_name -> pb.NtfColorBigUser 25, // 8: ColorRoomEndBet.bigUser:type_name -> NtfColorBigUser
22, // 9: pb.ColorRoomOpenThreeDice.dices:type_name -> pb.NtfColorOpenThreeDice 22, // 9: ColorRoomOpenThreeDice.dices:type_name -> NtfColorOpenThreeDice
23, // 10: pb.ColorRoomSettle.settle:type_name -> pb.NtfColorSettle 23, // 10: ColorRoomSettle.settle:type_name -> NtfColorSettle
3, // 11: pb.NtfColorRoomInfo.status:type_name -> pb.ColorGameStatus 3, // 11: NtfColorRoomInfo.status:type_name -> ColorGameStatus
6, // 12: pb.NtfColorRoomInfo.config:type_name -> pb.ColorRoomConfig 6, // 12: NtfColorRoomInfo.config:type_name -> ColorRoomConfig
24, // 13: pb.NtfColorRoomInfo.user:type_name -> pb.ColorUser 24, // 13: NtfColorRoomInfo.user:type_name -> ColorUser
7, // 14: pb.NtfColorRoomInfo.waitStart:type_name -> pb.ColorRoomWaitStart 7, // 14: NtfColorRoomInfo.waitStart:type_name -> ColorRoomWaitStart
8, // 15: pb.NtfColorRoomInfo.start:type_name -> pb.ColorRoomStart 8, // 15: NtfColorRoomInfo.start:type_name -> ColorRoomStart
9, // 16: pb.NtfColorRoomInfo.betting:type_name -> pb.ColorRoomBetting 9, // 16: NtfColorRoomInfo.betting:type_name -> ColorRoomBetting
10, // 17: pb.NtfColorRoomInfo.endBet:type_name -> pb.ColorRoomEndBet 10, // 17: NtfColorRoomInfo.endBet:type_name -> ColorRoomEndBet
11, // 18: pb.NtfColorRoomInfo.openThreeDice:type_name -> pb.ColorRoomOpenThreeDice 11, // 18: NtfColorRoomInfo.openThreeDice:type_name -> ColorRoomOpenThreeDice
12, // 19: pb.NtfColorRoomInfo.settle:type_name -> pb.ColorRoomSettle 12, // 19: NtfColorRoomInfo.settle:type_name -> ColorRoomSettle
2, // 20: pb.ReqColorBetting.area:type_name -> pb.ColorBetArea 2, // 20: ReqColorBetting.area:type_name -> ColorBetArea
31, // 21: pb.RspColorBetting.code:type_name -> pb.ErrCode 31, // 21: RspColorBetting.code:type_name -> ErrCode
18, // 22: pb.RspColorBetting.areaInfo:type_name -> pb.ColorBetAreaInfo 18, // 22: RspColorBetting.areaInfo:type_name -> ColorBetAreaInfo
2, // 23: pb.ColorBetAreaInfo.area:type_name -> pb.ColorBetArea 2, // 23: ColorBetAreaInfo.area:type_name -> ColorBetArea
18, // 24: pb.NtfColorBetAreaInfo.areaInfos:type_name -> pb.ColorBetAreaInfo 18, // 24: NtfColorBetAreaInfo.areaInfos:type_name -> ColorBetAreaInfo
2, // 25: pb.ColorBetAreaMul.area:type_name -> pb.ColorBetArea 2, // 25: ColorBetAreaMul.area:type_name -> ColorBetArea
0, // 26: pb.ColorBetAreaMul.prizeArea:type_name -> pb.ColorPrizeArea 0, // 26: ColorBetAreaMul.prizeArea:type_name -> ColorPrizeArea
4, // 27: pb.ColorBetAreaMul.prizeType:type_name -> pb.ColorPrizeType 4, // 27: ColorBetAreaMul.prizeType:type_name -> ColorPrizeType
20, // 28: pb.NtfColorEndBetting.areaMul:type_name -> pb.ColorBetAreaMul 20, // 28: NtfColorEndBetting.areaMul:type_name -> ColorBetAreaMul
1, // 29: pb.NtfColorOpenThreeDice.color:type_name -> pb.ColorType 1, // 29: NtfColorOpenThreeDice.color:type_name -> ColorType
2, // 30: pb.NtfColorOpenThreeDice.winArea:type_name -> pb.ColorBetArea 2, // 30: NtfColorOpenThreeDice.winArea:type_name -> ColorBetArea
29, // 31: pb.NtfColorSettle.userAreaWin:type_name -> pb.NtfColorSettle.UserBetAreaMul 29, // 31: NtfColorSettle.userAreaWin:type_name -> NtfColorSettle.UserBetAreaMul
1, // 32: pb.NtfColorSettle.threeDice:type_name -> pb.ColorType 1, // 32: NtfColorSettle.threeDice:type_name -> ColorType
27, // 33: pb.NtfColorBigUser.bigUser:type_name -> pb.ColorBigUser 27, // 33: NtfColorBigUser.bigUser:type_name -> ColorBigUser
30, // 34: pb.NtfColorTrend.colorRate:type_name -> pb.NtfColorTrend.ColorRate 30, // 34: NtfColorTrend.colorRate:type_name -> NtfColorTrend.ColorRate
20, // 35: pb.NtfColorSettle.UserBetAreaMul.areaMul:type_name -> pb.ColorBetAreaMul 20, // 35: NtfColorSettle.UserBetAreaMul.areaMul:type_name -> ColorBetAreaMul
1, // 36: pb.NtfColorTrend.ColorRate.color:type_name -> pb.ColorType 1, // 36: NtfColorTrend.ColorRate.color:type_name -> ColorType
37, // [37:37] is the sub-list for method output_type 37, // [37:37] is the sub-list for method output_type
37, // [37:37] is the sub-list for method input_type 37, // [37:37] is the sub-list for method input_type
37, // [37:37] is the sub-list for extension type_name 37, // [37:37] is the sub-list for extension type_name

54
common/proto/pb/common.pb.go
View File

@ -24,7 +24,7 @@ const (
// 踢出玩家 // 踢出玩家
type NtfKickOutUser struct { type NtfKickOutUser struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` // 踢出原因 Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"` // 踢出原因
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@ -108,7 +108,7 @@ func (*ReqEnterRoom) Descriptor() ([]byte, []int) {
// 玩家进房间返回。之后玩法服同步房间信息给玩家 // 玩家进房间返回。之后玩法服同步房间信息给玩家
type RspEnterRoom struct { type RspEnterRoom struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
GameId int32 `protobuf:"varint,2,opt,name=gameId,proto3" json:"gameId,omitempty"` // 玩法id GameId int32 `protobuf:"varint,2,opt,name=gameId,proto3" json:"gameId,omitempty"` // 玩法id
RoomType int32 `protobuf:"varint,3,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等 RoomType int32 `protobuf:"varint,3,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -205,7 +205,7 @@ func (*ReqLeaveRoom) Descriptor() ([]byte, []int) {
type RspLeaveRoom struct { type RspLeaveRoom struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@ -250,7 +250,7 @@ func (x *RspLeaveRoom) GetCode() ErrCode {
// 加钱或扣钱失败通知 // 加钱或扣钱失败通知
type NtfPayoutFail struct { type NtfPayoutFail struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@ -296,20 +296,20 @@ var File_common_proto protoreflect.FileDescriptor
const file_common_proto_rawDesc = "" + const file_common_proto_rawDesc = "" +
"\n" + "\n" +
"\fcommon.proto\x12\x02pb\x1a\n" + "\fcommon.proto\x1a\n" +
"code.proto\"1\n" + "code.proto\".\n" +
"\x0eNtfKickOutUser\x12\x1f\n" + "\x0eNtfKickOutUser\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\"\x0e\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\"\x0e\n" +
"\fReqEnterRoom\"c\n" + "\fReqEnterRoom\"`\n" +
"\fRspEnterRoom\x12\x1f\n" + "\fRspEnterRoom\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\x12\x16\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\x12\x16\n" +
"\x06gameId\x18\x02 \x01(\x05R\x06gameId\x12\x1a\n" + "\x06gameId\x18\x02 \x01(\x05R\x06gameId\x12\x1a\n" +
"\broomType\x18\x03 \x01(\x05R\broomType\"\x0e\n" + "\broomType\x18\x03 \x01(\x05R\broomType\"\x0e\n" +
"\fReqLeaveRoom\"/\n" + "\fReqLeaveRoom\",\n" +
"\fRspLeaveRoom\x12\x1f\n" + "\fRspLeaveRoom\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\"0\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\"-\n" +
"\rNtfPayoutFail\x12\x1f\n" + "\rNtfPayoutFail\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04codeB\x11Z\x0fcommon/proto/pbb\x06proto3" "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04codeB\x11Z\x0fcommon/proto/pbb\x06proto3"
var ( var (
file_common_proto_rawDescOnce sync.Once file_common_proto_rawDescOnce sync.Once
@ -325,19 +325,19 @@ func file_common_proto_rawDescGZIP() []byte {
var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_common_proto_goTypes = []any{ var file_common_proto_goTypes = []any{
(*NtfKickOutUser)(nil), // 0: pb.NtfKickOutUser (*NtfKickOutUser)(nil), // 0: NtfKickOutUser
(*ReqEnterRoom)(nil), // 1: pb.ReqEnterRoom (*ReqEnterRoom)(nil), // 1: ReqEnterRoom
(*RspEnterRoom)(nil), // 2: pb.RspEnterRoom (*RspEnterRoom)(nil), // 2: RspEnterRoom
(*ReqLeaveRoom)(nil), // 3: pb.ReqLeaveRoom (*ReqLeaveRoom)(nil), // 3: ReqLeaveRoom
(*RspLeaveRoom)(nil), // 4: pb.RspLeaveRoom (*RspLeaveRoom)(nil), // 4: RspLeaveRoom
(*NtfPayoutFail)(nil), // 5: pb.NtfPayoutFail (*NtfPayoutFail)(nil), // 5: NtfPayoutFail
(ErrCode)(0), // 6: pb.ErrCode (ErrCode)(0), // 6: ErrCode
} }
var file_common_proto_depIdxs = []int32{ var file_common_proto_depIdxs = []int32{
6, // 0: pb.NtfKickOutUser.code:type_name -> pb.ErrCode 6, // 0: NtfKickOutUser.code:type_name -> ErrCode
6, // 1: pb.RspEnterRoom.code:type_name -> pb.ErrCode 6, // 1: RspEnterRoom.code:type_name -> ErrCode
6, // 2: pb.RspLeaveRoom.code:type_name -> pb.ErrCode 6, // 2: RspLeaveRoom.code:type_name -> ErrCode
6, // 3: pb.NtfPayoutFail.code:type_name -> pb.ErrCode 6, // 3: NtfPayoutFail.code:type_name -> ErrCode
4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension type_name

38
common/proto/pb/login.pb.go
View File

@ -100,7 +100,7 @@ func (x *ReqUserLogin) GetVersion() string {
type RspUserLogin struct { type RspUserLogin struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
UserId int64 `protobuf:"varint,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` UserId int64 `protobuf:"varint,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
Token string `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"` // token Token string `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"` // token
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -287,7 +287,7 @@ func (*ReqUserLogout) Descriptor() ([]byte, []int) {
type RspUserLogout struct { type RspUserLogout struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` // 登出原因 Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"` // 登出原因
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@ -378,7 +378,7 @@ var File_login_proto protoreflect.FileDescriptor
const file_login_proto_rawDesc = "" + const file_login_proto_rawDesc = "" +
"\n" + "\n" +
"\vlogin.proto\x12\x02pb\x1a\n" + "\vlogin.proto\x1a\n" +
"code.proto\"\x8d\x01\n" + "code.proto\"\x8d\x01\n" +
"\fReqUserLogin\x12\x1a\n" + "\fReqUserLogin\x12\x1a\n" +
"\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" +
@ -386,18 +386,18 @@ const file_login_proto_rawDesc = "" +
"\x02ip\x18\x03 \x01(\tR\x02ip\x12\x1b\n" + "\x02ip\x18\x03 \x01(\tR\x02ip\x12\x1b\n" +
"\tdevice_id\x18\x04 \x01(\tR\bdeviceId\x12\x18\n" + "\tdevice_id\x18\x04 \x01(\tR\bdeviceId\x12\x18\n" +
"\aversion\x18\n" + "\aversion\x18\n" +
" \x01(\tR\aversion\"^\n" + " \x01(\tR\aversion\"[\n" +
"\fRspUserLogin\x12\x1f\n" + "\fRspUserLogin\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\x12\x17\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\x12\x17\n" +
"\auser_id\x18\x02 \x01(\x03R\x06userId\x12\x14\n" + "\auser_id\x18\x02 \x01(\x03R\x06userId\x12\x14\n" +
"\x05token\x18\x03 \x01(\tR\x05token\"(\n" + "\x05token\x18\x03 \x01(\tR\x05token\"(\n" +
"\rNtfUserOnline\x12\x17\n" + "\rNtfUserOnline\x12\x17\n" +
"\auser_id\x18\x02 \x01(\x03R\x06userId\"6\n" + "\auser_id\x18\x02 \x01(\x03R\x06userId\"6\n" +
"\x10NtfUserInService\x12\"\n" + "\x10NtfUserInService\x12\"\n" +
"\fserviceNames\x18\x03 \x03(\tR\fserviceNames\"\x0f\n" + "\fserviceNames\x18\x03 \x03(\tR\fserviceNames\"\x0f\n" +
"\rReqUserLogout\"0\n" + "\rReqUserLogout\"-\n" +
"\rRspUserLogout\x12\x1f\n" + "\rRspUserLogout\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\")\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\")\n" +
"\x0eNtfUserOffline\x12\x17\n" + "\x0eNtfUserOffline\x12\x17\n" +
"\auser_id\x18\x02 \x01(\x03R\x06userIdB\x11Z\x0fcommon/proto/pbb\x06proto3" "\auser_id\x18\x02 \x01(\x03R\x06userIdB\x11Z\x0fcommon/proto/pbb\x06proto3"
@ -415,18 +415,18 @@ func file_login_proto_rawDescGZIP() []byte {
var file_login_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_login_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_login_proto_goTypes = []any{ var file_login_proto_goTypes = []any{
(*ReqUserLogin)(nil), // 0: pb.ReqUserLogin (*ReqUserLogin)(nil), // 0: ReqUserLogin
(*RspUserLogin)(nil), // 1: pb.RspUserLogin (*RspUserLogin)(nil), // 1: RspUserLogin
(*NtfUserOnline)(nil), // 2: pb.NtfUserOnline (*NtfUserOnline)(nil), // 2: NtfUserOnline
(*NtfUserInService)(nil), // 3: pb.NtfUserInService (*NtfUserInService)(nil), // 3: NtfUserInService
(*ReqUserLogout)(nil), // 4: pb.ReqUserLogout (*ReqUserLogout)(nil), // 4: ReqUserLogout
(*RspUserLogout)(nil), // 5: pb.RspUserLogout (*RspUserLogout)(nil), // 5: RspUserLogout
(*NtfUserOffline)(nil), // 6: pb.NtfUserOffline (*NtfUserOffline)(nil), // 6: NtfUserOffline
(ErrCode)(0), // 7: pb.ErrCode (ErrCode)(0), // 7: ErrCode
} }
var file_login_proto_depIdxs = []int32{ var file_login_proto_depIdxs = []int32{
7, // 0: pb.RspUserLogin.code:type_name -> pb.ErrCode 7, // 0: RspUserLogin.code:type_name -> ErrCode
7, // 1: pb.RspUserLogout.code:type_name -> pb.ErrCode 7, // 1: RspUserLogout.code:type_name -> ErrCode
2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method output_type
2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for method input_type
2, // [2:2] is the sub-list for extension type_name 2, // [2:2] is the sub-list for extension type_name

60
common/proto/pb/match.pb.go
View File

@ -24,7 +24,7 @@ const (
// 房间匹配 // 房间匹配
type ReqMatchRoom struct { type ReqMatchRoom struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
GameId ServiceTypeId `protobuf:"varint,1,opt,name=gameId,proto3,enum=pb.ServiceTypeId" json:"gameId,omitempty"` // 玩法id GameId ServiceTypeId `protobuf:"varint,1,opt,name=gameId,proto3,enum=ServiceTypeId" json:"gameId,omitempty"` // 玩法id
RoomType int32 `protobuf:"varint,2,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等 RoomType int32 `protobuf:"varint,2,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
@ -77,8 +77,8 @@ func (x *ReqMatchRoom) GetRoomType() int32 {
// 玩家进房间返回 匹配服返回该消息，假房间。匹配成功后发给对应玩法服，玩法服发NotifyUserEnterRoom才是真房间 // 玩家进房间返回 匹配服返回该消息，假房间。匹配成功后发给对应玩法服，玩法服发NotifyUserEnterRoom才是真房间
type RspMatchRoom struct { type RspMatchRoom struct {
state protoimpl.MessageState `protogen:"open.v1"` state protoimpl.MessageState `protogen:"open.v1"`
Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=pb.ErrCode" json:"code,omitempty"` Code ErrCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrCode" json:"code,omitempty"`
GameId ServiceTypeId `protobuf:"varint,2,opt,name=gameId,proto3,enum=pb.ServiceTypeId" json:"gameId,omitempty"` // 玩法id GameId ServiceTypeId `protobuf:"varint,2,opt,name=gameId,proto3,enum=ServiceTypeId" json:"gameId,omitempty"` // 玩法id
RoomType int32 `protobuf:"varint,3,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等 RoomType int32 `protobuf:"varint,3,opt,name=roomType,proto3" json:"roomType,omitempty"` // 房间类型,低级，中级，高级等
User *GameUser `protobuf:"bytes,4,opt,name=User,proto3" json:"User,omitempty"` // 玩家数据 User *GameUser `protobuf:"bytes,4,opt,name=User,proto3" json:"User,omitempty"` // 玩家数据
ColorInfo *RspMatchRoom_ColorInfo `protobuf:"bytes,20,opt,name=colorInfo,proto3" json:"colorInfo,omitempty"` // color玩法配置信息 ColorInfo *RspMatchRoom_ColorInfo `protobuf:"bytes,20,opt,name=colorInfo,proto3" json:"colorInfo,omitempty"` // color玩法配置信息
@ -236,21 +236,21 @@ var File_match_proto protoreflect.FileDescriptor
const file_match_proto_rawDesc = "" + const file_match_proto_rawDesc = "" +
"\n" + "\n" +
"\vmatch.proto\x12\x02pb\x1a\n" + "\vmatch.proto\x1a\n" +
"code.proto\x1a\n" + "code.proto\x1a\n" +
"user.proto\x1a\rservice.proto\"U\n" + "user.proto\x1a\rservice.proto\"R\n" +
"\fReqMatchRoom\x12)\n" + "\fReqMatchRoom\x12&\n" +
"\x06gameId\x18\x01 \x01(\x0e2\x11.pb.ServiceTypeIdR\x06gameId\x12\x1a\n" + "\x06gameId\x18\x01 \x01(\x0e2\x0e.ServiceTypeIdR\x06gameId\x12\x1a\n" +
"\broomType\x18\x02 \x01(\x05R\broomType\"\xdf\x01\n" + "\broomType\x18\x02 \x01(\x05R\broomType\"\xd3\x01\n" +
"\fRspMatchRoom\x12\x1f\n" + "\fRspMatchRoom\x12\x1c\n" +
"\x04code\x18\x01 \x01(\x0e2\v.pb.ErrCodeR\x04code\x12)\n" + "\x04code\x18\x01 \x01(\x0e2\b.ErrCodeR\x04code\x12&\n" +
"\x06gameId\x18\x02 \x01(\x0e2\x11.pb.ServiceTypeIdR\x06gameId\x12\x1a\n" + "\x06gameId\x18\x02 \x01(\x0e2\x0e.ServiceTypeIdR\x06gameId\x12\x1a\n" +
"\broomType\x18\x03 \x01(\x05R\broomType\x12 \n" + "\broomType\x18\x03 \x01(\x05R\broomType\x12\x1d\n" +
"\x04User\x18\x04 \x01(\v2\f.pb.GameUserR\x04User\x128\n" + "\x04User\x18\x04 \x01(\v2\t.GameUserR\x04User\x125\n" +
"\tcolorInfo\x18\x14 \x01(\v2\x1a.pb.RspMatchRoom.ColorInfoR\tcolorInfo\x1a\v\n" + "\tcolorInfo\x18\x14 \x01(\v2\x17.RspMatchRoom.ColorInfoR\tcolorInfo\x1a\v\n" +
"\tColorInfo\"7\n" + "\tColorInfo\"4\n" +
"\x13NotifyUserEnterRoom\x12 \n" + "\x13NotifyUserEnterRoom\x12\x1d\n" +
"\x04User\x18\x01 \x03(\v2\f.pb.GameUserR\x04UserB\x11Z\x0fcommon/proto/pbb\x06proto3" "\x04User\x18\x01 \x03(\v2\t.GameUserR\x04UserB\x11Z\x0fcommon/proto/pbb\x06proto3"
var ( var (
file_match_proto_rawDescOnce sync.Once file_match_proto_rawDescOnce sync.Once
@ -266,21 +266,21 @@ func file_match_proto_rawDescGZIP() []byte {
var file_match_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_match_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_match_proto_goTypes = []any{ var file_match_proto_goTypes = []any{
(*ReqMatchRoom)(nil), // 0: pb.ReqMatchRoom (*ReqMatchRoom)(nil), // 0: ReqMatchRoom
(*RspMatchRoom)(nil), // 1: pb.RspMatchRoom (*RspMatchRoom)(nil), // 1: RspMatchRoom
(*NotifyUserEnterRoom)(nil), // 2: pb.NotifyUserEnterRoom (*NotifyUserEnterRoom)(nil), // 2: NotifyUserEnterRoom
(*RspMatchRoom_ColorInfo)(nil), // 3: pb.RspMatchRoom.ColorInfo (*RspMatchRoom_ColorInfo)(nil), // 3: RspMatchRoom.ColorInfo
(ServiceTypeId)(0), // 4: pb.ServiceTypeId (ServiceTypeId)(0), // 4: ServiceTypeId
(ErrCode)(0), // 5: pb.ErrCode (ErrCode)(0), // 5: ErrCode
(*GameUser)(nil), // 6: pb.GameUser (*GameUser)(nil), // 6: GameUser
} }
var file_match_proto_depIdxs = []int32{ var file_match_proto_depIdxs = []int32{
4, // 0: pb.ReqMatchRoom.gameId:type_name -> pb.ServiceTypeId 4, // 0: ReqMatchRoom.gameId:type_name -> ServiceTypeId
5, // 1: pb.RspMatchRoom.code:type_name -> pb.ErrCode 5, // 1: RspMatchRoom.code:type_name -> ErrCode
4, // 2: pb.RspMatchRoom.gameId:type_name -> pb.ServiceTypeId 4, // 2: RspMatchRoom.gameId:type_name -> ServiceTypeId
6, // 3: pb.RspMatchRoom.User:type_name -> pb.GameUser 6, // 3: RspMatchRoom.User:type_name -> GameUser
3, // 4: pb.RspMatchRoom.colorInfo:type_name -> pb.RspMatchRoom.ColorInfo 3, // 4: RspMatchRoom.colorInfo:type_name -> RspMatchRoom.ColorInfo
6, // 5: pb.NotifyUserEnterRoom.User:type_name -> pb.GameUser 6, // 5: NotifyUserEnterRoom.User:type_name -> GameUser
6, // [6:6] is the sub-list for method output_type 6, // [6:6] is the sub-list for method output_type
6, // [6:6] is the sub-list for method input_type 6, // [6:6] is the sub-list for method input_type
6, // [6:6] is the sub-list for extension type_name 6, // [6:6] is the sub-list for extension type_name

4
common/proto/pb/msgId.pb.go
View File

@ -166,7 +166,7 @@ var File_msgId_proto protoreflect.FileDescriptor
const file_msgId_proto_rawDesc = "" + const file_msgId_proto_rawDesc = "" +
"\n" + "\n" +
"\vmsgId.proto\x12\x02pb*\xc0\x05\n" + "\vmsgId.proto*\xc0\x05\n" +
"\x05MsgId\x12\x0e\n" + "\x05MsgId\x12\x0e\n" +
"\n" + "\n" +
"MI_Unknown\x10\x00\x12\x12\n" + "MI_Unknown\x10\x00\x12\x12\n" +
@ -215,7 +215,7 @@ func file_msgId_proto_rawDescGZIP() []byte {
var file_msgId_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_msgId_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_msgId_proto_goTypes = []any{ var file_msgId_proto_goTypes = []any{
(MsgId)(0), // 0: pb.MsgId (MsgId)(0), // 0: MsgId
} }
var file_msgId_proto_depIdxs = []int32{ var file_msgId_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method output_type

4
common/proto/pb/service.pb.go
View File

@ -99,7 +99,7 @@ var File_service_proto protoreflect.FileDescriptor
const file_service_proto_rawDesc = "" + const file_service_proto_rawDesc = "" +
"\n" + "\n" +
"\rservice.proto\x12\x02pb*\xa2\x01\n" + "\rservice.proto*\xa2\x01\n" +
"\rServiceTypeId\x12\x0f\n" + "\rServiceTypeId\x12\x0f\n" +
"\vSTI_Unknown\x10\x00\x12\x0e\n" + "\vSTI_Unknown\x10\x00\x12\x0e\n" +
"\tSTI_Login\x10\x90N\x12\r\n" + "\tSTI_Login\x10\x90N\x12\r\n" +
@ -125,7 +125,7 @@ func file_service_proto_rawDescGZIP() []byte {
var file_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_service_proto_goTypes = []any{ var file_service_proto_goTypes = []any{
(ServiceTypeId)(0), // 0: pb.ServiceTypeId (ServiceTypeId)(0), // 0: ServiceTypeId
} }
var file_service_proto_depIdxs = []int32{ var file_service_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method output_type

6
common/proto/pb/user.pb.go
View File

@ -204,7 +204,7 @@ var File_user_proto protoreflect.FileDescriptor
const file_user_proto_rawDesc = "" + const file_user_proto_rawDesc = "" +
"\n" + "\n" +
"\n" + "\n" +
"user.proto\x12\x02pb\"\x94\x01\n" + "user.proto\"\x94\x01\n" +
"\bChatUser\x12\x16\n" + "\bChatUser\x12\x16\n" +
"\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" +
"\bnickname\x18\x02 \x01(\tR\bnickname\x12\x16\n" + "\bnickname\x18\x02 \x01(\tR\bnickname\x12\x16\n" +
@ -235,8 +235,8 @@ func file_user_proto_rawDescGZIP() []byte {
var file_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_user_proto_goTypes = []any{ var file_user_proto_goTypes = []any{
(*ChatUser)(nil), // 0: pb.ChatUser (*ChatUser)(nil), // 0: ChatUser
(*GameUser)(nil), // 1: pb.GameUser (*GameUser)(nil), // 1: GameUser
} }
var file_user_proto_depIdxs = []int32{ var file_user_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method output_type

3
server/db/operation/userAccount.go
View File

@ -51,6 +51,9 @@ func (s *UserAccountOp) GetUserAccount(username string) (*user.UserAccount, pb.E
us := &user.UserAccount{} us := &user.UserAccount{}
err = s.db.Where("username = ?", username).First(us).Error err = s.db.Where("username = ?", username).First(us).Error
if err != nil { if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, pb.ErrCode_AccountNotExist
}
log.DebugF("find user:%v err:%v", username, err) log.DebugF("find user:%v err:%v", username, err)
return nil, pb.ErrCode_SystemErr return nil, pb.ErrCode_SystemErr
} }

4
server/login/server/processor.go
View File

@ -48,13 +48,13 @@ func (s *LoginService) checkLoginOrRegister(req *pb.ReqUserLogin) (us *user.User
log.ErrorF(s.Log("call rpc:%v err:%s ", rpcMsg.RpcMsgId, err.Error())) log.ErrorF(s.Log("call rpc:%v err:%s ", rpcMsg.RpcMsgId, err.Error()))
return nil, pb.ErrCode_SystemErr, node return nil, pb.ErrCode_SystemErr, node
} }
if rspMsg.RpcCode != 0 { if rspMsg.RpcCode != 0 && rspMsg.RpcCode != int32(pb.ErrCode_AccountNotExist) {
log.ErrorF(s.Log("call rpc:%v err:%s ", rpcMsg.RpcMsgId, pb.ErrCode(rspMsg.RpcCode))) log.ErrorF(s.Log("call rpc:%v err:%s ", rpcMsg.RpcMsgId, pb.ErrCode(rspMsg.RpcCode)))
return nil, pb.ErrCode(rspMsg.RpcCode), node return nil, pb.ErrCode(rspMsg.RpcCode), node
} }
_ = json.Unmarshal(rspMsg.Msg, us) _ = json.Unmarshal(rspMsg.Msg, us)
//log.DebugF("收到rpc:%v返回数据:%v", rpcName.GetUserAccount, string(rspMsg.Msg)) //log.DebugF("收到rpc:%v返回数据:%v", rpcName.GetUserAccount, string(rspMsg.Msg))
if us.ID == 0 { if rspMsg.RpcCode == int32(pb.ErrCode_AccountNotExist) {
// 没有帐号，创建帐号 // 没有帐号，创建帐号
us = &user.UserAccount{ us = &user.UserAccount{
Username: req.Username, Username: req.Username,