From fa19ac68764e257ba2c799447d1cd71862a29fee Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 7 Dec 2023 16:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8D=89=E8=99=AB=E5=AD=90?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/catchbugs/module.go | 4 +- modules/catchbugs/room.go | 45 +++++++++++++-- pb/catchbugs_db.pb.go | 111 +++++++++++++++++++++--------------- pb/catchbugs_msg.pb.go | 63 ++++++++++++++++---- 4 files changed, 158 insertions(+), 65 deletions(-) diff --git a/modules/catchbugs/module.go b/modules/catchbugs/module.go index f475be258..40124ab2e 100644 --- a/modules/catchbugs/module.go +++ b/modules/catchbugs/module.go @@ -98,11 +98,13 @@ func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string) Info: comm.GetUserBaseInfo(reduser), Integral: redinfo.Integral, Accruedintegral: redinfo.Accruedintegral, + Books: redinfo.Books, } blueplayer = &pb.DBCatchBugsPlayer{ Info: comm.GetUserBaseInfo(blueuser), Integral: blueinfo.Integral, - Accruedintegral: redinfo.Accruedintegral, + Accruedintegral: blueinfo.Accruedintegral, + Books: blueinfo.Books, } roomid, err = this.createRoom(rules, redplayer, blueplayer, sessions) diff --git a/modules/catchbugs/room.go b/modules/catchbugs/room.go index 41b1c5bcf..01316a792 100644 --- a/modules/catchbugs/room.go +++ b/modules/catchbugs/room.go @@ -312,24 +312,55 @@ func (this *Room) PlayerOffline(uid string) (err error) { } func (this *Room) gameover() { + var ( + redcard, bulecard int32 = 0, 0 + redscene, bulescene int32 = 0, 0 + // redintegral, buleintegral int32 = 0, 0 + ok bool + ) winuid := "" if len(this.data.Red.Cards) > len(this.data.Blue.Cards) { winuid = this.data.Red.Info.Uid this.data.Red.Score = int32(len(this.data.Red.Cards) * 4) this.data.Blue.Score = int32(len(this.data.Blue.Cards)) - + if this.data.Rules.Skill != 0 { + redscene = 6 * 2 + bulescene = 3 + } } else if len(this.data.Red.Cards) < len(this.data.Blue.Cards) { winuid = this.data.Blue.Info.Uid this.data.Blue.Score = int32(len(this.data.Blue.Cards) * 4) this.data.Red.Score = int32(len(this.data.Red.Cards)) + if this.data.Rules.Skill != 0 { + redscene = 3 + bulescene = 6 * 2 + } } else { this.data.Red.Score = int32(len(this.data.Red.Cards) * 2) this.data.Blue.Score = int32(len(this.data.Blue.Cards) * 2) + if this.data.Rules.Skill != 0 { + redscene = 6 + bulescene = 6 + } + } + + this.data.Red.Integral += this.data.Red.Score + redscene + this.data.Blue.Integral += this.data.Blue.Score + bulescene + this.data.Red.Accruedintegral += this.data.Red.Score + redscene + this.data.Blue.Accruedintegral += this.data.Blue.Score + redscene + + for _, v := range this.data.Red.Cards { + if _, ok = this.data.Red.Books[v]; !ok { + redcard++ + this.data.Red.Books[v]++ + } + } + for _, v := range this.data.Blue.Cards { + if _, ok = this.data.Blue.Books[v]; !ok { + bulecard++ + this.data.Blue.Books[v]++ + } } - this.data.Red.Integral += this.data.Red.Score - this.data.Blue.Integral += this.data.Blue.Score - this.data.Red.Accruedintegral += this.data.Red.Score - this.data.Blue.Accruedintegral += this.data.Blue.Score this.module.model.Change(this.data.Red.Info.Uid, map[string]interface{}{ "integral": this.data.Red.Integral, "accruedintegral": this.data.Red.Accruedintegral, @@ -342,8 +373,12 @@ func (this *Room) gameover() { } this.SendAllSessions("gameover", &pb.CatchbugsGameOverPush{ Winuid: winuid, + Redscene: redscene, + Bluescene: bulescene, Redintegral: this.data.Red.Integral, Blueintegral: this.data.Blue.Integral, + Redcard: redcard, + Bluecard: bulecard, }) this.module.rooms.removeRoom(this.data.Rid) } diff --git a/pb/catchbugs_db.pb.go b/pb/catchbugs_db.pb.go index 992dfab88..729f4d72c 100644 --- a/pb/catchbugs_db.pb.go +++ b/pb/catchbugs_db.pb.go @@ -194,15 +194,16 @@ type DBCatchBugsPlayer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息 - Ready bool `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"` - Isai bool `protobuf:"varint,3,opt,name=isai,proto3" json:"isai"` //是否是ai - Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` - Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分 - Accruedintegral int32 `protobuf:"varint,6,opt,name=accruedintegral,proto3" json:"accruedintegral"` //累计积分 - Lastopencard int32 `protobuf:"varint,7,opt,name=lastopencard,proto3" json:"lastopencard"` - Cards []int32 `protobuf:"varint,8,rep,packed,name=cards,proto3" json:"cards"` - Coiled int32 `protobuf:"varint,9,opt,name=coiled,proto3" json:"coiled"` //连续成功次数 + Info *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息 + Ready bool `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"` + Isai bool `protobuf:"varint,3,opt,name=isai,proto3" json:"isai"` //是否是ai + Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` + Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分 + Accruedintegral int32 `protobuf:"varint,6,opt,name=accruedintegral,proto3" json:"accruedintegral"` //累计积分 + Lastopencard int32 `protobuf:"varint,7,opt,name=lastopencard,proto3" json:"lastopencard"` + Cards []int32 `protobuf:"varint,8,rep,packed,name=cards,proto3" json:"cards"` + Coiled int32 `protobuf:"varint,9,opt,name=coiled,proto3" json:"coiled"` //连续成功次数 + Books map[int32]int32 `protobuf:"bytes,10,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 } func (x *DBCatchBugsPlayer) Reset() { @@ -300,6 +301,13 @@ func (x *DBCatchBugsPlayer) GetCoiled() int32 { return 0 } +func (x *DBCatchBugsPlayer) GetBooks() map[int32]int32 { + if x != nil { + return x.Books + } + return nil +} + //卡牌 type DBCatchBugsCard struct { state protoimpl.MessageState @@ -507,7 +515,7 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, - 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x8e, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, + 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0xfd, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 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, @@ -524,29 +532,36 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, - 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, - 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, - 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, - 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, - 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, - 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, - 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, - 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, - 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, - 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, - 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, - 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, - 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x06, 0x63, 0x6f, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, + 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, + 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6b, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x1a, 0x38, 0x0a, 0x0a, + 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, + 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, + 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, + 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, + 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, + 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, + 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, + 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, + 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, + 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, + 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, + 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, + 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -561,7 +576,7 @@ func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte { return file_catchbugs_catchbugs_db_proto_rawDescData } -var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ (*DBCatchBugs)(nil), // 0: DBCatchBugs (*DBCatchBugsRules)(nil), // 1: DBCatchBugsRules @@ -572,24 +587,26 @@ var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ nil, // 6: DBCatchBugs.WeekawardEntry nil, // 7: DBCatchBugs.AllawardEntry nil, // 8: DBCatchBugs.LevelEntry - (*BaseUserInfo)(nil), // 9: BaseUserInfo + nil, // 9: DBCatchBugsPlayer.BooksEntry + (*BaseUserInfo)(nil), // 10: BaseUserInfo } var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{ 5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry 6, // 1: DBCatchBugs.weekaward:type_name -> DBCatchBugs.WeekawardEntry 7, // 2: DBCatchBugs.allaward:type_name -> DBCatchBugs.AllawardEntry 8, // 3: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry - 9, // 4: DBCatchBugsPlayer.info:type_name -> BaseUserInfo - 1, // 5: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules - 2, // 6: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer - 2, // 7: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer - 3, // 8: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard - 3, // 9: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 10, // 4: DBCatchBugsPlayer.info:type_name -> BaseUserInfo + 9, // 5: DBCatchBugsPlayer.books:type_name -> DBCatchBugsPlayer.BooksEntry + 1, // 6: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules + 2, // 7: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer + 2, // 8: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer + 3, // 9: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard + 3, // 10: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_catchbugs_catchbugs_db_proto_init() } @@ -666,7 +683,7 @@ func file_catchbugs_catchbugs_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/catchbugs_msg.pb.go b/pb/catchbugs_msg.pb.go index 781e95741..4e75a1433 100644 --- a/pb/catchbugs_msg.pb.go +++ b/pb/catchbugs_msg.pb.go @@ -1008,9 +1008,13 @@ type CatchbugsGameOverPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Winuid string `protobuf:"bytes,1,opt,name=winuid,proto3" json:"winuid"` //赢得人 - 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"` //赢得人 0 平局 1红方胜 2 蓝方胜利 3对方离线认输 + Redscene int32 `protobuf:"varint,2,opt,name=redscene,proto3" json:"redscene"` //红方场地积分 + Bluescene int32 `protobuf:"varint,3,opt,name=bluescene,proto3" json:"bluescene"` //蓝方场地积分 + Redintegral int32 `protobuf:"varint,4,opt,name=redintegral,proto3" json:"redintegral"` //红方积分 + Blueintegral int32 `protobuf:"varint,5,opt,name=blueintegral,proto3" json:"blueintegral"` //蓝方积分 + Redcard int32 `protobuf:"varint,6,opt,name=redcard,proto3" json:"redcard"` //红方解锁卡牌数 + Bluecard int32 `protobuf:"varint,7,opt,name=bluecard,proto3" json:"bluecard"` //蓝方解锁卡牌数 } func (x *CatchbugsGameOverPush) Reset() { @@ -1052,6 +1056,20 @@ func (x *CatchbugsGameOverPush) GetWinuid() string { return "" } +func (x *CatchbugsGameOverPush) GetRedscene() int32 { + if x != nil { + return x.Redscene + } + return 0 +} + +func (x *CatchbugsGameOverPush) GetBluescene() int32 { + if x != nil { + return x.Bluescene + } + return 0 +} + func (x *CatchbugsGameOverPush) GetRedintegral() int32 { if x != nil { return x.Redintegral @@ -1066,6 +1084,20 @@ func (x *CatchbugsGameOverPush) GetBlueintegral() int32 { return 0 } +func (x *CatchbugsGameOverPush) GetRedcard() int32 { + if x != nil { + return x.Redcard + } + return 0 +} + +func (x *CatchbugsGameOverPush) GetBluecard() int32 { + if x != nil { + return x.Bluecard + } + return 0 +} + var File_catchbugs_catchbugs_msg_proto protoreflect.FileDescriptor var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{ @@ -1159,15 +1191,22 @@ var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{ 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, - 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, - 0x73, 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, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, - 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x50, 0x75, 0x73, 0x68, 0x22, 0xe5, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, + 0x67, 0x73, 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, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x73, 0x63, 0x65, + 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x64, 0x73, 0x63, 0x65, + 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x65, + 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, + 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, + 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, + 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x63, 0x61, 0x72, + 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x63, 0x61, 0x72, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x63, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x62, 0x6c, 0x75, 0x65, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (