From 210498560f78528b7a2b757864d2b90361b2c5be Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 1 Nov 2023 10:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B8=B8=E6=88=8F=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caninerabbit/module.go | 25 +- modules/caninerabbit/room.go | 91 +++- pb/caninerabbit_db.pb.go | 62 +-- pb/caninerabbit_msg.pb.go | 781 +++++++++++++++++---------------- pb/gameinvite_msg.pb.go | 2 +- 5 files changed, 525 insertions(+), 436 deletions(-) diff --git a/modules/caninerabbit/module.go b/modules/caninerabbit/module.go index 9a8ca10d2..f725edea7 100644 --- a/modules/caninerabbit/module.go +++ b/modules/caninerabbit/module.go @@ -63,11 +63,12 @@ func (this *CanineRabbit) OnInstallComp() { func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr string) (roomid string, err error) { var ( - rules *pb.DBCanineRabbitRules = &pb.DBCanineRabbitRules{} - chess []*pb.DBCanineRabbitChess - red *pb.DBUser - blue *pb.DBUser - room *Room + rules *pb.DBCanineRabbitRules = &pb.DBCanineRabbitRules{} + chess []*pb.DBCanineRabbitChess + red *pb.DBUser + redtype, bluetype int32 + blue *pb.DBUser + room *Room ) if err = json.Unmarshal([]byte(rulesStr), rules); err != nil { @@ -114,13 +115,23 @@ func (this *CanineRabbit) CreateRoom(sessions []comm.IUserSession, rulesStr stri Y: 2, }) + if rules.RedType == 0 { + redtype = 0 + bluetype = 1 + } else { + redtype = 1 + bluetype = 0 + } + if room, err = this.rooms.newRoom(&pb.DBCanineRabbitRoom{ Rid: roomid, Red: &pb.DBCanineRabbitRoomPlayer{ - Info: comm.GetUserBaseInfo(red), + Info: comm.GetUserBaseInfo(red), + Ctype: redtype, }, Blue: &pb.DBCanineRabbitRoomPlayer{ - Info: comm.GetUserBaseInfo(blue), + Info: comm.GetUserBaseInfo(blue), + Ctype: bluetype, }, Chess: chess, }, sessions); err != nil { diff --git a/modules/caninerabbit/room.go b/modules/caninerabbit/room.go index 217b489a8..3fc1c3218 100644 --- a/modules/caninerabbit/room.go +++ b/modules/caninerabbit/room.go @@ -15,7 +15,7 @@ type Room struct { data *pb.DBCanineRabbitRoom sessions []comm.IUserSession starttime time.Time - currside int32 + currside string currindex int32 } @@ -28,6 +28,7 @@ func (this *Room) GameStart() (err error) { }); err != nil { this.module.Errorln(err) } + return } @@ -39,10 +40,22 @@ func (this *Room) PlayerLoadEnd(uid string) (err error) { } if this.data.Red.Ready && this.data.Blue.Ready { //两个人都准备了 - this.currside = 1 - if err = this.Broadcast("gamestart", &pb.DColorGameStartPush{ - Roomid: this.data.Rid, - Side: 1, + if this.data.Rules.Headstart == 0 { + if this.data.Red.Ctype == 0 { //红方先手 + this.currside = this.data.Red.Info.Uid + } else { + this.currside = this.data.Blue.Info.Uid + } + } else { + if this.data.Red.Ctype == 0 { //红方先手 + this.currside = this.data.Blue.Info.Uid + } else { + this.currside = this.data.Red.Info.Uid + } + } + if err = this.Broadcast("gamestart", &pb.CanineRabbitGameStartPush{ + Roomid: this.data.Rid, + Currplayer: this.currside, }); err != nil { this.module.Errorln(err) } @@ -58,10 +71,15 @@ func (this *Room) PlayerHandle(uid string, handle *pb.CanineRabbitHandleReq) (er v.Y = handle.Chess.Y } } - if this.currside == 1 { - this.currside = 2 + if this.currside == uid { + if this.currside == this.data.Red.Info.Uid { + this.currside = this.data.Blue.Info.Uid + } else { + this.currside = this.data.Red.Info.Uid + } } else { - this.currside = 1 + err = fmt.Errorf("It's not you who shoot!") + return } if err = this.Broadcast("gamehandle", &pb.CanineRabbitGameHandlePush{ Roomid: this.data.Rid, @@ -75,11 +93,12 @@ func (this *Room) PlayerHandle(uid string, handle *pb.CanineRabbitHandleReq) (er //玩家操作 func (this *Room) PlayerWin(uid string, handle *pb.CanineRabbitWinReq) (err error) { - + var ( + winuid string = uid + ) if handle.Iswin { - if this.currside == 1 { - this.data.Red.Score = 1 - if this.data.Rules.RedType == 0 { + if this.currside != this.data.Red.Info.Uid { + if this.data.Red.Ctype == 0 { this.data.Red.Rabbitintegral += 1 } else { this.data.Red.Houndintegral += 1 @@ -88,28 +107,58 @@ func (this *Room) PlayerWin(uid string, handle *pb.CanineRabbitWinReq) (err erro "rabbitintegral": this.data.Red.Rabbitintegral, "houndintegral": this.data.Red.Houndintegral, }) - } else { - this.data.Blue.Score = 1 - if this.data.Rules.RedType == 0 { + if this.data.Blue.Ctype == 0 { this.data.Blue.Rabbitintegral += 1 } else { this.data.Blue.Houndintegral += 1 } this.module.model.Change(this.data.Blue.Info.Uid, map[string]interface{}{ - "rabbitintegral": this.data.Red.Rabbitintegral, - "houndintegral": this.data.Red.Houndintegral, + "rabbitintegral": this.data.Blue.Rabbitintegral, + "houndintegral": this.data.Blue.Houndintegral, }) } if err = this.Broadcast("gameover", &pb.CanineRabbitGameOverPush{ - Winside: this.currside, - RedIntegral: this.data.Red.Score, - BlueIntegral: this.data.Blue.Score, + Winuid: winuid, + Admitdefeat: false, + Red: this.data.Red, + Blue: this.data.Blue, + }); err != nil { + this.module.Errorln(err) + } + } else { + if uid != this.data.Red.Info.Uid { + winuid = this.data.Red.Info.Uid + if this.data.Red.Ctype == 0 { + this.data.Red.Rabbitintegral += 1 + } else { + this.data.Red.Houndintegral += 1 + } + this.module.model.Change(this.data.Red.Info.Uid, map[string]interface{}{ + "rabbitintegral": this.data.Red.Rabbitintegral, + "houndintegral": this.data.Red.Houndintegral, + }) + } else { + winuid = this.data.Blue.Info.Uid + if this.data.Blue.Ctype == 0 { + this.data.Blue.Rabbitintegral += 1 + } else { + this.data.Blue.Houndintegral += 1 + } + this.module.model.Change(this.data.Blue.Info.Uid, map[string]interface{}{ + "rabbitintegral": this.data.Blue.Rabbitintegral, + "houndintegral": this.data.Blue.Houndintegral, + }) + } + if err = this.Broadcast("gameover", &pb.CanineRabbitGameOverPush{ + Winuid: winuid, + Admitdefeat: true, + Red: this.data.Red, + Blue: this.data.Blue, }); err != nil { this.module.Errorln(err) } } - return } func (this *Room) Broadcast(stype string, msg proto.Message) (err error) { diff --git a/pb/caninerabbit_db.pb.go b/pb/caninerabbit_db.pb.go index 0ddaaecf7..e089bed60 100644 --- a/pb/caninerabbit_db.pb.go +++ b/pb/caninerabbit_db.pb.go @@ -20,7 +20,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//切磋请求记录 +//狗兔大战 type DBCanineRabbit struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -164,6 +164,7 @@ func (x *DBCanineRabbitRules) GetHeadstart() int32 { return 0 } +//旗子 type DBCanineRabbitChess struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -240,8 +241,8 @@ type DBCanineRabbitRoomPlayer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息 - Isai bool `protobuf:"varint,2,opt,name=isai,proto3" json:"isai"` + Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息 + Ctype int32 `protobuf:"varint,2,opt,name=ctype,proto3" json:"ctype"` //0兔子 1猎犬 Ready bool `protobuf:"varint,3,opt,name=ready,proto3" json:"ready"` Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` Rabbitintegral int32 `protobuf:"varint,5,opt,name=rabbitintegral,proto3" json:"rabbitintegral"` //兔子积分 @@ -287,11 +288,11 @@ func (x *DBCanineRabbitRoomPlayer) GetInfo() *BaseUserInfo { return nil } -func (x *DBCanineRabbitRoomPlayer) GetIsai() bool { +func (x *DBCanineRabbitRoomPlayer) GetCtype() int32 { if x != nil { - return x.Isai + return x.Ctype } - return false + return 0 } func (x *DBCanineRabbitRoomPlayer) GetReady() bool { @@ -435,34 +436,35 @@ var file_caninerabbit_caninerabbit_db_proto_rawDesc = []byte{ 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x01, 0x79, 0x22, 0xcb, 0x01, 0x0a, 0x18, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, + 0x28, 0x05, 0x52, 0x01, 0x79, 0x22, 0xcd, 0x01, 0x0a, 0x18, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, - 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x72, - 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x24, 0x0a, - 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, - 0x72, 0x61, 0x6c, 0x22, 0xda, 0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, - 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x05, - 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, - 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, + 0x65, 0x61, 0x64, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, + 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, + 0x24, 0x0a, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0xda, 0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, + 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, + 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x2a, + 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x75, + 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x65, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, + 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, + 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, - 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, - 0x62, 0x6c, 0x75, 0x65, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, - 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x2a, 0x0a, 0x05, 0x63, 0x68, 0x65, 0x73, 0x73, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, + 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x68, 0x65, + 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/pb/caninerabbit_msg.pb.go b/pb/caninerabbit_msg.pb.go index 0781ffa32..5e96cd26f 100644 --- a/pb/caninerabbit_msg.pb.go +++ b/pb/caninerabbit_msg.pb.go @@ -106,6 +106,109 @@ func (x *CanineRabbitInfoResp) GetInfo() *DBCanineRabbit { return nil } +//领奖 +type CanineRabbitAwardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` +} + +func (x *CanineRabbitAwardReq) Reset() { + *x = CanineRabbitAwardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CanineRabbitAwardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CanineRabbitAwardReq) ProtoMessage() {} + +func (x *CanineRabbitAwardReq) ProtoReflect() protoreflect.Message { + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CanineRabbitAwardReq.ProtoReflect.Descriptor instead. +func (*CanineRabbitAwardReq) Descriptor() ([]byte, []int) { + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *CanineRabbitAwardReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +type CanineRabbitAwardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` + Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //获取资源 +} + +func (x *CanineRabbitAwardResp) Reset() { + *x = CanineRabbitAwardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CanineRabbitAwardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CanineRabbitAwardResp) ProtoMessage() {} + +func (x *CanineRabbitAwardResp) ProtoReflect() protoreflect.Message { + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CanineRabbitAwardResp.ProtoReflect.Descriptor instead. +func (*CanineRabbitAwardResp) Descriptor() ([]byte, []int) { + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *CanineRabbitAwardResp) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *CanineRabbitAwardResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + //猜颜色单机游戏请求 type CanineRabbitSingleOverReq struct { state protoimpl.MessageState @@ -118,7 +221,7 @@ type CanineRabbitSingleOverReq struct { func (x *CanineRabbitSingleOverReq) Reset() { *x = CanineRabbitSingleOverReq{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[2] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +234,7 @@ func (x *CanineRabbitSingleOverReq) String() string { func (*CanineRabbitSingleOverReq) ProtoMessage() {} func (x *CanineRabbitSingleOverReq) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[2] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +247,7 @@ func (x *CanineRabbitSingleOverReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitSingleOverReq.ProtoReflect.Descriptor instead. func (*CanineRabbitSingleOverReq) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{2} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{4} } func (x *CanineRabbitSingleOverReq) GetStype() int32 { @@ -160,13 +263,14 @@ type CanineRabbitSingleOverResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Integral int32 `protobuf:"varint,1,opt,name=Integral,proto3" json:"Integral"` + Rabbitintegral int32 `protobuf:"varint,1,opt,name=rabbitintegral,proto3" json:"rabbitintegral"` //兔子积分 + Houndintegral int32 `protobuf:"varint,2,opt,name=houndintegral,proto3" json:"houndintegral"` //猎犬积分 } func (x *CanineRabbitSingleOverResp) Reset() { *x = CanineRabbitSingleOverResp{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[3] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -179,7 +283,7 @@ func (x *CanineRabbitSingleOverResp) String() string { func (*CanineRabbitSingleOverResp) ProtoMessage() {} func (x *CanineRabbitSingleOverResp) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[3] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -192,12 +296,19 @@ func (x *CanineRabbitSingleOverResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitSingleOverResp.ProtoReflect.Descriptor instead. func (*CanineRabbitSingleOverResp) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{3} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{5} } -func (x *CanineRabbitSingleOverResp) GetIntegral() int32 { +func (x *CanineRabbitSingleOverResp) GetRabbitintegral() int32 { if x != nil { - return x.Integral + return x.Rabbitintegral + } + return 0 +} + +func (x *CanineRabbitSingleOverResp) GetHoundintegral() int32 { + if x != nil { + return x.Houndintegral } return 0 } @@ -215,7 +326,7 @@ type CanineRabbitGameReadyPush struct { func (x *CanineRabbitGameReadyPush) Reset() { *x = CanineRabbitGameReadyPush{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[4] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -228,7 +339,7 @@ func (x *CanineRabbitGameReadyPush) String() string { func (*CanineRabbitGameReadyPush) ProtoMessage() {} func (x *CanineRabbitGameReadyPush) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[4] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -241,7 +352,7 @@ func (x *CanineRabbitGameReadyPush) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitGameReadyPush.ProtoReflect.Descriptor instead. func (*CanineRabbitGameReadyPush) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{4} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{6} } func (x *CanineRabbitGameReadyPush) GetServicePath() string { @@ -277,7 +388,7 @@ type CanineRabbitLoadCompleteReq struct { func (x *CanineRabbitLoadCompleteReq) Reset() { *x = CanineRabbitLoadCompleteReq{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[5] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -290,7 +401,7 @@ func (x *CanineRabbitLoadCompleteReq) String() string { func (*CanineRabbitLoadCompleteReq) ProtoMessage() {} func (x *CanineRabbitLoadCompleteReq) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[5] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -303,7 +414,7 @@ func (x *CanineRabbitLoadCompleteReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitLoadCompleteReq.ProtoReflect.Descriptor instead. func (*CanineRabbitLoadCompleteReq) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{5} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{7} } func (x *CanineRabbitLoadCompleteReq) GetRoomid() string { @@ -326,7 +437,7 @@ type CanineRabbitLoadCompleteResp struct { func (x *CanineRabbitLoadCompleteResp) Reset() { *x = CanineRabbitLoadCompleteResp{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[6] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -339,7 +450,7 @@ func (x *CanineRabbitLoadCompleteResp) String() string { func (*CanineRabbitLoadCompleteResp) ProtoMessage() {} func (x *CanineRabbitLoadCompleteResp) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[6] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -352,7 +463,7 @@ func (x *CanineRabbitLoadCompleteResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitLoadCompleteResp.ProtoReflect.Descriptor instead. func (*CanineRabbitLoadCompleteResp) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{6} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{8} } func (x *CanineRabbitLoadCompleteResp) GetRoomid() string { @@ -375,14 +486,14 @@ type CanineRabbitGameStartPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //战斗id - Side int32 `protobuf:"varint,2,opt,name=side,proto3" json:"side"` //先手房 0 红方先手 1蓝方先手 + Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //战斗id + Currplayer string `protobuf:"bytes,2,opt,name=currplayer,proto3" json:"currplayer"` //先手方 } func (x *CanineRabbitGameStartPush) Reset() { *x = CanineRabbitGameStartPush{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[7] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -395,7 +506,7 @@ func (x *CanineRabbitGameStartPush) String() string { func (*CanineRabbitGameStartPush) ProtoMessage() {} func (x *CanineRabbitGameStartPush) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[7] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -408,7 +519,7 @@ func (x *CanineRabbitGameStartPush) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitGameStartPush.ProtoReflect.Descriptor instead. func (*CanineRabbitGameStartPush) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{7} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{9} } func (x *CanineRabbitGameStartPush) GetRoomid() string { @@ -418,11 +529,11 @@ func (x *CanineRabbitGameStartPush) GetRoomid() string { return "" } -func (x *CanineRabbitGameStartPush) GetSide() int32 { +func (x *CanineRabbitGameStartPush) GetCurrplayer() string { if x != nil { - return x.Side + return x.Currplayer } - return 0 + return "" } //发送操作信息 @@ -438,7 +549,7 @@ type CanineRabbitHandleReq struct { func (x *CanineRabbitHandleReq) Reset() { *x = CanineRabbitHandleReq{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[8] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -451,7 +562,7 @@ func (x *CanineRabbitHandleReq) String() string { func (*CanineRabbitHandleReq) ProtoMessage() {} func (x *CanineRabbitHandleReq) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[8] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -464,7 +575,7 @@ func (x *CanineRabbitHandleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitHandleReq.ProtoReflect.Descriptor instead. func (*CanineRabbitHandleReq) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{8} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{10} } func (x *CanineRabbitHandleReq) GetRoomid() string { @@ -491,7 +602,7 @@ type CanineRabbitHandleResp struct { func (x *CanineRabbitHandleResp) Reset() { *x = CanineRabbitHandleResp{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[9] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -504,7 +615,7 @@ func (x *CanineRabbitHandleResp) String() string { func (*CanineRabbitHandleResp) ProtoMessage() {} func (x *CanineRabbitHandleResp) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[9] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -517,7 +628,7 @@ func (x *CanineRabbitHandleResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitHandleResp.ProtoReflect.Descriptor instead. func (*CanineRabbitHandleResp) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{9} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{11} } //游戏结果推送 @@ -534,7 +645,7 @@ type CanineRabbitGameHandlePush struct { func (x *CanineRabbitGameHandlePush) Reset() { *x = CanineRabbitGameHandlePush{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[10] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -547,7 +658,7 @@ func (x *CanineRabbitGameHandlePush) String() string { func (*CanineRabbitGameHandlePush) ProtoMessage() {} func (x *CanineRabbitGameHandlePush) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[10] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -560,7 +671,7 @@ func (x *CanineRabbitGameHandlePush) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitGameHandlePush.ProtoReflect.Descriptor instead. func (*CanineRabbitGameHandlePush) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{10} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{12} } func (x *CanineRabbitGameHandlePush) GetRoomid() string { @@ -597,7 +708,7 @@ type CanineRabbitWinReq struct { func (x *CanineRabbitWinReq) Reset() { *x = CanineRabbitWinReq{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[11] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -610,7 +721,7 @@ func (x *CanineRabbitWinReq) String() string { func (*CanineRabbitWinReq) ProtoMessage() {} func (x *CanineRabbitWinReq) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[11] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -623,7 +734,7 @@ func (x *CanineRabbitWinReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitWinReq.ProtoReflect.Descriptor instead. func (*CanineRabbitWinReq) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{11} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{13} } func (x *CanineRabbitWinReq) GetRoomid() string { @@ -649,7 +760,7 @@ type CanineRabbitWinResp struct { func (x *CanineRabbitWinResp) Reset() { *x = CanineRabbitWinResp{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[12] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -662,7 +773,7 @@ func (x *CanineRabbitWinResp) String() string { func (*CanineRabbitWinResp) ProtoMessage() {} func (x *CanineRabbitWinResp) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[12] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -675,7 +786,7 @@ func (x *CanineRabbitWinResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitWinResp.ProtoReflect.Descriptor instead. func (*CanineRabbitWinResp) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{12} + return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{14} } //游戏结束推送 @@ -684,15 +795,16 @@ type CanineRabbitGameOverPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Winside int32 `protobuf:"varint,1,opt,name=winside,proto3" json:"winside"` //0表示平局 1红方胜 2 蓝方胜 - RedIntegral int32 `protobuf:"varint,2,opt,name=redIntegral,proto3" json:"redIntegral"` - BlueIntegral int32 `protobuf:"varint,3,opt,name=blueIntegral,proto3" json:"blueIntegral"` + Winuid string `protobuf:"bytes,1,opt,name=winuid,proto3" json:"winuid"` //赢得人 + Admitdefeat bool `protobuf:"varint,2,opt,name=admitdefeat,proto3" json:"admitdefeat"` //是否认输 + Red *DBCanineRabbitRoomPlayer `protobuf:"bytes,3,opt,name=red,proto3" json:"red"` + Blue *DBCanineRabbitRoomPlayer `protobuf:"bytes,4,opt,name=blue,proto3" json:"blue"` } func (x *CanineRabbitGameOverPush) Reset() { *x = CanineRabbitGameOverPush{} if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[13] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -705,7 +817,7 @@ func (x *CanineRabbitGameOverPush) String() string { func (*CanineRabbitGameOverPush) ProtoMessage() {} func (x *CanineRabbitGameOverPush) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[13] + mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -718,128 +830,33 @@ func (x *CanineRabbitGameOverPush) ProtoReflect() protoreflect.Message { // Deprecated: Use CanineRabbitGameOverPush.ProtoReflect.Descriptor instead. func (*CanineRabbitGameOverPush) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{13} -} - -func (x *CanineRabbitGameOverPush) GetWinside() int32 { - if x != nil { - return x.Winside - } - return 0 -} - -func (x *CanineRabbitGameOverPush) GetRedIntegral() int32 { - if x != nil { - return x.RedIntegral - } - return 0 -} - -func (x *CanineRabbitGameOverPush) GetBlueIntegral() int32 { - if x != nil { - return x.BlueIntegral - } - return 0 -} - -type CanineRabbitAwardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` -} - -func (x *CanineRabbitAwardReq) Reset() { - *x = CanineRabbitAwardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CanineRabbitAwardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CanineRabbitAwardReq) ProtoMessage() {} - -func (x *CanineRabbitAwardReq) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CanineRabbitAwardReq.ProtoReflect.Descriptor instead. -func (*CanineRabbitAwardReq) Descriptor() ([]byte, []int) { - return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{14} -} - -func (x *CanineRabbitAwardReq) GetId() int32 { - if x != nil { - return x.Id - } - return 0 -} - -type CanineRabbitAwardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` - Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //获取资源 -} - -func (x *CanineRabbitAwardResp) Reset() { - *x = CanineRabbitAwardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CanineRabbitAwardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CanineRabbitAwardResp) ProtoMessage() {} - -func (x *CanineRabbitAwardResp) ProtoReflect() protoreflect.Message { - mi := &file_caninerabbit_caninerabbit_msg_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CanineRabbitAwardResp.ProtoReflect.Descriptor instead. -func (*CanineRabbitAwardResp) Descriptor() ([]byte, []int) { return file_caninerabbit_caninerabbit_msg_proto_rawDescGZIP(), []int{15} } -func (x *CanineRabbitAwardResp) GetId() int32 { +func (x *CanineRabbitGameOverPush) GetWinuid() string { if x != nil { - return x.Id + return x.Winuid } - return 0 + return "" } -func (x *CanineRabbitAwardResp) GetAward() []*UserAtno { +func (x *CanineRabbitGameOverPush) GetAdmitdefeat() bool { if x != nil { - return x.Award + return x.Admitdefeat + } + return false +} + +func (x *CanineRabbitGameOverPush) GetRed() *DBCanineRabbitRoomPlayer { + if x != nil { + return x.Red + } + return nil +} + +func (x *CanineRabbitGameOverPush) GetBlue() *DBCanineRabbitRoomPlayer { + if x != nil { + return x.Blue } return nil } @@ -857,35 +874,46 @@ var file_caninerabbit_caninerabbit_msg_proto_rawDesc = []byte{ 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, - 0x62, 0x69, 0x74, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x31, 0x0a, 0x19, 0x43, 0x61, 0x6e, - 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, - 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x22, 0x38, 0x0a, 0x1a, - 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, - 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6e, - 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x6e, - 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x84, 0x01, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x6e, - 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, - 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, - 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, - 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, - 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x35, 0x0a, - 0x1b, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x4c, 0x6f, 0x61, - 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, - 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, - 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4e, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, - 0x62, 0x62, 0x69, 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, - 0x73, 0x75, 0x63, 0x63, 0x22, 0x47, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, - 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, - 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x5b, 0x0a, + 0x62, 0x69, 0x74, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x26, 0x0a, 0x14, 0x43, 0x61, 0x6e, + 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, + 0x64, 0x22, 0x48, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, + 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, + 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x31, 0x0a, 0x19, 0x43, + 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, + 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x22, 0x6a, + 0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x53, 0x69, + 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x0e, + 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x72, 0x61, 0x62, 0x62, 0x69, 0x74, 0x69, 0x6e, 0x74, 0x65, + 0x67, 0x72, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x6f, 0x75, + 0x6e, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x84, 0x01, 0x0a, 0x19, 0x43, + 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x52, + 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x6f, + 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, + 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, + 0x6f, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, + 0x6e, 0x22, 0x35, 0x0a, 0x1b, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, + 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4e, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x69, + 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x53, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x69, + 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x72, + 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1e, 0x0a, + 0x0a, 0x63, 0x75, 0x72, 0x72, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x63, 0x75, 0x72, 0x72, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x2a, @@ -906,23 +934,19 @@ var file_caninerabbit_caninerabbit_msg_proto_rawDesc = []byte{ 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x57, 0x69, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x22, 0x7a, 0x0a, 0x18, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, - 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, - 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, - 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, - 0x72, 0x65, 0x64, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, - 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, - 0x26, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x69, 0x6e, - 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, - 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x73, 0x70, 0x22, 0xb0, 0x01, 0x0a, 0x18, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, 0x52, 0x61, + 0x62, 0x62, 0x69, 0x74, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x6d, 0x69, + 0x74, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x61, + 0x64, 0x6d, 0x69, 0x74, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x65, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, + 0x6e, 0x65, 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, + 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x6e, 0x69, 0x6e, 0x65, + 0x52, 0x61, 0x62, 0x62, 0x69, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -941,36 +965,39 @@ var file_caninerabbit_caninerabbit_msg_proto_msgTypes = make([]protoimpl.Message var file_caninerabbit_caninerabbit_msg_proto_goTypes = []interface{}{ (*CanineRabbitInfoReq)(nil), // 0: CanineRabbitInfoReq (*CanineRabbitInfoResp)(nil), // 1: CanineRabbitInfoResp - (*CanineRabbitSingleOverReq)(nil), // 2: CanineRabbitSingleOverReq - (*CanineRabbitSingleOverResp)(nil), // 3: CanineRabbitSingleOverResp - (*CanineRabbitGameReadyPush)(nil), // 4: CanineRabbitGameReadyPush - (*CanineRabbitLoadCompleteReq)(nil), // 5: CanineRabbitLoadCompleteReq - (*CanineRabbitLoadCompleteResp)(nil), // 6: CanineRabbitLoadCompleteResp - (*CanineRabbitGameStartPush)(nil), // 7: CanineRabbitGameStartPush - (*CanineRabbitHandleReq)(nil), // 8: CanineRabbitHandleReq - (*CanineRabbitHandleResp)(nil), // 9: CanineRabbitHandleResp - (*CanineRabbitGameHandlePush)(nil), // 10: CanineRabbitGameHandlePush - (*CanineRabbitWinReq)(nil), // 11: CanineRabbitWinReq - (*CanineRabbitWinResp)(nil), // 12: CanineRabbitWinResp - (*CanineRabbitGameOverPush)(nil), // 13: CanineRabbitGameOverPush - (*CanineRabbitAwardReq)(nil), // 14: CanineRabbitAwardReq - (*CanineRabbitAwardResp)(nil), // 15: CanineRabbitAwardResp + (*CanineRabbitAwardReq)(nil), // 2: CanineRabbitAwardReq + (*CanineRabbitAwardResp)(nil), // 3: CanineRabbitAwardResp + (*CanineRabbitSingleOverReq)(nil), // 4: CanineRabbitSingleOverReq + (*CanineRabbitSingleOverResp)(nil), // 5: CanineRabbitSingleOverResp + (*CanineRabbitGameReadyPush)(nil), // 6: CanineRabbitGameReadyPush + (*CanineRabbitLoadCompleteReq)(nil), // 7: CanineRabbitLoadCompleteReq + (*CanineRabbitLoadCompleteResp)(nil), // 8: CanineRabbitLoadCompleteResp + (*CanineRabbitGameStartPush)(nil), // 9: CanineRabbitGameStartPush + (*CanineRabbitHandleReq)(nil), // 10: CanineRabbitHandleReq + (*CanineRabbitHandleResp)(nil), // 11: CanineRabbitHandleResp + (*CanineRabbitGameHandlePush)(nil), // 12: CanineRabbitGameHandlePush + (*CanineRabbitWinReq)(nil), // 13: CanineRabbitWinReq + (*CanineRabbitWinResp)(nil), // 14: CanineRabbitWinResp + (*CanineRabbitGameOverPush)(nil), // 15: CanineRabbitGameOverPush (*DBCanineRabbit)(nil), // 16: DBCanineRabbit - (*DBCanineRabbitRoom)(nil), // 17: DBCanineRabbitRoom - (*DBCanineRabbitChess)(nil), // 18: DBCanineRabbitChess - (*UserAtno)(nil), // 19: UserAtno + (*UserAtno)(nil), // 17: UserAtno + (*DBCanineRabbitRoom)(nil), // 18: DBCanineRabbitRoom + (*DBCanineRabbitChess)(nil), // 19: DBCanineRabbitChess + (*DBCanineRabbitRoomPlayer)(nil), // 20: DBCanineRabbitRoomPlayer } var file_caninerabbit_caninerabbit_msg_proto_depIdxs = []int32{ 16, // 0: CanineRabbitInfoResp.info:type_name -> DBCanineRabbit - 17, // 1: CanineRabbitGameReadyPush.room:type_name -> DBCanineRabbitRoom - 18, // 2: CanineRabbitHandleReq.chess:type_name -> DBCanineRabbitChess - 18, // 3: CanineRabbitGameHandlePush.chess:type_name -> DBCanineRabbitChess - 19, // 4: CanineRabbitAwardResp.award:type_name -> UserAtno - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 17, // 1: CanineRabbitAwardResp.award:type_name -> UserAtno + 18, // 2: CanineRabbitGameReadyPush.room:type_name -> DBCanineRabbitRoom + 19, // 3: CanineRabbitHandleReq.chess:type_name -> DBCanineRabbitChess + 19, // 4: CanineRabbitGameHandlePush.chess:type_name -> DBCanineRabbitChess + 20, // 5: CanineRabbitGameOverPush.red:type_name -> DBCanineRabbitRoomPlayer + 20, // 6: CanineRabbitGameOverPush.blue:type_name -> DBCanineRabbitRoomPlayer + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_caninerabbit_caninerabbit_msg_proto_init() } @@ -1006,150 +1033,6 @@ func file_caninerabbit_caninerabbit_msg_proto_init() { } } file_caninerabbit_caninerabbit_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitSingleOverReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitSingleOverResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitGameReadyPush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitLoadCompleteReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitLoadCompleteResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitGameStartPush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitHandleReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitHandleResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitGameHandlePush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitWinReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitWinResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanineRabbitGameOverPush); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanineRabbitAwardReq); i { case 0: return &v.state @@ -1161,7 +1044,7 @@ func file_caninerabbit_caninerabbit_msg_proto_init() { return nil } } - file_caninerabbit_caninerabbit_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_caninerabbit_caninerabbit_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanineRabbitAwardResp); i { case 0: return &v.state @@ -1173,6 +1056,150 @@ func file_caninerabbit_caninerabbit_msg_proto_init() { return nil } } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitSingleOverReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitSingleOverResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitGameReadyPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitLoadCompleteReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitLoadCompleteResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitGameStartPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitHandleReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitHandleResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitGameHandlePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitWinReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitWinResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_caninerabbit_caninerabbit_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CanineRabbitGameOverPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/pb/gameinvite_msg.pb.go b/pb/gameinvite_msg.pb.go index bfcf3eefe..1203ea243 100644 --- a/pb/gameinvite_msg.pb.go +++ b/pb/gameinvite_msg.pb.go @@ -27,7 +27,7 @@ type GameInviteQiecuoReq struct { unknownFields protoimpl.UnknownFields Fid string `protobuf:"bytes,1,opt,name=fid,proto3" json:"fid"` //游戏邀请对象 - Gtype int32 `protobuf:"varint,2,opt,name=gtype,proto3" json:"gtype"` //游戏类型 + Gtype int32 `protobuf:"varint,2,opt,name=gtype,proto3" json:"gtype"` //游戏类型 1 武馆切磋 2 犬兔大战 3 猜颜色 Rules string `protobuf:"bytes,3,opt,name=rules,proto3" json:"rules"` //规则字符串 }