修改任务结束奖励

modules/rtask/api_battlefinish.go

@@ -2,14 +2,14 @@ package rtask
 
 import (
 	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 
 	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.RtaskBattleFinishReq) (code pb.ErrorCode) {
-	if req.RtaskId == 0 {
+	if req.RtaskId == 0 || req.RtaskSubId == 0 {
 		code = pb.ErrorCode_ReqParameterError
 	}
 	return
@@ -19,19 +19,23 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
 	if code = this.BattleFinishCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-
-	if req.IsWin {
-		// 获取玩家的任务
-		rtask := &pb.DBRtask{}
-		if err := this.moduleRtask.modelRtask.Get(session.GetUserId(), rtask); err != nil {
-			return
-		}
-
 	// 获取当前任务配置
 	conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
-			log.Errorf("rdtask %v no found", req.RtaskId)
+		return
+	}
+
+	// 获取支线任务配置
+	sideConf := this.moduleRtask.configure.getRtaskSidById(req.RtaskSubId)
+	if sideConf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	// 获取玩家的任务
+	rtask := &pb.DBRtask{}
+	if err := this.moduleRtask.modelRtask.Get(session.GetUserId(), rtask); err != nil {
 		return
 	}
 
@@ -40,28 +44,21 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
 		ok        bool
 	)
 
-		if frtaskArr, ok = rtask.FrtaskIds[conf.Group]; !ok {
+	if frtaskArr, ok = rtask.FrtaskIds[conf.Group]; ok {
-			frtaskArr = &pb.FrtaskIds{}
+		//验证该任务是否已完成
+		if _, ok := utils.Findx(frtaskArr.RtaskIds, req.RtaskId); ok {
+			for _, v := range sideConf.Reward {
+				if v.ChooseId == 0 {
+					this.moduleRtask.DispenseRes(session, v.Reward, true)
 				}
-
-		// 更新完成的任务
-		frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
-		if rtask.FrtaskIds == nil {
-			rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
 			}
-		rtask.FrtaskIds[conf.Group] = frtaskArr
-		update := map[string]interface{}{
-			"frtaskIds": rtask.FrtaskIds,
-		}
-		if err := this.moduleRtask.modelRtask.Change(session.GetUserId(), update); err != nil {
-			code = pb.ErrorCode_SystemError
-			return
 		}
 	}
 
 	if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeBattleFinish,
 		&pb.RtaskBattleFinishResp{
 			RtaskId:    req.RtaskId,
+			RtaskSubId: req.RtaskSubId,
 		}); err != nil {
 		code = pb.ErrorCode_SystemError
 	}

modules/rtask/api_choose.go

@@ -2,7 +2,6 @@ package rtask
 
 import (
 	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
 
@@ -31,7 +30,6 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
 	if conf == nil {
 		code = pb.ErrorCode_ConfigNoFound
-		log.Errorf("rdtask %v no found", req.RtaskId)
 		return
 	}
 
@@ -39,7 +37,6 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	sideConf := this.moduleRtask.configure.getRtaskSidById(req.RtaskSubId)
 	if sideConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
-		log.Errorf("rdtask_side %v no found", req.RtaskSubId)
 		return
 	}
 
@@ -47,16 +44,17 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 	chooseCnf := this.moduleRtask.configure.getRtaskChooseCfg(req.ChooseId)
 	if chooseCnf == nil {
 		code = pb.ErrorCode_ConfigNoFound
-		log.Errorf("rdtask_choose %v no found", req.ChooseId)
 		return
 	}
 
 	// 校验限定条件
+	if chooseCnf.PreTid != 0 {
 		if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), chooseCnf.PreTid); !ok {
-		log.Errorf("no reach condi err: %v", err)
+			this.moduleRtask.Errorf("no reach condi err: %v", err)
 			code = pb.ErrorCode_RtaskCondiNoReach
 			return
 		}
+	}
 
 	var (
 		frtaskArr *pb.FrtaskIds //完成的任务

pb/rtask_msg.pb.go

@@ -622,8 +622,7 @@ type RtaskBattleFinishReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	RtaskId    int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"`       //任务ID
-	IsWin   bool          `protobuf:"varint,2,opt,name=isWin,proto3" json:"isWin"`     //战斗结果
+	RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID
-	Report  *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"`    //战报
 }
 
 func (x *RtaskBattleFinishReq) Reset() {
@@ -665,18 +664,11 @@ func (x *RtaskBattleFinishReq) GetRtaskId() int32 {
 	return 0
 }
 
-func (x *RtaskBattleFinishReq) GetIsWin() bool {
+func (x *RtaskBattleFinishReq) GetRtaskSubId() int32 {
 	if x != nil {
-		return x.IsWin
+		return x.RtaskSubId
 	}
-	return false
+	return 0
-}
-
-func (x *RtaskBattleFinishReq) GetReport() *BattleReport {
-	if x != nil {
-		return x.Report
-	}
-	return nil
 }
 
 type RtaskBattleFinishResp struct {
@@ -685,6 +677,7 @@ type RtaskBattleFinishResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	RtaskId    int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"`       //任务ID
+	RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID
 }
 
 func (x *RtaskBattleFinishResp) Reset() {
@@ -726,6 +719,13 @@ func (x *RtaskBattleFinishResp) GetRtaskId() int32 {
 	return 0
 }
 
+func (x *RtaskBattleFinishResp) GetRtaskSubId() int32 {
+	if x != nil {
+		return x.RtaskSubId
+	}
+	return 0
+}
+
 //获取玩家任务记录
 type RtaskGetrecordReq struct {
 	state         protoimpl.MessageState
@@ -979,32 +979,32 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{
 	0x22, 0x37, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
 	0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6d, 0x0a, 0x14, 0x52, 0x74, 0x61,
+	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x50, 0x0a, 0x14, 0x52, 0x74, 0x61,
 	0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
 	0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69,
+	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72,
-	0x73, 0x57, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x57, 0x69,
+	0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6e, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x52,
-	0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
-	0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x31, 0x0a, 0x15, 0x52, 0x74, 0x61, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
-	0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e,
-	0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x52,
+	0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x13,
-	0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
+	0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f,
+	0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72,
-	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b,
+	0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74,
-	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x5e,
+	0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
-	0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c,
+	0x64, 0x22, 0x5e, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65,
-	0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61,
+	0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18,
+	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x23,
+	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49,
-	0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x64, 0x22, 0x23, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65,
-	0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66,
+	0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x74, 0x6f, 0x33,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1039,18 +1039,16 @@ var file_rtask_rtask_msg_proto_goTypes = []interface{}{
 	(*RtaskTestReq)(nil),          // 15: RtaskTestReq
 	(*RtaskTestResp)(nil),         // 16: RtaskTestResp
 	(*BattleInfo)(nil),            // 17: BattleInfo
-	(*BattleReport)(nil),          // 18: BattleReport
+	(*DBRtaskRecord)(nil),         // 18: DBRtaskRecord
-	(*DBRtaskRecord)(nil),         // 19: DBRtaskRecord
 }
 var file_rtask_rtask_msg_proto_depIdxs = []int32{
 	17, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo
-	18, // 1: RtaskBattleFinishReq.report:type_name -> BattleReport
+	18, // 1: RtaskGetrecordResp.record:type_name -> DBRtaskRecord
-	19, // 2: RtaskGetrecordResp.record:type_name -> DBRtaskRecord
+	2,  // [2:2] is the sub-list for method output_type
-	3,  // [3:3] is the sub-list for method output_type
+	2,  // [2:2] is the sub-list for method input_type
-	3,  // [3:3] is the sub-list for method input_type
+	2,  // [2:2] is the sub-list for extension type_name
-	3,  // [3:3] is the sub-list for extension type_name
+	2,  // [2:2] is the sub-list for extension extendee
-	3,  // [3:3] is the sub-list for extension extendee
+	0,  // [0:2] is the sub-list for field type_name
-	0,  // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_rtask_rtask_msg_proto_init() }

pb/userexpand.pb.go

@@ -391,6 +391,7 @@ type DBUserExpand struct {
 	LoginAddCount          int32             `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"`                                                                                   //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数
 	LoginContinueCount     int32             `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"`                                                                         //@go_tasgs(`bson:"loginContinueCount"`)  连续登录天数
 	CompletePagoda         bool              `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"`                                                           //通关普通塔
+	RtaskId                int32             `protobuf:"varint,22,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"`                                                                                // 当前完成的随机任务ID
 }
 
 func (x *DBUserExpand) Reset() {
@@ -572,6 +573,13 @@ func (x *DBUserExpand) GetCompletePagoda() bool {
 	return false
 }
 
+func (x *DBUserExpand) GetRtaskId() int32 {
+	if x != nil {
+		return x.RtaskId
+	}
+	return 0
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
@@ -600,7 +608,7 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d,
 	0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
 	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70,
-	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
+	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0xd5, 0x07, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65,
 	0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73,
@@ -652,16 +660,17 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6d,
 	0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x18, 0x15, 0x20, 0x01, 0x28,
 	0x08, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x67, 0x6f, 0x64,
-	0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x61, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x16, 0x20, 0x01,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x54,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73,
-	0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76,
-	0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x72, 0x65, 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 (