diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index ffb843303..4bec1ebc4 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -126,7 +126,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c if nextAwaken == nil { // 达到满级觉醒 resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) if resonConfig == nil { // 满星 - + if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) + } } } } diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 49fa17710..22d91678e 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -124,5 +124,20 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR // 任务相关 this.module.ModuleRtask.SendToRtask(session, comm.Rtype39, 1) this.module.ModuleRtask.SendToRtask(session, comm.Rtype40, 1, 1) + cfg := this.module.configure.GetHero(_hero.HeroID) + if cfg != nil { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv) + //xx英雄满级、共鸣、觉醒至最高状态 + nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) + if nextAwaken == nil { // 达到满级觉醒 + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) + if resonConfig == nil { // 满星 + if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) + } + } + } + } return } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 8141d5e0a..b77fd61e2 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -197,6 +197,18 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren cfg := this.module.configure.GetHero(_hero.HeroID) if cfg != nil { this.module.ModuleRtask.SendToRtask(session, comm.Rtype32, 1, cfg.Color, _hero.Lv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv) + //xx英雄满级、共鸣、觉醒至最高状态 + nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) + if nextAwaken == nil { // 达到满级觉醒 + resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, _hero.Star+1) + if resonConfig == nil { // 满星 + if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) + } + } + } } this.module.ModuleRtask.SendToRtask(session, comm.Rtype33, 1, 1, _hero.Lv) } diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 72c46f67c..0f346acee 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -42,10 +42,10 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng return } // 类型校验 - boosData := this.configure.GetVikingBossConfigData(req.BossType, req.Difficulty) - if boosData != nil { - if value, ok := viking.Boos[req.BossType]; !ok { // 类型校验 - viking.Boos[req.BossType] = 0 + BossData := this.configure.GetVikingBossConfigData(req.BossType, req.Difficulty) + if BossData != nil { + if value, ok := viking.Boss[req.BossType]; !ok { // 类型校验 + viking.Boss[req.BossType] = 0 if value < req.Difficulty { if value+1 != req.Difficulty { code = pb.ErrorCode_VikingLvErr @@ -62,14 +62,14 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng if code = this.module.DispenseRes(session, cfg.Firstprize, true); code != pb.ErrorCode_Success { return } - viking.Boos[req.BossType] += 1 - mapData["boos"] = viking.Boos - viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 // todo 耗时 - mapData["challengeTime"] = viking.ChallengeTime + viking.Boss[req.BossType] += 1 + mapData["Boss"] = viking.Boss + // viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 // todo 耗时 + // mapData["challengeTime"] = viking.ChallengeTime } // 耗时校验 当前战斗胜利时间消耗小于之前刷新数据 - viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 + //viking.ChallengeTime[req.BossType<<16+req.Difficulty] = 0 code = this.module.ModifyVikingData(session.GetUserId(), mapData) // 发放通关随机奖励 this.module.configure.GetDropReward(cfg.Drop, reward) // 获取掉落奖励 diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 426286715..98a59dc0e 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -27,7 +27,14 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq code = pb.ErrorCode_DBError return } - + if len(list.Boss) == 0 { + _cfg := this.module.configure.GetVikingBossTypeConfigData() + for k := range _cfg { + list.Boss[k] = 0 + str := string(k) + "_0" + list.BossTime[str] = 0 + } + } // 校验 是不是当天 if !utils.IsToday(list.CTime) { list.CTime = time.Now().Unix() diff --git a/modules/viking/comp_configure.go b/modules/viking/comp_configure.go index d57bb4da6..586b6ad42 100644 --- a/modules/viking/comp_configure.go +++ b/modules/viking/comp_configure.go @@ -42,7 +42,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp }) err = this.LoadConfigure(game_challenge, cfg.NewGameVikingChallenge) - // _data := this.GetBuyChallengeCount(1) + // _data := this.GetVikingBossTypeConfigData() // log.Debugf("%v", _data) return } @@ -71,22 +71,22 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) } // get boss Type -func (this *configureComp) GetVikingBossTypeConfigData() (mapType map[int32]struct{}) { +func (this *configureComp) GetVikingBossTypeConfigData() map[int32]struct{} { - mapType = make(map[int32]struct{}, 0) + mapType := make(map[int32]struct{}, 0) if v, err := this.GetConfigure(game_vikingboss); err == nil { if configure, ok := v.(*cfg.GameVikingBoss); ok { this.hlock.Lock() defer this.hlock.Unlock() for _, value := range configure.GetDataList() { if _, ok := mapType[value.Type]; !ok { - mapType[value.Type] = struct{}{} + ipos := value.Type + mapType[ipos] = struct{}{} } } - } } - return + return mapType } func (this *configureComp) GetBuyChallengeCount(index int32) (data *cfg.GameVikingChallengeData) { diff --git a/modules/viking/model_viking.go b/modules/viking/model_viking.go index f9f12ca4d..9a1b5d619 100644 --- a/modules/viking/model_viking.go +++ b/modules/viking/model_viking.go @@ -30,10 +30,10 @@ func (this *modelViking) Init(service core.IService, module core.IModule, comp c func (this *modelViking) getVikingList(uid string) (result *pb.DBViking, err error) { result = &pb.DBViking{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Boos: make(map[int32]int32), - ChallengeTime: make(map[int32]int32), + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Boss: make(map[int32]int32), + BossTime: make(map[string]int32), } if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err { diff --git a/pb/viking_db.pb.go b/pb/viking_db.pb.go index cbbca5a08..b9997c6d6 100644 --- a/pb/viking_db.pb.go +++ b/pb/viking_db.pb.go @@ -26,13 +26,13 @@ type DBViking struct { 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 - ChallengeCount int32 `protobuf:"varint,3,opt,name=challengeCount,proto3" json:"challengeCount" bson:"challengeCount"` //挑战次数 - Boos map[int32]int32 `protobuf:"bytes,4,rep,name=boos,proto3" json:"boos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key boos 类型 value 难度 - BuyCount int32 `protobuf:"varint,5,opt,name=buyCount,proto3" json:"buyCount" bson:"buyCount"` //购买次数 - CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` //修改时间 - ChallengeTime map[int32]int32 `protobuf:"bytes,7,rep,name=challengeTime,proto3" json:"challengeTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"challengeTime"` //每个难度通关时间 + 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 + ChallengeCount int32 `protobuf:"varint,3,opt,name=challengeCount,proto3" json:"challengeCount" bson:"challengeCount"` //挑战次数 + Boss map[int32]int32 `protobuf:"bytes,4,rep,name=boss,proto3" json:"boss" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key boos 类型 value 难度 + BuyCount int32 `protobuf:"varint,5,opt,name=buyCount,proto3" json:"buyCount" bson:"buyCount"` //购买次数 + CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` //修改时间 + BossTime map[string]int32 `protobuf:"bytes,7,rep,name=bossTime,proto3" json:"bossTime" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"bossTime"` // } func (x *DBViking) Reset() { @@ -88,9 +88,9 @@ func (x *DBViking) GetChallengeCount() int32 { return 0 } -func (x *DBViking) GetBoos() map[int32]int32 { +func (x *DBViking) GetBoss() map[int32]int32 { if x != nil { - return x.Boos + return x.Boss } return nil } @@ -109,9 +109,9 @@ func (x *DBViking) GetCTime() int64 { return 0 } -func (x *DBViking) GetChallengeTime() map[int32]int32 { +func (x *DBViking) GetBossTime() map[string]int32 { if x != nil { - return x.ChallengeTime + return x.BossTime } return nil } @@ -224,44 +224,42 @@ var File_viking_viking_db_proto protoreflect.FileDescriptor var file_viking_viking_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x5f, - 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xee, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x56, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xda, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 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, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x27, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, - 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43, + 0x27, 0x0a, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x63, 0x68, - 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x43, 0x68, 0x61, - 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x0d, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x37, - 0x0a, 0x09, 0x42, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x12, 0x43, 0x68, 0x61, 0x6c, 0x6c, - 0x65, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x6d, 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, - 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, 0xc8, 0x01, 0x0a, 0x0c, 0x44, 0x42, - 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 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, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, - 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 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, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x62, 0x6f, + 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, + 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x1a, + 0x37, 0x0a, 0x09, 0x42, 0x6f, 0x73, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x42, 0x6f, 0x73, 0x73, + 0x54, 0x69, 0x6d, 0x65, 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, 0x22, 0xc8, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, + 0x6e, 0x67, 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, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x08, 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, } var ( @@ -280,12 +278,12 @@ var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_viking_viking_db_proto_goTypes = []interface{}{ (*DBViking)(nil), // 0: DBViking (*DBVikingRank)(nil), // 1: DBVikingRank - nil, // 2: DBViking.BoosEntry - nil, // 3: DBViking.ChallengeTimeEntry + nil, // 2: DBViking.BossEntry + nil, // 3: DBViking.BossTimeEntry } var file_viking_viking_db_proto_depIdxs = []int32{ - 2, // 0: DBViking.boos:type_name -> DBViking.BoosEntry - 3, // 1: DBViking.challengeTime:type_name -> DBViking.ChallengeTimeEntry + 2, // 0: DBViking.boss:type_name -> DBViking.BossEntry + 3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry 2, // [2:2] is the sub-list for method output_type 2, // [2:2] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name