Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

上传开始时间
2024-03-12 15:32:38 +08:00 · 2024-03-12 15:32:35 +08:00
9 changed files with 293 additions and 105 deletions
--- a/modules/exclusive/configure.go
+++ b/modules/exclusive/configure.go
@ -17,6 +17,7 @@ const (
 	game_exclusivestar    = "game_exclusivestar.json"    //装备信息表
 	game_exclusiverack    = "game_exclusiverank.json"    //装备信息表
 	game_exclusiveitem    = "game_exclusiveitem.json"    //经验道具
+
 )

 // /背包配置管理组件
@ -33,6 +34,7 @@ type configureComp struct {
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*Exclusive)
+
 	this.LoadConfigure(game_exclusiveweapon, cfg.NewGameExclusiveWeapon)
 	this.LoadConfigure(game_exclusiveitem, cfg.NewGameExclusiveItem)
 	//等级
--- a/modules/exclusive/model.go
+++ b/modules/exclusive/model.go
@ -31,6 +31,12 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
 	return
 }

+func (this *modelComp) Start() (err error) {
+	this.MCompModel.Start()
+
+	return
+}
+
 // 更新埋点数据到db中
 func (this *modelComp) getburiedModel(uid string) (model *exclusiveModel, err error) {
 	var m *db.DBModel
--- a/modules/exclusive/module.go
+++ b/modules/exclusive/module.go
@ -17,7 +17,7 @@ func NewModule() core.IModule {

 type Exclusive struct {
 	modules.ModuleBase
-	service   core.IService
+	service   comm.IService
 	chat      comm.IChat
 	api       *apiComp
 	configure *configureComp
@ -34,7 +34,7 @@ func (this *Exclusive) Init(service core.IService, module core.IModule, options
 	if err = this.ModuleBase.Init(service, module, options); err != nil {
 		return
 	}
-	this.service = service
+	this.service = service.(comm.IService)
 	return
 }

--- a/modules/realarena/api_info.go
+++ b/modules/realarena/api_info.go
@ -26,6 +26,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.RealArenaInfoReq) (
 		return
 	}

-	session.SendMsg(string(this.module.GetType()), "info", &pb.RealArenaInfoResp{Info: info})
+	session.SendMsg(string(this.module.GetType()), "info", &pb.RealArenaInfoResp{Info: info, Opentime: this.module.model.whichissue.Curropentime, Endtime: this.module.model.whichissue.Currendtime})
 	return
 }
--- a/modules/realarena/configure.go
+++ b/modules/realarena/configure.go
@ -12,6 +12,7 @@ const (
 	game_arenarealtimeconfig     = "game_arenarealtimeconfig.json" //购买挑战记录
 	game_arenarealtimerankreward = "game_arenarealtimerankreward.json"
 	game_arenarealtimewinstreak  = "game_arenarealtimewinstreak.json"
+	game_arenarealtimeopentime   = "game_arenarealtimeopentime.json" //开启时间
 )

 ///竞技场配置管理组件
@ -28,6 +29,7 @@ type configureComp struct {
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*RealArena)
+	this.LoadConfigure(game_arenarealtimeopentime, cfg.NewGameArenarealtimeOpentime)
 	this.LoadConfigure(game_arenarealtimeconfig, cfg.NewGameArenarealtimeConfig)
 	this.LoadConfigure(game_arenarealtimerankreward, cfg.NewGameArenarealtimeRankreward)
 	this.LoadConfigure(game_arenarealtimewinstreak, cfg.NewGameArenarealtimeWinStreak)
@ -71,3 +73,15 @@ func (this *configureComp) getGameArenarealtimeConfig(dan int32) (conf *cfg.Game
 	}
 	return
 }
+
+//获取全部开启时间
+func (this *configureComp) GetGameArenarealtimeOpentime() (conf *cfg.GameArenarealtimeOpentime, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = this.GetConfigure(game_arenarealtimeopentime); err == nil {
+		conf = v.(*cfg.GameArenarealtimeOpentime)
+		return
+	}
+	return
+}
--- a/modules/realarena/model.go
+++ b/modules/realarena/model.go
@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/sys/db"
 	"math"
@ -15,10 +16,15 @@ import (
 	"go.mongodb.org/mongo-driver/x/bsonx"
 )

+var (
+	GlobalWhichIssueKey = "ExclusiveWhichIssue"
+)
+
 // /装备 数据组件
 type modelComp struct {
 	modules.MCompModel
-	module *RealArena
+	module     *RealArena
+	whichissue *pb.DBRealArenaWhichIssue
 }

 // 组件初始化接口
@ -33,6 +39,57 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
 	return
 }

+func (this *modelComp) Start() (err error) {
+	this.whichissue = &pb.DBRealArenaWhichIssue{}
+	this.module.ModuleTools.GetGlobalData(GlobalWhichIssueKey, this.whichissue)
+	this.computeWhich()
+	return
+}
+
+//计算比赛周期
+func (this *modelComp) computeWhich() {
+	var (
+		conf *cfg.GameArenarealtimeOpentime
+		err  error
+	)
+	if conf, err = this.module.configure.GetGameArenarealtimeOpentime(); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	if this.whichissue.Currwhichissue == 0 { //第0期
+		this.whichissue.Currwhichissue = conf.GetDataList()[0].Id
+		this.whichissue.Curropentime = this.module.service.GetOpentime().Unix() + int64(conf.GetDataList()[0].OpenTime)
+		this.whichissue.Currendtime = this.whichissue.Curropentime + int64(conf.GetDataList()[0].DurationTime)
+		this.module.ModuleTools.UpdateGlobalData(GlobalWhichIssueKey, this.whichissue)
+	} else {
+		for i, v := range conf.GetDataList() {
+			if v.Id == this.whichissue.Currwhichissue { //当前第几期
+				if v.CycleIndex == 1 {
+					if configure.Now().Unix() > this.whichissue.Currendtime { //是否结束当前周期
+						this.whichissue.Curropentime = this.whichissue.Currendtime + int64(v.IntervalTime)
+						this.whichissue.Currendtime = this.whichissue.Curropentime + int64(v.DurationTime)
+						this.module.ModuleTools.UpdateGlobalData(GlobalWhichIssueKey, this.whichissue)
+						break
+					}
+				} else {
+					if configure.Now().Unix() > this.whichissue.Currendtime { //进入下一期
+						if i < len(conf.GetDataList())-1 {
+							this.whichissue.Currwhichissue = conf.GetDataList()[i+1].Id
+							this.whichissue.Curropentime = this.whichissue.Currendtime + int64(conf.GetDataList()[i+1].IntervalTime)
+							this.whichissue.Currendtime = this.whichissue.Curropentime + int64(conf.GetDataList()[i+1].DurationTime)
+						} else {
+							this.whichissue.Curropentime = this.whichissue.Currendtime + int64(v.IntervalTime)
+							this.whichissue.Currendtime = this.whichissue.Curropentime + int64(v.DurationTime)
+						}
+						this.module.ModuleTools.UpdateGlobalData(GlobalWhichIssueKey, this.whichissue)
+						break
+					}
+				}
+			}
+		}
+	}
+}
+
 // 更新埋点数据到db中
 func (this *modelComp) getmodel() (model *realArenaModel, err error) {
 	var (
--- a/modules/tools/modelGlobal.go
+++ b/modules/tools/modelGlobal.go
@ -27,7 +27,9 @@ func (this *modelGlobal) Init(service core.IService, module core.IModule, comp c
 func (this *modelGlobal) GetGlobalData(key string, v interface{}) (err error) {
 	if err = this.DBModel.DB.FindOne(core.SqlTable(this.TableName), bson.M{"_id": key}).Decode(v); err != nil && err != mgo.MongodbNil {
 		this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()})
+		return
 	}
+	err = nil
 	return
 }

@ -35,7 +37,9 @@ func (this *modelGlobal) GetGlobalData(key string, v interface{}) (err error) {
 func (this *modelGlobal) GetAndUpdateGlobalData(key string, v interface{}, update interface{}) (err error) {
 	if err = this.DBModel.DB.FindOneAndUpdate(core.SqlTable(this.TableName), bson.M{"_id": key}, update).Decode(v); err != nil && err != mgo.MongodbNil {
 		this.module.Error("GetAndUpdateGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()})
+		return
 	}
+	err = nil
 	return
 }

--- a/pb/realarena_db.pb.go
+++ b/pb/realarena_db.pb.go
@ -324,6 +324,70 @@ func (x *DBRealArenaRace) GetBule() *DBRealArenaMember {
 	return nil
 }

+//全集比赛周期代码
+type DBRealArenaWhichIssue struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Currwhichissue int32 `protobuf:"varint,1,opt,name=currwhichissue,proto3" json:"currwhichissue"` //当前第几期
+	Curropentime   int64 `protobuf:"varint,2,opt,name=curropentime,proto3" json:"curropentime"`     //当前比赛开始时间
+	Currendtime    int64 `protobuf:"varint,3,opt,name=currendtime,proto3" json:"currendtime"`       //当前比赛结束时间
+}
+
+func (x *DBRealArenaWhichIssue) Reset() {
+	*x = DBRealArenaWhichIssue{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_realarena_realarena_db_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBRealArenaWhichIssue) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBRealArenaWhichIssue) ProtoMessage() {}
+
+func (x *DBRealArenaWhichIssue) ProtoReflect() protoreflect.Message {
+	mi := &file_realarena_realarena_db_proto_msgTypes[3]
+	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 DBRealArenaWhichIssue.ProtoReflect.Descriptor instead.
+func (*DBRealArenaWhichIssue) Descriptor() ([]byte, []int) {
+	return file_realarena_realarena_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DBRealArenaWhichIssue) GetCurrwhichissue() int32 {
+	if x != nil {
+		return x.Currwhichissue
+	}
+	return 0
+}
+
+func (x *DBRealArenaWhichIssue) GetCurropentime() int64 {
+	if x != nil {
+		return x.Curropentime
+	}
+	return 0
+}
+
+func (x *DBRealArenaWhichIssue) GetCurrendtime() int64 {
+	if x != nil {
+		return x.Currendtime
+	}
+	return 0
+}
+
 var File_realarena_realarena_db_proto protoreflect.FileDescriptor

 var file_realarena_realarena_db_proto_rawDesc = []byte{
@ -376,8 +440,17 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{
 	0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
 	0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x42, 0x06, 0x5a, 0x04,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x85, 0x01, 0x0a,
+	0x15, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x57, 0x68, 0x69, 0x63,
+	0x68, 0x49, 0x73, 0x73, 0x75, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x77, 0x68,
+	0x69, 0x63, 0x68, 0x69, 0x73, 0x73, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e,
+	0x63, 0x75, 0x72, 0x72, 0x77, 0x68, 0x69, 0x63, 0x68, 0x69, 0x73, 0x73, 0x75, 0x65, 0x12, 0x22,
+	0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x64,
+	0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@ -392,20 +465,21 @@ func file_realarena_realarena_db_proto_rawDescGZIP() []byte {
 	return file_realarena_realarena_db_proto_rawDescData
 }

-var file_realarena_realarena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_realarena_realarena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_realarena_realarena_db_proto_goTypes = []interface{}{
-	(*DBRealArena)(nil),       // 0: DBRealArena
-	(*DBRealArenaMember)(nil), // 1: DBRealArenaMember
-	(*DBRealArenaRace)(nil),   // 2: DBRealArenaRace
-	nil,                       // 3: DBRealArena.DanawardEntry
-	(*BaseUserInfo)(nil),      // 4: BaseUserInfo
-	(*UserAtno)(nil),          // 5: UserAtno
+	(*DBRealArena)(nil),           // 0: DBRealArena
+	(*DBRealArenaMember)(nil),     // 1: DBRealArenaMember
+	(*DBRealArenaRace)(nil),       // 2: DBRealArenaRace
+	(*DBRealArenaWhichIssue)(nil), // 3: DBRealArenaWhichIssue
+	nil,                           // 4: DBRealArena.DanawardEntry
+	(*BaseUserInfo)(nil),          // 5: BaseUserInfo
+	(*UserAtno)(nil),              // 6: UserAtno
 }
 var file_realarena_realarena_db_proto_depIdxs = []int32{
-	4, // 0: DBRealArena.uinfo:type_name -> BaseUserInfo
-	3, // 1: DBRealArena.danaward:type_name -> DBRealArena.DanawardEntry
-	4, // 2: DBRealArenaMember.user:type_name -> BaseUserInfo
-	5, // 3: DBRealArenaMember.award:type_name -> UserAtno
+	5, // 0: DBRealArena.uinfo:type_name -> BaseUserInfo
+	4, // 1: DBRealArena.danaward:type_name -> DBRealArena.DanawardEntry
+	5, // 2: DBRealArenaMember.user:type_name -> BaseUserInfo
+	6, // 3: DBRealArenaMember.award:type_name -> UserAtno
 	1, // 4: DBRealArenaRace.red:type_name -> DBRealArenaMember
 	1, // 5: DBRealArenaRace.bule:type_name -> DBRealArenaMember
 	6, // [6:6] is the sub-list for method output_type
@ -458,6 +532,18 @@ func file_realarena_realarena_db_proto_init() {
 				return nil
 			}
 		}
+		file_realarena_realarena_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBRealArenaWhichIssue); 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{
@ -465,7 +551,7 @@ func file_realarena_realarena_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_realarena_realarena_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
--- a/pb/realarena_msg.pb.go
+++ b/pb/realarena_msg.pb.go
@ -64,7 +64,9 @@ type RealArenaInfoResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields

-	Info *DBRealArena `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+	Info     *DBRealArena `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+	Opentime int64        `protobuf:"varint,2,opt,name=opentime,proto3" json:"opentime"`
+	Endtime  int64        `protobuf:"varint,3,opt,name=endtime,proto3" json:"endtime"`
 }

 func (x *RealArenaInfoResp) Reset() {
@ -106,6 +108,20 @@ func (x *RealArenaInfoResp) GetInfo() *DBRealArena {
 	return nil
 }

+func (x *RealArenaInfoResp) GetOpentime() int64 {
+	if x != nil {
+		return x.Opentime
+	}
+	return 0
+}
+
+func (x *RealArenaInfoResp) GetEndtime() int64 {
+	if x != nil {
+		return x.Endtime
+	}
+	return 0
+}
+
 //排行榜
 type RealArenaRankReq struct {
 	state         protoimpl.MessageState
@ -1273,98 +1289,101 @@ var file_realarena_realarena_msg_proto_rawDesc = []byte{
 	0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x72, 0x65, 0x61,
 	0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61,
 	0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65, 0x61,
-	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a,
+	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x6b, 0x0a,
 	0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x0c, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a,
-	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42,
-	0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22,
-	0x13, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65,
-	0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63,
-	0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1a, 0x0a, 0x18, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73,
-	0x70, 0x22, 0x3e, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72,
-	0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x52, 0x65,
-	0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63,
-	0x65, 0x22, 0x60, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74,
-	0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73,
-	0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f,
-	0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64,
-	0x6f, 0x77, 0x6e, 0x22, 0x55, 0x0a, 0x1a, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65,
-	0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x68, 0x65, 0x72,
-	0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x42,
-	0x61, 0x73, 0x65, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22, 0x1d, 0x0a, 0x1b, 0x52, 0x65,
-	0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61,
-	0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4c, 0x0a, 0x17, 0x52, 0x65, 0x61,
-	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65,
-	0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22, 0x4f, 0x0a, 0x1d, 0x52, 0x65, 0x61, 0x6c, 0x41,
-	0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4b, 0x0a, 0x1b, 0x52, 0x65, 0x61, 0x6c,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65, 0x61, 0x6d,
+	0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65,
+	0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x35,
+	0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52,
+	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65,
+	0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x52, 0x65,
+	0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70,
+	0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1a, 0x0a, 0x18, 0x52,
+	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x6c, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73,
+	0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63,
+	0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x60, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48,
+	0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x55, 0x0a, 0x1a, 0x52, 0x65, 0x61,
+	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d,
 	0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 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, 0x1e, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x18, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73,
-	0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 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, 0x3e, 0x0a, 0x1e, 0x52, 0x65, 0x61,
-	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4c, 0x0a, 0x1c, 0x52, 0x65, 0x61,
-	0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d,
-	0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 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, 0x1f, 0x0a, 0x1d, 0x52, 0x65, 0x61, 0x6c, 0x41,
-	0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x4c, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x43, 0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x9b, 0x01,
-	0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72,
+	0x1f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73,
+	0x22, 0x1d, 0x0a, 0x1b, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22,
+	0x4c, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65,
+	0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05,
+	0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x48, 0x65,
+	0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x22, 0x4f, 0x0a,
+	0x1d, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72, 0x74, 0x44,
+	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x4b,
+	0x0a, 0x1b, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
+	0x6f, 0x6f, 0x6d, 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, 0x1e, 0x0a, 0x1c, 0x52,
+	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54,
+	0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x18, 0x52,
+	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x48,
+	0x65, 0x72, 0x6f, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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,
+	0x3e, 0x0a, 0x1e, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x74, 0x61, 0x72,
+	0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x75, 0x73,
+	0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22,
+	0x4c, 0x0a, 0x1c, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65,
+	0x63, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12,
+	0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x72, 0x6f, 0x6f, 0x6d, 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, 0x1f, 0x0a,
+	0x1d, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
+	0x54, 0x65, 0x61, 0x6d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x43,
+	0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x9b, 0x01, 0x0a, 0x19, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e,
+	0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73,
+	0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e,
+	0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73,
+	0x69, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c,
+	0x65, 0x22, 0x30, 0x0a, 0x16, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
 	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x24, 0x0a,
-	0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52,
-	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03,
-	0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d,
-	0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x30, 0x0a, 0x16, 0x52,
-	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x78,
-	0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x19, 0x0a,
-	0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4d, 0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f,
-	0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65,
-	0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x22, 0x1e, 0x0a, 0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52,
-	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73,
-	0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4d,
+	0x0a, 0x1b, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54,
+	0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52,
+	0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x66, 0x66, 0x55, 0x69, 0x64, 0x22, 0x1e, 0x0a,
+	0x1c, 0x52, 0x50, 0x43, 0x5f, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x72,
+	0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
Author	SHA1	Message	Date
liwei1dao	21dcb8cd4f	Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev	2024-03-12 15:32:38 +08:00
liwei1dao	3f93eaafca	上传开始时间	2024-03-12 15:32:35 +08:00