From 7cd04286682eda9caf6a5c22f7bf4bdd3d535627 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 20 Dec 2023 15:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B6=88=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 3 + modules/entertainment/api_rank.go | 67 +++++++ modules/entertainment/model.go | 26 +++ modules/entertainment/modelrank.go | 79 +++++++++ modules/entertainment/module.go | 4 +- pb/entertain_db.pb.go | 274 ++++++++++++++++++++++------- pb/entertain_msg.pb.go | 212 +++++++++++++++++----- 7 files changed, 554 insertions(+), 111 deletions(-) create mode 100644 modules/entertainment/api_rank.go create mode 100644 modules/entertainment/modelrank.go diff --git a/comm/const.go b/comm/const.go index 338f92502..0361aa694 100644 --- a/comm/const.go +++ b/comm/const.go @@ -434,6 +434,9 @@ const ( // 积分boss TableIntegral = "integral" + + // 三消Rank + TableEntertainRank = "xxlrank" //排名 ) // RPC服务接口定义处 diff --git a/modules/entertainment/api_rank.go b/modules/entertainment/api_rank.go new file mode 100644 index 000000000..0ed509380 --- /dev/null +++ b/modules/entertainment/api_rank.go @@ -0,0 +1,67 @@ +package entertainment + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.EntertainRankReq) (errdata *pb.ErrorData) { + + return +} + +// /排行榜获取 +func (this *apiComp) Rank(session comm.IUserSession, req *pb.EntertainRankReq) (errdata *pb.ErrorData) { + var ( + info *pb.XxlPlayer + uids []string + ranks []*pb.DBXXLData + players []*pb.XxlPlayer + err error + ) + + if errdata = this.RankCheck(session, req); errdata != nil { + return + } + if info, err = this.module.model.queryXxlPlayer(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if uids, err = this.module.modelRank.queryRankUser(); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if ranks, err = this.module.model.queryPlayers(uids); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + players = make([]*pb.XxlPlayer, len(ranks)) + for i, v := range ranks { + rank := int32(i + 1) + players[i] = &pb.XxlPlayer{ + Uinfo: v.Uinfo, + Rank: rank, + Maxconsumeexp: v.Maxconsumeexp, + Consumeexp: v.Consumeexp, + Maxsocre: v.Maxsocre, + } + if session.GetUserId() == v.Uinfo.Uid && info.Rank != rank { + info.Rank = rank + } + } + session.SendMsg(string(this.module.GetType()), "rank", &pb.EntertainRankResp{Players: players}) + return +} diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go index 53870e551..83899947f 100644 --- a/modules/entertainment/model.go +++ b/modules/entertainment/model.go @@ -5,6 +5,7 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/db" @@ -31,6 +32,31 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor return } +func (this *modelComp) queryPlayers(uIds []string) (result []*pb.DBXXLData, err error) { + result = make([]*pb.DBXXLData, 0) + if _, err = this.Gets(uIds, &result); err != nil && err != mgo.MongodbNil { + this.module.Errorln(err) + return + } + 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) { var ( dbModel *db.DBModel diff --git a/modules/entertainment/modelrank.go b/modules/entertainment/modelrank.go new file mode 100644 index 000000000..9c0747e98 --- /dev/null +++ b/modules/entertainment/modelrank.go @@ -0,0 +1,79 @@ +package entertainment + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/redis/pipe" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "github.com/go-redis/redis/v8" +) + +type modelRank struct { + modules.MCompModel + module *Entertainment +} + +// 组件初始化接口 +func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { + this.TableName = comm.TableEntertainRank + this.MCompModel.Init(service, module, comp, opt) + this.module = module.(*Entertainment) + + return +} + +// 更新排名 +func (this *modelRank) updateXxlRank(users ...*pb.XxlPlayer) (err error) { + var ( + pipe *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO()) + menbers []*redis.Z + cmd *redis.IntCmd + menbersCmd []*redis.IntCmd = make([]*redis.IntCmd, len(users)) + rank int64 + ) + menbers = make([]*redis.Z, len(users)) + for i, v := range users { + menbers[i] = &redis.Z{Score: float64(v.Consumeexp), Member: v.Uinfo.Uid} + } + if cmd = pipe.ZAdd(this.TableName, menbers...); err != nil { + this.module.Errorln(err) + } + for i, v := range users { + menbersCmd[i] = pipe.ZRevRank(this.TableName, v.Uinfo.Uid) + } + if _, err = pipe.Exec(); err != nil { + this.module.Errorln(err) + return + } + if _, err = cmd.Result(); err != nil { + this.module.Errorln(err) + return + } + for i, v := range menbersCmd { + if rank, err = v.Result(); err != nil { + this.module.Errorln(err) + return + } + users[i].Rank = int32(rank + 1) + } + return +} + +// 获取排行榜前50的用户名单 +func (this *modelRank) queryRankUser() (ranks []string, err error) { + var ( + result []string + ) + if result, err = this.DBModel.Redis.ZRevRange(this.TableName, 0, 50).Result(); err != nil { + this.module.Errorln(err) + return + } + ranks = make([]string, 0) + for i := 0; i < len(result); i += 1 { + ranks = append(ranks, result[i]) + } + return +} diff --git a/modules/entertainment/module.go b/modules/entertainment/module.go index 61fe110b5..95cb7a71a 100644 --- a/modules/entertainment/module.go +++ b/modules/entertainment/module.go @@ -26,7 +26,8 @@ type Entertainment struct { model *modelComp gameMgr *gameMgrComp //room *Room - match *matchComp + match *matchComp + modelRank *modelRank } // 模块名 @@ -52,6 +53,7 @@ func (this *Entertainment) OnInstallComp() { this.gameMgr = this.RegisterComp(new(gameMgrComp)).(*gameMgrComp) //this.room = this.RegisterComp(new(Room)).(*Room) this.match = this.RegisterComp(new(matchComp)).(*matchComp) + this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank) } func (this *Entertainment) Start() (err error) { diff --git a/pb/entertain_db.pb.go b/pb/entertain_db.pb.go index ae44958c3..f7ef3ccc2 100644 --- a/pb/entertain_db.pb.go +++ b/pb/entertain_db.pb.go @@ -445,16 +445,20 @@ type DBXXLData struct { Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 (客户端不用) Playtype []int32 `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"` // 每天随机玩法 // map boxid = 7; // 宝箱 key 宝箱id value 可领取的时间 - Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"` - Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用 - ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用 - Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间 - Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数 - Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0) - Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜 - Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度 - Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"` - Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买 + Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"` + Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用 + ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用 + Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间 + Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数 + Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0) + Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜 + Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度 + Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"` + Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买 + Maxconsumeexp int32 `protobuf:"varint,17,opt,name=maxconsumeexp,proto3" json:"maxconsumeexp"` // 最大赛季积分 + Consumeexp int32 `protobuf:"varint,18,opt,name=consumeexp,proto3" json:"consumeexp"` //赛季积分 + Maxsocre int32 `protobuf:"varint,19,opt,name=maxsocre,proto3" json:"maxsocre"` // 单局最大得分 + Uinfo *BaseUserInfo `protobuf:"bytes,20,opt,name=uinfo,proto3" json:"uinfo"` //用户基础 } func (x *DBXXLData) Reset() { @@ -601,6 +605,34 @@ func (x *DBXXLData) GetVip() bool { return false } +func (x *DBXXLData) GetMaxconsumeexp() int32 { + if x != nil { + return x.Maxconsumeexp + } + return 0 +} + +func (x *DBXXLData) GetConsumeexp() int32 { + if x != nil { + return x.Consumeexp + } + return 0 +} + +func (x *DBXXLData) GetMaxsocre() int32 { + if x != nil { + return x.Maxsocre + } + return 0 +} + +func (x *DBXXLData) GetUinfo() *BaseUserInfo { + if x != nil { + return x.Uinfo + } + return nil +} + // 三消游戏规则 type DBXxlRules struct { state protoimpl.MessageState @@ -681,6 +713,86 @@ func (x *DBXxlRules) GetSkill2() map[int32]int32 { return nil } +//玩家基本信息 +type XxlPlayer struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Uinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=uinfo,proto3" json:"uinfo"` //用户基础 + Rank int32 `protobuf:"varint,2,opt,name=rank,proto3" json:"rank"` //排名 + Maxconsumeexp int32 `protobuf:"varint,3,opt,name=maxconsumeexp,proto3" json:"maxconsumeexp"` // 最大赛季积分 + Consumeexp int32 `protobuf:"varint,4,opt,name=consumeexp,proto3" json:"consumeexp"` //赛季积分 + Maxsocre int32 `protobuf:"varint,5,opt,name=maxsocre,proto3" json:"maxsocre"` // 单局最大得分 +} + +func (x *XxlPlayer) Reset() { + *x = XxlPlayer{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_db_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *XxlPlayer) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*XxlPlayer) ProtoMessage() {} + +func (x *XxlPlayer) 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 XxlPlayer.ProtoReflect.Descriptor instead. +func (*XxlPlayer) Descriptor() ([]byte, []int) { + return file_entertain_entertain_db_proto_rawDescGZIP(), []int{8} +} + +func (x *XxlPlayer) GetUinfo() *BaseUserInfo { + if x != nil { + return x.Uinfo + } + return nil +} + +func (x *XxlPlayer) GetRank() int32 { + if x != nil { + return x.Rank + } + return 0 +} + +func (x *XxlPlayer) GetMaxconsumeexp() int32 { + if x != nil { + return x.Maxconsumeexp + } + return 0 +} + +func (x *XxlPlayer) GetConsumeexp() int32 { + if x != nil { + return x.Consumeexp + } + return 0 +} + +func (x *XxlPlayer) GetMaxsocre() int32 { + if x != nil { + return x.Maxsocre + } + return 0 +} + var File_entertain_entertain_db_proto protoreflect.FileDescriptor var file_entertain_entertain_db_proto_rawDesc = []byte{ @@ -738,7 +850,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 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, 0x92, 0x05, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x99, 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, @@ -768,37 +880,56 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{ 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, 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, + 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, 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 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, 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, } @@ -814,7 +945,7 @@ func file_entertain_entertain_db_proto_rawDescGZIP() []byte { return file_entertain_entertain_db_proto_rawDescData } -var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_entertain_entertain_db_proto_goTypes = []interface{}{ (*MapData)(nil), // 0: MapData (*GirdeData)(nil), // 1: GirdeData @@ -824,32 +955,35 @@ var file_entertain_entertain_db_proto_goTypes = []interface{}{ (*BoxData)(nil), // 5: BoxData (*DBXXLData)(nil), // 6: DBXXLData (*DBXxlRules)(nil), // 7: DBXxlRules - nil, // 8: PlayerData.SkillEntry - nil, // 9: DBXXLMatch.SkillEntry - nil, // 10: DBXXLData.RewardEntry - nil, // 11: DBXXLData.CardEntry - nil, // 12: DBXXLData.SkillEntry - nil, // 13: DBXxlRules.Skill1Entry - nil, // 14: DBXxlRules.Skill2Entry - (*BaseUserInfo)(nil), // 15: BaseUserInfo + (*XxlPlayer)(nil), // 8: XxlPlayer + nil, // 9: PlayerData.SkillEntry + nil, // 10: DBXXLMatch.SkillEntry + nil, // 11: DBXXLData.RewardEntry + nil, // 12: DBXXLData.CardEntry + nil, // 13: DBXXLData.SkillEntry + nil, // 14: DBXxlRules.Skill1Entry + nil, // 15: DBXxlRules.Skill2Entry + (*BaseUserInfo)(nil), // 16: BaseUserInfo } var file_entertain_entertain_db_proto_depIdxs = []int32{ 1, // 0: MapData.data:type_name -> GirdeData - 15, // 1: PlayerData.userinfo:type_name -> BaseUserInfo - 8, // 2: PlayerData.skill:type_name -> PlayerData.SkillEntry - 15, // 3: DBXXLMatch.userinfo:type_name -> BaseUserInfo - 9, // 4: DBXXLMatch.skill:type_name -> DBXXLMatch.SkillEntry - 10, // 5: DBXXLData.reward:type_name -> DBXXLData.RewardEntry - 11, // 6: DBXXLData.card:type_name -> DBXXLData.CardEntry + 16, // 1: PlayerData.userinfo:type_name -> BaseUserInfo + 9, // 2: PlayerData.skill:type_name -> PlayerData.SkillEntry + 16, // 3: DBXXLMatch.userinfo:type_name -> BaseUserInfo + 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 - 12, // 8: DBXXLData.skill:type_name -> DBXXLData.SkillEntry - 13, // 9: DBXxlRules.skill1:type_name -> DBXxlRules.Skill1Entry - 14, // 10: DBXxlRules.skill2:type_name -> DBXxlRules.Skill2Entry - 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 + 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 } func init() { file_entertain_entertain_db_proto_init() } @@ -955,6 +1089,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.(*XxlPlayer); 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{ @@ -962,7 +1108,7 @@ func file_entertain_entertain_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_entertain_entertain_db_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/entertain_msg.pb.go b/pb/entertain_msg.pb.go index 4fa698d51..463570646 100644 --- a/pb/entertain_msg.pb.go +++ b/pb/entertain_msg.pb.go @@ -2257,7 +2257,7 @@ type EntertainReceiveReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Rtype int32 `protobuf:"varint,1,opt,name=Rtype,proto3" json:"Rtype"` + Rtype int32 `protobuf:"varint,1,opt,name=Rtype,proto3" json:"Rtype"` // 战令类型 6 } func (x *EntertainReceiveReq) Reset() { @@ -2354,6 +2354,93 @@ func (x *EntertainReceiveResp) GetAward() []*UserAtno { return nil } +//排行榜 请求 +type EntertainRankReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *EntertainRankReq) Reset() { + *x = EntertainRankReq{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[42] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRankReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRankReq) ProtoMessage() {} + +func (x *EntertainRankReq) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[42] + 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 EntertainRankReq.ProtoReflect.Descriptor instead. +func (*EntertainRankReq) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{42} +} + +//排行榜 回应 +type EntertainRankResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Players []*XxlPlayer `protobuf:"bytes,1,rep,name=players,proto3" json:"players"` +} + +func (x *EntertainRankResp) Reset() { + *x = EntertainRankResp{} + if protoimpl.UnsafeEnabled { + mi := &file_entertain_entertain_msg_proto_msgTypes[43] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EntertainRankResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EntertainRankResp) ProtoMessage() {} + +func (x *EntertainRankResp) ProtoReflect() protoreflect.Message { + mi := &file_entertain_entertain_msg_proto_msgTypes[43] + 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 EntertainRankResp.ProtoReflect.Descriptor instead. +func (*EntertainRankResp) Descriptor() ([]byte, []int) { + return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{43} +} + +func (x *EntertainRankResp) GetPlayers() []*XxlPlayer { + if x != nil { + return x.Players + } + return nil +} + var File_entertain_entertain_msg_proto protoreflect.FileDescriptor var file_entertain_entertain_msg_proto_rawDesc = []byte{ @@ -2582,8 +2669,13 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{ 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 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, + 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x12, 0x0a, + 0x10, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, + 0x71, 0x22, 0x39, 0x0a, 0x11, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x61, + 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, + 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2598,7 +2690,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, 44) +var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 46) var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainMatchReq)(nil), // 0: EntertainMatchReq (*EntertainMatchResp)(nil), // 1: EntertainMatchResp @@ -2642,49 +2734,53 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{ (*EntertainSurrenderResp)(nil), // 39: EntertainSurrenderResp (*EntertainReceiveReq)(nil), // 40: EntertainReceiveReq (*EntertainReceiveResp)(nil), // 41: EntertainReceiveResp - nil, // 42: EntertainChangePush.CardEntry - nil, // 43: EntertainChangePush.SkillEntry - (*PlayerData)(nil), // 44: PlayerData - (*MapData)(nil), // 45: MapData - (*UserAtno)(nil), // 46: UserAtno - (*BoxData)(nil), // 47: BoxData - (*DBXXLData)(nil), // 48: DBXXLData + (*EntertainRankReq)(nil), // 42: EntertainRankReq + (*EntertainRankResp)(nil), // 43: EntertainRankResp + nil, // 44: EntertainChangePush.CardEntry + nil, // 45: EntertainChangePush.SkillEntry + (*PlayerData)(nil), // 46: PlayerData + (*MapData)(nil), // 47: MapData + (*UserAtno)(nil), // 48: UserAtno + (*BoxData)(nil), // 49: BoxData + (*DBXXLData)(nil), // 50: DBXXLData + (*XxlPlayer)(nil), // 51: XxlPlayer } var file_entertain_entertain_msg_proto_depIdxs = []int32{ - 44, // 0: EntertainStartGamePush.user1:type_name -> PlayerData - 44, // 1: EntertainStartGamePush.user2:type_name -> PlayerData - 45, // 2: EntertainStartGamePush.mpadata:type_name -> MapData - 45, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData - 44, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData - 44, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData - 44, // 6: EntertainGameOverPush.user1:type_name -> PlayerData - 44, // 7: EntertainGameOverPush.user2:type_name -> PlayerData - 45, // 8: EntertainGameOverPush.mpadata:type_name -> MapData - 46, // 9: EntertainGameOverPush.reward:type_name -> UserAtno - 47, // 10: EntertainGameOverPush.box:type_name -> BoxData - 44, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData - 44, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData - 45, // 13: EntertainReconnectResp.mpadata:type_name -> MapData - 44, // 14: EntertainReconnectResp.user1:type_name -> PlayerData - 44, // 15: EntertainReconnectResp.user2:type_name -> PlayerData - 45, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData - 45, // 17: EntertainRefreshPush.mpadata:type_name -> MapData - 48, // 18: EntertainGetListResp.data:type_name -> DBXXLData - 48, // 19: EntertainRewardResp.data:type_name -> DBXXLData - 46, // 20: EntertainRewardResp.reward:type_name -> UserAtno - 42, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry - 43, // 22: EntertainChangePush.skill:type_name -> EntertainChangePush.SkillEntry - 44, // 23: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData - 44, // 24: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData - 47, // 25: EntertainBoxRewardResp.box:type_name -> BoxData - 46, // 26: EntertainBoxRewardResp.reward:type_name -> UserAtno - 48, // 27: EntertainReceiveResp.info:type_name -> DBXXLData - 46, // 28: EntertainReceiveResp.award:type_name -> UserAtno - 29, // [29:29] is the sub-list for method output_type - 29, // [29:29] is the sub-list for method input_type - 29, // [29:29] is the sub-list for extension type_name - 29, // [29:29] is the sub-list for extension extendee - 0, // [0:29] is the sub-list for field type_name + 46, // 0: EntertainStartGamePush.user1:type_name -> PlayerData + 46, // 1: EntertainStartGamePush.user2:type_name -> PlayerData + 47, // 2: EntertainStartGamePush.mpadata:type_name -> MapData + 47, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData + 46, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData + 46, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData + 46, // 6: EntertainGameOverPush.user1:type_name -> PlayerData + 46, // 7: EntertainGameOverPush.user2:type_name -> PlayerData + 47, // 8: EntertainGameOverPush.mpadata:type_name -> MapData + 48, // 9: EntertainGameOverPush.reward:type_name -> UserAtno + 49, // 10: EntertainGameOverPush.box:type_name -> BoxData + 46, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData + 46, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData + 47, // 13: EntertainReconnectResp.mpadata:type_name -> MapData + 46, // 14: EntertainReconnectResp.user1:type_name -> PlayerData + 46, // 15: EntertainReconnectResp.user2:type_name -> PlayerData + 47, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData + 47, // 17: EntertainRefreshPush.mpadata:type_name -> MapData + 50, // 18: EntertainGetListResp.data:type_name -> DBXXLData + 50, // 19: EntertainRewardResp.data:type_name -> DBXXLData + 48, // 20: EntertainRewardResp.reward:type_name -> UserAtno + 44, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry + 45, // 22: EntertainChangePush.skill:type_name -> EntertainChangePush.SkillEntry + 46, // 23: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData + 46, // 24: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData + 49, // 25: EntertainBoxRewardResp.box:type_name -> BoxData + 48, // 26: EntertainBoxRewardResp.reward:type_name -> UserAtno + 50, // 27: EntertainReceiveResp.info:type_name -> DBXXLData + 48, // 28: EntertainReceiveResp.award:type_name -> UserAtno + 51, // 29: EntertainRankResp.players:type_name -> XxlPlayer + 30, // [30:30] is the sub-list for method output_type + 30, // [30:30] is the sub-list for method input_type + 30, // [30:30] is the sub-list for extension type_name + 30, // [30:30] is the sub-list for extension extendee + 0, // [0:30] is the sub-list for field type_name } func init() { file_entertain_entertain_msg_proto_init() } @@ -3199,6 +3295,30 @@ func file_entertain_entertain_msg_proto_init() { return nil } } + file_entertain_entertain_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRankReq); 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[43].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EntertainRankResp); 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{ @@ -3206,7 +3326,7 @@ func file_entertain_entertain_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_entertain_entertain_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 44, + NumMessages: 46, NumExtensions: 0, NumServices: 0, },