diff --git a/comm/const.go b/comm/const.go index e4b4d8738..331aefcef 100644 --- a/comm/const.go +++ b/comm/const.go @@ -437,6 +437,8 @@ const ( // 三消Rank TableEntertainRank = "xxlrank" //排名 + + TableEntertainRecode = "xxlrecode" //战报 ) // RPC服务接口定义处 diff --git a/modules/entertainment/api_record.go b/modules/entertainment/api_record.go new file mode 100644 index 000000000..a2e41f1b3 --- /dev/null +++ b/modules/entertainment/api_record.go @@ -0,0 +1,32 @@ +package entertainment + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.EntertainRecordReq) (errdata *pb.ErrorData) { + + return +} + +// 记录获取 +func (this *apiComp) Record(session comm.IUserSession, req *pb.EntertainRecordReq) (errdata *pb.ErrorData) { + var ( + records []*pb.DBXxlRecord + err error + ) + + if errdata = this.RecordCheck(session, req); errdata != nil { + return + } + + if records, err = this.module.modelRecode.getXxlRecord(session.GetUserId()); err != nil { + return + } + session.SendMsg(string(this.module.GetType()), "record", &pb.EntertainRecordResp{ + Record: records, + }) + return +} diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go index 2030c3d9e..de967d964 100644 --- a/modules/entertainment/model.go +++ b/modules/entertainment/model.go @@ -37,27 +37,10 @@ func (this *modelComp) queryPlayers(uIds []string) (result []*pb.DBXXLData, err } return } -func (this *modelComp) queryXxlPlayer(uId string) (rst *pb.XxlPlayer, err error) { - var ( - result *pb.DBXXLData - ) - result, err = this.getEntertainmList(uId) - if err != nil { - return - } - rst = &pb.XxlPlayer{ - Uinfo: result.Uinfo, - Maxconsumeexp: result.Maxconsumeexp, - Consumeexp: result.Consumeexp, - Maxsocre: result.Maxsocre, - } - return -} func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err error) { result = &pb.DBXXLData{ - Reward: map[int32]int32{}, Card: map[string]int32{}, Skill: map[int32]int32{}, @@ -81,6 +64,19 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err for _, v := range this.module.configure.GetInitGameConsumeSkill() { result.Skill[v] = 1 } + if user, e := this.module.ModuleUser.GetUser(uid); e == nil { + // 查询一次 写基本信息 + result.Uinfo = &pb.BaseUserInfo{ + Uid: uid, + Sid: user.Sid, + Name: user.Name, + Gender: user.Gender, + Skin: user.CurSkin, + Aframe: user.Curaframe, + Title: user.Curtitle, + Lv: user.Lv, + } + } err = this.Add(uid, result) } return result, err diff --git a/modules/entertainment/modelrecord.go b/modules/entertainment/modelrecord.go new file mode 100644 index 000000000..13deeb1f7 --- /dev/null +++ b/modules/entertainment/modelrecord.go @@ -0,0 +1,69 @@ +package entertainment + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelRecode struct { + modules.MCompModel + module *Entertainment +} + +// 组件初始化接口 +func (this *modelRecode) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { + this.TableName = comm.TableEntertainRecode + this.MCompModel.Init(service, module, comp, opt) + this.module = module.(*Entertainment) + // 通过uid创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "p1", Value: bsonx.Int32(1)}}, + }) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "p2", Value: bsonx.Int32(1)}}, + }) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "ctime", Value: bsonx.Int32(1)}}, + }) + return +} + +// 更新排名 +func (this *modelRecode) updateXxlRecord(record *pb.DBXxlRecord) (err error) { + if _, err = this.DBModel.DB.InsertOne(core.SqlTable(this.TableName), record); err != nil { + this.module.Errorln(err) + return + } + return +} + +func (this *modelRecode) getXxlRecord(uid string) (results []*pb.DBXxlRecord, err error) { + var ( + cursor *mongo.Cursor + ) + results = make([]*pb.DBXxlRecord, 0) + if cursor, err = this.DBModel.DB.Find(comm.TableEntertainRecode, bson.M{"$or": []bson.M{{"p1": uid}, + {"p2": uid}}}, options.Find().SetSort(bson.M{"ctime": -1}), + options.Find().SetLimit(int64(comm.MaxRankList))); err != nil { + this.module.Errorln(err) + return + } else { + for cursor.Next(context.Background()) { + temp := &pb.DBXxlRecord{} + if err = cursor.Decode(temp); err != nil { + this.module.Errorln(err) + return + } + results = append(results, temp) + } + } + return +} diff --git a/modules/entertainment/module.go b/modules/entertainment/module.go index b732ee265..fc9bc2799 100644 --- a/modules/entertainment/module.go +++ b/modules/entertainment/module.go @@ -27,8 +27,9 @@ type Entertainment struct { model *modelComp gameMgr *gameMgrComp //room *Room - match *matchComp - modelRank *modelRank + match *matchComp + modelRank *modelRank + modelRecode *modelRecode } // 模块名 @@ -55,6 +56,7 @@ func (this *Entertainment) OnInstallComp() { //this.room = this.RegisterComp(new(Room)).(*Room) this.match = this.RegisterComp(new(matchComp)).(*matchComp) this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank) + this.modelRecode = this.RegisterComp(new(modelRecode)).(*modelRecode) } func (this *Entertainment) Start() (err error) { diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index 2ae4b861b..b16643983 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -121,76 +121,6 @@ func (this *Room) InitRoom(module *Entertainment, p1 *pb.PlayerData, p2 *pb.Play } // AI 操作了 -func (this *Room) AiOperator() { - var ( - curScore int32 - szMap []*pb.MapData - bAddPs bool - oid1 int32 - oid2 int32 - ) - - this.player2.Ps-- - // 交换元素 - szMap, oid1, oid2, bAddPs = this.chessboard.AiSwapGirde() - - if bAddPs { - this.player2.Ps++ - if this.player2.Ps > MaxPs { - this.player2.Ps = MaxPs - } - } - if this.player2.Ps <= 0 { // 权限给下一个人 - this.NexPower = this.player1.Userinfo.Uid - this.player1.Ps = MaxPs - this.round++ - } - // 校验下次是不是消除 - if !this.chessboard.CheckAndRefreshPlat() { - this.chessboard.RedsetPlatData() - szMap = append(szMap, &pb.MapData{ - Data: this.chessboard.GetPalatData(), - ChangeType: 1, - }) - } - for _, v := range szMap { // - curScore += v.CurSocre - this.player2.Score += v.CurSocre - v.CurSocre = this.player2.Score - this.player2.Energy += v.CurEnergy - v.CurEnergy = this.player2.Energy - } - - // 广播消息 - if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "operatorrst", &pb.EntertainOperatorRstPush{ - Mpadata: szMap, - Power: this.NexPower, - Curpower: this.curPower, - Score: curScore, - Round: this.round, - User1: this.player1, - User2: this.player2, - Itype: 0, - Curid: oid1, - Targetid: oid2, - }, this.szSession...); err != nil { - this.module.Errorln(err) - } - - if this.round > this.MaxRound { // 游戏结束 - if this.player1.Score == this.player2.Score { - this.MaxRound += 1 // 增加一回合 - } else { - this.GameOver(nil) - } - return - } - this.curPower = this.NexPower - if this.RoomType == 2 && this.curPower == this.player2.Userinfo.Uid { - //this.AiOperator() - this.AutoOperator(this.curPower) - } -} func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg proto.Message) (errdata *pb.ErrorData) { switch stype { @@ -542,6 +472,8 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { lostPlayer *pb.PlayerData // 输的玩家 box *pb.BoxData // 是否可以获得宝箱奖励 pl []*pb.XxlPlayer + winScore int32 // 胜利获得的积分 + lostScore int32 // 失败扣的积分 ) if winner == nil { if this.player1.Score < this.player2.Score { @@ -563,13 +495,14 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { update map[string]interface{} ) update = make(map[string]interface{}) - if list, err = this.module.model.getEntertainmList(winner.Userinfo.Uid); err == nil { + if list, err = this.module.model.getEntertainmList(winner.Userinfo.Uid); err != nil { return } if conf, err := this.module.configure.GetGameConsumeintegral(list.Consumeexp); err == nil { for _, v := range conf.Rewards { if v.A == "attr" && v.T == "consumeexp" { list.Consumeexp += v.N + winScore = v.N update["consumeexp"] = list.Consumeexp winner.Consumeexp = list.Consumeexp if list.Consumeexp > list.Maxconsumeexp { // 写最高积分 @@ -626,7 +559,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { } if lostPlayer.Userinfo.Uid != "999" { - if conf, err := this.module.configure.GetGameConsumeHero(lostPlayer.Cardid); err == nil { + if conf, err := this.module.configure.GetGameConsumeHero(lostPlayer.Cardid); err != nil { update := map[string]interface{}{} if list, err := this.module.model.getEntertainmList(lostPlayer.Userinfo.Uid); err == nil { if list.Liansheng != 0 { @@ -643,6 +576,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { if conf, err := this.module.configure.GetGameConsumeintegral(list.Consumeexp); err == nil { // 战败扣除积分 for _, v := range conf.Rewards { if v.A == "attr" && v.T == "consumeexp" { + lostScore = v.N list.Consumeexp -= v.N if list.Consumeexp <= 0 { list.Consumeexp = 0 @@ -678,10 +612,28 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { } } } + } // 更新排行榜数据 this.module.modelRank.updateXxlRank(pl...) + // 写记录 + recode1 := &pb.DBXxlRecord{ + Id: primitive.NewObjectID().Hex(), + P1: this.player1.Userinfo.Uid, + P2: this.player2.Userinfo.Uid, + Uinfo1: this.player1.Userinfo, + Uinfo2: this.player2.Userinfo, + P1Score: this.player1.Score, + P2Score: this.player2.Score, + Win: winner.Userinfo.Uid, + Winscore: winScore, + Lostscore: lostScore, + Ctime: configure.Now().Unix(), + } + + this.module.modelRecode.updateXxlRecord(recode1) + // 修改房间状态 this.Status = 2 this.module.SendMsgSyncToSession(string(this.module.GetType()), "gameover", &pb.EntertainGameOverPush{ @@ -701,6 +653,7 @@ func (this *Room) GameOver(winner *pb.PlayerData) (errdata *pb.ErrorData) { timewheel.Remove(this.closeRoomTimer) this.closeRoomTimer = nil } + this.curPower = "" return } @@ -840,7 +793,7 @@ func (this *Room) AutoOperator(uid string) { }, this.szSession...); err != nil { this.module.Errorln(err) } - + this.curPower = this.NexPower if this.round > this.MaxRound { // 游戏结束 if this.player1.Score == this.player2.Score { this.MaxRound += 1 // 增加一回合 @@ -849,7 +802,7 @@ func (this *Room) AutoOperator(uid string) { } return } - this.curPower = this.NexPower + if this.RoomType == 2 && this.curPower == p.Userinfo.Uid { this.AutoOperator(this.curPower) } diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go index cde46657a..26412d5ef 100644 --- a/modules/entertainment/xxlPlat.go +++ b/modules/entertainment/xxlPlat.go @@ -276,57 +276,57 @@ func (this *MapData) Check5X() (bEliminate bool, xiaochu []int, s map[int]int) { } } - // 校验上下左右 - for j := 0; j < Width; j++ { - for k := 0; k < Height; k++ { - pos := j*Width + k - if pos+2 < Height { - k1 := this.Plat[pos].Color - k2 := this.Plat[pos+1].Color - k3 := this.Plat[pos+2].Color - var k4 int32 - var k5 int32 - if k1 == k2 && k3 == k1 { // 三个颜色相等 - tmp := pos - index := 0 - for { - index++ - if tmp/Width-2 >= 0 { // k1 的左右 - k4 = this.Plat[tmp/Width-1].Color - k5 = this.Plat[tmp/Width-2].Color - if k1 == k4 && k1 == k5 { - bEliminate = true - s[tmp] = FiveType - this.Plat[pos].Cid = 0 - this.Plat[pos+1].Cid = 0 - this.Plat[pos+2].Cid = 0 - this.Plat[tmp/Width-1].Cid = 0 - this.Plat[tmp/Width-2].Cid = 0 - } - } - if tmp/Width+2 < Width { - k4 = this.Plat[tmp/Width+1].Color - k5 = this.Plat[tmp/Width+2].Color - if k1 == k4 && k1 == k5 { - bEliminate = true - s[tmp] = FiveType - this.Plat[pos].Cid = 0 - this.Plat[pos+1].Cid = 0 - this.Plat[pos+2].Cid = 0 - this.Plat[tmp/Width+1].Cid = 0 - this.Plat[tmp/Width+2].Cid = 0 - } - } - tmp = pos + 2 - if index == 2 { - break - } - } - } - } + // // 校验上下左右 + // for j := 0; j < Width; j++ { + // for k := 0; k < Height; k++ { + // pos := j*Width + k + // if pos+2 < Height { + // k1 := this.Plat[pos].Color + // k2 := this.Plat[pos+1].Color + // k3 := this.Plat[pos+2].Color + // var k4 int32 + // var k5 int32 + // if k1 == k2 && k3 == k1 { // 三个颜色相等 + // tmp := pos + // index := 0 + // for { + // index++ + // if tmp/Width-2 >= 0 { // k1 的左右 + // k4 = this.Plat[tmp/Width-1].Color + // k5 = this.Plat[tmp/Width-2].Color + // if k1 == k4 && k1 == k5 { + // bEliminate = true + // s[tmp] = FiveType + // this.Plat[pos].Cid = 0 + // this.Plat[pos+1].Cid = 0 + // this.Plat[pos+2].Cid = 0 + // this.Plat[tmp/Width-1].Cid = 0 + // this.Plat[tmp/Width-2].Cid = 0 + // } + // } + // if tmp/Width+2 < Width { + // k4 = this.Plat[tmp/Width+1].Color + // k5 = this.Plat[tmp/Width+2].Color + // if k1 == k4 && k1 == k5 { + // bEliminate = true + // s[tmp] = FiveType + // this.Plat[pos].Cid = 0 + // this.Plat[pos+1].Cid = 0 + // this.Plat[pos+2].Cid = 0 + // this.Plat[tmp/Width+1].Cid = 0 + // this.Plat[tmp/Width+2].Cid = 0 + // } + // } + // tmp = pos + 2 + // if index == 2 { + // break + // } + // } + // } + // } - } - } + // } + // } return } diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index 88160946c..52f54a1a5 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -191,6 +191,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe if heroObj := this.module.QueryHeroByConfId(session.GetUserId(), talent.HeroId); heroObj != nil { var tasks []*pb.BuriedParam tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype123, heroObj.HeroID, heroObj.Star)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype39, 1)) //累计英雄共鸣xx次 tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype124, heroObj.HeroID)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype123, 1, int32(len(talent.Talent)), heroObj.Star)) tasks = append(tasks, comm.GetBuriedParam(comm.Rtype124, 1)) diff --git a/pb/entertain_db.pb.go b/pb/entertain_db.pb.go index 6a114716a..7f56c36fe 100644 --- a/pb/entertain_db.pb.go +++ b/pb/entertain_db.pb.go @@ -267,45 +267,6 @@ func (x *PlayerData) GetSkill() map[int32]int32 { return nil } -//战令 -type XxlWarorder struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *XxlWarorder) Reset() { - *x = XxlWarorder{} - if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *XxlWarorder) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*XxlWarorder) ProtoMessage() {} - -func (x *XxlWarorder) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_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 XxlWarorder.ProtoReflect.Descriptor instead. -func (*XxlWarorder) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{3} -} - // 消消乐匹配数据 type DBXXLMatch struct { state protoimpl.MessageState @@ -321,7 +282,7 @@ type DBXXLMatch struct { func (x *DBXXLMatch) Reset() { *x = DBXXLMatch{} if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[4] + mi := &file_entertain_entertain_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -334,7 +295,7 @@ func (x *DBXXLMatch) String() string { func (*DBXXLMatch) ProtoMessage() {} func (x *DBXXLMatch) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_proto_msgTypes[4] + mi := &file_entertain_entertain_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -347,7 +308,7 @@ func (x *DBXXLMatch) ProtoReflect() protoreflect.Message { // Deprecated: Use DBXXLMatch.ProtoReflect.Descriptor instead. func (*DBXXLMatch) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4} + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{3} } func (x *DBXXLMatch) GetUserinfo() *BaseUserInfo { @@ -390,7 +351,7 @@ type BoxData struct { func (x *BoxData) Reset() { *x = BoxData{} if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[5] + mi := &file_entertain_entertain_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -403,7 +364,7 @@ func (x *BoxData) String() string { func (*BoxData) ProtoMessage() {} func (x *BoxData) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_proto_msgTypes[5] + mi := &file_entertain_entertain_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -416,7 +377,7 @@ func (x *BoxData) ProtoReflect() protoreflect.Message { // Deprecated: Use BoxData.ProtoReflect.Descriptor instead. func (*BoxData) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5} + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4} } func (x *BoxData) GetBoxid() int32 { @@ -465,7 +426,7 @@ type DBXXLData struct { func (x *DBXXLData) Reset() { *x = DBXXLData{} if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[6] + mi := &file_entertain_entertain_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -478,7 +439,7 @@ func (x *DBXXLData) String() string { func (*DBXXLData) ProtoMessage() {} func (x *DBXXLData) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_proto_msgTypes[6] + mi := &file_entertain_entertain_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -491,7 +452,7 @@ func (x *DBXXLData) ProtoReflect() protoreflect.Message { // Deprecated: Use DBXXLData.ProtoReflect.Descriptor instead. func (*DBXXLData) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{6} + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5} } func (x *DBXXLData) GetId() string { @@ -657,7 +618,7 @@ type DBXxlRules struct { func (x *DBXxlRules) Reset() { *x = DBXxlRules{} if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[7] + mi := &file_entertain_entertain_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -670,7 +631,7 @@ func (x *DBXxlRules) String() string { func (*DBXxlRules) ProtoMessage() {} func (x *DBXxlRules) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_proto_msgTypes[7] + mi := &file_entertain_entertain_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -683,7 +644,7 @@ func (x *DBXxlRules) ProtoReflect() protoreflect.Message { // Deprecated: Use DBXxlRules.ProtoReflect.Descriptor instead. func (*DBXxlRules) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{7} + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{6} } func (x *DBXxlRules) GetRoomType() int32 { @@ -737,7 +698,7 @@ type XxlPlayer struct { func (x *XxlPlayer) Reset() { *x = XxlPlayer{} if protoimpl.UnsafeEnabled { - mi := &file_entertain_entertain_db_proto_msgTypes[8] + mi := &file_entertain_entertain_db_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -750,7 +711,7 @@ func (x *XxlPlayer) String() string { func (*XxlPlayer) ProtoMessage() {} func (x *XxlPlayer) ProtoReflect() protoreflect.Message { - mi := &file_entertain_entertain_db_proto_msgTypes[8] + mi := &file_entertain_entertain_db_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -763,7 +724,7 @@ func (x *XxlPlayer) ProtoReflect() protoreflect.Message { // Deprecated: Use XxlPlayer.ProtoReflect.Descriptor instead. func (*XxlPlayer) Descriptor() ([]byte, []int) { - return file_entertain_entertain_db_proto_rawDescGZIP(), []int{8} + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{7} } func (x *XxlPlayer) GetUinfo() *BaseUserInfo { @@ -801,6 +762,134 @@ func (x *XxlPlayer) GetMaxsocre() int32 { return 0 } +// 三消对局记录 +type DBXxlRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + P1 string `protobuf:"bytes,2,opt,name=p1,proto3" json:"p1"` // 服务端索引用 + P2 string `protobuf:"bytes,3,opt,name=p2,proto3" json:"p2"` // 服务端索引用 + Uinfo1 *BaseUserInfo `protobuf:"bytes,4,opt,name=uinfo1,proto3" json:"uinfo1"` //p1基本信息 + Uinfo2 *BaseUserInfo `protobuf:"bytes,5,opt,name=uinfo2,proto3" json:"uinfo2"` //p2基本信息 + P1Score int32 `protobuf:"varint,6,opt,name=p1score,proto3" json:"p1score"` // p1 得分 + P2Score int32 `protobuf:"varint,7,opt,name=p2score,proto3" json:"p2score"` // p2 得分 + Win string `protobuf:"bytes,8,opt,name=win,proto3" json:"win"` // uid 胜利 + Winscore int32 `protobuf:"varint,9,opt,name=winscore,proto3" json:"winscore"` + Lostscore int32 `protobuf:"varint,10,opt,name=lostscore,proto3" json:"lostscore"` + Ctime int64 `protobuf:"varint,11,opt,name=ctime,proto3" json:"ctime"` // 创建时间 +} + +func (x *DBXxlRecord) Reset() { + *x = DBXxlRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_db_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBXxlRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBXxlRecord) ProtoMessage() {} + +func (x *DBXxlRecord) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_db_proto_msgTypes[8] + 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 DBXxlRecord.ProtoReflect.Descriptor instead. +func (*DBXxlRecord) Descriptor() ([]byte, []int) { + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{8} +} + +func (x *DBXxlRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBXxlRecord) GetP1() string { + if x != nil { + return x.P1 + } + return "" +} + +func (x *DBXxlRecord) GetP2() string { + if x != nil { + return x.P2 + } + return "" +} + +func (x *DBXxlRecord) GetUinfo1() *BaseUserInfo { + if x != nil { + return x.Uinfo1 + } + return nil +} + +func (x *DBXxlRecord) GetUinfo2() *BaseUserInfo { + if x != nil { + return x.Uinfo2 + } + return nil +} + +func (x *DBXxlRecord) GetP1Score() int32 { + if x != nil { + return x.P1Score + } + return 0 +} + +func (x *DBXxlRecord) GetP2Score() int32 { + if x != nil { + return x.P2Score + } + return 0 +} + +func (x *DBXxlRecord) GetWin() string { + if x != nil { + return x.Win + } + return "" +} + +func (x *DBXxlRecord) GetWinscore() int32 { + if x != nil { + return x.Winscore + } + return 0 +} + +func (x *DBXxlRecord) GetLostscore() int32 { + if x != nil { + return x.Lostscore + } + return 0 +} + +func (x *DBXxlRecord) GetCtime() int64 { + if x != nil { + return x.Ctime + } + return 0 +} + var File_entertain_entertain_db_proto protoreflect.FileDescriptor var file_entertain_entertain_db_proto_rawDesc = []byte{ @@ -840,107 +929,124 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 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, - 0x0d, 0x0a, 0x0b, 0x58, 0x78, 0x6c, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0xd7, - 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, 0x0a, - 0x08, 0x75, 0x73, 0x65, 0x72, 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, 0x08, - 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, - 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, - 0x12, 0x2c, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, - 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0xd7, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29, + 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 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, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, + 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, + 0x70, 0x12, 0x2c, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, + 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, + 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, + 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xbb, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, + 0x74, 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, + 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, + 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x12, 0x16, + 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x12, 0x2b, 0x0a, 0x05, 0x73, 0x6b, + 0x69, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x58, 0x58, + 0x4c, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x61, 0x6e, 0x73, + 0x68, 0x65, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c, 0x69, 0x61, 0x6e, + 0x73, 0x68, 0x65, 0x6e, 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, + 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, + 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, + 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, + 0x69, 0x70, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x24, 0x0a, + 0x0d, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x11, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, + 0x65, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, + 0x70, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, + 0x65, 0x78, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x12, + 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, + 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, + 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x70, 0x72, 0x6f, 0x67, + 0x65, 0x73, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x70, + 0x72, 0x6f, 0x67, 0x65, 0x73, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, + 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, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 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, 0xac, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, + 0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x63, 0x61, 0x72, 0x64, 0x31, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x12, 0x2f, 0x0a, 0x06, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, + 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x12, 0x2f, 0x0a, 0x06, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, + 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a, + 0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 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, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44, - 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, - 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, - 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xbb, 0x06, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, - 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, - 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x2e, - 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70, - 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, - 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x12, 0x16, 0x0a, - 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, - 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x50, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x74, 0x6f, 0x75, 0x78, 0x69, 0x61, 0x6e, 0x67, 0x12, 0x2b, 0x0a, 0x05, 0x73, 0x6b, 0x69, - 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, - 0x44, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x61, 0x6e, 0x73, 0x68, - 0x65, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c, 0x69, 0x61, 0x6e, 0x73, - 0x68, 0x65, 0x6e, 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, - 0x72, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, - 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, - 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, - 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, - 0x70, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x24, 0x0a, 0x0d, - 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x11, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, - 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, - 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, - 0x78, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x23, - 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, - 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x70, 0x72, 0x6f, 0x67, 0x65, - 0x73, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x70, 0x72, - 0x6f, 0x67, 0x65, 0x73, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 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, - 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x32, 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, 0xac, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, - 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, - 0x61, 0x72, 0x64, 0x31, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x32, 0x12, 0x2f, 0x0a, 0x06, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x31, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x58, - 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x12, 0x2f, 0x0a, 0x06, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, - 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a, 0x0b, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x32, 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, 0xa6, 0x01, 0x0a, 0x09, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x12, 0x23, 0x0a, 0x05, 0x75, 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, 0x05, - 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x78, - 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12, - 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x12, - 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x38, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x09, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65, + 0x72, 0x12, 0x23, 0x0a, 0x05, 0x75, 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, + 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, + 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, + 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70, + 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x22, 0xa1, 0x02, 0x0a, + 0x0b, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, + 0x70, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x31, 0x12, 0x0e, 0x0a, 0x02, + 0x70, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x32, 0x12, 0x25, 0x0a, 0x06, + 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, + 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x75, 0x69, 0x6e, + 0x66, 0x6f, 0x31, 0x12, 0x25, 0x0a, 0x06, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x32, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x06, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x31, + 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x31, 0x73, + 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x32, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x77, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x77, 0x69, 0x6e, + 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x69, 0x6e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x77, 0x69, 0x6e, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1c, 0x0a, 0x09, + 0x6c, 0x6f, 0x73, 0x74, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x6c, 0x6f, 0x73, 0x74, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -960,12 +1066,12 @@ var file_entertain_entertain_db_proto_goTypes = []interface{}{ (*MapData)(nil), // 0: MapData (*GirdeData)(nil), // 1: GirdeData (*PlayerData)(nil), // 2: PlayerData - (*XxlWarorder)(nil), // 3: XxlWarorder - (*DBXXLMatch)(nil), // 4: DBXXLMatch - (*BoxData)(nil), // 5: BoxData - (*DBXXLData)(nil), // 6: DBXXLData - (*DBXxlRules)(nil), // 7: DBXxlRules - (*XxlPlayer)(nil), // 8: XxlPlayer + (*DBXXLMatch)(nil), // 3: DBXXLMatch + (*BoxData)(nil), // 4: BoxData + (*DBXXLData)(nil), // 5: DBXXLData + (*DBXxlRules)(nil), // 6: DBXxlRules + (*XxlPlayer)(nil), // 7: XxlPlayer + (*DBXxlRecord)(nil), // 8: DBXxlRecord nil, // 9: PlayerData.SkillEntry nil, // 10: DBXXLMatch.SkillEntry nil, // 11: DBXXLData.RewardEntry @@ -983,17 +1089,19 @@ var file_entertain_entertain_db_proto_depIdxs = []int32{ 10, // 4: DBXXLMatch.skill:type_name -> DBXXLMatch.SkillEntry 11, // 5: DBXXLData.reward:type_name -> DBXXLData.RewardEntry 12, // 6: DBXXLData.card:type_name -> DBXXLData.CardEntry - 5, // 7: DBXXLData.box:type_name -> BoxData + 4, // 7: DBXXLData.box:type_name -> BoxData 13, // 8: DBXXLData.skill:type_name -> DBXXLData.SkillEntry 16, // 9: DBXXLData.uinfo:type_name -> BaseUserInfo 14, // 10: DBXxlRules.skill1:type_name -> DBXxlRules.Skill1Entry 15, // 11: DBXxlRules.skill2:type_name -> DBXxlRules.Skill2Entry 16, // 12: XxlPlayer.uinfo:type_name -> BaseUserInfo - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 16, // 13: DBXxlRecord.uinfo1:type_name -> BaseUserInfo + 16, // 14: DBXxlRecord.uinfo2:type_name -> BaseUserInfo + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_entertain_entertain_db_proto_init() } @@ -1040,18 +1148,6 @@ func file_entertain_entertain_db_proto_init() { } } file_entertain_entertain_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*XxlWarorder); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_entertain_entertain_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBXXLMatch); i { case 0: return &v.state @@ -1063,7 +1159,7 @@ func file_entertain_entertain_db_proto_init() { return nil } } - file_entertain_entertain_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_entertain_entertain_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BoxData); i { case 0: return &v.state @@ -1075,7 +1171,7 @@ func file_entertain_entertain_db_proto_init() { return nil } } - file_entertain_entertain_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_entertain_entertain_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBXXLData); i { case 0: return &v.state @@ -1087,7 +1183,7 @@ func file_entertain_entertain_db_proto_init() { return nil } } - file_entertain_entertain_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_entertain_entertain_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBXxlRules); i { case 0: return &v.state @@ -1099,7 +1195,7 @@ func file_entertain_entertain_db_proto_init() { return nil } } - file_entertain_entertain_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_entertain_entertain_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*XxlPlayer); i { case 0: return &v.state @@ -1111,6 +1207,18 @@ func file_entertain_entertain_db_proto_init() { return nil } } + file_entertain_entertain_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBXxlRecord); 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/entertain_msg.pb.go b/pb/entertain_msg.pb.go index bcb1fa522..d72444ad1 100644 --- a/pb/entertain_msg.pb.go +++ b/pb/entertain_msg.pb.go @@ -2544,6 +2544,92 @@ func (x *EntertainTaskRewardResp) GetAward() []*UserAtno { return nil } +// 战斗对局 +type EntertainRecordReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *EntertainRecordReq) Reset() { + *x = EntertainRecordReq{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[46] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRecordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRecordReq) ProtoMessage() {} + +func (x *EntertainRecordReq) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[46] + 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 EntertainRecordReq.ProtoReflect.Descriptor instead. +func (*EntertainRecordReq) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{46} +} + +type EntertainRecordResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Record []*DBXxlRecord `protobuf:"bytes,1,rep,name=record,proto3" json:"record"` +} + +func (x *EntertainRecordResp) Reset() { + *x = EntertainRecordResp{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[47] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRecordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRecordResp) ProtoMessage() {} + +func (x *EntertainRecordResp) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[47] + 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 EntertainRecordResp.ProtoReflect.Descriptor instead. +func (*EntertainRecordResp) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{47} +} + +func (x *EntertainRecordResp) GetRecord() []*DBXxlRecord { + if x != nil { + return x.Record + } + return nil +} + var File_entertain_entertain_msg_proto protoreflect.FileDescriptor var file_entertain_entertain_msg_proto_rawDesc = []byte{ @@ -2786,8 +2872,13 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x72, 0x6f, 0x67, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x61, 0x73, 0x6b, 0x70, 0x72, 0x6f, 0x67, 0x65, 0x73, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 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, + 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x45, 0x6e, + 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x22, 0x3b, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2802,7 +2893,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte { return file_entertain_entertain_msg_proto_rawDescData } -var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48) +var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 50) var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainMatchReq)(nil), // 0: EntertainMatchReq (*EntertainMatchResp)(nil), // 1: EntertainMatchResp @@ -2850,52 +2941,56 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainRankResp)(nil), // 43: EntertainRankResp (*EntertainTaskRewardReq)(nil), // 44: EntertainTaskRewardReq (*EntertainTaskRewardResp)(nil), // 45: EntertainTaskRewardResp - nil, // 46: EntertainChangePush.CardEntry - nil, // 47: EntertainChangePush.SkillEntry - (*PlayerData)(nil), // 48: PlayerData - (*MapData)(nil), // 49: MapData - (*UserAtno)(nil), // 50: UserAtno - (*BoxData)(nil), // 51: BoxData - (*DBXXLData)(nil), // 52: DBXXLData - (*XxlPlayer)(nil), // 53: XxlPlayer + (*EntertainRecordReq)(nil), // 46: EntertainRecordReq + (*EntertainRecordResp)(nil), // 47: EntertainRecordResp + nil, // 48: EntertainChangePush.CardEntry + nil, // 49: EntertainChangePush.SkillEntry + (*PlayerData)(nil), // 50: PlayerData + (*MapData)(nil), // 51: MapData + (*UserAtno)(nil), // 52: UserAtno + (*BoxData)(nil), // 53: BoxData + (*DBXXLData)(nil), // 54: DBXXLData + (*XxlPlayer)(nil), // 55: XxlPlayer + (*DBXxlRecord)(nil), // 56: DBXxlRecord } var file_entertain_entertain_msg_proto_depIdxs = []int32{ - 48, // 0: EntertainStartGamePush.user1:type_name -> PlayerData - 48, // 1: EntertainStartGamePush.user2:type_name -> PlayerData - 49, // 2: EntertainStartGamePush.mpadata:type_name -> MapData - 49, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData - 48, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData - 48, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData - 48, // 6: EntertainGameOverPush.user1:type_name -> PlayerData - 48, // 7: EntertainGameOverPush.user2:type_name -> PlayerData - 49, // 8: EntertainGameOverPush.mpadata:type_name -> MapData - 50, // 9: EntertainGameOverPush.reward:type_name -> UserAtno - 51, // 10: EntertainGameOverPush.box:type_name -> BoxData - 48, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData - 48, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData - 49, // 13: EntertainReconnectResp.mpadata:type_name -> MapData - 48, // 14: EntertainReconnectResp.user1:type_name -> PlayerData - 48, // 15: EntertainReconnectResp.user2:type_name -> PlayerData - 49, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData - 49, // 17: EntertainRefreshPush.mpadata:type_name -> MapData - 52, // 18: EntertainGetListResp.data:type_name -> DBXXLData - 52, // 19: EntertainRewardResp.data:type_name -> DBXXLData - 50, // 20: EntertainRewardResp.reward:type_name -> UserAtno - 46, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry - 47, // 22: EntertainChangePush.skill:type_name -> EntertainChangePush.SkillEntry - 48, // 23: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData - 48, // 24: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData - 51, // 25: EntertainBoxRewardResp.box:type_name -> BoxData - 50, // 26: EntertainBoxRewardResp.reward:type_name -> UserAtno - 52, // 27: EntertainReceiveResp.info:type_name -> DBXXLData - 50, // 28: EntertainReceiveResp.award:type_name -> UserAtno - 53, // 29: EntertainRankResp.players:type_name -> XxlPlayer - 50, // 30: EntertainTaskRewardResp.award:type_name -> UserAtno - 31, // [31:31] is the sub-list for method output_type - 31, // [31:31] is the sub-list for method input_type - 31, // [31:31] is the sub-list for extension type_name - 31, // [31:31] is the sub-list for extension extendee - 0, // [0:31] is the sub-list for field type_name + 50, // 0: EntertainStartGamePush.user1:type_name -> PlayerData + 50, // 1: EntertainStartGamePush.user2:type_name -> PlayerData + 51, // 2: EntertainStartGamePush.mpadata:type_name -> MapData + 51, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData + 50, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData + 50, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData + 50, // 6: EntertainGameOverPush.user1:type_name -> PlayerData + 50, // 7: EntertainGameOverPush.user2:type_name -> PlayerData + 51, // 8: EntertainGameOverPush.mpadata:type_name -> MapData + 52, // 9: EntertainGameOverPush.reward:type_name -> UserAtno + 53, // 10: EntertainGameOverPush.box:type_name -> BoxData + 50, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData + 50, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData + 51, // 13: EntertainReconnectResp.mpadata:type_name -> MapData + 50, // 14: EntertainReconnectResp.user1:type_name -> PlayerData + 50, // 15: EntertainReconnectResp.user2:type_name -> PlayerData + 51, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData + 51, // 17: EntertainRefreshPush.mpadata:type_name -> MapData + 54, // 18: EntertainGetListResp.data:type_name -> DBXXLData + 54, // 19: EntertainRewardResp.data:type_name -> DBXXLData + 52, // 20: EntertainRewardResp.reward:type_name -> UserAtno + 48, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry + 49, // 22: EntertainChangePush.skill:type_name -> EntertainChangePush.SkillEntry + 50, // 23: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData + 50, // 24: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData + 53, // 25: EntertainBoxRewardResp.box:type_name -> BoxData + 52, // 26: EntertainBoxRewardResp.reward:type_name -> UserAtno + 54, // 27: EntertainReceiveResp.info:type_name -> DBXXLData + 52, // 28: EntertainReceiveResp.award:type_name -> UserAtno + 55, // 29: EntertainRankResp.players:type_name -> XxlPlayer + 52, // 30: EntertainTaskRewardResp.award:type_name -> UserAtno + 56, // 31: EntertainRecordResp.record:type_name -> DBXxlRecord + 32, // [32:32] is the sub-list for method output_type + 32, // [32:32] is the sub-list for method input_type + 32, // [32:32] is the sub-list for extension type_name + 32, // [32:32] is the sub-list for extension extendee + 0, // [0:32] is the sub-list for field type_name } func init() { file_entertain_entertain_msg_proto_init() } @@ -3458,6 +3553,30 @@ func file_entertain_entertain_msg_proto_init() { return nil } } + file_entertain_entertain_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRecordReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_entertain_entertain_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRecordResp); 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{ @@ -3465,7 +3584,7 @@ func file_entertain_entertain_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_entertain_entertain_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 48, + NumMessages: 50, NumExtensions: 0, NumServices: 0, },