diff --git a/comm/const.go b/comm/const.go index 8e57fcf50..621090655 100644 --- a/comm/const.go +++ b/comm/const.go @@ -152,6 +152,8 @@ const ( // 维京远征排行榜 TableVikingRank = "vikingrank" + TableVikingSRank = "vikingsrank" // 赛季BOSS rank + //月之秘境 TableMoonFantasy = "moonfantasy" TableUserMFantasy = "usermfantasy" diff --git a/modules/mline/model_mainline.go b/modules/mline/model_mainline.go index a20bb637d..c44a8c0ed 100644 --- a/modules/mline/model_mainline.go +++ b/modules/mline/model_mainline.go @@ -20,7 +20,7 @@ func (this *ModelMline) Init(service core.IService, module core.IModule, comp co err = this.MCompModel.Init(service, module, comp, options) this.module = module.(*Mline) //创建uid索引 - this.DB.CreateIndex(core.SqlTable(comm.TableMail), mongo.IndexModel{ + this.DB.CreateIndex(core.SqlTable(comm.TableMline), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, }) return diff --git a/modules/pagoda/model_rank.go b/modules/pagoda/model_rank.go index c78e89980..e2b08bb1c 100644 --- a/modules/pagoda/model_rank.go +++ b/modules/pagoda/model_rank.go @@ -29,7 +29,7 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor this.modulePagoda = module.(*Pagoda) //创建uid索引 - this.DB.CreateIndex(core.SqlTable(comm.TableMail), mongo.IndexModel{ + this.DB.CreateIndex(core.SqlTable(comm.TablePagodaRecord), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, }) return diff --git a/modules/passon/modelPasson.go b/modules/passon/modelPasson.go index 102924fec..6165dd12d 100644 --- a/modules/passon/modelPasson.go +++ b/modules/passon/modelPasson.go @@ -23,7 +23,7 @@ func (this *modelPasson) Init(service core.IService, module core.IModule, comp c this.MCompModel.Init(service, module, comp, options) this.module = module.(*Passon) //创建uid索引 - this.DB.CreateIndex(core.SqlTable(comm.TableMail), mongo.IndexModel{ + this.DB.CreateIndex(core.SqlTable(comm.TablePasson), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, }) return diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index bcf820a52..a0fe54114 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -128,14 +128,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal } } } - // else if v.A == "item" { //道具出售 以后补充 - // if cfg, err := this.configure.GetItemConfigureData(v.T); err != nil { // 自动出售 转换成其他道具 - // if len(cfg.Sale) != 0 { - // bFound = true - // res = append(res, cfg.Sale...) - // } - // } - // } + if !bFound { res = append(res, v) } diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go index 681e9014f..100d9295c 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -24,7 +24,7 @@ func (this *ModelRank) Init(service core.IService, module core.IModule, comp cor err = this.MCompModel.Init(service, module, comp, options) this.moduleViking = module.(*Viking) //创建uid索引 - this.DB.CreateIndex(core.SqlTable(comm.TableMail), mongo.IndexModel{ + this.DB.CreateIndex(core.SqlTable(comm.TableVikingRank), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, }) return diff --git a/modules/viking/model_seasonrank.go b/modules/viking/model_seasonrank.go new file mode 100644 index 000000000..177549420 --- /dev/null +++ b/modules/viking/model_seasonrank.go @@ -0,0 +1,87 @@ +package viking + +import ( + "context" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/redis/pipe" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + "go_dreamfactory/sys/db" + + "github.com/go-redis/redis/v8" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type ModelSeasonRank struct { + modules.MCompModel + moduleViking *Viking +} + +func (this *ModelSeasonRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = comm.TableVikingSRank + err = this.MCompModel.Init(service, module, comp, options) + this.moduleViking = module.(*Viking) + //创建uid索引 + this.DB.CreateIndex(core.SqlTable(comm.TableVikingSRank), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} +func (this *ModelSeasonRank) AddSeasonRankList(uId string, id string, data *pb.DBVSeasonRank) (err error) { + if err = this.AddList(uId, id, data); err != nil { + return + } + return nil +} + +// 获取排行榜数据 +func (this *ModelSeasonRank) getVikingSeasonRankList(uid string) []*pb.DBVSeasonRank { + ranks := make([]*pb.DBVSeasonRank, 0) + err := this.GetList(uid, &ranks) + if err != nil { + return nil + } + return ranks +} + +func (this *ModelSeasonRank) getVikingSeasonRankListByBossType(uid string, bossType int32) *pb.DBVSeasonRank { + ranks := make([]*pb.DBVSeasonRank, 0) + err := this.GetList(uid, &ranks) + if err != nil { + return nil + } + for _, v := range ranks { + if v.Bosstype == bossType { + return v + } + } + return nil +} + +// 排行数据写跨服 +func (this *ModelSeasonRank) SetRankListData(tableName string, score int64, objId string) { + if !db.IsCross() { + if conn, err := db.Cross(); err == nil { + var ( + pipe *pipe.RedisPipe = conn.Redis.RedisPipe(context.TODO()) + menbers *redis.Z + ) + + menbers = &redis.Z{Score: float64(score), Member: objId} + + if cmd := pipe.ZAdd(tableName, menbers); cmd != nil { + + dock, err1 := cmd.Result() + if err1 != nil { + this.moduleViking.Errorln(dock, err1) + } + } + if _, err := pipe.Exec(); err != nil { + this.moduleViking.Errorln(err) + return + } + } + } +} diff --git a/modules/viking/module.go b/modules/viking/module.go index 98302e0bc..4165d27f6 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -26,12 +26,13 @@ import ( type Viking struct { modules.ModuleBase - modelViking *modelViking - api *apiComp - configure *configureComp - modulerank *ModelRank - battle comm.IBattle - service base.IRPCXService + modelViking *modelViking + api *apiComp + configure *configureComp + modulerank *ModelRank + moduleseasonrank *ModelSeasonRank + battle comm.IBattle + service base.IRPCXService } const ( @@ -58,6 +59,7 @@ func (this *Viking) OnInstallComp() { this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelViking = this.RegisterComp(new(modelViking)).(*modelViking) this.modulerank = this.RegisterComp(new(ModelRank)).(*ModelRank) + this.moduleseasonrank = this.RegisterComp(new(ModelSeasonRank)).(*ModelSeasonRank) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } @@ -421,3 +423,74 @@ func (this *Viking) CheckPreSeasonData() (bLocal bool) { } return true } + +// 记录数据存在跨服 +func (this *Viking) CheckSeasonRank(uid string, boosID int32, difficulty int32, leadpos int32, szLine []*pb.LineUp, huihe int32) { + conn_, err := db.Cross() // 获取跨服数据库对象 + if err != nil { + return + } + userinfo := this.ModuleUser.GetUser(uid) + model := db.NewDBModel(comm.TableVikingSRank, 0, conn_) + + // 写入排行榜 + objID := "" + bFind := false + ranks := make([]*pb.DBVSeasonRank, 0) + model.GetList(uid, &ranks) + for _, v := range ranks { + if v.Bosstype == boosID && v.Difficulty <= difficulty { + mapRankData := make(map[string]interface{}, 0) + mapRankData["difficulty"] = difficulty + mapRankData["bosstype"] = boosID + mapRankData["Leadpos"] = leadpos + mapRankData["line"] = szLine + mapRankData["huihe"] = huihe + + model.ChangeList(uid, v.Id, mapRankData) + objID = v.Id + bFind = true + break + } + } + if !bFind { + + new := &pb.DBVSeasonRank{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Difficulty: difficulty, + Bosstype: boosID, + Nickname: userinfo.Name, + Icon: "", + Lv: userinfo.Lv, + Leadpos: leadpos, + Line: szLine, + Huihe: huihe, + } + objID = new.Id + model.AddList(uid, new.Id, new) + } + + var ( + pipe *pipe.RedisPipe = conn_.Redis.RedisPipe(context.TODO()) + menbers *redis.Z + tableName string + score int32 + ) + score = difficulty<<16 + huihe + tableName = "vSeasonRank" + strconv.Itoa(int(boosID)) + strKey := "vSeasonRank:" + uid + "-" + objID // 自定义key + menbers = &redis.Z{Score: float64(score), Member: strKey} + + if cmd := pipe.ZAdd(tableName, menbers); cmd != nil { + + dock, err1 := cmd.Result() + if err1 != nil { + this.Errorln(dock, err1) + } + } + if _, err := pipe.Exec(); err != nil { + this.Errorln(err) + return + } +} diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index b423a3d1a..ed35a5b0c 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -329,7 +329,7 @@ type DBActivityData struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"` + Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"` Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"` Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` @@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string { return "" } -func (x *DBActivityData) GetHid() int32 { +func (x *DBActivityData) GetHdid() int32 { if x != nil { - return x.Hid + return x.Hdid } return 0 } @@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{ 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, - 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, - 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, + 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, + 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go index 13023b1b0..5cea1d8d4 100644 --- a/pb/viking_db.pb.go +++ b/pb/viking_db.pb.go @@ -220,6 +220,126 @@ func (x *DBVikingRank) GetCostTime() int32 { return 0 } +// 装备副本DBVSeasonRank +type DBVSeasonRank struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度 + Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型 + Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称 + Icon string `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon"` // 玩家头像 + Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级 + Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 + Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据 + Huihe int32 `protobuf:"varint,10,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 建议*10 +} + +func (x *DBVSeasonRank) Reset() { + *x = DBVSeasonRank{} + if protoimpl.UnsafeEnabled { + mi := &file_viking_viking_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBVSeasonRank) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBVSeasonRank) ProtoMessage() {} + +func (x *DBVSeasonRank) ProtoReflect() protoreflect.Message { + mi := &file_viking_viking_db_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBVSeasonRank.ProtoReflect.Descriptor instead. +func (*DBVSeasonRank) Descriptor() ([]byte, []int) { + return file_viking_viking_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBVSeasonRank) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBVSeasonRank) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBVSeasonRank) GetDifficulty() int32 { + if x != nil { + return x.Difficulty + } + return 0 +} + +func (x *DBVSeasonRank) GetBosstype() int32 { + if x != nil { + return x.Bosstype + } + return 0 +} + +func (x *DBVSeasonRank) GetNickname() string { + if x != nil { + return x.Nickname + } + return "" +} + +func (x *DBVSeasonRank) GetIcon() string { + if x != nil { + return x.Icon + } + return "" +} + +func (x *DBVSeasonRank) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *DBVSeasonRank) GetLeadpos() int32 { + if x != nil { + return x.Leadpos + } + return 0 +} + +func (x *DBVSeasonRank) GetLine() []*LineUp { + if x != nil { + return x.Line + } + return nil +} + +func (x *DBVSeasonRank) GetHuihe() int32 { + if x != nil { + return x.Huihe + } + return 0 +} + var File_viking_viking_db_proto protoreflect.FileDescriptor var file_viking_viking_db_proto_rawDesc = []byte{ @@ -264,7 +384,23 @@ var file_viking_viking_db_proto_rawDesc = []byte{ 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, + 0x6e, 0x6b, 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, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, + 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, + 0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, + 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, + 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, + 0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, + 0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -279,25 +415,27 @@ func file_viking_viking_db_proto_rawDescGZIP() []byte { return file_viking_viking_db_proto_rawDescData } -var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_viking_viking_db_proto_goTypes = []interface{}{ - (*DBViking)(nil), // 0: DBViking - (*DBVikingRank)(nil), // 1: DBVikingRank - nil, // 2: DBViking.BossEntry - nil, // 3: DBViking.BossTimeEntry - nil, // 4: DBViking.PsEntry - (*LineUp)(nil), // 5: LineUp + (*DBViking)(nil), // 0: DBViking + (*DBVikingRank)(nil), // 1: DBVikingRank + (*DBVSeasonRank)(nil), // 2: DBVSeasonRank + nil, // 3: DBViking.BossEntry + nil, // 4: DBViking.BossTimeEntry + nil, // 5: DBViking.PsEntry + (*LineUp)(nil), // 6: LineUp } var file_viking_viking_db_proto_depIdxs = []int32{ - 2, // 0: DBViking.boss:type_name -> DBViking.BossEntry - 3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry - 4, // 2: DBViking.ps:type_name -> DBViking.PsEntry - 5, // 3: DBVikingRank.line:type_name -> LineUp - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 3, // 0: DBViking.boss:type_name -> DBViking.BossEntry + 4, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry + 5, // 2: DBViking.ps:type_name -> DBViking.PsEntry + 6, // 3: DBVikingRank.line:type_name -> LineUp + 6, // 4: DBVSeasonRank.line:type_name -> LineUp + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_viking_viking_db_proto_init() } @@ -331,6 +469,18 @@ func file_viking_viking_db_proto_init() { return nil } } + file_viking_viking_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBVSeasonRank); 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{ @@ -338,7 +488,7 @@ func file_viking_viking_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_db_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 6, NumExtensions: 0, NumServices: 0, },