diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 0a12e137e..954e6ba29 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -24,7 +24,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh var ( conf *cfg.GameMainStageData info *pb.DBMainline - aeward []*pb.UserAssets = make([]*pb.UserAssets, 0) + atno []*pb.UserAtno + aeward []*pb.UserAtno = make([]*pb.UserAtno, 0) isWin bool first bool // 判断是否是首通 star int32 // 评星 @@ -114,40 +115,43 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh this.module.modelMline.updateprogress(info) if first { // 发奖 - if errdata = this.module.DispenseRes(session, conf.Firstaward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, conf.Firstaward, true); errdata != nil { this.module.Debugf("Mline first DispenseRes err:+%v", conf.Firstaward) } - for _, v := range conf.Firstaward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) + // for _, v := range conf.Firstaward { + // aeward = append(aeward, &pb.UserAssets{ + // A: v.A, + // T: v.T, + // N: v.N, + // }) + // } } else { - if errdata = this.module.DispenseRes(session, conf.Commonaward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, conf.Commonaward, true); errdata != nil { this.module.Debugf("Mline Commonaward DispenseRes err:+%v", conf.Commonaward) } - for _, v := range conf.Commonaward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) + // for _, v := range conf.Commonaward { + // aeward = append(aeward, &pb.UserAssets{ + // A: v.A, + // T: v.T, + // N: v.N, + // }) + // } } user := this.module.ModuleUser.GetUser(session.GetUserId()) if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(conf.Lotteryward, user.Vip, user.Lv); len(lotteryward) > 0 { - if errdata = this.module.DispenseRes(session, lotteryward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) } - for _, v := range lotteryward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) + // for _, v := range lotteryward { + // aeward = append(aeward, &pb.UserAssets{ + // A: v.A, + // T: v.T, + // N: v.N, + // }) + // } } // 加英雄经验 diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index 51042b392..6c2909b00 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -24,7 +24,8 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP var ( conf *cfg.GameMainStageData info *pb.DBMainline - aeward []*pb.UserAssets = make([]*pb.UserAssets, 0) + atno []*pb.UserAtno + aeward []*pb.UserAtno = make([]*pb.UserAtno, 0) first bool // 判断是否是首通 star int32 // 评星 tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) @@ -79,40 +80,29 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP info.Lastlevel[conf.Chapterid] = req.Level this.module.modelMline.updateprogress(info) if first { // 发奖 - if errdata = this.module.DispenseRes(session, conf.Firstaward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, conf.Firstaward, true); errdata != nil { this.module.Debugf("Mline first DispenseRes err:+%v", conf.Firstaward) } - for _, v := range conf.Firstaward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) + // for _, v := range conf.Firstaward { + // aeward = append(aeward, &pb.UserAssets{ + // A: v.A, + // T: v.T, + // N: v.N, + // }) + // } } else { - if errdata = this.module.DispenseRes(session, conf.Commonaward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, conf.Commonaward, true); errdata != nil { this.module.Debugf("Mline Commonaward DispenseRes err:+%v", conf.Commonaward) } - for _, v := range conf.Commonaward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) } user := this.module.ModuleUser.GetUser(session.GetUserId()) if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(conf.Lotteryward, user.Vip, user.Lv); len(lotteryward) > 0 { - if errdata = this.module.DispenseRes(session, lotteryward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) } - for _, v := range lotteryward { - aeward = append(aeward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + aeward = append(aeward, atno...) } userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs) session.SendMsg(string(this.module.GetType()), "levelpass", &pb.MainlineLevelPassResp{ diff --git a/modules/mainline/api_receiveaward.go b/modules/mainline/api_receiveaward.go index 7e0c7d066..4316e0766 100644 --- a/modules/mainline/api_receiveaward.go +++ b/modules/mainline/api_receiveaward.go @@ -21,7 +21,8 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec awardConfs []*cfg.GameMainStarrewardData awardid int32 awardConf *cfg.GameMainStarrewardData - reward []*pb.UserAssets + reward []*pb.UserAtno + atno []*pb.UserAtno pass int32 ok bool err error @@ -126,17 +127,18 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec return } - if errdata = this.module.DispenseRes(session, awardConf.Reward, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, awardConf.Reward, true); errdata != nil { return } - reward = make([]*pb.UserAssets, 0) - for _, v := range awardConf.Reward { - reward = append(reward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + reward = make([]*pb.UserAtno, 0) + reward = append(reward, atno...) + // for _, v := range awardConf.Reward { + // reward = append(reward, &pb.UserAssets{ + // A: v.A, + // T: v.T, + // N: v.N, + // }) + // } if err = this.module.modelMline.updateMainlineData(session.GetUserId(), info); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index f35b678e6..7c4d75695 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -121,8 +121,8 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } return } - drop = fconf.Group } + drop = fconf.Group break case 6, 7, 8: if fconf, err = this.module.configure.getGameShopCenterFund(req.Pid); err != nil { diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index 7674d4811..3fa353230 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -504,11 +504,11 @@ type ComStartAction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - From int32 `protobuf:"varint,1,opt,name=from,proto3" json:"from"` //当前出手角色 - Target int32 `protobuf:"varint,2,opt,name=target,proto3" json:"target"` //预选攻击目标 - CurRound int32 `protobuf:"varint,3,opt,name=curRound,proto3" json:"curRound"` //当前回合 - CanAtk bool `protobuf:"varint,4,opt,name=canAtk,proto3" json:"canAtk"` //是否能攻击 - SkillInfo []*ComSkillInfo `protobuf:"bytes,5,rep,name=skillInfo,proto3" json:"skillInfo"` + From int32 `protobuf:"varint,1,opt,name=from,proto3" json:"from"` //当前出手角色 + Target int32 `protobuf:"varint,2,opt,name=target,proto3" json:"target"` //预选攻击目标 + CurRound int32 `protobuf:"varint,3,opt,name=curRound,proto3" json:"curRound"` //当前回合 + CanAtk bool `protobuf:"varint,4,opt,name=canAtk,proto3" json:"canAtk"` //是否能攻击 + SkillInfo []*ComSkillInfo `protobuf:"bytes,5,rep,name=skillInfo,proto3" json:"skillInfo"` //技能数据 } func (x *ComStartAction) Reset() { @@ -1080,7 +1080,8 @@ type ComModifyHealth struct { Num float32 `protobuf:"fixed32,6,opt,name=num,proto3" json:"num"` Nhp int32 `protobuf:"varint,7,opt,name=nhp,proto3" json:"nhp"` Mhp int32 `protobuf:"varint,8,opt,name=mhp,proto3" json:"mhp"` - Dmg bool `protobuf:"varint,9,opt,name=dmg,proto3" json:"dmg"` //会出现 -0的情况 + SealHp int32 `protobuf:"varint,9,opt,name=sealHp,proto3" json:"sealHp"` //被封印的血量 + Dmg bool `protobuf:"varint,10,opt,name=dmg,proto3" json:"dmg"` //会出现 -0的情况 } func (x *ComModifyHealth) Reset() { @@ -1171,6 +1172,13 @@ func (x *ComModifyHealth) GetMhp() int32 { return 0 } +func (x *ComModifyHealth) GetSealHp() int32 { + if x != nil { + return x.SealHp + } + return 0 +} + func (x *ComModifyHealth) GetDmg() bool { if x != nil { return x.Dmg @@ -1796,7 +1804,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0x1c, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, - 0x22, 0xcd, 0x01, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, + 0x22, 0xe5, 0x01, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, 0x6f, 0x6a, @@ -1807,58 +1815,59 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, - 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x10, - 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67, - 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, + 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, + 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x34, + 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, - 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x08, - 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x64, - 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, - 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, - 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, - 0x6c, 0x65, 0x73, 0x22, 0x43, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x66, - 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x45, - 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, 0x07, - 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, - 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, 0x66, - 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, - 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, - 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, - 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, - 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, - 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, - 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0xab, 0x01, 0x0a, 0x0e, 0x45, 0x66, - 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, - 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, - 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, - 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, - 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, - 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, - 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6f, + 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, + 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, + 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, + 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x43, 0x0a, 0x0d, 0x43, + 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, + 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, + 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x45, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x44, + 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x12, + 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, + 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69, 0x6e, + 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x0d, + 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, + 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x2a, 0xab, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, + 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, + 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, + 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, + 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, + 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, + 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, + 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go index 690214c0c..92f09d646 100644 --- a/pb/mainline_msg.pb.go +++ b/pb/mainline_msg.pb.go @@ -279,11 +279,11 @@ type MainlineChallengeOverResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //小关ID - Star int32 `protobuf:"varint,2,opt,name=star,proto3" json:"star"` //通关星级 - Reward []*UserAssets `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //奖励 - UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"` - HeroExp int32 `protobuf:"varint,5,opt,name=heroExp,proto3" json:"heroExp"` + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //小关ID + Star int32 `protobuf:"varint,2,opt,name=star,proto3" json:"star"` //通关星级 + Reward []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //奖励 + UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"` + HeroExp int32 `protobuf:"varint,5,opt,name=heroExp,proto3" json:"heroExp"` } func (x *MainlineChallengeOverResp) Reset() { @@ -332,7 +332,7 @@ func (x *MainlineChallengeOverResp) GetStar() int32 { return 0 } -func (x *MainlineChallengeOverResp) GetReward() []*UserAssets { +func (x *MainlineChallengeOverResp) GetReward() []*UserAtno { if x != nil { return x.Reward } @@ -406,11 +406,11 @@ type MainlineLevelPassResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //小关ID - Star int32 `protobuf:"varint,2,opt,name=star,proto3" json:"star"` //通关星级 - Reward []*UserAssets `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //奖励 - UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"` - HeroExp int32 `protobuf:"varint,5,opt,name=heroExp,proto3" json:"heroExp"` + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //小关ID + Star int32 `protobuf:"varint,2,opt,name=star,proto3" json:"star"` //通关星级 + Reward []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //奖励 + UserExp int32 `protobuf:"varint,4,opt,name=userExp,proto3" json:"userExp"` + HeroExp int32 `protobuf:"varint,5,opt,name=heroExp,proto3" json:"heroExp"` } func (x *MainlineLevelPassResp) Reset() { @@ -459,7 +459,7 @@ func (x *MainlineLevelPassResp) GetStar() int32 { return 0 } -func (x *MainlineLevelPassResp) GetReward() []*UserAssets { +func (x *MainlineLevelPassResp) GetReward() []*UserAtno { if x != nil { return x.Reward } @@ -558,11 +558,11 @@ type MainlineReceiveAwardResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` // 0 进度奖励 1 探索奖励 2组奖励 - Chapter int32 `protobuf:"varint,2,opt,name=chapter,proto3" json:"chapter"` //章节id - Group int32 `protobuf:"varint,3,opt,name=group,proto3" json:"group"` //章节id - Stage int32 `protobuf:"varint,4,opt,name=stage,proto3" json:"stage"` //目标阶段 - Reward []*UserAssets `protobuf:"bytes,5,rep,name=reward,proto3" json:"reward"` //奖励 + Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` // 0 进度奖励 1 探索奖励 2组奖励 + Chapter int32 `protobuf:"varint,2,opt,name=chapter,proto3" json:"chapter"` //章节id + Group int32 `protobuf:"varint,3,opt,name=group,proto3" json:"group"` //章节id + Stage int32 `protobuf:"varint,4,opt,name=stage,proto3" json:"stage"` //目标阶段 + Reward []*UserAtno `protobuf:"bytes,5,rep,name=reward,proto3" json:"reward"` //奖励 } func (x *MainlineReceiveAwardResp) Reset() { @@ -625,7 +625,7 @@ func (x *MainlineReceiveAwardResp) GetStage() int32 { return 0 } -func (x *MainlineReceiveAwardResp) GetReward() []*UserAssets { +func (x *MainlineReceiveAwardResp) GetReward() []*UserAtno { if x != nil { return x.Reward } @@ -661,48 +661,48 @@ var file_mainline_mainline_msg_proto_rawDesc = []byte{ 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, - 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, + 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9c, 0x01, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, - 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, - 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x2c, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x71, - 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x9a, 0x01, 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, - 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, - 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, - 0x45, 0x78, 0x70, 0x22, 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, - 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, - 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x18, 0x4d, - 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, - 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, - 0x61, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, + 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, + 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x2c, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, + 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x22, 0x98, 0x01, 0x0a, 0x15, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, + 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, + 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, + 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, + 0x75, 0x0a, 0x17, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x22, 0x99, 0x01, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, + 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x70, + 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, + 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -733,16 +733,16 @@ var file_mainline_mainline_msg_proto_goTypes = []interface{}{ (*BattleFormation)(nil), // 11: BattleFormation (*BattleInfo)(nil), // 12: BattleInfo (*BattleReport)(nil), // 13: BattleReport - (*UserAssets)(nil), // 14: UserAssets + (*UserAtno)(nil), // 14: UserAtno } var file_mainline_mainline_msg_proto_depIdxs = []int32{ 10, // 0: MainlineInfoResp.info:type_name -> DBMainline 11, // 1: MainlineChallengeReq.battle:type_name -> BattleFormation 12, // 2: MainlineChallengeResp.info:type_name -> BattleInfo 13, // 3: MainlineChallengeOverReq.report:type_name -> BattleReport - 14, // 4: MainlineChallengeOverResp.reward:type_name -> UserAssets - 14, // 5: MainlineLevelPassResp.reward:type_name -> UserAssets - 14, // 6: MainlineReceiveAwardResp.reward:type_name -> UserAssets + 14, // 4: MainlineChallengeOverResp.reward:type_name -> UserAtno + 14, // 5: MainlineLevelPassResp.reward:type_name -> UserAtno + 14, // 6: MainlineReceiveAwardResp.reward:type_name -> UserAtno 7, // [7:7] is the sub-list for method output_type 7, // [7:7] is the sub-list for method input_type 7, // [7:7] is the sub-list for extension type_name diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go index b6bf77da0..f2038d3c4 100644 --- a/pb/stonehenge_msg.pb.go +++ b/pb/stonehenge_msg.pb.go @@ -1678,101 +1678,6 @@ func (x *StonehengeTaskReceiveResp) GetAward() []*UserAssets { return nil } -// 重置三选一 -type StonehengeResetBuffReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` -} - -func (x *StonehengeResetBuffReq) Reset() { - *x = StonehengeResetBuffReq{} - if protoimpl.UnsafeEnabled { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *StonehengeResetBuffReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*StonehengeResetBuffReq) ProtoMessage() {} - -func (x *StonehengeResetBuffReq) ProtoReflect() protoreflect.Message { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[30] - 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 StonehengeResetBuffReq.ProtoReflect.Descriptor instead. -func (*StonehengeResetBuffReq) Descriptor() ([]byte, []int) { - return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{30} -} - -func (x *StonehengeResetBuffReq) GetEventid() int32 { - if x != nil { - return x.Eventid - } - return 0 -} - -type StonehengeResetBuffResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Selectbuff []int32 `protobuf:"varint,1,rep,packed,name=selectbuff,proto3" json:"selectbuff"` -} - -func (x *StonehengeResetBuffResp) Reset() { - *x = StonehengeResetBuffResp{} - if protoimpl.UnsafeEnabled { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *StonehengeResetBuffResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*StonehengeResetBuffResp) ProtoMessage() {} - -func (x *StonehengeResetBuffResp) ProtoReflect() protoreflect.Message { - mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[31] - 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 StonehengeResetBuffResp.ProtoReflect.Descriptor instead. -func (*StonehengeResetBuffResp) Descriptor() ([]byte, []int) { - return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{31} -} - -func (x *StonehengeResetBuffResp) GetSelectbuff() []int32 { - if x != nil { - return x.Selectbuff - } - return nil -} - var File_stonehenge_stonehenge_msg_proto protoreflect.FileDescriptor var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ @@ -1993,15 +1898,8 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{ 0x61, 0x73, 0x6b, 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, 0x32, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x18, - 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, - 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, - 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, - 0x75, 0x66, 0x66, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2016,7 +1914,7 @@ func file_stonehenge_stonehenge_msg_proto_rawDescGZIP() []byte { return file_stonehenge_stonehenge_msg_proto_rawDescData } -var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 41) +var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39) var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeGetListReq)(nil), // 0: StonehengeGetListReq (*StonehengeGetListResp)(nil), // 1: StonehengeGetListResp @@ -2048,61 +1946,59 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{ (*StonehengeTaskInfoResp)(nil), // 27: StonehengeTaskInfoResp (*StonehengeTaskReceiveReq)(nil), // 28: StonehengeTaskReceiveReq (*StonehengeTaskReceiveResp)(nil), // 29: StonehengeTaskReceiveResp - (*StonehengeResetBuffReq)(nil), // 30: StonehengeResetBuffReq - (*StonehengeResetBuffResp)(nil), // 31: StonehengeResetBuffResp - nil, // 32: StonehengeEnterLevelResp.HeroEntry - nil, // 33: StonehengeEventResp.HeroEntry - nil, // 34: StonehengeEventResp.UserbuffEntry - nil, // 35: StonehengeStoreResp.ShopEntry - nil, // 36: StonehengeActivateTalentResp.TalentEntry - nil, // 37: StonehengeActivateTalentResp.TalentpropertyEntry - nil, // 38: StonehengeWeekAwardResp.WeeklyrewardEntry - nil, // 39: StonehengeTaskInfoResp.TaskEntry - nil, // 40: StonehengeTaskReceiveResp.TaskEntry - (*DBStonehenge)(nil), // 41: DBStonehenge - (*DBStoneBoss)(nil), // 42: DBStoneBoss - (*RoomData)(nil), // 43: RoomData - (*BattleReport)(nil), // 44: BattleReport - (*UserAtno)(nil), // 45: UserAtno - (*BattleFormation)(nil), // 46: BattleFormation - (*BattleInfo)(nil), // 47: BattleInfo - (StonehengePrivilege)(0), // 48: StonehengePrivilege - (*DBStonehengeBook)(nil), // 49: DBStonehengeBook - (*UserAssets)(nil), // 50: UserAssets - (*ConIProgress)(nil), // 51: ConIProgress - (*BattleRole)(nil), // 52: BattleRole + nil, // 30: StonehengeEnterLevelResp.HeroEntry + nil, // 31: StonehengeEventResp.HeroEntry + nil, // 32: StonehengeEventResp.UserbuffEntry + nil, // 33: StonehengeStoreResp.ShopEntry + nil, // 34: StonehengeActivateTalentResp.TalentEntry + nil, // 35: StonehengeActivateTalentResp.TalentpropertyEntry + nil, // 36: StonehengeWeekAwardResp.WeeklyrewardEntry + nil, // 37: StonehengeTaskInfoResp.TaskEntry + nil, // 38: StonehengeTaskReceiveResp.TaskEntry + (*DBStonehenge)(nil), // 39: DBStonehenge + (*DBStoneBoss)(nil), // 40: DBStoneBoss + (*RoomData)(nil), // 41: RoomData + (*BattleReport)(nil), // 42: BattleReport + (*UserAtno)(nil), // 43: UserAtno + (*BattleFormation)(nil), // 44: BattleFormation + (*BattleInfo)(nil), // 45: BattleInfo + (StonehengePrivilege)(0), // 46: StonehengePrivilege + (*DBStonehengeBook)(nil), // 47: DBStonehengeBook + (*UserAssets)(nil), // 48: UserAssets + (*ConIProgress)(nil), // 49: ConIProgress + (*BattleRole)(nil), // 50: BattleRole } var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{ - 41, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge - 42, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss - 32, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry - 43, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData - 43, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData - 44, // 5: StonehengeEventReq.report:type_name -> BattleReport - 43, // 6: StonehengeEventResp.room:type_name -> RoomData - 45, // 7: StonehengeEventResp.reward:type_name -> UserAtno - 33, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry - 34, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry - 43, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData - 41, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge - 45, // 12: StonehengeFinishResp.reward:type_name -> UserAtno - 46, // 13: StonehengeBattleReq.battle:type_name -> BattleFormation - 47, // 14: StonehengeBattleResp.info:type_name -> BattleInfo - 43, // 15: StonehengeStoryResp.room:type_name -> RoomData - 35, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry - 36, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry - 37, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry - 48, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege - 49, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook - 50, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets - 38, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry - 50, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets - 51, // 24: StonehengeTaskInfoResp.conlds:type_name -> ConIProgress - 39, // 25: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry - 40, // 26: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry - 50, // 27: StonehengeTaskReceiveResp.award:type_name -> UserAssets - 52, // 28: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole - 52, // 29: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole + 39, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge + 40, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss + 30, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry + 41, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData + 41, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData + 42, // 5: StonehengeEventReq.report:type_name -> BattleReport + 41, // 6: StonehengeEventResp.room:type_name -> RoomData + 43, // 7: StonehengeEventResp.reward:type_name -> UserAtno + 31, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry + 32, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry + 41, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData + 39, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge + 43, // 12: StonehengeFinishResp.reward:type_name -> UserAtno + 44, // 13: StonehengeBattleReq.battle:type_name -> BattleFormation + 45, // 14: StonehengeBattleResp.info:type_name -> BattleInfo + 41, // 15: StonehengeStoryResp.room:type_name -> RoomData + 33, // 16: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry + 34, // 17: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry + 35, // 18: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry + 46, // 19: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege + 47, // 20: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook + 48, // 21: StonehengeBookAwardResp.award:type_name -> UserAssets + 36, // 22: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry + 48, // 23: StonehengeWeekAwardResp.award:type_name -> UserAssets + 49, // 24: StonehengeTaskInfoResp.conlds:type_name -> ConIProgress + 37, // 25: StonehengeTaskInfoResp.task:type_name -> StonehengeTaskInfoResp.TaskEntry + 38, // 26: StonehengeTaskReceiveResp.task:type_name -> StonehengeTaskReceiveResp.TaskEntry + 48, // 27: StonehengeTaskReceiveResp.award:type_name -> UserAssets + 50, // 28: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole + 50, // 29: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole 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 @@ -2481,30 +2377,6 @@ func file_stonehenge_stonehenge_msg_proto_init() { return nil } } - file_stonehenge_stonehenge_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StonehengeResetBuffReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_stonehenge_stonehenge_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StonehengeResetBuffResp); 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{ @@ -2512,7 +2384,7 @@ func file_stonehenge_stonehenge_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 41, + NumMessages: 39, NumExtensions: 0, NumServices: 0, },