diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 1e48892a9..377747431 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -31,7 +31,6 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e _heroMap map[string]interface{} err error bManAwaken bool // 是否达到满级共鸣 - atno []*pb.UserAtno ) _heroMap = make(map[string]interface{}, 0) chanegCard = make([]*pb.DBHero, 0) @@ -65,9 +64,6 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e if errdata = this.module.ConsumeRes(session, awakenData.Phaseneed, true); errdata != nil { return } - if errdata, atno = this.module.DispenseAtno(session, awakenData.Awakenup, true); errdata != nil { - return - } _hero.JuexingLv += 1 if len(awakenData.Phasebonus) > 0 { @@ -115,8 +111,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e chanegCard = append(chanegCard, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard}) session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenResp{ - Hero: _hero, - Reward: atno, + Hero: _hero, }) var tasks []*pb.BuriedParam diff --git a/modules/hero/api_awakenreward.go b/modules/hero/api_awakenreward.go new file mode 100644 index 000000000..7576323ad --- /dev/null +++ b/modules/hero/api_awakenreward.go @@ -0,0 +1,98 @@ +package hero + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) AwakenRewardCheck(session comm.IUserSession, req *pb.HeroAwakenRewardReq) (errdata *pb.ErrorData) { + if req.Heroid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Heroid is Empty", + } + return + } + + return +} + +// / 英雄觉醒 +func (this *apiComp) AwakenReward(session comm.IUserSession, req *pb.HeroAwakenRewardReq) (errdata *pb.ErrorData) { + var ( + hero *pb.DBHero + conf *cfg.GameHeroAwakenData + give []*cfg.Gameatn + atno []*pb.UserAtno + ok bool + err error + ) + if hero, errdata = this.module.GetHeroByObjID(session.GetUserId(), req.Heroid); errdata != nil { + return + } + + if req.Index == 0 { + for i := int32(0); i <= (hero.JuexingLv); i++ { + if conf, err = this.module.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + if _, ok = hero.Awakenreward[i]; !ok { + give = append(give, conf.Awakenup...) + hero.Awakenreward[i] = true + } + } + } else { + if req.Index > hero.JuexingLv { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "index more than the hero.JuexingLv", + } + return + } + if conf, err = this.module.configure.GetHeroAwakenConfig(hero.HeroID, req.Index); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + if _, ok = hero.Awakenreward[req.Index]; !ok { + give = append(give, conf.Awakenup...) + hero.Awakenreward[req.Index] = true + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Received", + } + return + } + } + if errdata, atno = this.module.DispenseAtno(session, give, true); errdata != nil { + return + } + // 保存数据 + if err = this.module.modelHero.ChangeList(session.GetUserId(), hero.Id, map[string]interface{}{ + "awakenreward": hero.Awakenreward, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroAwakenRewardResp{ + Heroid: req.Heroid, + Awakenreward: hero.Awakenreward, + Atno: atno, + }) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroAwakenRewardReq", atno) + }) + return +} diff --git a/modules/hero/api_lvreward.go b/modules/hero/api_lvreward.go new file mode 100644 index 000000000..34f804b9d --- /dev/null +++ b/modules/hero/api_lvreward.go @@ -0,0 +1,103 @@ +package hero + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.HeroLvRewardReq) (errdata *pb.ErrorData) { + if req.Heroid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Heroid is Empty", + } + return + } + + return +} + +// / 英雄觉醒 +func (this *apiComp) LvReward(session comm.IUserSession, req *pb.HeroLvRewardReq) (errdata *pb.ErrorData) { + var ( + hero *pb.DBHero + confs []*cfg.GameHeroLeveluprewardData + conf *cfg.GameHeroLeveluprewardData + give []*cfg.Gameatn + atno []*pb.UserAtno + ok bool + err error + ) + if hero, errdata = this.module.GetHeroByObjID(session.GetUserId(), req.Heroid); errdata != nil { + return + } + + if req.Index == 0 { + + if confs, err = this.module.configure.GetHeroLvUpWardDatas(hero.Star); err == nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + for _, conf = range confs { + if conf.Level <= hero.Lv { + if _, ok = hero.Lvreward[conf.Level]; !ok { + give = append(give, conf.Starup...) + hero.Lvreward[conf.Level] = true + } + } + } + + } else { + if req.Index > hero.Lv { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "index more than the hero.Lv", + } + return + } + if conf, err = this.module.configure.GetHeroLvUpWardData(hero.Star, req.Index); err == nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + if _, ok = hero.Lvreward[req.Index]; !ok { + give = append(give, conf.Starup...) + hero.Lvreward[req.Index] = true + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Message: "Received", + } + return + } + } + if errdata, atno = this.module.DispenseAtno(session, give, true); errdata != nil { + return + } + // 保存数据 + if err = this.module.modelHero.ChangeList(session.GetUserId(), hero.Id, map[string]interface{}{ + "lvreward": hero.Lvreward, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), Awaken, &pb.HeroLvRewardResp{ + Heroid: req.Heroid, + Lvreward: hero.Lvreward, + Atno: atno, + }) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroLvRewardResp", atno) + }) + return +} diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 570023cc7..ce4daef23 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -657,6 +657,23 @@ func (this *configureComp) GetHeroLvUpWardData(star int32, lv int32) (conf *cfg. return } +// 获取英雄升级属性变化相关配置数据 +func (this *configureComp) GetHeroLvUpWardDatas(star int32) (confs []*cfg.GameHeroLeveluprewardData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_herolevelupreward); err == nil { + for _, conf := range v.(*cfg.GameHeroLevelupreward).GetDataList() { + if conf.Star == star { + confs = append(confs, conf) + } + } + } else { + err = comm.NewNotFoundConfErr(moduleName, game_herolevelupreward, star) + } + return +} + // 转map 类型 方便计算 func (this *configureComp) GetGameFightingCapacityData() (m map[int32]int32) { var ( diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 2ecea9fcf..a190c56be 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -665,8 +665,6 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, tasks []*pb.BuriedParam changeupdate map[string]interface{} = make(map[string]interface{}) maxlvhero *pb.DBHero - upwardconf *cfg.GameHeroLeveluprewardData - upwardconfs []*cfg.GameHeroLeveluprewardData err error ) curAddExp = make(map[string]int32, len(heros)) @@ -765,9 +763,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, } else { // 升级操作 curExp -= maxExp curLv += 1 // 经验够了 那么等级+1 - if upwardconf, err = this.module.configure.GetHeroLvUpWardData(heroconf.Star, curLv); err == nil { - upwardconfs = append(upwardconfs, upwardconf) - } + _data, _ = this.module.configure.GetHeroLv(curLv) if _data == nil { // 等级加失败了 回到原来的等级 fullexp = (curExp - maxExp) @@ -875,11 +871,6 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, } } award = make([]*cfg.Gameatn, 0) - if len(upwardconfs) > 0 { - for _, v := range upwardconfs { - award = append(award, v.Starup...) - } - } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { if maxlvhero != nil { this.module.passon.HeroUpLv(session, maxlvhero.HeroID, maxlvhero.Lv) diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index fa309bbcc..013f9e0c9 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -104,6 +104,8 @@ type DBHero struct { Exclusiveid string `protobuf:"bytes,31,opt,name=exclusiveid,proto3" json:"exclusiveid"` //专属武器id ExclusiveProperty map[int32]int32 `protobuf:"bytes,32,rep,name=exclusiveProperty,proto3" json:"exclusiveProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"exclusiveProperty"` //专属武器属性 ExclusiveSkill []*SkillData `protobuf:"bytes,33,rep,name=exclusiveSkill,proto3" json:"exclusiveSkill" bson:"exclusiveSkill"` //装备技能 + Lvreward map[int32]bool `protobuf:"bytes,34,rep,name=lvreward,proto3" json:"lvreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //等级奖励 + Awakenreward map[int32]bool `protobuf:"bytes,35,rep,name=awakenreward,proto3" json:"awakenreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //觉醒奖励 } func (x *DBHero) Reset() { @@ -369,6 +371,20 @@ func (x *DBHero) GetExclusiveSkill() []*SkillData { return nil } +func (x *DBHero) GetLvreward() map[int32]bool { + if x != nil { + return x.Lvreward + } + return nil +} + +func (x *DBHero) GetAwakenreward() map[int32]bool { + if x != nil { + return x.Awakenreward + } + return nil +} + //英雄扩展数据 type DBHeroRecord struct { state protoimpl.MessageState @@ -767,8 +783,8 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69, - 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, - 0x0d, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9c, + 0x0f, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, @@ -846,35 +862,50 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x12, 0x32, 0x0a, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x21, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 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, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 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, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 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, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 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, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, - 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x3a, 0x0a, 0x0c, 0x46, - 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x31, 0x0a, 0x08, 0x6c, 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, + 0x4c, 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6c, + 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3d, 0x0a, 0x0c, 0x61, 0x77, 0x61, 0x6b, 0x65, + 0x6e, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x72, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x61, 0x77, 0x61, 0x6b, 0x65, 0x6e, + 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 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, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 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, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 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, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x44, 0x0a, 0x16, 0x45, 0x78, 0x63, 0x6c, 0x75, - 0x73, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, + 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x8e, 0x0b, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, + 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 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, 0x44, 0x0a, 0x16, 0x45, 0x78, 0x63, + 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x4c, 0x76, 0x72, 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, + 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, + 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x72, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8e, 0x0b, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, @@ -1003,7 +1034,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { } var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_hero_hero_db_proto_goTypes = []interface{}{ (HeroType)(0), // 0: HeroType (*DBHero)(nil), // 1: DBHero @@ -1017,49 +1048,53 @@ var file_hero_hero_db_proto_goTypes = []interface{}{ nil, // 9: DBHero.HoroscopePropertyEntry nil, // 10: DBHero.FettersEntry nil, // 11: DBHero.ExclusivePropertyEntry - nil, // 12: DBHeroRecord.ConditionEntry - nil, // 13: DBHeroRecord.Star5HeroEntry - nil, // 14: DBHeroRecord.RaceEntry - nil, // 15: DBHeroRecord.Baodi4Entry - nil, // 16: DBHeroRecord.Baodi5Entry - nil, // 17: DBHeroRecord.CountEntry - nil, // 18: DBHeroRecord.PeachEntry - nil, // 19: DBHeroRecord.LimitEntry - nil, // 20: DBHeroRecord.WishEntry - nil, // 21: DBHeroTalent.TalentEntry - (*SkillData)(nil), // 22: SkillData - (*DB_EquipmentSuit)(nil), // 23: DB_EquipmentSuit + nil, // 12: DBHero.LvrewardEntry + nil, // 13: DBHero.AwakenrewardEntry + nil, // 14: DBHeroRecord.ConditionEntry + nil, // 15: DBHeroRecord.Star5HeroEntry + nil, // 16: DBHeroRecord.RaceEntry + nil, // 17: DBHeroRecord.Baodi4Entry + nil, // 18: DBHeroRecord.Baodi5Entry + nil, // 19: DBHeroRecord.CountEntry + nil, // 20: DBHeroRecord.PeachEntry + nil, // 21: DBHeroRecord.LimitEntry + nil, // 22: DBHeroRecord.WishEntry + nil, // 23: DBHeroTalent.TalentEntry + (*SkillData)(nil), // 24: SkillData + (*DB_EquipmentSuit)(nil), // 25: DB_EquipmentSuit } var file_hero_hero_db_proto_depIdxs = []int32{ - 22, // 0: DBHero.normalSkill:type_name -> SkillData + 24, // 0: DBHero.normalSkill:type_name -> SkillData 5, // 1: DBHero.property:type_name -> DBHero.PropertyEntry 6, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry 7, // 3: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry 0, // 4: DBHero.status:type_name -> HeroType - 23, // 5: DBHero.suits:type_name -> DB_EquipmentSuit + 25, // 5: DBHero.suits:type_name -> DB_EquipmentSuit 8, // 6: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry - 22, // 7: DBHero.equipSkill:type_name -> SkillData + 24, // 7: DBHero.equipSkill:type_name -> SkillData 9, // 8: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry 10, // 9: DBHero.fetters:type_name -> DBHero.FettersEntry - 22, // 10: DBHero.awakenskill:type_name -> SkillData - 22, // 11: DBHero.talentskill:type_name -> SkillData + 24, // 10: DBHero.awakenskill:type_name -> SkillData + 24, // 11: DBHero.talentskill:type_name -> SkillData 11, // 12: DBHero.exclusiveProperty:type_name -> DBHero.ExclusivePropertyEntry - 22, // 13: DBHero.exclusiveSkill:type_name -> SkillData - 12, // 14: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry - 13, // 15: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry - 14, // 16: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry - 15, // 17: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry - 16, // 18: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry - 17, // 19: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry - 18, // 20: DBHeroRecord.peach:type_name -> DBHeroRecord.PeachEntry - 19, // 21: DBHeroRecord.limit:type_name -> DBHeroRecord.LimitEntry - 20, // 22: DBHeroRecord.wish:type_name -> DBHeroRecord.WishEntry - 21, // 23: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry - 24, // [24:24] is the sub-list for method output_type - 24, // [24:24] is the sub-list for method input_type - 24, // [24:24] is the sub-list for extension type_name - 24, // [24:24] is the sub-list for extension extendee - 0, // [0:24] is the sub-list for field type_name + 24, // 13: DBHero.exclusiveSkill:type_name -> SkillData + 12, // 14: DBHero.lvreward:type_name -> DBHero.LvrewardEntry + 13, // 15: DBHero.awakenreward:type_name -> DBHero.AwakenrewardEntry + 14, // 16: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry + 15, // 17: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry + 16, // 18: DBHeroRecord.race:type_name -> DBHeroRecord.RaceEntry + 17, // 19: DBHeroRecord.baodi4:type_name -> DBHeroRecord.Baodi4Entry + 18, // 20: DBHeroRecord.baodi5:type_name -> DBHeroRecord.Baodi5Entry + 19, // 21: DBHeroRecord.count:type_name -> DBHeroRecord.CountEntry + 20, // 22: DBHeroRecord.peach:type_name -> DBHeroRecord.PeachEntry + 21, // 23: DBHeroRecord.limit:type_name -> DBHeroRecord.LimitEntry + 22, // 24: DBHeroRecord.wish:type_name -> DBHeroRecord.WishEntry + 23, // 25: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry + 26, // [26:26] is the sub-list for method output_type + 26, // [26:26] is the sub-list for method input_type + 26, // [26:26] is the sub-list for extension type_name + 26, // [26:26] is the sub-list for extension extendee + 0, // [0:26] is the sub-list for field type_name } func init() { file_hero_hero_db_proto_init() } @@ -1125,7 +1160,7 @@ func file_hero_hero_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_db_proto_rawDesc, NumEnums: 1, - NumMessages: 21, + NumMessages: 23, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 54079ddea..4217b02c7 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2353,6 +2353,246 @@ func (x *HeroDrawRecordResp) GetRecord() []*DBHeroDrawRecord { return nil } +//英雄等级奖励领取 +type HeroLvRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 英雄对象ID + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` //领取进度 0表示一键领取 +} + +func (x *HeroLvRewardReq) Reset() { + *x = HeroLvRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[45] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroLvRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroLvRewardReq) ProtoMessage() {} + +func (x *HeroLvRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[45] + 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 HeroLvRewardReq.ProtoReflect.Descriptor instead. +func (*HeroLvRewardReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{45} +} + +func (x *HeroLvRewardReq) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +func (x *HeroLvRewardReq) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +//英雄等级奖励领取 +type HeroLvRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 英雄对象ID + Lvreward map[int32]bool `protobuf:"bytes,2,rep,name=lvreward,proto3" json:"lvreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //等级奖励 + Atno []*UserAtno `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"` +} + +func (x *HeroLvRewardResp) Reset() { + *x = HeroLvRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[46] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroLvRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroLvRewardResp) ProtoMessage() {} + +func (x *HeroLvRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[46] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HeroLvRewardResp.ProtoReflect.Descriptor instead. +func (*HeroLvRewardResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{46} +} + +func (x *HeroLvRewardResp) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +func (x *HeroLvRewardResp) GetLvreward() map[int32]bool { + if x != nil { + return x.Lvreward + } + return nil +} + +func (x *HeroLvRewardResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + +//英雄觉醒奖励领取 +type HeroAwakenRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` //英雄对象ID + Index int32 `protobuf:"varint,2,opt,name=index,proto3" json:"index"` //领取进度 0表示一键领取 +} + +func (x *HeroAwakenRewardReq) Reset() { + *x = HeroAwakenRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[47] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroAwakenRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroAwakenRewardReq) ProtoMessage() {} + +func (x *HeroAwakenRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[47] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use HeroAwakenRewardReq.ProtoReflect.Descriptor instead. +func (*HeroAwakenRewardReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{47} +} + +func (x *HeroAwakenRewardReq) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +func (x *HeroAwakenRewardReq) GetIndex() int32 { + if x != nil { + return x.Index + } + return 0 +} + +//英雄觉醒奖励领取 +type HeroAwakenRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` //英雄对象ID + Awakenreward map[int32]bool `protobuf:"bytes,2,rep,name=awakenreward,proto3" json:"awakenreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //等级奖励 + Atno []*UserAtno `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"` +} + +func (x *HeroAwakenRewardResp) Reset() { + *x = HeroAwakenRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[48] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroAwakenRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroAwakenRewardResp) ProtoMessage() {} + +func (x *HeroAwakenRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[48] + 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 HeroAwakenRewardResp.ProtoReflect.Descriptor instead. +func (*HeroAwakenRewardResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{48} +} + +func (x *HeroAwakenRewardResp) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +func (x *HeroAwakenRewardResp) GetAwakenreward() map[int32]bool { + if x != nil { + return x.Awakenreward + } + return nil +} + +func (x *HeroAwakenRewardResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -2572,8 +2812,42 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x64, 0x22, 0x3f, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x14, + 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x22, 0xc3, 0x01, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, + 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, + 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x6c, 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6c, 0x76, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1d, + 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x3b, 0x0a, + 0x0d, 0x4c, 0x76, 0x72, 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, 0x08, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x43, 0x0a, 0x13, 0x48, 0x65, + 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, + 0xdb, 0x01, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, + 0x12, 0x4b, 0x0a, 0x0c, 0x61, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, + 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x77, + 0x61, 0x6b, 0x65, 0x6e, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0c, 0x61, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1d, 0x0a, + 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x3f, 0x0a, 0x11, + 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x72, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2588,7 +2862,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 51) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 57) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2635,54 +2909,64 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroSelectCardResp)(nil), // 42: HeroSelectCardResp (*HeroDrawRecordReq)(nil), // 43: HeroDrawRecordReq (*HeroDrawRecordResp)(nil), // 44: HeroDrawRecordResp - nil, // 45: HeroStrengthenUplvReq.ItemEntry - nil, // 46: HeroStrengthenUpSkillReq.ItemEntry - nil, // 47: HeroPropertyPush.PropertyEntry - nil, // 48: HeroPropertyPush.AddPropertyEntry - nil, // 49: HeroFusionReq.HerosEntry - nil, // 50: HeroPeachRewardResp.PeachEntry - (*DBHero)(nil), // 51: DBHero - (*UserAtno)(nil), // 52: UserAtno - (*DBHeroRecord)(nil), // 53: DBHeroRecord - (*DBHeroTalent)(nil), // 54: DBHeroTalent - (*DBHeroDrawRecord)(nil), // 55: DBHeroDrawRecord + (*HeroLvRewardReq)(nil), // 45: HeroLvRewardReq + (*HeroLvRewardResp)(nil), // 46: HeroLvRewardResp + (*HeroAwakenRewardReq)(nil), // 47: HeroAwakenRewardReq + (*HeroAwakenRewardResp)(nil), // 48: HeroAwakenRewardResp + nil, // 49: HeroStrengthenUplvReq.ItemEntry + nil, // 50: HeroStrengthenUpSkillReq.ItemEntry + nil, // 51: HeroPropertyPush.PropertyEntry + nil, // 52: HeroPropertyPush.AddPropertyEntry + nil, // 53: HeroFusionReq.HerosEntry + nil, // 54: HeroPeachRewardResp.PeachEntry + nil, // 55: HeroLvRewardResp.LvrewardEntry + nil, // 56: HeroAwakenRewardResp.AwakenrewardEntry + (*DBHero)(nil), // 57: DBHero + (*UserAtno)(nil), // 58: UserAtno + (*DBHeroRecord)(nil), // 59: DBHeroRecord + (*DBHeroTalent)(nil), // 60: DBHeroTalent + (*DBHeroDrawRecord)(nil), // 61: DBHeroDrawRecord } var file_hero_hero_msg_proto_depIdxs = []int32{ - 51, // 0: HeroInfoResp.base:type_name -> DBHero - 51, // 1: HeroListResp.list:type_name -> DBHero - 45, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry - 51, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero - 52, // 4: HeroStrengthenUplvResp.atno:type_name -> UserAtno - 51, // 5: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 46, // 6: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry - 51, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 51, // 8: HeroAwakenResp.hero:type_name -> DBHero - 52, // 9: HeroAwakenResp.reward:type_name -> UserAtno - 47, // 10: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 48, // 11: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 51, // 12: HeroLockResp.hero:type_name -> DBHero - 51, // 13: HeroGetSpecifiedResp.hero:type_name -> DBHero - 52, // 14: AtnoData.atno:type_name -> UserAtno + 57, // 0: HeroInfoResp.base:type_name -> DBHero + 57, // 1: HeroListResp.list:type_name -> DBHero + 49, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry + 57, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 58, // 4: HeroStrengthenUplvResp.atno:type_name -> UserAtno + 57, // 5: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 50, // 6: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry + 57, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 57, // 8: HeroAwakenResp.hero:type_name -> DBHero + 58, // 9: HeroAwakenResp.reward:type_name -> UserAtno + 51, // 10: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 52, // 11: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 57, // 12: HeroLockResp.hero:type_name -> DBHero + 57, // 13: HeroGetSpecifiedResp.hero:type_name -> DBHero + 58, // 14: AtnoData.atno:type_name -> UserAtno 19, // 15: HeroDrawCardResp.data:type_name -> AtnoData - 52, // 16: HeroDrawCardResp.wish:type_name -> UserAtno - 53, // 17: HeroDrawCardResp.record:type_name -> DBHeroRecord - 51, // 18: HeroChangePush.list:type_name -> DBHero - 53, // 19: HeroDrawCardFloorResp.record:type_name -> DBHeroRecord - 49, // 20: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 54, // 21: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 54, // 22: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 54, // 23: HeroTalentResetResp.telnet:type_name -> DBHeroTalent - 50, // 24: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry - 52, // 25: HeroPeachRewardResp.atno:type_name -> UserAtno - 53, // 26: HeroSaveCardResp.record:type_name -> DBHeroRecord - 53, // 27: HeroSelectCardResp.record:type_name -> DBHeroRecord + 58, // 16: HeroDrawCardResp.wish:type_name -> UserAtno + 59, // 17: HeroDrawCardResp.record:type_name -> DBHeroRecord + 57, // 18: HeroChangePush.list:type_name -> DBHero + 59, // 19: HeroDrawCardFloorResp.record:type_name -> DBHeroRecord + 53, // 20: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 60, // 21: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 60, // 22: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 60, // 23: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 54, // 24: HeroPeachRewardResp.peach:type_name -> HeroPeachRewardResp.PeachEntry + 58, // 25: HeroPeachRewardResp.atno:type_name -> UserAtno + 59, // 26: HeroSaveCardResp.record:type_name -> DBHeroRecord + 59, // 27: HeroSelectCardResp.record:type_name -> DBHeroRecord 19, // 28: HeroSelectCardResp.atno:type_name -> AtnoData - 55, // 29: HeroDrawRecordResp.record:type_name -> DBHeroDrawRecord - 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 + 61, // 29: HeroDrawRecordResp.record:type_name -> DBHeroDrawRecord + 55, // 30: HeroLvRewardResp.lvreward:type_name -> HeroLvRewardResp.LvrewardEntry + 58, // 31: HeroLvRewardResp.atno:type_name -> UserAtno + 56, // 32: HeroAwakenRewardResp.awakenreward:type_name -> HeroAwakenRewardResp.AwakenrewardEntry + 58, // 33: HeroAwakenRewardResp.atno:type_name -> UserAtno + 34, // [34:34] is the sub-list for method output_type + 34, // [34:34] is the sub-list for method input_type + 34, // [34:34] is the sub-list for extension type_name + 34, // [34:34] is the sub-list for extension extendee + 0, // [0:34] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -3233,6 +3517,54 @@ func file_hero_hero_msg_proto_init() { return nil } } + file_hero_hero_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroLvRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroLvRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroAwakenRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroAwakenRewardResp); 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{ @@ -3240,7 +3572,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 51, + NumMessages: 57, NumExtensions: 0, NumServices: 0, },