From 781466ba5794eb5a65cf93b98842502afd3eea69 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 19 Aug 2022 15:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=A9=E6=88=98=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/friend/api_assistlist.go |  3 ++-
 pb/friend_msg.pb.go              | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/friend/api_assistlist.go b/modules/friend/api_assistlist.go
index ac605699a..53bf2743f 100644
--- a/modules/friend/api_assistlist.go
+++ b/modules/friend/api_assistlist.go
@@ -34,7 +34,8 @@ func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistl
 	}
 
 	rsp := &pb.FriendAssistlistResp{
-		List: list,
+		List:      list,
+		HeroObjId: self.AssistHeroId,
 	}
 	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSbuTypeAssistlist, rsp); err != nil {
 		code = pb.ErrorCode_SystemError
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 157533f80..c591f2deb 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -1706,7 +1706,8 @@ type FriendAssistlistResp 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 *FriendAssistlistResp) Reset() {
@@ -1748,6 +1749,13 @@ func (x *FriendAssistlistResp) GetList() []*FriendBase {
 	return nil
 }
 
+func (x *FriendAssistlistResp) 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{
@@ -1870,11 +1878,13 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	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, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65,
 	0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
-	0x37, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c,
+	0x55, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (