diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 8e2478f93..3e72bda51 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/db" - "math" "strconv" "time" @@ -169,7 +168,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal this.module.Errorf("db crosserr :%v", err) } - this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), int64(math.MaxInt32-newData.CostTime), newData.Id) + this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id) } // 通关奖励 diff --git a/modules/pagoda/api_crossrank.go b/modules/pagoda/api_crossrank.go index c051bbefc..a41748559 100644 --- a/modules/pagoda/api_crossrank.go +++ b/modules/pagoda/api_crossrank.go @@ -24,7 +24,7 @@ func (this *apiComp) CrossRaceRankListCheck(session comm.IUserSession, req *pb.P func (this *apiComp) CrossRaceRankList(session comm.IUserSession, req *pb.PagodaCrossRaceRankListReq) (errdata *pb.ErrorData) { var ( - szRank []*pb.DBPagodaRecord + szRank []*pb.DBRacePagodaRecord rd *redis.StringSliceCmd ) if errdata = this.CrossRaceRankListCheck(session, req); errdata != nil { @@ -44,7 +44,7 @@ func (this *apiComp) CrossRaceRankList(session comm.IUserSession, req *pb.Pagoda } _dataList := rd.Val() for _, v := range _dataList { - result := &pb.DBPagodaRecord{} + result := &pb.DBRacePagodaRecord{} if err := this.module.modulerank.GetListObj(session.GetUserId(), v, result); err == nil { szRank = append(szRank, result) } diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go index 36ef5eec2..fc526e595 100644 --- a/modules/pagoda/api_racechallengeover.go +++ b/modules/pagoda/api_racechallengeover.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "go_dreamfactory/sys/db" - "math" "strconv" "time" @@ -127,32 +126,19 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda // 记录爬塔明细数据 if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { - leadpos := req.Report.Info.Redflist[0].Leadpos - szLine := make([]*pb.LineUp, 0) - for _, v := range req.Report.Info.Redflist[0].Team { - if v != nil { - szLine = append(szLine, &pb.LineUp{ - Cid: v.HeroID, - Star: v.Star, - Lv: v.Lv, - }) - } - } + // 数据直接插入跨服数据库中 uid := session.GetUserId() - userinfo := this.module.ModuleUser.GetUser(session.GetUserId()) - newData := &pb.DBPagodaRecord{ + userinfo := this.module.ModuleUser.GetUser(session.GetUserId()) // + newData := &pb.DBRacePagodaRecord{ Id: primitive.NewObjectID().Hex(), Uid: session.GetUserId(), - PagodaId: race.Race[conf.Restriction].Curfloor, + Floor: race.Race[conf.Restriction].Curfloor, Type: conf.Restriction, Nickname: userinfo.Name, Icon: "", Lv: userinfo.Lv, - Leadpos: leadpos, - Line: szLine, - CostTime: req.Report.Costtime, - Tab: 0, + Overtime: configure.Now().Unix(), } // 数据写到跨服中 @@ -165,8 +151,8 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda if v.Type == conf.Restriction { newData.Id = v.Id mapRankData := make(map[string]interface{}, 0) - mapRankData["pagodaId"] = race.Race[conf.Restriction].Curfloor - mapRankData["costTime"] = req.Report.Costtime + mapRankData["floor"] = race.Race[conf.Restriction].Curfloor + mapRankData["overtime"] = configure.Now().Unix() dbModel.ChangeList(uid, newData.Id, mapRankData) bRet = true break @@ -179,7 +165,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda } else { this.module.Errorf("db crosserr :%v", err) } - this.module.SetPagodaRankList("race"+strconv.Itoa(int(conf.Restriction)), int64(math.MaxInt32-newData.CostTime), newData.Id) + this.module.SetPagodaRankList("race"+strconv.Itoa(int(conf.Restriction)), race.Race[conf.Restriction].Curfloor, newData.Id) } // 任务相关 //go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab)) diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go index 644922f60..cbc568d9d 100644 --- a/modules/pagoda/api_ranklist.go +++ b/modules/pagoda/api_ranklist.go @@ -36,7 +36,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListR var ( pipe *pipe.RedisPipe = this.module.modelPagoda.Redis.RedisPipe(context.TODO()) ) - + req.Cid = 11 rd = pipe.ZRange("pagodaList"+strconv.Itoa(int(req.Cid)), 0, comm.MaxRankList) if _, err := pipe.Exec(); err != nil { diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 8a15c090e..2c22397a6 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -122,7 +122,7 @@ func (this *Pagoda) CheckUserBasePagodaInfo(uid string) (data *pb.DBPagodaRecord } // redis 排序 tableName:"pagodaList" -func (this *Pagoda) SetPagodaRankList(tableName string, score int64, uid string) { +func (this *Pagoda) SetPagodaRankList(tableName string, score int32, uid string) { if !this.IsCross() { if conn, err := db.Cross(); err == nil { var ( diff --git a/pb/pagoda_db.pb.go b/pb/pagoda_db.pb.go index be8df0f7f..8ad1a2950 100644 --- a/pb/pagoda_db.pb.go +++ b/pb/pagoda_db.pb.go @@ -243,6 +243,110 @@ func (x *DBPagodaRecord) GetTab() int32 { return 0 } +// 爬塔数据明细 +type DBRacePagodaRecord 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 + Floor int32 `protobuf:"varint,3,opt,name=floor,proto3" json:"floor"` // 塔层 + Type int32 `protobuf:"varint,4,opt,name=type,proto3" json:"type"` // 阵营类型 + 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"` // 等级 + Overtime int64 `protobuf:"varint,8,opt,name=overtime,proto3" json:"overtime"` //通关时间 +} + +func (x *DBRacePagodaRecord) Reset() { + *x = DBRacePagodaRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_pagoda_pagoda_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBRacePagodaRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBRacePagodaRecord) ProtoMessage() {} + +func (x *DBRacePagodaRecord) ProtoReflect() protoreflect.Message { + mi := &file_pagoda_pagoda_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 DBRacePagodaRecord.ProtoReflect.Descriptor instead. +func (*DBRacePagodaRecord) Descriptor() ([]byte, []int) { + return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBRacePagodaRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBRacePagodaRecord) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBRacePagodaRecord) GetFloor() int32 { + if x != nil { + return x.Floor + } + return 0 +} + +func (x *DBRacePagodaRecord) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + +func (x *DBRacePagodaRecord) GetNickname() string { + if x != nil { + return x.Nickname + } + return "" +} + +func (x *DBRacePagodaRecord) GetIcon() string { + if x != nil { + return x.Icon + } + return "" +} + +func (x *DBRacePagodaRecord) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + +func (x *DBRacePagodaRecord) GetOvertime() int64 { + if x != nil { + return x.Overtime + } + return 0 +} + type DBPagodaRace struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -256,7 +360,7 @@ type DBPagodaRace struct { func (x *DBPagodaRace) Reset() { *x = DBPagodaRace{} if protoimpl.UnsafeEnabled { - mi := &file_pagoda_pagoda_db_proto_msgTypes[2] + mi := &file_pagoda_pagoda_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -269,7 +373,7 @@ func (x *DBPagodaRace) String() string { func (*DBPagodaRace) ProtoMessage() {} func (x *DBPagodaRace) ProtoReflect() protoreflect.Message { - mi := &file_pagoda_pagoda_db_proto_msgTypes[2] + mi := &file_pagoda_pagoda_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -282,7 +386,7 @@ func (x *DBPagodaRace) ProtoReflect() protoreflect.Message { // Deprecated: Use DBPagodaRace.ProtoReflect.Descriptor instead. func (*DBPagodaRace) Descriptor() ([]byte, []int) { - return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{2} + return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{3} } func (x *DBPagodaRace) GetId() string { @@ -323,7 +427,7 @@ type RaceData struct { func (x *RaceData) Reset() { *x = RaceData{} if protoimpl.UnsafeEnabled { - mi := &file_pagoda_pagoda_db_proto_msgTypes[3] + mi := &file_pagoda_pagoda_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -336,7 +440,7 @@ func (x *RaceData) String() string { func (*RaceData) ProtoMessage() {} func (x *RaceData) ProtoReflect() protoreflect.Message { - mi := &file_pagoda_pagoda_db_proto_msgTypes[3] + mi := &file_pagoda_pagoda_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -349,7 +453,7 @@ func (x *RaceData) ProtoReflect() protoreflect.Message { // Deprecated: Use RaceData.ProtoReflect.Descriptor instead. func (*RaceData) Descriptor() ([]byte, []int) { - return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{3} + return file_pagoda_pagoda_db_proto_rawDescGZIP(), []int{4} } func (x *RaceData) GetRace() int32 { @@ -437,27 +541,39 @@ var file_pagoda_pagoda_db_proto_rawDesc = []byte{ 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, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, - 0x61, 0x62, 0x22, 0xa1, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, - 0x61, 0x63, 0x65, 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, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, - 0x63, 0x65, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, - 0x63, 0x65, 0x1a, 0x42, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44, - 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x72, - 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, - 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x62, 0x22, 0xbc, 0x01, 0x0a, 0x12, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x50, 0x61, 0x67, + 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x14, 0x0a, 0x05, 0x66, + 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x6c, 0x6f, 0x6f, + 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 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, 0x1a, 0x0a, 0x08, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, + 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, + 0x63, 0x65, 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, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x61, 0x63, + 0x65, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, + 0x65, 0x1a, 0x42, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, + 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -472,23 +588,24 @@ func file_pagoda_pagoda_db_proto_rawDescGZIP() []byte { return file_pagoda_pagoda_db_proto_rawDescData } -var file_pagoda_pagoda_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_pagoda_pagoda_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_pagoda_pagoda_db_proto_goTypes = []interface{}{ - (*DBPagoda)(nil), // 0: DBPagoda - (*DBPagodaRecord)(nil), // 1: DBPagodaRecord - (*DBPagodaRace)(nil), // 2: DBPagodaRace - (*RaceData)(nil), // 3: RaceData - nil, // 4: DBPagoda.RewardEntry - nil, // 5: DBPagoda.DataEntry - nil, // 6: DBPagodaRace.RaceEntry - (*LineUp)(nil), // 7: LineUp + (*DBPagoda)(nil), // 0: DBPagoda + (*DBPagodaRecord)(nil), // 1: DBPagodaRecord + (*DBRacePagodaRecord)(nil), // 2: DBRacePagodaRecord + (*DBPagodaRace)(nil), // 3: DBPagodaRace + (*RaceData)(nil), // 4: RaceData + nil, // 5: DBPagoda.RewardEntry + nil, // 6: DBPagoda.DataEntry + nil, // 7: DBPagodaRace.RaceEntry + (*LineUp)(nil), // 8: LineUp } var file_pagoda_pagoda_db_proto_depIdxs = []int32{ - 4, // 0: DBPagoda.reward:type_name -> DBPagoda.RewardEntry - 5, // 1: DBPagoda.data:type_name -> DBPagoda.DataEntry - 7, // 2: DBPagodaRecord.line:type_name -> LineUp - 6, // 3: DBPagodaRace.race:type_name -> DBPagodaRace.RaceEntry - 3, // 4: DBPagodaRace.RaceEntry.value:type_name -> RaceData + 5, // 0: DBPagoda.reward:type_name -> DBPagoda.RewardEntry + 6, // 1: DBPagoda.data:type_name -> DBPagoda.DataEntry + 8, // 2: DBPagodaRecord.line:type_name -> LineUp + 7, // 3: DBPagodaRace.race:type_name -> DBPagodaRace.RaceEntry + 4, // 4: DBPagodaRace.RaceEntry.value:type_name -> RaceData 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 @@ -528,7 +645,7 @@ func file_pagoda_pagoda_db_proto_init() { } } file_pagoda_pagoda_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBPagodaRace); i { + switch v := v.(*DBRacePagodaRecord); i { case 0: return &v.state case 1: @@ -540,6 +657,18 @@ func file_pagoda_pagoda_db_proto_init() { } } file_pagoda_pagoda_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPagodaRace); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pagoda_pagoda_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RaceData); i { case 0: return &v.state @@ -558,7 +687,7 @@ func file_pagoda_pagoda_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pagoda_pagoda_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/pagoda_msg.pb.go b/pb/pagoda_msg.pb.go index 72432ef11..2bc72283d 100644 --- a/pb/pagoda_msg.pb.go +++ b/pb/pagoda_msg.pb.go @@ -1153,7 +1153,7 @@ type PagodaCrossRaceRankListResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ranks []*DBPagodaRecord `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` + Ranks []*DBRacePagodaRecord `protobuf:"bytes,1,rep,name=ranks,proto3" json:"ranks"` } func (x *PagodaCrossRaceRankListResp) Reset() { @@ -1188,7 +1188,7 @@ func (*PagodaCrossRaceRankListResp) Descriptor() ([]byte, []int) { return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{23} } -func (x *PagodaCrossRaceRankListResp) GetRanks() []*DBPagodaRecord { +func (x *PagodaCrossRaceRankListResp) GetRanks() []*DBRacePagodaRecord { if x != nil { return x.Ranks } @@ -1293,12 +1293,12 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{ 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x52, 0x61, 0x63, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x63, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x61, 0x63, 0x65, - 0x69, 0x64, 0x22, 0x44, 0x0a, 0x1b, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x72, 0x6f, 0x73, + 0x69, 0x64, 0x22, 0x48, 0x0a, 0x1b, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x52, 0x61, 0x63, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x12, 0x29, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1348,6 +1348,7 @@ var file_pagoda_pagoda_msg_proto_goTypes = []interface{}{ (*UserAssets)(nil), // 30: UserAssets (*RaceData)(nil), // 31: RaceData (*UserAtno)(nil), // 32: UserAtno + (*DBRacePagodaRecord)(nil), // 33: DBRacePagodaRecord } var file_pagoda_pagoda_msg_proto_depIdxs = []int32{ 25, // 0: PagodaGetListResp.data:type_name -> DBPagoda @@ -1367,7 +1368,7 @@ var file_pagoda_pagoda_msg_proto_depIdxs = []int32{ 31, // 14: PagodaChallengeRaceOverResp.race:type_name -> RaceData 32, // 15: PagodaChallengeRaceOverResp.reward:type_name -> UserAtno 24, // 16: PagodaGetRaceResp.race:type_name -> PagodaGetRaceResp.RaceEntry - 29, // 17: PagodaCrossRaceRankListResp.ranks:type_name -> DBPagodaRecord + 33, // 17: PagodaCrossRaceRankListResp.ranks:type_name -> DBRacePagodaRecord 31, // 18: PagodaGetRaceResp.RaceEntry.value:type_name -> RaceData 19, // [19:19] is the sub-list for method output_type 19, // [19:19] is the sub-list for method input_type