From 121e7c94d27085c4fb1289fbe86bdb52279ec795 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 18 Aug 2022 17:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_com.json             |   3 +-
 bin/json/game_global.json          |   5 +-
 cmd/v2/service/dbServer.go         |  10 +
 cmd/v2/ui/app_gen.go               |   9 +-
 cmd/v2/ui/views/friend_randlist.go |   2 +-
 modules/friend/api.go              |   2 +
 modules/friend/api_addblack.go     |   8 +-
 modules/friend/api_assisthero.go   |  46 ++++
 modules/friend/api_del.go          |  22 ++
 modules/friend/api_list.go         |  12 +-
 pb/friend_db.pb.go                 |  28 +-
 pb/friend_msg.pb.go                | 416 +++++++++++++++++++----------
 pb/user_db.pb.go                   |  94 ++++---
 13 files changed, 445 insertions(+), 212 deletions(-)
 create mode 100644 modules/friend/api_assisthero.go

diff --git a/bin/json/game_com.json b/bin/json/game_com.json
index 045ab8264..53a944206 100644
--- a/bin/json/game_com.json
+++ b/bin/json/game_com.json
@@ -139,7 +139,6 @@
     "smithy_maxtime": 36000,
     "chat_expression_small": [
       "lt_bq_icon001,lt_bq_icon002,lt_bq_icon003,lt_bq_icon004,lt_bq_icon005,lt_bq_icon006,lt_bq_icon007,lt_bq_icon008,lt_bq_icon009,lt_bq_icon010,lt_bq_icon011,lt_bq_icon012"
-    ],
-    "kungfu_time": 30
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 26ae44012..53a944206 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -136,6 +136,9 @@
     "camp_pool_star5": 100,
     "gourmet": 500,
     "smithy_maxplayer": 20,
-    "smithy_maxtime": 36000
+    "smithy_maxtime": 36000,
+    "chat_expression_small": [
+      "lt_bq_icon001,lt_bq_icon002,lt_bq_icon003,lt_bq_icon004,lt_bq_icon005,lt_bq_icon006,lt_bq_icon007,lt_bq_icon008,lt_bq_icon009,lt_bq_icon010,lt_bq_icon011,lt_bq_icon012"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/cmd/v2/service/dbServer.go b/cmd/v2/service/dbServer.go
index d908500b6..dd716791d 100644
--- a/cmd/v2/service/dbServer.go
+++ b/cmd/v2/service/dbServer.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"encoding/json"
 	"fmt"
 	"go_dreamfactory/cmd/v2/model"
 	"log"
@@ -19,10 +20,19 @@ type DbServiceImpl struct {
 }
 
 func NewDbService() DbService {
+	GetBoltDb()
 	return &DbServiceImpl{}
 }
 
 func (this *DbServiceImpl) Create(conf *model.GenTool) error {
+	defer boltDb.Close()
+	_ = boltDb.Update(func(tx *bolt.Tx) error {
+		b, err2 := json.Marshal(conf)
+		if err2 != nil {
+			return err
+		}
+		return bucket.Put([]byte("gen"), b)
+	})
 	return nil
 }
 
diff --git a/cmd/v2/ui/app_gen.go b/cmd/v2/ui/app_gen.go
index 9165ec522..604c03479 100644
--- a/cmd/v2/ui/app_gen.go
+++ b/cmd/v2/ui/app_gen.go
@@ -106,13 +106,10 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 			dialog.ShowError(errors.New("类型未选择"), toolWin.w)
 			return
 		}
-		// service.GetBoltDb().Update(func(tx *bolt.Tx) error {
 
-		// 	return nil
-		// })
-		str := `%s -h %s -j cfg --  -d %s --input_data_dir %s  --output_code_dir %s  --output_data_dir %s --gen_types %s  --go:bright_module_name bright  -s server`
+		commandStr := `%s -h %s -j cfg --  -d %s --input_data_dir %s  --output_code_dir %s  --output_data_dir %s --gen_types %s  --go:bright_module_name bright  -s server`
 
-		arg := fmt.Sprintf(str,
+		arg := fmt.Sprintf(commandStr,
 			workDir.Text+client.Text,
 			serverAddr.Text,
 			workDir.Text+define.Text,
@@ -123,6 +120,8 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 		)
 
 		logrus.Debug(arg)
+		form.Disable()
+		defer form.Enable()
 		c := exec.Command("cmd.exe", "/c", arg)
 		if err := c.Run(); err != nil {
 			dialog.ShowError(err, toolWin.w)
diff --git a/cmd/v2/ui/views/friend_randlist.go b/cmd/v2/ui/views/friend_randlist.go
index 0a73b0570..14d477651 100644
--- a/cmd/v2/ui/views/friend_randlist.go
+++ b/cmd/v2/ui/views/friend_randlist.go
@@ -16,7 +16,7 @@ type FriendRandListView struct {
 func (this *FriendRandListView) CreateView(t *model.TestCase) fyne.CanvasObject {
 	this.form.OnSubmit = func() {
 		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
-			&pb.FriendOnlineReq{}); err != nil {
+			&pb.FriendRandlistReq{}); err != nil {
 			logrus.Error(err)
 		}
 	}
diff --git a/modules/friend/api.go b/modules/friend/api.go
index a68d31d00..c631bc5b4 100644
--- a/modules/friend/api.go
+++ b/modules/friend/api.go
@@ -19,6 +19,8 @@ const (
 	FriendSubTypeZanreceive = "zanreceive"
 	FriendSubTypeZanList    = "zanlist"
 	FriendSubTypeRandList   = "randlist"
+	FriendSubTypeAssistHero = "assisthero"
+	FriendSubTypeDel        = "del"
 )
 
 type apiComp struct {
diff --git a/modules/friend/api_addblack.go b/modules/friend/api_addblack.go
index 17d11f5d8..1aa9ca850 100644
--- a/modules/friend/api_addblack.go
+++ b/modules/friend/api_addblack.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendBlackAddReq) (code pb.ErrorCode) {
+func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode) {
 	if req.FriendId == "" {
 		code = pb.ErrorCode_ReqParameterError
 	}
@@ -16,7 +16,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendBlac
 }
 
 //加入黑名单
-func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendBlackAddReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data proto.Message) {
 	if code = this.AddblackCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
@@ -25,11 +25,11 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendBlackAddR
 		err    error
 		self   *pb.DBFriend
 		target *pb.DBFriend
-		Resp   *pb.FriendBlackAddResp
+		Resp   *pb.FriendAddBlackResp
 	)
 
 	defer func() {
-		Resp = &pb.FriendBlackAddResp{
+		Resp = &pb.FriendAddBlackResp{
 			FriendId: req.FriendId,
 			UserId:   session.GetUserId(),
 		}
diff --git a/modules/friend/api_assisthero.go b/modules/friend/api_assisthero.go
new file mode 100644
index 000000000..7b5c6ec72
--- /dev/null
+++ b/modules/friend/api_assisthero.go
@@ -0,0 +1,46 @@
+// package 设置助战英雄
+package friend
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode) {
+	if req.HeroObjId == "" {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.AssistheroCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	//获取玩家自己好友数据
+	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())
+	if self == nil {
+		code = pb.ErrorCode_FriendSelfNoData
+		return
+	}
+
+	if err := this.moduleFriend.modelFriend.Change(self.Uid, map[string]interface{}{
+		"assistHeroId": req.HeroObjId,
+	}); err != nil {
+		log.Errorf("Assisthero err:%v", err)
+		code = pb.ErrorCode_FriendApplyError
+		return
+	}
+
+	rsp := &pb.FriendAssistheroResp{HeroObjId: req.HeroObjId}
+	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeAssistHero, rsp); err != nil {
+		code = pb.ErrorCode_SystemError
+		return
+	}
+
+	return
+}
diff --git a/modules/friend/api_del.go b/modules/friend/api_del.go
index 0ae546d00..2a6da6285 100644
--- a/modules/friend/api_del.go
+++ b/modules/friend/api_del.go
@@ -2,7 +2,9 @@ package friend
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -20,5 +22,25 @@ func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code
 		return
 	}
 
+	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())
+	if self == nil {
+		code = pb.ErrorCode_FriendSelfNoData
+		return
+	}
+
+	friendIds := utils.DeleteString(self.FriendIds, req.FriendId)
+
+	if err := this.moduleFriend.modelFriend.Change(self.Uid, map[string]interface{}{
+		"friendIds": friendIds,
+	}); err != nil {
+		log.Errorf("Del friend err:%v", err)
+		code = pb.ErrorCode_FriendApplyError
+		return
+	}
+
+	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeDel, &pb.FriendDelResp{FriendId: req.FriendId, UserId: self.Uid}); err != nil {
+		code = pb.ErrorCode_SystemError
+	}
+
 	return
 }
diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go
index 494392dbb..c241ba97c 100644
--- a/modules/friend/api_list.go
+++ b/modules/friend/api_list.go
@@ -15,14 +15,16 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq)
 //好友列表
 func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		self *pb.DBFriend
-		Resp *pb.FriendListResp
-		list []*pb.FriendBase
+		self      *pb.DBFriend
+		Resp      *pb.FriendListResp
+		list      []*pb.FriendBase
+		heroObjId string
 	)
 
 	defer func() {
 		Resp = &pb.FriendListResp{
-			List: list,
+			List:      list,
+			HeroObjId: heroObjId,
 		}
 		err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeList, Resp)
 		if err != nil {
@@ -36,6 +38,8 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (cod
 		code = pb.ErrorCode_FriendSelfNoData
 		return
 	}
+	// 助战英雄ID
+	heroObjId = self.AssistHeroId
 
 	// 我的好友
 	for _, userId := range self.FriendIds {
diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go
index a4677d5ee..7d44fedee 100644
--- a/pb/friend_db.pb.go
+++ b/pb/friend_db.pb.go
@@ -25,12 +25,13 @@ type DBFriend struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid        string   `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                      //用户ID
-	FriendIds  []string `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds" bson:"friendIds"`    //好友ID
-	ApplyIds   []string `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds" bson:"applyIds"`       //申请用户ID
-	BlackIds   []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"`       //黑名单ID
-	ZanIds     []string `protobuf:"bytes,5,rep,name=zanIds,proto3" json:"zanIds" bson:"zanIds"`             //点赞好友ID
-	GetZandIds []string `protobuf:"bytes,6,rep,name=getZandIds,proto3" json:"getZandIds" bson:"getZandIds"` //已接收赞好友ID
+	Uid          string   `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                            //用户ID
+	FriendIds    []string `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds" bson:"friendIds"`          //好友ID
+	ApplyIds     []string `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds" bson:"applyIds"`             //申请用户ID
+	BlackIds     []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"`             //黑名单ID
+	ZanIds       []string `protobuf:"bytes,5,rep,name=zanIds,proto3" json:"zanIds" bson:"zanIds"`                   //点赞好友ID
+	GetZandIds   []string `protobuf:"bytes,6,rep,name=getZandIds,proto3" json:"getZandIds" bson:"getZandIds"`       //已接收赞好友ID
+	AssistHeroId string   `protobuf:"bytes,7,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"` //助战英雄ID
 }
 
 func (x *DBFriend) Reset() {
@@ -107,11 +108,18 @@ func (x *DBFriend) GetGetZandIds() []string {
 	return nil
 }
 
+func (x *DBFriend) GetAssistHeroId() string {
+	if x != nil {
+		return x.AssistHeroId
+	}
+	return ""
+}
+
 var File_friend_friend_db_proto protoreflect.FileDescriptor
 
 var file_friend_friend_db_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
-	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x46,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xce, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x46,
 	0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e,
 	0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65,
@@ -122,8 +130,10 @@ var file_friend_friend_db_proto_rawDesc = []byte{
 	0x06, 0x7a, 0x61, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x7a,
 	0x61, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x74, 0x5a, 0x61, 0x6e, 0x64,
 	0x49, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x65, 0x74, 0x5a, 0x61,
-	0x6e, 0x64, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x64, 0x49, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
+	0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x73, 0x73,
+	0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index dbe13049d..0c641ad89 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -35,7 +35,6 @@ type FriendBase struct {
 	IsApplied   bool   `protobuf:"varint,8,opt,name=isApplied,proto3" json:"isApplied"`     //是否已申请加好友
 	IsZaned     bool   `protobuf:"varint,9,opt,name=isZaned,proto3" json:"isZaned"`         //是否已点赞
 	IsGetZaned  bool   `protobuf:"varint,10,opt,name=isGetZaned,proto3" json:"isGetZaned"`  //是否已获赞
-	IsOnline    bool   `protobuf:"varint,11,opt,name=isOnline,proto3" json:"isOnline"`      //是否在线
 }
 
 func (x *FriendBase) Reset() {
@@ -140,13 +139,6 @@ func (x *FriendBase) GetIsGetZaned() bool {
 	return false
 }
 
-func (x *FriendBase) GetIsOnline() bool {
-	if x != nil {
-		return x.IsOnline
-	}
-	return false
-}
-
 //好友列表
 type FriendListReq struct {
 	state         protoimpl.MessageState
@@ -191,7 +183,8 @@ type FriendListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+	List      []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
+	HeroObjId string        `protobuf:"bytes,2,opt,name=heroObjId,proto3" json:"heroObjId"`
 }
 
 func (x *FriendListResp) Reset() {
@@ -233,15 +226,22 @@ func (x *FriendListResp) GetList() []*FriendBase {
 	return nil
 }
 
+func (x *FriendListResp) GetHeroObjId() string {
+	if x != nil {
+		return x.HeroObjId
+	}
+	return ""
+}
+
 // 随机的在线玩家
-type FriendOnlineReq struct {
+type FriendRandlistReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *FriendOnlineReq) Reset() {
-	*x = FriendOnlineReq{}
+func (x *FriendRandlistReq) Reset() {
+	*x = FriendRandlistReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -249,13 +249,13 @@ func (x *FriendOnlineReq) Reset() {
 	}
 }
 
-func (x *FriendOnlineReq) String() string {
+func (x *FriendRandlistReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendOnlineReq) ProtoMessage() {}
+func (*FriendRandlistReq) ProtoMessage() {}
 
-func (x *FriendOnlineReq) ProtoReflect() protoreflect.Message {
+func (x *FriendRandlistReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -267,12 +267,12 @@ func (x *FriendOnlineReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendOnlineReq.ProtoReflect.Descriptor instead.
-func (*FriendOnlineReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendRandlistReq.ProtoReflect.Descriptor instead.
+func (*FriendRandlistReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{3}
 }
 
-type FriendOnlineResp struct {
+type FriendRandlistResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -280,8 +280,8 @@ type FriendOnlineResp struct {
 	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *FriendOnlineResp) Reset() {
-	*x = FriendOnlineResp{}
+func (x *FriendRandlistResp) Reset() {
+	*x = FriendRandlistResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -289,13 +289,13 @@ func (x *FriendOnlineResp) Reset() {
 	}
 }
 
-func (x *FriendOnlineResp) String() string {
+func (x *FriendRandlistResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendOnlineResp) ProtoMessage() {}
+func (*FriendRandlistResp) ProtoMessage() {}
 
-func (x *FriendOnlineResp) ProtoReflect() protoreflect.Message {
+func (x *FriendRandlistResp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -307,12 +307,12 @@ func (x *FriendOnlineResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendOnlineResp.ProtoReflect.Descriptor instead.
-func (*FriendOnlineResp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendRandlistResp.ProtoReflect.Descriptor instead.
+func (*FriendRandlistResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *FriendOnlineResp) GetList() []*FriendBase {
+func (x *FriendRandlistResp) GetList() []*FriendBase {
 	if x != nil {
 		return x.List
 	}
@@ -983,7 +983,7 @@ func (x *FriendBlackListResp) GetFriends() []*FriendBase {
 }
 
 //添加黑名单
-type FriendBlackAddReq struct {
+type FriendAddBlackReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -991,8 +991,8 @@ type FriendBlackAddReq struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *FriendBlackAddReq) Reset() {
-	*x = FriendBlackAddReq{}
+func (x *FriendAddBlackReq) Reset() {
+	*x = FriendAddBlackReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1000,13 +1000,13 @@ func (x *FriendBlackAddReq) Reset() {
 	}
 }
 
-func (x *FriendBlackAddReq) String() string {
+func (x *FriendAddBlackReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendBlackAddReq) ProtoMessage() {}
+func (*FriendAddBlackReq) ProtoMessage() {}
 
-func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message {
+func (x *FriendAddBlackReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1018,19 +1018,19 @@ func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendBlackAddReq.ProtoReflect.Descriptor instead.
-func (*FriendBlackAddReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAddBlackReq.ProtoReflect.Descriptor instead.
+func (*FriendAddBlackReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{19}
 }
 
-func (x *FriendBlackAddReq) GetFriendId() string {
+func (x *FriendAddBlackReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type FriendBlackAddResp struct {
+type FriendAddBlackResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1039,8 +1039,8 @@ type FriendBlackAddResp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *FriendBlackAddResp) Reset() {
-	*x = FriendBlackAddResp{}
+func (x *FriendAddBlackResp) Reset() {
+	*x = FriendAddBlackResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1048,13 +1048,13 @@ func (x *FriendBlackAddResp) Reset() {
 	}
 }
 
-func (x *FriendBlackAddResp) String() string {
+func (x *FriendAddBlackResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendBlackAddResp) ProtoMessage() {}
+func (*FriendAddBlackResp) ProtoMessage() {}
 
-func (x *FriendBlackAddResp) ProtoReflect() protoreflect.Message {
+func (x *FriendAddBlackResp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1066,19 +1066,19 @@ func (x *FriendBlackAddResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendBlackAddResp.ProtoReflect.Descriptor instead.
-func (*FriendBlackAddResp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAddBlackResp.ProtoReflect.Descriptor instead.
+func (*FriendAddBlackResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *FriendBlackAddResp) GetFriendId() string {
+func (x *FriendAddBlackResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendBlackAddResp) GetUserId() string {
+func (x *FriendAddBlackResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1567,11 +1567,106 @@ func (x *FriendZanreceiveResp) GetFlag() bool {
 	return false
 }
 
+// 设置助战英雄
+type FriendAssistheroReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	HeroObjId string `protobuf:"bytes,1,opt,name=heroObjId,proto3" json:"heroObjId"`
+}
+
+func (x *FriendAssistheroReq) Reset() {
+	*x = FriendAssistheroReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[31]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendAssistheroReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendAssistheroReq) ProtoMessage() {}
+
+func (x *FriendAssistheroReq) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[31]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FriendAssistheroReq.ProtoReflect.Descriptor instead.
+func (*FriendAssistheroReq) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{31}
+}
+
+func (x *FriendAssistheroReq) GetHeroObjId() string {
+	if x != nil {
+		return x.HeroObjId
+	}
+	return ""
+}
+
+type FriendAssistheroResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	HeroObjId string `protobuf:"bytes,1,opt,name=heroObjId,proto3" json:"heroObjId"`
+}
+
+func (x *FriendAssistheroResp) Reset() {
+	*x = FriendAssistheroResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendAssistheroResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendAssistheroResp) ProtoMessage() {}
+
+func (x *FriendAssistheroResp) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[32]
+	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 FriendAssistheroResp.ProtoReflect.Descriptor instead.
+func (*FriendAssistheroResp) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{32}
+}
+
+func (x *FriendAssistheroResp) GetHeroObjId() string {
+	if x != nil {
+		return x.HeroObjId
+	}
+	return ""
+}
+
 var File_friend_friend_msg_proto protoreflect.FileDescriptor
 
 var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x0a, 0x17, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
-	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbc, 0x02, 0x0a, 0x0a, 0x46, 0x72,
+	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x02, 0x0a, 0x0a, 0x46, 0x72,
 	0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
 	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
 	0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
@@ -1589,99 +1684,106 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x65, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x18, 0x09, 0x20,
 	0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
 	0x69, 0x73, 0x47, 0x65, 0x74, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0a, 0x69, 0x73, 0x47, 0x65, 0x74, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08,
-	0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c,
-	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x11, 0x0a, 0x0f,
-	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22,
-	0x33, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
-	0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70,
-	0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44,
-	0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
-	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
-	0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22,
-	0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52,
+	0x52, 0x0a, 0x69, 0x73, 0x47, 0x65, 0x74, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x22, 0x0f, 0x0a, 0x0d,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x4f, 0x0a,
+	0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x13,
+	0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x6e,
+	0x64, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22,
+	0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12,
+	0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x22, 0x2e, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52,
 	0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18,
 	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73,
-	0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x13,
+	0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52,
+	0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75,
+	0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12,
 	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
-	0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65,
-	0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e,
-	0x61, 0x6d, 0x65, 0x22, 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12,
-	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63,
-	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73,
-	0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41,
-	0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
-	0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b,
-	0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71,
-	0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12,
-	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65,
+	0x65, 0x71, 0x22, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c,
+	0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
+	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+	0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63,
+	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a,
+	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c,
+	0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42,
+	0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65,
 	0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f,
-	0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x12, 0x0a, 0x10, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a,
-	0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c,
-	0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e,
+	0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a,
+	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74,
+	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22,
+	0x12, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e,
+	0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42,
+	0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0c, 0x46, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x33, 0x0a, 0x13,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
 	0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73,
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
-	0x73, 0x22, 0x23, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x33, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
-	0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x14, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x22, 0x2a, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x33, 0x0a,
+	0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x68, 0x65, 0x72,
+	0x6f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x22, 0x34, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
+	0x73, 0x74, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65,
+	0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1696,13 +1798,13 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 	return file_friend_friend_msg_proto_rawDescData
 }
 
-var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
+var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendBase)(nil),           // 0: FriendBase
 	(*FriendListReq)(nil),        // 1: FriendListReq
 	(*FriendListResp)(nil),       // 2: FriendListResp
-	(*FriendOnlineReq)(nil),      // 3: FriendOnlineReq
-	(*FriendOnlineResp)(nil),     // 4: FriendOnlineResp
+	(*FriendRandlistReq)(nil),    // 3: FriendRandlistReq
+	(*FriendRandlistResp)(nil),   // 4: FriendRandlistResp
 	(*FriendApplyReq)(nil),       // 5: FriendApplyReq
 	(*FriendApplyResp)(nil),      // 6: FriendApplyResp
 	(*FriendDelReq)(nil),         // 7: FriendDelReq
@@ -1717,8 +1819,8 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendSearchResp)(nil),     // 16: FriendSearchResp
 	(*FriendBlackListReq)(nil),   // 17: FriendBlackListReq
 	(*FriendBlackListResp)(nil),  // 18: FriendBlackListResp
-	(*FriendBlackAddReq)(nil),    // 19: FriendBlackAddReq
-	(*FriendBlackAddResp)(nil),   // 20: FriendBlackAddResp
+	(*FriendAddBlackReq)(nil),    // 19: FriendAddBlackReq
+	(*FriendAddBlackResp)(nil),   // 20: FriendAddBlackResp
 	(*FriendDelBlackReq)(nil),    // 21: FriendDelBlackReq
 	(*FriendDelBlackResp)(nil),   // 22: FriendDelBlackResp
 	(*FriendTotalReq)(nil),       // 23: FriendTotalReq
@@ -1729,10 +1831,12 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendZanResp)(nil),        // 28: FriendZanResp
 	(*FriendZanreceiveReq)(nil),  // 29: FriendZanreceiveReq
 	(*FriendZanreceiveResp)(nil), // 30: FriendZanreceiveResp
+	(*FriendAssistheroReq)(nil),  // 31: FriendAssistheroReq
+	(*FriendAssistheroResp)(nil), // 32: FriendAssistheroResp
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
 	0, // 0: FriendListResp.list:type_name -> FriendBase
-	0, // 1: FriendOnlineResp.list:type_name -> FriendBase
+	0, // 1: FriendRandlistResp.list:type_name -> FriendBase
 	0, // 2: FriendApplyListResp.list:type_name -> FriendBase
 	0, // 3: FriendSearchResp.friend:type_name -> FriendBase
 	0, // 4: FriendBlackListResp.friends:type_name -> FriendBase
@@ -1787,7 +1891,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendOnlineReq); i {
+			switch v := v.(*FriendRandlistReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1799,7 +1903,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendOnlineResp); i {
+			switch v := v.(*FriendRandlistResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1979,7 +2083,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendBlackAddReq); i {
+			switch v := v.(*FriendAddBlackReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1991,7 +2095,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendBlackAddResp); i {
+			switch v := v.(*FriendAddBlackResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2122,6 +2226,30 @@ func file_friend_friend_msg_proto_init() {
 				return nil
 			}
 		}
+		file_friend_friend_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendAssistheroReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_friend_friend_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendAssistheroResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2129,7 +2257,7 @@ func file_friend_friend_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_friend_friend_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   31,
+			NumMessages:   33,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go
index b079d4f85..bfafc6b45 100644
--- a/pb/user_db.pb.go
+++ b/pb/user_db.pb.go
@@ -104,24 +104,25 @@ type DBUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                           //ID
-	Uid         string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                         //用户ID
-	Uuid        string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"`                      //玩家唯一uuid
-	Binduid     string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"`             //玩家账号
-	Name        string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"`                      //玩家名
-	Sid         string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"`                         //区服id
-	Createip    string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"`          //创建账号时的ip
-	Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip
-	Ctime       int64  `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"`                  //玩家创号时间戳
-	Logintime   int64  `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"`     //最后一次登录时间
-	Avatar      string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"`               //头像
-	Gold        int32  `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"`                    //金币
-	Exp         int32  `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"`                       //经验
-	Created     bool   `protobuf:"varint,15,opt,name=created,proto3" json:"created" bson:"created"`           //创角
-	Lv          int32  `protobuf:"varint,16,opt,name=lv,proto3" json:"lv" bson:"lv"`                          //等级
-	Vip         int32  `protobuf:"varint,17,opt,name=vip,proto3" json:"vip" bson:"vip"`                       // vip
-	Diamond     int32  `protobuf:"varint,18,opt,name=diamond,proto3" json:"diamond" bson:"diamond"`           // 钻石
-	Title       int32  `protobuf:"varint,19,opt,name=title,proto3" json:"title"`                              //@go_tags(`bson:"title"`)头衔
+	Id          string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                             //ID
+	Uid         string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                           //用户ID
+	Uuid        string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"`                        //玩家唯一uuid
+	Binduid     string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"`               //玩家账号
+	Name        string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"`                        //玩家名
+	Sid         string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"`                           //区服id
+	Createip    string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"`            //创建账号时的ip
+	Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"`   //最后一次登录时的ip
+	Ctime       int64  `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"`                    //玩家创号时间戳
+	Logintime   int64  `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"`       //最后一次登录时间
+	Avatar      string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"`                 //头像
+	Gold        int32  `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"`                      //金币
+	Exp         int32  `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"`                         //经验
+	Created     bool   `protobuf:"varint,15,opt,name=created,proto3" json:"created" bson:"created"`             //创角
+	Lv          int32  `protobuf:"varint,16,opt,name=lv,proto3" json:"lv" bson:"lv"`                            //等级
+	Vip         int32  `protobuf:"varint,17,opt,name=vip,proto3" json:"vip" bson:"vip"`                         // vip
+	Diamond     int32  `protobuf:"varint,18,opt,name=diamond,proto3" json:"diamond" bson:"diamond"`             // 钻石
+	Title       int32  `protobuf:"varint,19,opt,name=title,proto3" json:"title"`                                //@go_tags(`bson:"title"`)头衔
+	Offlinetime int64  `protobuf:"varint,11,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间
 }
 
 func (x *DBUser) Reset() {
@@ -282,6 +283,13 @@ func (x *DBUser) GetTitle() int32 {
 	return 0
 }
 
+func (x *DBUser) GetOfflinetime() int64 {
+	if x != nil {
+		return x.Offlinetime
+	}
+	return 0
+}
+
 type DBUserSetting struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -438,7 +446,7 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72,
 	0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61,
 	0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x9a,
+	0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xbc,
 	0x03, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75,
@@ -464,29 +472,31 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64,
 	0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69,
 	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x13,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0xc7, 0x02, 0x0a, 0x0d,
-	0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a,
-	0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67,
-	0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e,
-	0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e,
-	0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65,
-	0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66,
-	0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62,
-	0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12,
-	0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f,
-	0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e,
-	0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
-	0x73, 0x61, 0x69, 0x6a, 0x69, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6f,
+	0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xc7, 0x02,
+	0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e,
+	0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61,
+	0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75,
+	0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75,
+	0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a,
+	0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65,
+	0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66,
+	0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65,
+	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f,
+	0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64,
+	0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e,
+	0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (