diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go
index 41b1b824c..2c7f5d483 100644
--- a/modules/arena/api_challengereward.go
+++ b/modules/arena/api_challengereward.go
@@ -146,10 +146,8 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
 
 	} else {
 		bule = &pb.ArenaPlayer{
-			Dan: info.Dan,
-			Uinfo: &pb.BaseUserInfo{
-				Name: req.Ainame,
-			},
+			Dan:      info.Dan,
+			Uinfo:    req.Aiinfo,
 			Integral: req.Aiintegral,
 		}
 		if bule.Integral < 0 {
diff --git a/modules/arena/module.go b/modules/arena/module.go
index d5961eb50..6348b3e40 100644
--- a/modules/arena/module.go
+++ b/modules/arena/module.go
@@ -100,6 +100,11 @@ func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.E
 // 修改用户积分
 func (this *Arena) Rpc_ModuleArenaModifyIntegral(ctx context.Context, args *pb.RPCModifyIntegralReq, reply *pb.EmptyResp) (err error) {
 	this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "args", Value: args.String()})
+	//防止数据未初始化就修改数据
+	if _, err = this.modelArena.queryPlayerInfo(args.Uid); err != nil && err != mgo.MongodbNil {
+		this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "err", Value: err.Error()})
+		return
+	}
 	err = this.modelArena.modifyIntegral(args.Uid, args.Integral)
 	return
 }
diff --git a/modules/enchant/api_ranklist.go b/modules/enchant/api_ranklist.go
index 3b5b8e96e..525b52967 100644
--- a/modules/enchant/api_ranklist.go
+++ b/modules/enchant/api_ranklist.go
@@ -13,12 +13,13 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRan
 
 func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (errdata *pb.ErrorData) {
 	var (
-		uids    []string
-		ranks   []*pb.DBEnchant
-		franks  []*pb.DBEnchant
-		players []*pb.DBEnchantRank
-		friends []*pb.DBEnchantRank
-		err     error
+		uids     []string
+		ranks    []*pb.DBEnchant
+		ranksmap map[string]*pb.DBEnchant
+		franks   []*pb.DBEnchant
+		players  []*pb.DBEnchantRank
+		friends  []*pb.DBEnchantRank
+		err      error
 	)
 
 	if errdata = this.RankListCheck(session, req); errdata != nil {
@@ -41,16 +42,22 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankList
 		}
 		return
 	}
-	players = make([]*pb.DBEnchantRank, len(ranks))
-	for i, v := range ranks {
-		players[i] = &pb.DBEnchantRank{
-			Id:         v.Uid,
-			Uinfo:      v.Uinfo,
-			Score:      v.Boss[req.BoosType].Score,
-			Grade:      v.Boss[req.BoosType].Grade,
-			Gradegroup: v.Boss[req.BoosType].Gradegroup,
-			Battletime: v.Boss[req.BoosType].Battletime,
-			Line:       v.Boss[req.BoosType].Line,
+	ranksmap = make(map[string]*pb.DBEnchant)
+	for _, v := range ranks {
+		ranksmap[v.Uid] = v
+	}
+	players = make([]*pb.DBEnchantRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := ranksmap[v]; ok {
+			players = append(players, &pb.DBEnchantRank{
+				Id:         player.Uid,
+				Uinfo:      player.Uinfo,
+				Score:      player.Boss[req.BoosType].Score,
+				Grade:      player.Boss[req.BoosType].Grade,
+				Gradegroup: player.Boss[req.BoosType].Gradegroup,
+				Battletime: player.Boss[req.BoosType].Battletime,
+				Line:       player.Boss[req.BoosType].Line,
+			})
 		}
 	}
 	// 获取好友
diff --git a/modules/entertainment/model.go b/modules/entertainment/model.go
index 7591b6749..db0e7e380 100644
--- a/modules/entertainment/model.go
+++ b/modules/entertainment/model.go
@@ -37,7 +37,7 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor
 
 func (this *modelComp) queryPlayers(uIds []string) (result []*pb.DBXXLData, err error) {
 	result = make([]*pb.DBXXLData, 0)
-	if _, err = this.Gets(uIds, &result); err != nil && err != mgo.MongodbNil {
+	if _, err = this.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
 		this.module.Errorln(err)
 		return
 	}
diff --git a/modules/hunting/api_ranklist.go b/modules/hunting/api_ranklist.go
index 4b897731d..913999b5e 100644
--- a/modules/hunting/api_ranklist.go
+++ b/modules/hunting/api_ranklist.go
@@ -18,11 +18,12 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.HuntingRan
 
 func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (errdata *pb.ErrorData) {
 	var (
-		fRank   []*pb.DBHuntingRank
-		uids    []string
-		err     error
-		ranks   []*pb.DBHuntingRecord
-		players []*pb.DBHuntingRank
+		fRank    []*pb.DBHuntingRank
+		uids     []string
+		err      error
+		ranks    []*pb.DBHuntingRecord
+		ranksMap map[string]*pb.DBHuntingRecord
+		players  []*pb.DBHuntingRank
 	)
 	if errdata = this.RankListCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
@@ -43,15 +44,22 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankList
 		}
 		return
 	}
-	players = make([]*pb.DBHuntingRank, len(ranks))
-	for i, v := range ranks {
-		players[i] = &pb.DBHuntingRank{
-			Uinfo:      v.Uinfo,
-			Line:       v.Data[req.BoosType].Line[v.Data[req.BoosType].Maxnandu],
-			Difficulty: v.Data[req.BoosType].Maxnandu,
-			Bosstype:   req.BoosType,
-			Costtime:   v.Data[req.BoosType].Costime[v.Data[req.BoosType].Maxnandu],
+	ranksMap = make(map[string]*pb.DBHuntingRecord)
+	for _, v := range ranks {
+		ranksMap[v.Uid] = v
+	}
+	players = make([]*pb.DBHuntingRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := ranksMap[v]; ok {
+			players = append(players, &pb.DBHuntingRank{
+				Uinfo:      player.Uinfo,
+				Line:       player.Data[req.BoosType].Line[player.Data[req.BoosType].Maxnandu],
+				Difficulty: player.Data[req.BoosType].Maxnandu,
+				Bosstype:   req.BoosType,
+				Costtime:   player.Data[req.BoosType].Costime[player.Data[req.BoosType].Maxnandu],
+			})
 		}
+
 	}
 	session.SendMsg(string(this.module.GetType()), HuntingRankListResp, &pb.HuntingRankListResp{
 		Ranks:  players,
diff --git a/modules/integral/api_rank.go b/modules/integral/api_rank.go
index c56562c9a..b497b371c 100644
--- a/modules/integral/api_rank.go
+++ b/modules/integral/api_rank.go
@@ -14,8 +14,9 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.IntegralRa
 // /排行榜获取
 func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankListReq) (errdata *pb.ErrorData) {
 	var (
-		uids  []string
-		ranks []*pb.DBIntegralBoss
+		uids     []string
+		ranks    []*pb.DBIntegralBoss
+		ranksmap map[string]*pb.DBIntegralBoss
 		// franks  []*pb.DBIntegralBoss
 		players []*pb.DBIntegralRank
 		err     error
@@ -42,16 +43,23 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.IntegralRankLis
 		}
 		return
 	}
-	players = make([]*pb.DBIntegralRank, len(ranks))
-	for i, v := range ranks {
-		players[i] = &pb.DBIntegralRank{
-			Id:    v.Uid,
-			Uinfo: v.Uinfo,
-			Nandu: v.Nandu,
-			Score: v.Score[req.Nandu],
-			Line:  v.Line[req.Nandu],
-			Buff:  v.Carrybuff[req.Nandu].Buff,
+	ranksmap = make(map[string]*pb.DBIntegralBoss)
+	for _, v := range ranks {
+		ranksmap[v.Uid] = v
+	}
+	players = make([]*pb.DBIntegralRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := ranksmap[v]; ok {
+			players = append(players, &pb.DBIntegralRank{
+				Id:    player.Uid,
+				Uinfo: player.Uinfo,
+				Nandu: player.Nandu,
+				Score: player.Score[req.Nandu],
+				Line:  player.Line[req.Nandu],
+				Buff:  player.Carrybuff[req.Nandu].Buff,
+			})
 		}
+
 	}
 	// // 获取好友
 	// fids := this.module.ModuleFriend.GetFriendList(session.GetUserId())
diff --git a/modules/pagoda/api_cyclerank.go b/modules/pagoda/api_cyclerank.go
index 84ce518a9..13100fec5 100644
--- a/modules/pagoda/api_cyclerank.go
+++ b/modules/pagoda/api_cyclerank.go
@@ -14,10 +14,11 @@ func (this *apiComp) CrossCycleRankListCheck(session comm.IUserSession, req *pb.
 // 循环塔榜
 func (this *apiComp) CrossCycleRankList(session comm.IUserSession, req *pb.PagodaCrossCycleRankListReq) (errdata *pb.ErrorData) {
 	var (
-		uids   []string
-		err    error
-		result []*pb.DBCyclePagodaRecord
-		ranks  []*pb.DBCycleRank
+		uids      []string
+		err       error
+		result    []*pb.DBCyclePagodaRecord
+		resultMap map[string]*pb.DBCyclePagodaRecord
+		ranks     []*pb.DBCycleRank
 	)
 
 	if errdata = this.CrossCycleRankListCheck(session, req); errdata != nil {
@@ -40,13 +41,20 @@ func (this *apiComp) CrossCycleRankList(session comm.IUserSession, req *pb.Pagod
 		}
 		return
 	}
+	resultMap = make(map[string]*pb.DBCyclePagodaRecord)
 	for _, v := range result {
-		ranks = append(ranks, &pb.DBCycleRank{
-			Uinfo:    v.Uinfo,
-			Line:     v.Data[v.Maxfloor].Line,
-			Floor:    v.Maxfloor,
-			Costtime: v.Data[v.Maxfloor].Consttime,
-		})
+		resultMap[v.Uid] = v
+	}
+	ranks = make([]*pb.DBCycleRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := resultMap[v]; ok {
+			ranks = append(ranks, &pb.DBCycleRank{
+				Uinfo:    player.Uinfo,
+				Line:     player.Data[player.Maxfloor].Line,
+				Floor:    player.Maxfloor,
+				Costtime: player.Data[player.Maxfloor].Consttime,
+			})
+		}
 	}
 	session.SendMsg(string(this.module.GetType()), "crosscycleranklist", &pb.PagodaCrossCycleRankListResp{
 		Ranks: ranks,
diff --git a/modules/pagoda/api_racerank.go b/modules/pagoda/api_racerank.go
index 5859112be..6651d4002 100644
--- a/modules/pagoda/api_racerank.go
+++ b/modules/pagoda/api_racerank.go
@@ -14,10 +14,11 @@ func (this *apiComp) CrossRaceRankListCheck(session comm.IUserSession, req *pb.P
 // 六合塔榜
 func (this *apiComp) CrossRaceRankList(session comm.IUserSession, req *pb.PagodaCrossRaceRankListReq) (errdata *pb.ErrorData) {
 	var (
-		uids   []string
-		err    error
-		result []*pb.DBRacePagodaRecord
-		ranks  []*pb.DBRaceRank
+		uids      []string
+		err       error
+		result    []*pb.DBRacePagodaRecord
+		resultMap map[string]*pb.DBRacePagodaRecord
+		ranks     []*pb.DBRaceRank
 	)
 
 	if errdata = this.CrossRaceRankListCheck(session, req); errdata != nil {
@@ -40,13 +41,21 @@ func (this *apiComp) CrossRaceRankList(session comm.IUserSession, req *pb.Pagoda
 		}
 		return
 	}
+	resultMap = make(map[string]*pb.DBRacePagodaRecord)
 	for _, v := range result {
-		ranks = append(ranks, &pb.DBRaceRank{
-			Uinfo:    v.Uinfo,
-			Line:     v.Data[v.Maxfloor].Line,
-			Floor:    v.Maxfloor,
-			Costtime: v.Data[v.Maxfloor].Consttime,
-		})
+		resultMap[v.Uid] = v
+	}
+	ranks = make([]*pb.DBRaceRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := resultMap[v]; ok {
+			ranks = append(ranks, &pb.DBRaceRank{
+				Uinfo:    player.Uinfo,
+				Line:     player.Data[player.Maxfloor].Line,
+				Floor:    player.Maxfloor,
+				Costtime: player.Data[player.Maxfloor].Consttime,
+			})
+		}
+
 	}
 	session.SendMsg(string(this.module.GetType()), PagodaCrossRaceRankListReq, &pb.PagodaCrossRaceRankListResp{
 		Ranks: ranks,
diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go
index 5487db08e..3ff5de5bc 100644
--- a/modules/practice/modelPandata.go
+++ b/modules/practice/modelPandata.go
@@ -79,7 +79,7 @@ func (this *modelPandata) queryrooms(uids []string) (results []*pb.DBPracticeRoo
 		onfound []string
 		newdata map[string]interface{} = make(map[string]interface{})
 	)
-	if onfound, err = this.Gets(uids, &results); err != nil {
+	if onfound, err = this.GetByUids(uids, &results); err != nil {
 		this.module.Errorln(err)
 		return
 	}
diff --git a/modules/robot/modulerobot_arena.go b/modules/robot/modulerobot_arena.go
index 0038569c0..0dde560da 100644
--- a/modules/robot/modulerobot_arena.go
+++ b/modules/robot/modulerobot_arena.go
@@ -86,7 +86,7 @@ func (this *ModuleRobot_Arena) DoPipeline(robot IRobot) (err error) {
 		Iswin:      true,
 		Isai:       player.Isai,
 		Aiintegral: player.Integral,
-		Ainame:     player.Uinfo.Name,
+		Aiinfo:     player.Uinfo,
 		Report: &pb.BattleReport{
 			Info:    resp.(*pb.ArenaChallengeResp).Info,
 			WinSide: 1,
@@ -139,7 +139,7 @@ func (this *ModuleRobot_Arena) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskD
 			Iswin:      true,
 			Isai:       player.Isai,
 			Aiintegral: player.Integral,
-			Ainame:     player.Uinfo.Name,
+			Aiinfo:     player.Uinfo,
 			Report: &pb.BattleReport{
 				Info:    resp.(*pb.MainlineChallengeResp).Info,
 				WinSide: 1,
diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go
index c87101e63..df71c2759 100644
--- a/modules/viking/api_ranklist.go
+++ b/modules/viking/api_ranklist.go
@@ -18,11 +18,12 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.VikingRank
 
 func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListReq) (errdata *pb.ErrorData) {
 	var (
-		fRank   []*pb.DBVikingRank
-		uids    []string
-		err     error
-		ranks   []*pb.DBVikingRecord
-		players []*pb.DBVikingRank
+		fRank    []*pb.DBVikingRank
+		uids     []string
+		err      error
+		ranks    []*pb.DBVikingRecord
+		ranksMap map[string]*pb.DBVikingRecord
+		players  []*pb.DBVikingRank
 	)
 	if errdata = this.RankListCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
@@ -43,15 +44,23 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListR
 		}
 		return
 	}
-	players = make([]*pb.DBVikingRank, len(ranks))
-	for i, v := range ranks {
-		players[i] = &pb.DBVikingRank{
-			Uinfo:      v.Uinfo,
-			Line:       v.Data[req.BoosType].Line[v.Data[req.BoosType].Maxnandu],
-			Difficulty: v.Data[req.BoosType].Maxnandu,
-			Bosstype:   req.BoosType,
-			Costtime:   v.Data[req.BoosType].Costime[v.Data[req.BoosType].Maxnandu],
+	ranksMap = make(map[string]*pb.DBVikingRecord)
+	for _, v := range ranks {
+		ranksMap[v.Uid] = v
+	}
+
+	players = make([]*pb.DBVikingRank, 0, len(uids))
+	for _, v := range uids {
+		if player, ok := ranksMap[v]; ok {
+			players = append(players, &pb.DBVikingRank{
+				Uinfo:      player.Uinfo,
+				Line:       player.Data[req.BoosType].Line[player.Data[req.BoosType].Maxnandu],
+				Difficulty: player.Data[req.BoosType].Maxnandu,
+				Bosstype:   req.BoosType,
+				Costtime:   player.Data[req.BoosType].Costime[player.Data[req.BoosType].Maxnandu],
+			})
 		}
+
 	}
 
 	// 获取好友数据
diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go
index daa9eec98..676ea00c0 100644
--- a/pb/arena_msg.pb.go
+++ b/pb/arena_msg.pb.go
@@ -643,7 +643,7 @@ type ArenaChallengeRewardReq struct {
 	Iswin      bool          `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"`           //是否胜利
 	Isai       bool          `protobuf:"varint,2,opt,name=isai,proto3" json:"isai"`             //对手是否是ai
 	Aiintegral int32         `protobuf:"varint,3,opt,name=aiintegral,proto3" json:"aiintegral"` // ai 积分
-	Ainame     string        `protobuf:"bytes,4,opt,name=ainame,proto3" json:"ainame"`          // ai名称
+	Aiinfo     *BaseUserInfo `protobuf:"bytes,4,opt,name=aiinfo,proto3" json:"aiinfo"`          //用户基础
 	Report     *BattleReport `protobuf:"bytes,5,opt,name=report,proto3" json:"report"`          //战报
 	Revengeid  string        `protobuf:"bytes,6,opt,name=revengeid,proto3" json:"revengeid"`    //复仇id
 }
@@ -701,11 +701,11 @@ func (x *ArenaChallengeRewardReq) GetAiintegral() int32 {
 	return 0
 }
 
-func (x *ArenaChallengeRewardReq) GetAiname() string {
+func (x *ArenaChallengeRewardReq) GetAiinfo() *BaseUserInfo {
 	if x != nil {
-		return x.Ainame
+		return x.Aiinfo
 	}
-	return ""
+	return nil
 }
 
 func (x *ArenaChallengeRewardReq) GetReport() *BattleReport {
@@ -1643,94 +1643,95 @@ var file_arena_arena_msg_proto_rawDesc = []byte{
 	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
 	0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04,
 	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0xc0, 0x01,
+	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0xcf, 0x01,
 	0x0a, 0x17, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
 	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77,
 	0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12,
 	0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69,
 	0x73, 0x61, 0x69, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x69, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
 	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x69, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x69, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x69, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72,
-	0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x69, 0x64, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x69, 0x64,
-	0x22, 0x81, 0x01, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
-	0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
-	0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
-	0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x64, 0x61, 0x6e, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61,
-	0x77, 0x61, 0x72, 0x64, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e,
-	0x6b, 0x52, 0x65, 0x71, 0x22, 0x59, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x20, 0x0a,
-	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
-	0x25, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16,
-	0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42,
-	0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16,
-	0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x25, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44,
-	0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x62,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, 0x3e, 0x0a,
-	0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x62,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, 0x4a, 0x0a,
-	0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
-	0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12,
-	0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x62, 0x0a, 0x0d, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4d, 0x0a,
-	0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9e, 0x01, 0x0a,
-	0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x2f, 0x0a, 0x03,
-	0x6e, 0x70, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e,
-	0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, 0x3e, 0x0a,
-	0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e,
-	0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a,
-	0x13, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
-	0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x49, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54,
-	0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
-	0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64,
-	0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
-	0x64, 0x22, 0x26, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63,
-	0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x22, 0x48, 0x0a, 0x13, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
-	0x61, 0x6e, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x72, 0x61, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x61, 0x69, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x06, 0x61, 0x69, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x69, 0x64, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x69, 0x64, 0x22,
+	0x81, 0x01, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+	0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
+	0x73, 0x75, 0x63, 0x63, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
+	0x61, 0x6e, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77,
-	0x61, 0x72, 0x64, 0x22, 0x52, 0x0a, 0x19, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x74,
-	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68,
-	0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
-	0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x72, 0x64, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
+	0x52, 0x65, 0x71, 0x22, 0x59, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x20, 0x0a, 0x04,
+	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x25,
+	0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
+	0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a,
+	0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x25, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x65,
+	0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x12,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0c,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
+	0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x28,
+	0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x62, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e,
+	0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
+	0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69,
+	0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4d, 0x0a, 0x12,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x70, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
+	0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x13,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x2f, 0x0a, 0x03, 0x6e,
+	0x70, 0x63, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x50, 0x6c, 0x6f, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4e,
+	0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, 0x3e, 0x0a, 0x08,
+	0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70,
+	0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x49, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x61,
+	0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
+	0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12,
+	0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+	0x22, 0x26, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x65,
+	0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x22, 0x48, 0x0a, 0x13, 0x41, 0x72, 0x65, 0x6e,
+	0x61, 0x44, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61,
+	0x6e, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
+	0x72, 0x64, 0x22, 0x52, 0x0a, 0x19, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x74, 0x6c,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12,
+	0x14, 0x0a, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
+	0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1782,9 +1783,10 @@ var file_arena_arena_msg_proto_goTypes = []interface{}{
 	(*BattleFormation)(nil),           // 32: BattleFormation
 	(ErrorCode)(0),                    // 33: ErrorCode
 	(*BattleInfo)(nil),                // 34: BattleInfo
-	(*BattleReport)(nil),              // 35: BattleReport
-	(*UserAtno)(nil),                  // 36: UserAtno
-	(*DBNpc)(nil),                     // 37: DBNpc
+	(*BaseUserInfo)(nil),              // 35: BaseUserInfo
+	(*BattleReport)(nil),              // 36: BattleReport
+	(*UserAtno)(nil),                  // 37: UserAtno
+	(*DBNpc)(nil),                     // 38: DBNpc
 }
 var file_arena_arena_msg_proto_depIdxs = []int32{
 	30, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
@@ -1793,24 +1795,25 @@ var file_arena_arena_msg_proto_depIdxs = []int32{
 	32, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation
 	33, // 4: ArenaChallengeResp.code:type_name -> ErrorCode
 	34, // 5: ArenaChallengeResp.info:type_name -> BattleInfo
-	35, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport
-	36, // 7: ArenaChallengeRewardResp.award:type_name -> UserAtno
-	31, // 8: ArenaRankResp.players:type_name -> ArenaPlayer
-	30, // 9: ArenaRankResp.info:type_name -> DBArenaUser
-	32, // 10: ArenaPlotReq.battle:type_name -> BattleFormation
-	33, // 11: ArenaPlotResp.code:type_name -> ErrorCode
-	34, // 12: ArenaPlotResp.info:type_name -> BattleInfo
-	35, // 13: ArenaPlotRewardReq.report:type_name -> BattleReport
-	29, // 14: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry
-	36, // 15: ArenaTaskReceiveResp.award:type_name -> UserAtno
-	36, // 16: ArenaDanReceiveResp.award:type_name -> UserAtno
-	36, // 17: ArenaSettlementRewardPush.award:type_name -> UserAtno
-	37, // 18: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc
-	19, // [19:19] is the sub-list for method output_type
-	19, // [19:19] is the sub-list for method input_type
-	19, // [19:19] is the sub-list for extension type_name
-	19, // [19:19] is the sub-list for extension extendee
-	0,  // [0:19] is the sub-list for field type_name
+	35, // 6: ArenaChallengeRewardReq.aiinfo:type_name -> BaseUserInfo
+	36, // 7: ArenaChallengeRewardReq.report:type_name -> BattleReport
+	37, // 8: ArenaChallengeRewardResp.award:type_name -> UserAtno
+	31, // 9: ArenaRankResp.players:type_name -> ArenaPlayer
+	30, // 10: ArenaRankResp.info:type_name -> DBArenaUser
+	32, // 11: ArenaPlotReq.battle:type_name -> BattleFormation
+	33, // 12: ArenaPlotResp.code:type_name -> ErrorCode
+	34, // 13: ArenaPlotResp.info:type_name -> BattleInfo
+	36, // 14: ArenaPlotRewardReq.report:type_name -> BattleReport
+	29, // 15: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry
+	37, // 16: ArenaTaskReceiveResp.award:type_name -> UserAtno
+	37, // 17: ArenaDanReceiveResp.award:type_name -> UserAtno
+	37, // 18: ArenaSettlementRewardPush.award:type_name -> UserAtno
+	38, // 19: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc
+	20, // [20:20] is the sub-list for method output_type
+	20, // [20:20] is the sub-list for method input_type
+	20, // [20:20] is the sub-list for extension type_name
+	20, // [20:20] is the sub-list for extension extendee
+	0,  // [0:20] is the sub-list for field type_name
 }
 
 func init() { file_arena_arena_msg_proto_init() }