From 1b198d0ab532c2e3ed501482835b82c011219f4d Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 7 Mar 2024 14:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BA=A2=E7=82=B9=E5=92=8C?=
 =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                         |   5 +-
 lego/core/cbase/servicebase.go          |   8 +
 lego/core/core.go                       |   1 +
 modules/realarena/api_danreceive.go     |   5 -
 modules/realarena/api_selectteamhero.go |   2 +-
 modules/realarena/model.go              |  39 ++
 modules/realarena/modelrank.go          |  93 ++++
 modules/realarena/module.go             |  35 ++
 modules/realarena/romm.go               |  24 +-
 modules/reddot/api_get.go               | 140 +-----
 modules/reddot/module.go                | 107 +----
 pb/comm.pb.go                           | 590 ++++++++++++++----------
 pb/realarena_db.pb.go                   |  41 +-
 pb/realarena_msg.pb.go                  | 195 ++++----
 14 files changed, 654 insertions(+), 631 deletions(-)
 create mode 100644 modules/realarena/modelrank.go

diff --git a/comm/imodule.go b/comm/imodule.go
index 667542854..a3d1d6253 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -483,8 +483,7 @@ type (
 	}
 	//支付模块
 	IPay interface {
-		//模拟发货
-		// ModulePayDelivery(session IUserSession, Productid string, Price int32) (errdata *pb.ErrorData)
+		IGetReddot
 		IActivityNotice
 	}
 
@@ -533,6 +532,7 @@ type (
 
 	//捕羊大赛
 	IParkour interface {
+		IGetReddot
 	}
 
 	ITools interface {
@@ -612,6 +612,7 @@ type (
 	}
 	//战令
 	IWarorder interface {
+		IGetReddot
 		IPayDelivery
 		IActivityNotice
 	}
diff --git a/lego/core/cbase/servicebase.go b/lego/core/cbase/servicebase.go
index 57774cb9f..b6e12ad14 100644
--- a/lego/core/cbase/servicebase.go
+++ b/lego/core/cbase/servicebase.go
@@ -184,6 +184,14 @@ func (this *ServiceBase) GetModule(ModuleName core.M_Modules) (module core.IModu
 	}
 }
 
+//获取当前服务下指定模块对象
+func (this *ServiceBase) GetAllModules() (modules []core.IModule, err error) {
+	for _, v := range this.modules {
+		modules = append(modules, v.mi)
+	}
+	return
+}
+
 //获取当前服务下指定组件对象
 func (this *ServiceBase) GetComp(CompName core.S_Comps) (comp core.IServiceComp, err error) {
 	if v, ok := this.comps[CompName]; ok {
diff --git a/lego/core/core.go b/lego/core/core.go
index 2c87aa39a..9ca636741 100644
--- a/lego/core/core.go
+++ b/lego/core/core.go
@@ -61,6 +61,7 @@ type IService interface {
 	Destroy() (err error)                                       //销毁服务
 	GetComp(CompName S_Comps) (comp IServiceComp, err error)    //获取组件
 	GetModule(ModuleName M_Modules) (module IModule, err error) //获取模块
+	GetAllModules() (modules []IModule, err error)              //获取所有模块
 }
 
 //基础服务组件的接口设计
diff --git a/modules/realarena/api_danreceive.go b/modules/realarena/api_danreceive.go
index d36eda097..a6966fe00 100644
--- a/modules/realarena/api_danreceive.go
+++ b/modules/realarena/api_danreceive.go
@@ -55,11 +55,6 @@ func (this *apiComp) DanReceive(session comm.IUserSession, req *pb.ArenaDanRecei
 		return
 	}
 	if errdata, atno = this.module.DispenseAtno(session, conf.ExReward, true); errdata != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
 		return
 	}
 	if err = this.module.model.change(session.GetUserId(), map[string]interface{}{
diff --git a/modules/realarena/api_selectteamhero.go b/modules/realarena/api_selectteamhero.go
index 959d07722..fd870e0ef 100644
--- a/modules/realarena/api_selectteamhero.go
+++ b/modules/realarena/api_selectteamhero.go
@@ -26,7 +26,7 @@ func (this *apiComp) SelectTeamHero(session comm.IUserSession, req *pb.RealArena
 	room, ok = this.module.rooms[req.Roomid]
 	this.module.lock.RUnlock()
 	if ok {
-		if err = room.selectheros(session.GetUserId(), req.Herosids, req.Heroscids); err != nil {
+		if err = room.selectheros(session.GetUserId(), req.Heros); err != nil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_ReqParameterError,
 				Message: err.Error(),
diff --git a/modules/realarena/model.go b/modules/realarena/model.go
index 6886f8373..8a388f48f 100644
--- a/modules/realarena/model.go
+++ b/modules/realarena/model.go
@@ -6,7 +6,9 @@ import (
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/sys/db"
+	"math"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -81,6 +83,43 @@ func (this *modelComp) change(uid string, update map[string]interface{}) (err er
 	return
 }
 
+// 积分计算
+func (this *modelComp) integralCompute(red, bule *pb.ArenaPlayer, iswin bool) {
+	var (
+		redactive  *cfg.GameArenaActiveRewardData
+		buleactive *cfg.GameArenaActiveRewardData
+		err        error
+	)
+	if redactive, err = this.module.configure.getGameArenarealtimeConfig(red.Dan); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	if buleactive, err = this.module.configure.getGameArenarealtimeConfig(bule.Dan); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	if iswin {
+		red.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float32(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400)))))
+		bule.Changeintegral = int32(float64(buleactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral))/400))))
+	} else {
+		red.Changeintegral = int32(float64(redactive.KValue) * float64(0-1/float64(1+math.Pow(10, float64(float64(bule.Integral-red.Integral)/400)))))
+		bule.Changeintegral = int32(float64(redactive.KValue) * float64(1-1/float64(1+math.Pow(10, float64(float64(red.Integral-bule.Integral)/400)))))
+	}
+	if red.Integral+red.Changeintegral < 0 {
+		red.Changeintegral = -red.Integral
+		red.Integral = 0
+	} else {
+		red.Integral = red.Integral + red.Changeintegral
+	}
+	if bule.Integral+bule.Changeintegral < 0 {
+		bule.Changeintegral = -bule.Integral
+		bule.Integral = 0
+	} else {
+		bule.Integral = bule.Integral + bule.Changeintegral
+	}
+
+}
+
 // 埋点专属模型 会封装特殊的数据转换接口
 type realArenaModel struct {
 	module *RealArena
diff --git a/modules/realarena/modelrank.go b/modules/realarena/modelrank.go
new file mode 100644
index 000000000..cbe39a04f
--- /dev/null
+++ b/modules/realarena/modelrank.go
@@ -0,0 +1,93 @@
+package realarena
+
+import (
+	"context"
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/redis/pipe"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/sys/db"
+
+	"github.com/go-redis/redis/v8"
+)
+
+// /竞技场 数据组件
+type modelRank struct {
+	modules.MCompModel
+	module *RealArena
+}
+
+// 组件初始化接口
+func (this *modelRank) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
+	this.TableName = comm.TableArenaRank
+	this.MCompModel.Init(service, module, comp, opt)
+	this.module = module.(*RealArena)
+
+	return
+}
+
+func (this *modelRank) rankey() string {
+	return fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName)
+}
+
+// 更新排名
+func (this *modelRank) updateArenaRank(uid string, integral int32) (rank int64, err error) {
+	var (
+		pipe       *pipe.RedisPipe = this.DBModel.Redis.RedisPipe(context.TODO())
+		cmd        *redis.IntCmd
+		menbersCmd *redis.IntCmd
+	)
+
+	if cmd = pipe.ZAdd(this.rankey(), &redis.Z{Score: float64(integral), Member: uid}); err != nil {
+		this.module.Errorln(err)
+	}
+	menbersCmd = pipe.ZRevRank(this.rankey(), uid)
+	if _, err = pipe.Exec(); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	if _, err = cmd.Result(); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+
+	if rank, err = menbersCmd.Result(); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	rank = rank + 1
+	return
+}
+
+//获取指定区间的玩家人数
+func (this *modelRank) queryRankByScoreArea(min, max int32) (count int64, err error) {
+	if count, err = this.DBModel.Redis.ZCount(this.rankey(), fmt.Sprintln(min), fmt.Sprintln(max)); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	return
+}
+
+// 获取排行榜前50的用户名单
+func (this *modelRank) queryRankUser() (ranks []string, err error) {
+	var (
+		result []string
+	)
+	if result, err = this.DBModel.Redis.ZRevRange(this.rankey(), 0, 50).Result(); err != nil {
+		this.module.Errorln(err)
+		return
+	}
+	ranks = make([]string, 0)
+	for i := 0; i < len(result); i += 1 {
+		ranks = append(ranks, result[i])
+	}
+	return
+}
+
+// 比赛结算
+func (this *modelRank) raceSettlement() {
+	// if isopen := this.module.modelArena.isInMaintenance(); isopen {
+	this.DBModel.Del(this.rankey(), db.SetDBMgoLog(false))
+	// }
+}
diff --git a/modules/realarena/module.go b/modules/realarena/module.go
index 1448d5116..e5b52684d 100644
--- a/modules/realarena/module.go
+++ b/modules/realarena/module.go
@@ -31,6 +31,7 @@ type RealArena struct {
 	apicomp   *apiComp
 	configure *configureComp
 	model     *modelComp
+	modelRank *modelRank
 	match     *matchComp
 	lock      sync.RWMutex
 	rooms     map[string]*Room
@@ -69,6 +70,7 @@ func (this *RealArena) OnInstallComp() {
 	this.apicomp = this.RegisterComp(new(apiComp)).(*apiComp)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 	this.model = this.RegisterComp(new(modelComp)).(*modelComp)
+	this.modelRank = this.RegisterComp(new(modelRank)).(*modelRank)
 	this.match = this.RegisterComp(new(matchComp)).(*matchComp)
 }
 
@@ -174,3 +176,36 @@ func (this *RealArena) endgame(ctx context.Context, req *pb.RPC_RealArenaTrustee
 	}
 	return
 }
+
+//战斗结束
+func (this *RealArena) ChallengeResults(roomid, red, bule string, winSide int32) {
+	var (
+		// room *Room
+		ok  bool
+		err error
+	)
+	this.lock.Lock()
+	_, ok = this.rooms[roomid]
+	delete(this.rooms, roomid)
+	this.lock.Unlock()
+	if ok {
+		if err = this.model.change(red, map[string]interface{}{
+			"state":    0,
+			"roomid":   "",
+			"roompath": "",
+			"integral": 0,
+		}); err != nil {
+			this.Errorln(err)
+			return
+		}
+		if err = this.model.change(bule, map[string]interface{}{
+			"state":    0,
+			"roomid":   "",
+			"roompath": "",
+			"integral": 0,
+		}); err != nil {
+			this.Errorln(err)
+			return
+		}
+	}
+}
diff --git a/modules/realarena/romm.go b/modules/realarena/romm.go
index e98dac637..d5f546569 100644
--- a/modules/realarena/romm.go
+++ b/modules/realarena/romm.go
@@ -40,7 +40,7 @@ func (this *Room) init() (err error) {
 }
 
 //选择英雄
-func (this *Room) selectheros(uid string, heros []string, herocid []string) (err error) {
+func (this *Room) selectheros(uid string, heros []*pb.HeroBase) (err error) {
 	var (
 		num int32
 	)
@@ -51,8 +51,12 @@ func (this *Room) selectheros(uid string, heros []string, herocid []string) (err
 
 	for _, v := range this.members {
 		if v.User.Uid == uid {
-			v.Heros = heros
-			v.Heroscid = herocid
+			v.Heros = make([]string, len(heros))
+			for i, hero := range heros {
+				if hero != nil {
+					v.Heros[i] = hero.Old
+				}
+			}
 		} else {
 			this.handle = v.User.Uid
 		}
@@ -69,14 +73,14 @@ func (this *Room) selectheros(uid string, heros []string, herocid []string) (err
 		break
 	}
 	this.PushMessage("startselecthero", &pb.RealArenaSelectHeroPush{
-		Uid:       this.members[0].User.Uid,
-		Heroscids: herocid,
+		Uid:   this.members[0].User.Uid,
+		Heros: heros,
 	})
 
 	this.step++
 	if this.step == 7 { //选完了
 		this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
-			Uid:       this.members[0].User.Uid,
+			Uid:       this.members[1].User.Uid,
 			Countdown: 10,
 		})
 	} else {
@@ -94,19 +98,23 @@ func (this *Room) disableheros(uid string, index int32) (err error) {
 	var finish bool
 	finish = true
 	for _, v := range this.members {
-		if v.User.Uid == uid {
+		if v.User.Uid != uid {
 			v.Disable = index
 		}
 		if v.Disable == -1 {
 			finish = false
 		}
 	}
-	this.PushMessage("selecthero", &pb.RealArenaDisableHeroPush{
+	this.PushMessage("disablehero", &pb.RealArenaDisableHeroPush{
 		Uid:   uid,
 		Index: index,
 	})
 	if finish {
 		this.PushMessage("startselectleader", &pb.RealArenaStartSelectLeaderPush{
+			Countdown: 10,
+		})
+	} else {
+		this.PushMessage("startdisableHero", &pb.RealArenaStartDisableHeroPush{
 			Uid:       this.members[0].User.Uid,
 			Countdown: 10,
 		})
diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go
index b45c8bfb0..2445cd524 100644
--- a/modules/reddot/api_get.go
+++ b/modules/reddot/api_get.go
@@ -2,6 +2,7 @@ package reddot
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
 	"go_dreamfactory/pb"
 )
 
@@ -27,144 +28,21 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda
 
 	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
 		var (
+			modules    []core.IModule
 			reddotItem []*pb.ReddotItem = make([]*pb.ReddotItem, 0)
 		)
-		for _, v := range this.module.mainline.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
+		modules, _ = this.module.service.GetAllModules()
+		for _, module := range modules {
+			if redot, ok := module.(comm.IGetReddot); ok {
+				for _, v := range redot.Reddot(session, reds) {
+					reddotItem = append(reddotItem, v)
+				}
+			}
 		}
-		for _, v := range this.module.smithy.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.ModuleSociaty.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.arena.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.friend.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.library.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.guildgve.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.horoscope.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.gourmet.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.mail.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.viking.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.hunting.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.gourmet.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.ModuleUser.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.atlas.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.color.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-		for _, v := range this.module.catchbugs.Reddot(session, reds) {
-			reddotItem = append(reddotItem, v)
-		}
-
 		if len(reddotItem) > 0 {
 			session.SendMsg(string(this.module.GetType()), "change", &pb.ReddotChangePush{Rids: reddotItem})
 		}
 
 	})
-
-	// for _, rid := range req.Rids {
-	// 	_rid := comm.ReddotType(rid)
-	// 	switch _rid {
-	// 	//任务
-	// 	// case comm.Reddot10101, comm.Reddot10102, comm.Reddot10103, comm.Reddot10201, comm.Reddot10301:
-	// 	// 	for k, v := range this.module.ModuleTask.Reddot(session, _rid) {
-	// 	// 		reddot[int32(k)] = v
-	// 	// 	}
-	// 	//主线
-	// 	case comm.Reddot24101:
-	// 		for k, v := range this.module.mainline.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//铁匠铺
-	// 	case comm.Reddot17102, comm.Reddot17106, comm.Reddot17107:
-	// 		for k, v := range this.module.smithy.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//工会
-	// 	case comm.Reddot15102, comm.Reddot15201, comm.Reddot15401:
-	// 		for k, v := range this.module.ModuleSociaty.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//竞技场
-	// 	case comm.Reddot22102:
-	// 		for k, v := range this.module.arena.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//好友
-	// 	case comm.Reddot21101:
-	// 		for k, v := range this.module.friend.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//羁绊
-	// 	case comm.Reddot19103, comm.Reddot19105, comm.Reddot19109, comm.Reddot19110:
-	// 		for k, v := range this.module.library.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//每日任务
-	// 	case comm.Reddot25101:
-	// 		for k, v := range this.module.library.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	//工会boos战
-	// 	case comm.Reddot15301:
-	// 		for k, v := range this.module.guildgve.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot17:
-	// 		for k, v := range this.module.horoscope.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot20, comm.Reddot21, comm.Reddot22:
-	// 		for k, v := range this.module.gourmet.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot12101, comm.Reddot12102:
-	// 		for k, v := range this.module.mail.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot13102:
-	// 		for k, v := range this.module.viking.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-
-	// 	case comm.Reddot14102:
-	// 		for k, v := range this.module.hunting.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot23101:
-	// 		for k, v := range this.module.gourmet.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	case comm.Reddot27101, comm.Reddot30100:
-	// 		for k, v := range this.module.ModuleUser.Reddot(session, _rid) {
-	// 			reddot[int32(k)] = v
-	// 		}
-	// 	}
-	// }
 	return
 }
diff --git a/modules/reddot/module.go b/modules/reddot/module.go
index 8ccec8c2d..179c518b4 100644
--- a/modules/reddot/module.go
+++ b/modules/reddot/module.go
@@ -21,27 +21,7 @@ func NewModule() core.IModule {
 type Reddot struct {
 	modules.ModuleBase
 	service base.IRPCXService
-
-	smithy     comm.ISmithy  //铁匠铺
-	library    comm.ILibrary //羁绊
-	mail       comm.Imail    //邮件
-	sociaty    comm.ISociaty //工会
-	pagoda     comm.IPagoda
-	horoscope  comm.IHoroscope
-	arena      comm.IArena     //竞技场
-	practice   comm.IPractice  //武馆
-	dailytask  comm.IDailytask //每日任务
-	friend     comm.IFriend
-	gourmet    comm.IGourmet
-	viking     comm.IViking
-	hunting    comm.IHunting
-	guildgve   comm.IGuildgve   //工会boos战
-	expedition comm.IExpedition //工会远征
-	api_comp   *apiComp
-	mainline   comm.IMainline
-	atlas      comm.IPandaAtlas
-	color      comm.IDColor
-	catchbugs  comm.ICatchBugs
+	apicomp *apiComp
 }
 
 // 模块名
@@ -61,96 +41,13 @@ func (this *Reddot) Start() (err error) {
 	if err = this.ModuleBase.Start(); err != nil {
 		return
 	}
-	var module core.IModule
-
-	if module, err = this.service.GetModule(comm.ModuleMainline); err != nil {
-		return
-	}
-	this.mainline = module.(comm.IMainline)
-	if module, err = this.service.GetModule(comm.ModuleSmithy); err != nil {
-		return
-	}
-	this.smithy = module.(comm.ISmithy)
-	if module, err = this.service.GetModule(comm.ModuleFriend); err != nil {
-		return
-	}
-	this.friend = module.(comm.IFriend)
-	if module, err = this.service.GetModule(comm.ModulePagoda); err != nil {
-		return
-	}
-	this.pagoda = module.(comm.IPagoda)
-	if module, err = this.service.GetModule(comm.ModuleHoroscope); err != nil {
-		return
-	}
-	this.horoscope = module.(comm.IHoroscope)
-	if module, err = this.service.GetModule(comm.ModuleArena); err != nil {
-		return
-	}
-	this.arena = module.(comm.IArena)
-
-	if module, err = this.service.GetModule(comm.ModulePractice); err != nil {
-		return
-	}
-	this.practice = module.(comm.IPractice)
-
-	if module, err = this.service.GetModule(comm.ModuleGourmet); err != nil {
-		return
-	}
-	this.gourmet = module.(comm.IGourmet)
-
-	if module, err = this.service.GetModule(comm.ModuleSociaty); err != nil {
-		return
-	}
-	this.sociaty = module.(comm.ISociaty)
-
-	if module, err = this.service.GetModule(comm.ModuleMail); err != nil {
-		return
-	}
-	this.mail = module.(comm.Imail)
-
-	if module, err = this.service.GetModule(comm.ModuleViking); err != nil {
-		return
-	}
-	this.viking = module.(comm.IViking)
-
-	if module, err = this.service.GetModule(comm.ModuleHunting); err != nil {
-		return
-	}
-	this.hunting = module.(comm.IHunting)
-
-	if module, err = this.service.GetModule(comm.ModuleLibrary); err != nil {
-		return
-	}
-	this.library = module.(comm.ILibrary)
-
-	if module, err = this.service.GetModule(comm.ModuleDailytask); err != nil {
-		return
-	}
-	this.dailytask = module.(comm.IDailytask)
-	if module, err = this.service.GetModule(comm.ModuleGuildGve); err != nil {
-		return
-	}
-	this.guildgve = module.(comm.IGuildgve)
-	if module, err = this.service.GetModule(comm.ModulePandaAtlas); err != nil {
-		return
-	}
-	this.atlas = module.(comm.IPandaAtlas)
-	if module, err = this.service.GetModule(comm.ModuleDcolor); err != nil {
-		return
-	}
-	this.color = module.(comm.IDColor)
-	if module, err = this.service.GetModule(comm.ModuleCatchbugs); err != nil {
-		return
-	}
-	this.catchbugs = module.(comm.ICatchBugs)
-
 	return
 }
 
 // 装备组件
 func (this *Reddot) OnInstallComp() {
 	this.ModuleBase.OnInstallComp()
-	this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
+	this.apicomp = this.RegisterComp(new(apiComp)).(*apiComp)
 }
 
 // 推送红点
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index 4263d7cd0..6b1cb2c46 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -1196,6 +1196,78 @@ func (x *NoticeUserCloseReq) GetGatewayServiceId() string {
 	return ""
 }
 
+//英雄的基础信息
+type HeroBase struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Old  string `protobuf:"bytes,1,opt,name=old,proto3" json:"old"`    //唯一id
+	Cid  string `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid"`    // 配置表id
+	Star int32  `protobuf:"varint,3,opt,name=star,proto3" json:"star"` // 星级
+	Lv   int32  `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"`     // 等级
+}
+
+func (x *HeroBase) Reset() {
+	*x = HeroBase{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_comm_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HeroBase) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeroBase) ProtoMessage() {}
+
+func (x *HeroBase) ProtoReflect() protoreflect.Message {
+	mi := &file_comm_proto_msgTypes[16]
+	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 HeroBase.ProtoReflect.Descriptor instead.
+func (*HeroBase) Descriptor() ([]byte, []int) {
+	return file_comm_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *HeroBase) GetOld() string {
+	if x != nil {
+		return x.Old
+	}
+	return ""
+}
+
+func (x *HeroBase) GetCid() string {
+	if x != nil {
+		return x.Cid
+	}
+	return ""
+}
+
+func (x *HeroBase) GetStar() int32 {
+	if x != nil {
+		return x.Star
+	}
+	return 0
+}
+
+func (x *HeroBase) GetLv() int32 {
+	if x != nil {
+		return x.Lv
+	}
+	return 0
+}
+
 type SkillData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1208,7 +1280,7 @@ type SkillData struct {
 func (x *SkillData) Reset() {
 	*x = SkillData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[16]
+		mi := &file_comm_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1221,7 +1293,7 @@ func (x *SkillData) String() string {
 func (*SkillData) ProtoMessage() {}
 
 func (x *SkillData) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[16]
+	mi := &file_comm_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1234,7 +1306,7 @@ func (x *SkillData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SkillData.ProtoReflect.Descriptor instead.
 func (*SkillData) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{16}
+	return file_comm_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *SkillData) GetSkillID() int32 {
@@ -1265,7 +1337,7 @@ type UserAssets struct {
 func (x *UserAssets) Reset() {
 	*x = UserAssets{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[17]
+		mi := &file_comm_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1278,7 +1350,7 @@ func (x *UserAssets) String() string {
 func (*UserAssets) ProtoMessage() {}
 
 func (x *UserAssets) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[17]
+	mi := &file_comm_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1291,7 +1363,7 @@ func (x *UserAssets) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserAssets.ProtoReflect.Descriptor instead.
 func (*UserAssets) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{17}
+	return file_comm_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *UserAssets) GetA() string {
@@ -1330,7 +1402,7 @@ type UserAtno struct {
 func (x *UserAtno) Reset() {
 	*x = UserAtno{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[18]
+		mi := &file_comm_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1343,7 +1415,7 @@ func (x *UserAtno) String() string {
 func (*UserAtno) ProtoMessage() {}
 
 func (x *UserAtno) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[18]
+	mi := &file_comm_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1356,7 +1428,7 @@ func (x *UserAtno) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserAtno.ProtoReflect.Descriptor instead.
 func (*UserAtno) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{18}
+	return file_comm_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *UserAtno) GetA() string {
@@ -1407,7 +1479,7 @@ type BaseUserInfo struct {
 func (x *BaseUserInfo) Reset() {
 	*x = BaseUserInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[19]
+		mi := &file_comm_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1420,7 +1492,7 @@ func (x *BaseUserInfo) String() string {
 func (*BaseUserInfo) ProtoMessage() {}
 
 func (x *BaseUserInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[19]
+	mi := &file_comm_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1433,7 +1505,7 @@ func (x *BaseUserInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BaseUserInfo.ProtoReflect.Descriptor instead.
 func (*BaseUserInfo) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{19}
+	return file_comm_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *BaseUserInfo) GetUid() string {
@@ -1511,7 +1583,7 @@ type TaskParam struct {
 func (x *TaskParam) Reset() {
 	*x = TaskParam{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[20]
+		mi := &file_comm_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1524,7 +1596,7 @@ func (x *TaskParam) String() string {
 func (*TaskParam) ProtoMessage() {}
 
 func (x *TaskParam) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[20]
+	mi := &file_comm_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1537,7 +1609,7 @@ func (x *TaskParam) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TaskParam.ProtoReflect.Descriptor instead.
 func (*TaskParam) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{20}
+	return file_comm_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *TaskParam) GetFirst() int32 {
@@ -1567,7 +1639,7 @@ type RtaskParam struct {
 func (x *RtaskParam) Reset() {
 	*x = RtaskParam{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[21]
+		mi := &file_comm_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1580,7 +1652,7 @@ func (x *RtaskParam) String() string {
 func (*RtaskParam) ProtoMessage() {}
 
 func (x *RtaskParam) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[21]
+	mi := &file_comm_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1593,7 +1665,7 @@ func (x *RtaskParam) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RtaskParam.ProtoReflect.Descriptor instead.
 func (*RtaskParam) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{21}
+	return file_comm_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *RtaskParam) GetParam1() int32 {
@@ -1628,7 +1700,7 @@ type UIdReq struct {
 func (x *UIdReq) Reset() {
 	*x = UIdReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[22]
+		mi := &file_comm_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1641,7 +1713,7 @@ func (x *UIdReq) String() string {
 func (*UIdReq) ProtoMessage() {}
 
 func (x *UIdReq) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[22]
+	mi := &file_comm_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1654,7 +1726,7 @@ func (x *UIdReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UIdReq.ProtoReflect.Descriptor instead.
 func (*UIdReq) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{22}
+	return file_comm_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *UIdReq) GetUid() string {
@@ -1675,7 +1747,7 @@ type NameReq struct {
 func (x *NameReq) Reset() {
 	*x = NameReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[23]
+		mi := &file_comm_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1688,7 +1760,7 @@ func (x *NameReq) String() string {
 func (*NameReq) ProtoMessage() {}
 
 func (x *NameReq) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[23]
+	mi := &file_comm_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1701,7 +1773,7 @@ func (x *NameReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NameReq.ProtoReflect.Descriptor instead.
 func (*NameReq) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{23}
+	return file_comm_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *NameReq) GetName() string {
@@ -1720,7 +1792,7 @@ type EmptyReq struct {
 func (x *EmptyReq) Reset() {
 	*x = EmptyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[24]
+		mi := &file_comm_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1733,7 +1805,7 @@ func (x *EmptyReq) String() string {
 func (*EmptyReq) ProtoMessage() {}
 
 func (x *EmptyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[24]
+	mi := &file_comm_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1746,7 +1818,7 @@ func (x *EmptyReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EmptyReq.ProtoReflect.Descriptor instead.
 func (*EmptyReq) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{24}
+	return file_comm_proto_rawDescGZIP(), []int{25}
 }
 
 type EmptyResp struct {
@@ -1758,7 +1830,7 @@ type EmptyResp struct {
 func (x *EmptyResp) Reset() {
 	*x = EmptyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[25]
+		mi := &file_comm_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1771,7 +1843,7 @@ func (x *EmptyResp) String() string {
 func (*EmptyResp) ProtoMessage() {}
 
 func (x *EmptyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[25]
+	mi := &file_comm_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1784,7 +1856,7 @@ func (x *EmptyResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EmptyResp.ProtoReflect.Descriptor instead.
 func (*EmptyResp) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{25}
+	return file_comm_proto_rawDescGZIP(), []int{26}
 }
 
 // rpc 通用请求消息 1
@@ -1799,7 +1871,7 @@ type RPCGeneralReqA1 struct {
 func (x *RPCGeneralReqA1) Reset() {
 	*x = RPCGeneralReqA1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[26]
+		mi := &file_comm_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1812,7 +1884,7 @@ func (x *RPCGeneralReqA1) String() string {
 func (*RPCGeneralReqA1) ProtoMessage() {}
 
 func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[26]
+	mi := &file_comm_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1825,7 +1897,7 @@ func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCGeneralReqA1.ProtoReflect.Descriptor instead.
 func (*RPCGeneralReqA1) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{26}
+	return file_comm_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *RPCGeneralReqA1) GetParam1() string {
@@ -1848,7 +1920,7 @@ type RPCGeneralReqA2 struct {
 func (x *RPCGeneralReqA2) Reset() {
 	*x = RPCGeneralReqA2{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[27]
+		mi := &file_comm_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1861,7 +1933,7 @@ func (x *RPCGeneralReqA2) String() string {
 func (*RPCGeneralReqA2) ProtoMessage() {}
 
 func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[27]
+	mi := &file_comm_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1874,7 +1946,7 @@ func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCGeneralReqA2.ProtoReflect.Descriptor instead.
 func (*RPCGeneralReqA2) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{27}
+	return file_comm_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *RPCGeneralReqA2) GetParam1() string {
@@ -1905,7 +1977,7 @@ type RPCGeneralReqA3 struct {
 func (x *RPCGeneralReqA3) Reset() {
 	*x = RPCGeneralReqA3{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[28]
+		mi := &file_comm_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1918,7 +1990,7 @@ func (x *RPCGeneralReqA3) String() string {
 func (*RPCGeneralReqA3) ProtoMessage() {}
 
 func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[28]
+	mi := &file_comm_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1931,7 +2003,7 @@ func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCGeneralReqA3.ProtoReflect.Descriptor instead.
 func (*RPCGeneralReqA3) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{28}
+	return file_comm_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *RPCGeneralReqA3) GetParam1() string {
@@ -1970,7 +2042,7 @@ type RPCGeneralReqA4 struct {
 func (x *RPCGeneralReqA4) Reset() {
 	*x = RPCGeneralReqA4{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[29]
+		mi := &file_comm_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1983,7 +2055,7 @@ func (x *RPCGeneralReqA4) String() string {
 func (*RPCGeneralReqA4) ProtoMessage() {}
 
 func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[29]
+	mi := &file_comm_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1996,7 +2068,7 @@ func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCGeneralReqA4.ProtoReflect.Descriptor instead.
 func (*RPCGeneralReqA4) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{29}
+	return file_comm_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *RPCGeneralReqA4) GetParam1() string {
@@ -2041,7 +2113,7 @@ type RPCAccountBan struct {
 func (x *RPCAccountBan) Reset() {
 	*x = RPCAccountBan{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[30]
+		mi := &file_comm_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2054,7 +2126,7 @@ func (x *RPCAccountBan) String() string {
 func (*RPCAccountBan) ProtoMessage() {}
 
 func (x *RPCAccountBan) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[30]
+	mi := &file_comm_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2067,7 +2139,7 @@ func (x *RPCAccountBan) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCAccountBan.ProtoReflect.Descriptor instead.
 func (*RPCAccountBan) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{30}
+	return file_comm_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *RPCAccountBan) GetUid() string {
@@ -2104,7 +2176,7 @@ type RPCGeneralReqB1 struct {
 func (x *RPCGeneralReqB1) Reset() {
 	*x = RPCGeneralReqB1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[31]
+		mi := &file_comm_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2117,7 +2189,7 @@ func (x *RPCGeneralReqB1) String() string {
 func (*RPCGeneralReqB1) ProtoMessage() {}
 
 func (x *RPCGeneralReqB1) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[31]
+	mi := &file_comm_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2130,7 +2202,7 @@ func (x *RPCGeneralReqB1) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCGeneralReqB1.ProtoReflect.Descriptor instead.
 func (*RPCGeneralReqB1) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{31}
+	return file_comm_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *RPCGeneralReqB1) GetParam1() string {
@@ -2161,7 +2233,7 @@ type RPCRTaskReq struct {
 func (x *RPCRTaskReq) Reset() {
 	*x = RPCRTaskReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[32]
+		mi := &file_comm_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2174,7 +2246,7 @@ func (x *RPCRTaskReq) String() string {
 func (*RPCRTaskReq) ProtoMessage() {}
 
 func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[32]
+	mi := &file_comm_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2187,7 +2259,7 @@ func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RPCRTaskReq.ProtoReflect.Descriptor instead.
 func (*RPCRTaskReq) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{32}
+	return file_comm_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *RPCRTaskReq) GetUid() string {
@@ -2235,7 +2307,7 @@ type ServiceDBInfo struct {
 func (x *ServiceDBInfo) Reset() {
 	*x = ServiceDBInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[33]
+		mi := &file_comm_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2248,7 +2320,7 @@ func (x *ServiceDBInfo) String() string {
 func (*ServiceDBInfo) ProtoMessage() {}
 
 func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[33]
+	mi := &file_comm_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2261,7 +2333,7 @@ func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ServiceDBInfo.ProtoReflect.Descriptor instead.
 func (*ServiceDBInfo) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{33}
+	return file_comm_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *ServiceDBInfo) GetServerid() string {
@@ -2369,7 +2441,7 @@ type DBVector3 struct {
 func (x *DBVector3) Reset() {
 	*x = DBVector3{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[34]
+		mi := &file_comm_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2382,7 +2454,7 @@ func (x *DBVector3) String() string {
 func (*DBVector3) ProtoMessage() {}
 
 func (x *DBVector3) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[34]
+	mi := &file_comm_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2395,7 +2467,7 @@ func (x *DBVector3) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBVector3.ProtoReflect.Descriptor instead.
 func (*DBVector3) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{34}
+	return file_comm_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *DBVector3) GetX() float32 {
@@ -2436,7 +2508,7 @@ type SweepResult struct {
 func (x *SweepResult) Reset() {
 	*x = SweepResult{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[35]
+		mi := &file_comm_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2449,7 +2521,7 @@ func (x *SweepResult) String() string {
 func (*SweepResult) ProtoMessage() {}
 
 func (x *SweepResult) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[35]
+	mi := &file_comm_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2462,7 +2534,7 @@ func (x *SweepResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SweepResult.ProtoReflect.Descriptor instead.
 func (*SweepResult) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{35}
+	return file_comm_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *SweepResult) GetBattleid() string {
@@ -2522,7 +2594,7 @@ type DBServiceGroup struct {
 func (x *DBServiceGroup) Reset() {
 	*x = DBServiceGroup{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_comm_proto_msgTypes[36]
+		mi := &file_comm_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2535,7 +2607,7 @@ func (x *DBServiceGroup) String() string {
 func (*DBServiceGroup) ProtoMessage() {}
 
 func (x *DBServiceGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_comm_proto_msgTypes[36]
+	mi := &file_comm_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2548,7 +2620,7 @@ func (x *DBServiceGroup) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBServiceGroup.ProtoReflect.Descriptor instead.
 func (*DBServiceGroup) Descriptor() ([]byte, []int) {
-	return file_comm_proto_rawDescGZIP(), []int{36}
+	return file_comm_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *DBServiceGroup) GetId() string {
@@ -2722,139 +2794,144 @@ var file_comm_proto_rawDesc = []byte{
 	0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64,
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c,
-	0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12,
-	0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65,
-	0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01,
-	0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a,
-	0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0xc6, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x66,
-	0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x66, 0x72, 0x61,
-	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x39,
-	0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66,
-	0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73,
-	0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61,
-	0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22,
-	0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e,
-	0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
-	0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41,
-	0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41,
-	0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x52, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f,
+	0x42, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02,
+	0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x3f, 0x0a, 0x09,
+	0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69,
+	0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c,
+	0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a,
+	0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+	0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12,
+	0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a,
+	0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0xc6, 0x01, 0x0a, 0x0c, 0x42, 0x61,
+	0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b,
+	0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x16,
+	0x0a, 0x06, 0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02,
+	0x6c, 0x76, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05,
+	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
+	0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a,
+	0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22,
+	0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a,
+	0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65,
+	0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
+	0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c,
+	0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a,
+	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61,
+	0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31,
+	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61,
+	0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33,
+	0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65,
+	0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x34, 0x22, 0x49, 0x0a, 0x0d, 0x52, 0x50, 0x43, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x42, 0x61, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x41,
+	0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42,
+	0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
-	0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52,
-	0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06,
-	0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f,
-	0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22,
-	0x49, 0x0a, 0x0d, 0x52, 0x50, 0x43, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6e,
+	0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+	0x32, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71,
 	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50,
-	0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42, 0x31, 0x12, 0x16, 0x0a,
-	0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
-	0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x51, 0x0a,
-	0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a,
-	0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e,
-	0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e,
-	0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f,
-	0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72,
-	0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f,
-	0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67,
-	0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65,
-	0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09,
-	0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65,
-	0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64,
-	0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f,
-	0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f,
-	0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61,
-	0x62, 0x61, 0x73, 0x65, 0x22, 0x35, 0x0a, 0x09, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x33, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x78, 0x12,
-	0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x79, 0x12, 0x0c, 0x0a,
-	0x01, 0x7a, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x7a, 0x22, 0x90, 0x02, 0x0a, 0x0b,
-	0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x62,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x16, 0x0a,
-	0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72,
-	0x6f, 0x75, 0x6e, 0x64, 0x73, 0x12, 0x25, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65,
-	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
-	0x65, 0x74, 0x73, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x05,
-	0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
-	0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a,
-	0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x48, 0x65, 0x72,
-	0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65,
-	0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6c,
-	0x0a, 0x0e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x2a, 0x43, 0x0a, 0x12,
-	0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74,
-	0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05,
-	0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10,
-	0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73,
+	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18,
+	0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67,
+	0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08,
+	0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
+	0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69,
+	0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24,
+	0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73,
+	0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e,
+	0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28,
+	0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73,
+	0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62,
+	0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x22, 0x35, 0x0a, 0x09, 0x44, 0x42, 0x56, 0x65,
+	0x63, 0x74, 0x6f, 0x72, 0x33, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02,
+	0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01,
+	0x79, 0x12, 0x0c, 0x0a, 0x01, 0x7a, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x7a, 0x22,
+	0x90, 0x02, 0x0a, 0x0b, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12,
+	0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69,
+	0x73, 0x77, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69,
+	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x12, 0x25, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65,
+	0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
+	0x64, 0x12, 0x33, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x07, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
+	0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0x6c, 0x0a, 0x0e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x47,
+	0x72, 0x6f, 0x75, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d,
+	0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
+	0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07,
+	0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02,
+	0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43,
+	0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2870,7 +2947,7 @@ func file_comm_proto_rawDescGZIP() []byte {
 }
 
 var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
+var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
 var file_comm_proto_goTypes = []interface{}{
 	(HeroAttributesType)(0),      // 0: HeroAttributesType
 	(*ErrorData)(nil),            // 1: ErrorData
@@ -2889,46 +2966,47 @@ var file_comm_proto_goTypes = []interface{}{
 	(*NoticeUserLoginResp)(nil),  // 14: NoticeUserLoginResp
 	(*NoticeUserCreateReq)(nil),  // 15: NoticeUserCreateReq
 	(*NoticeUserCloseReq)(nil),   // 16: NoticeUserCloseReq
-	(*SkillData)(nil),            // 17: SkillData
-	(*UserAssets)(nil),           // 18: UserAssets
-	(*UserAtno)(nil),             // 19: UserAtno
-	(*BaseUserInfo)(nil),         // 20: BaseUserInfo
-	(*TaskParam)(nil),            // 21: TaskParam
-	(*RtaskParam)(nil),           // 22: RtaskParam
-	(*UIdReq)(nil),               // 23: UIdReq
-	(*NameReq)(nil),              // 24: NameReq
-	(*EmptyReq)(nil),             // 25: EmptyReq
-	(*EmptyResp)(nil),            // 26: EmptyResp
-	(*RPCGeneralReqA1)(nil),      // 27: RPCGeneralReqA1
-	(*RPCGeneralReqA2)(nil),      // 28: RPCGeneralReqA2
-	(*RPCGeneralReqA3)(nil),      // 29: RPCGeneralReqA3
-	(*RPCGeneralReqA4)(nil),      // 30: RPCGeneralReqA4
-	(*RPCAccountBan)(nil),        // 31: RPCAccountBan
-	(*RPCGeneralReqB1)(nil),      // 32: RPCGeneralReqB1
-	(*RPCRTaskReq)(nil),          // 33: RPCRTaskReq
-	(*ServiceDBInfo)(nil),        // 34: ServiceDBInfo
-	(*DBVector3)(nil),            // 35: DBVector3
-	(*SweepResult)(nil),          // 36: SweepResult
-	(*DBServiceGroup)(nil),       // 37: DBServiceGroup
-	nil,                          // 38: SweepResult.HeroexpEntry
-	(ErrorCode)(0),               // 39: ErrorCode
-	(*anypb.Any)(nil),            // 40: google.protobuf.Any
+	(*HeroBase)(nil),             // 17: HeroBase
+	(*SkillData)(nil),            // 18: SkillData
+	(*UserAssets)(nil),           // 19: UserAssets
+	(*UserAtno)(nil),             // 20: UserAtno
+	(*BaseUserInfo)(nil),         // 21: BaseUserInfo
+	(*TaskParam)(nil),            // 22: TaskParam
+	(*RtaskParam)(nil),           // 23: RtaskParam
+	(*UIdReq)(nil),               // 24: UIdReq
+	(*NameReq)(nil),              // 25: NameReq
+	(*EmptyReq)(nil),             // 26: EmptyReq
+	(*EmptyResp)(nil),            // 27: EmptyResp
+	(*RPCGeneralReqA1)(nil),      // 28: RPCGeneralReqA1
+	(*RPCGeneralReqA2)(nil),      // 29: RPCGeneralReqA2
+	(*RPCGeneralReqA3)(nil),      // 30: RPCGeneralReqA3
+	(*RPCGeneralReqA4)(nil),      // 31: RPCGeneralReqA4
+	(*RPCAccountBan)(nil),        // 32: RPCAccountBan
+	(*RPCGeneralReqB1)(nil),      // 33: RPCGeneralReqB1
+	(*RPCRTaskReq)(nil),          // 34: RPCRTaskReq
+	(*ServiceDBInfo)(nil),        // 35: ServiceDBInfo
+	(*DBVector3)(nil),            // 36: DBVector3
+	(*SweepResult)(nil),          // 37: SweepResult
+	(*DBServiceGroup)(nil),       // 38: DBServiceGroup
+	nil,                          // 39: SweepResult.HeroexpEntry
+	(ErrorCode)(0),               // 40: ErrorCode
+	(*anypb.Any)(nil),            // 41: google.protobuf.Any
 }
 var file_comm_proto_depIdxs = []int32{
-	39, // 0: ErrorData.code:type_name -> ErrorCode
-	18, // 1: ErrorData.atn:type_name -> UserAssets
+	40, // 0: ErrorData.code:type_name -> ErrorCode
+	19, // 1: ErrorData.atn:type_name -> UserAssets
 	3,  // 2: MessagePackage.messages:type_name -> UserMessage
-	40, // 3: UserMessage.data:type_name -> google.protobuf.Any
-	40, // 4: AgentMessage.Message:type_name -> google.protobuf.Any
+	41, // 3: UserMessage.data:type_name -> google.protobuf.Any
+	41, // 4: AgentMessage.Message:type_name -> google.protobuf.Any
 	1,  // 5: RPCMessageReply.ErrorData:type_name -> ErrorData
 	3,  // 6: RPCMessageReply.Reply:type_name -> UserMessage
 	3,  // 7: AgentSendMessageReq.Reply:type_name -> UserMessage
-	40, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any
-	40, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any
-	40, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
-	18, // 11: SweepResult.consume:type_name -> UserAssets
-	19, // 12: SweepResult.award:type_name -> UserAtno
-	38, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry
+	41, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any
+	41, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any
+	41, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
+	19, // 11: SweepResult.consume:type_name -> UserAssets
+	20, // 12: SweepResult.award:type_name -> UserAtno
+	39, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry
 	14, // [14:14] is the sub-list for method output_type
 	14, // [14:14] is the sub-list for method input_type
 	14, // [14:14] is the sub-list for extension type_name
@@ -3136,7 +3214,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SkillData); i {
+			switch v := v.(*HeroBase); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3148,7 +3226,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserAssets); i {
+			switch v := v.(*SkillData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3160,7 +3238,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserAtno); i {
+			switch v := v.(*UserAssets); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3172,7 +3250,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BaseUserInfo); i {
+			switch v := v.(*UserAtno); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3184,7 +3262,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TaskParam); i {
+			switch v := v.(*BaseUserInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3196,7 +3274,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RtaskParam); i {
+			switch v := v.(*TaskParam); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3208,7 +3286,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UIdReq); i {
+			switch v := v.(*RtaskParam); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3220,7 +3298,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NameReq); i {
+			switch v := v.(*UIdReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3232,7 +3310,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EmptyReq); i {
+			switch v := v.(*NameReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3244,7 +3322,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EmptyResp); i {
+			switch v := v.(*EmptyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3256,7 +3334,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCGeneralReqA1); i {
+			switch v := v.(*EmptyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3268,7 +3346,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCGeneralReqA2); i {
+			switch v := v.(*RPCGeneralReqA1); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3280,7 +3358,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCGeneralReqA3); i {
+			switch v := v.(*RPCGeneralReqA2); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3292,7 +3370,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCGeneralReqA4); i {
+			switch v := v.(*RPCGeneralReqA3); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3304,7 +3382,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCAccountBan); i {
+			switch v := v.(*RPCGeneralReqA4); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3316,7 +3394,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCGeneralReqB1); i {
+			switch v := v.(*RPCAccountBan); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3328,7 +3406,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RPCRTaskReq); i {
+			switch v := v.(*RPCGeneralReqB1); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3340,7 +3418,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceDBInfo); i {
+			switch v := v.(*RPCRTaskReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3352,7 +3430,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DBVector3); i {
+			switch v := v.(*ServiceDBInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3364,7 +3442,7 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SweepResult); i {
+			switch v := v.(*DBVector3); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3376,6 +3454,18 @@ func file_comm_proto_init() {
 			}
 		}
 		file_comm_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SweepResult); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comm_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBServiceGroup); i {
 			case 0:
 				return &v.state
@@ -3394,7 +3484,7 @@ func file_comm_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_comm_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   38,
+			NumMessages:   39,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/realarena_db.pb.go b/pb/realarena_db.pb.go
index cea23f14d..5743f2a17 100644
--- a/pb/realarena_db.pb.go
+++ b/pb/realarena_db.pb.go
@@ -142,7 +142,6 @@ type DBRealArenaMember struct {
 	Dan      int32         `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"`           //段位
 	Integral int32         `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` //积分
 	Heros    []string      `protobuf:"bytes,4,rep,name=heros,proto3" json:"heros"`        //队伍
-	Heroscid []string      `protobuf:"bytes,5,rep,name=heroscid,proto3" json:"heroscid"`  //队伍cid
 	Disable  int32         `protobuf:"varint,6,opt,name=disable,proto3" json:"disable"`   //禁用
 	Leader   int32         `protobuf:"varint,7,opt,name=leader,proto3" json:"leader"`     //队长
 }
@@ -207,13 +206,6 @@ func (x *DBRealArenaMember) GetHeros() []string {
 	return nil
 }
 
-func (x *DBRealArenaMember) GetHeroscid() []string {
-	if x != nil {
-		return x.Heroscid
-	}
-	return nil
-}
-
 func (x *DBRealArenaMember) GetDisable() int32 {
 	if x != nil {
 		return x.Disable
@@ -325,7 +317,7 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{
 	0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x44, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74,
 	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc8,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xac,
 	0x01, 0x0a, 0x11, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x65,
 	0x6d, 0x62, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66,
@@ -333,22 +325,21 @@ var file_realarena_realarena_db_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
 	0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74,
 	0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x68,
-	0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x68,
-	0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62,
-	0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x44, 0x42,
-	0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a,
-	0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 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, 0x42, 0x06, 0x5a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64,
+	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69,
+	0x73, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x91, 0x01,
+	0x0a, 0x0f, 0x44, 0x42, 0x52, 0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x63,
+	0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
+	0x61, 0x74, 0x68, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/pb/realarena_msg.pb.go b/pb/realarena_msg.pb.go
index fe1485f2e..3930c672e 100644
--- a/pb/realarena_msg.pb.go
+++ b/pb/realarena_msg.pb.go
@@ -379,9 +379,8 @@ type RealArenaSelectTeamHeroReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Roomid    string   `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
-	Herosids  []string `protobuf:"bytes,2,rep,name=herosids,proto3" json:"herosids"`
-	Heroscids []string `protobuf:"bytes,3,rep,name=heroscids,proto3" json:"heroscids"`
+	Roomid string      `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
+	Heros  []*HeroBase `protobuf:"bytes,2,rep,name=heros,proto3" json:"heros"`
 }
 
 func (x *RealArenaSelectTeamHeroReq) Reset() {
@@ -423,16 +422,9 @@ func (x *RealArenaSelectTeamHeroReq) GetRoomid() string {
 	return ""
 }
 
-func (x *RealArenaSelectTeamHeroReq) GetHerosids() []string {
+func (x *RealArenaSelectTeamHeroReq) GetHeros() []*HeroBase {
 	if x != nil {
-		return x.Herosids
-	}
-	return nil
-}
-
-func (x *RealArenaSelectTeamHeroReq) GetHeroscids() []string {
-	if x != nil {
-		return x.Heroscids
+		return x.Heros
 	}
 	return nil
 }
@@ -481,8 +473,8 @@ type RealArenaSelectHeroPush struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid       string   `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
-	Heroscids []string `protobuf:"bytes,2,rep,name=heroscids,proto3" json:"heroscids"`
+	Uid   string      `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Heros []*HeroBase `protobuf:"bytes,2,rep,name=heros,proto3" json:"heros"`
 }
 
 func (x *RealArenaSelectHeroPush) Reset() {
@@ -524,9 +516,9 @@ func (x *RealArenaSelectHeroPush) GetUid() string {
 	return ""
 }
 
-func (x *RealArenaSelectHeroPush) GetHeroscids() []string {
+func (x *RealArenaSelectHeroPush) GetHeros() []*HeroBase {
 	if x != nil {
-		return x.Heroscids
+		return x.Heros
 	}
 	return nil
 }
@@ -743,8 +735,7 @@ type RealArenaStartSelectLeaderPush struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid       string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
-	Countdown int32  `protobuf:"varint,2,opt,name=countdown,proto3" json:"countdown"` //倒计时
+	Countdown int32 `protobuf:"varint,2,opt,name=countdown,proto3" json:"countdown"` //倒计时
 }
 
 func (x *RealArenaStartSelectLeaderPush) Reset() {
@@ -779,13 +770,6 @@ func (*RealArenaStartSelectLeaderPush) Descriptor() ([]byte, []int) {
 	return file_realarena_realarena_msg_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *RealArenaStartSelectLeaderPush) GetUid() string {
-	if x != nil {
-		return x.Uid
-	}
-	return ""
-}
-
 func (x *RealArenaStartSelectLeaderPush) GetCountdown() int32 {
 	if x != nil {
 		return x.Countdown
@@ -1043,83 +1027,82 @@ var File_realarena_realarena_msg_proto protoreflect.FileDescriptor
 var file_realarena_realarena_msg_proto_rawDesc = []byte{
 	0x0a, 0x1d, 0x72, 0x65, 0x61, 0x6c, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x72, 0x65, 0x61, 0x6c,
 	0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x6d, 0x73, 0x67, 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, 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, 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, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x69, 0x64, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x69, 0x64, 0x73, 0x12, 0x1c,
-	0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x63, 0x69, 0x64, 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, 0x49, 0x0a, 0x17, 0x52,
-	0x65, 0x61, 0x6c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65,
+	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,
+	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, 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, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
-	0x73, 0x63, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72,
-	0x6f, 0x73, 0x63, 0x69, 0x64, 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,
+	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, 0x50, 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, 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, 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,
+	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, 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, 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,
+	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, 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 (
@@ -1159,15 +1142,18 @@ var file_realarena_realarena_msg_proto_goTypes = []interface{}{
 	(*RPC_RealArenaTrusteeshipResp)(nil),   // 20: RPC_RealArenaTrusteeshipResp
 	(*DBRealArena)(nil),                    // 21: DBRealArena
 	(*DBRealArenaRace)(nil),                // 22: DBRealArenaRace
+	(*HeroBase)(nil),                       // 23: HeroBase
 }
 var file_realarena_realarena_msg_proto_depIdxs = []int32{
 	21, // 0: RealArenaInfoResp.info:type_name -> DBRealArena
 	22, // 1: RealArenaMatchSuccPush.race:type_name -> DBRealArenaRace
-	2,  // [2:2] is the sub-list for method output_type
-	2,  // [2:2] is the sub-list for method input_type
-	2,  // [2:2] is the sub-list for extension type_name
-	2,  // [2:2] is the sub-list for extension extendee
-	0,  // [0:2] is the sub-list for field type_name
+	23, // 2: RealArenaSelectTeamHeroReq.heros:type_name -> HeroBase
+	23, // 3: RealArenaSelectHeroPush.heros:type_name -> HeroBase
+	4,  // [4:4] is the sub-list for method output_type
+	4,  // [4:4] is the sub-list for method input_type
+	4,  // [4:4] is the sub-list for extension type_name
+	4,  // [4:4] is the sub-list for extension extendee
+	0,  // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_realarena_realarena_msg_proto_init() }
@@ -1175,6 +1161,7 @@ func file_realarena_realarena_msg_proto_init() {
 	if File_realarena_realarena_msg_proto != nil {
 		return
 	}
+	file_comm_proto_init()
 	file_realarena_realarena_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_realarena_realarena_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {