diff --git a/comm/const.go b/comm/const.go
index 431b12222..a7ff56e81 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -332,6 +332,7 @@ const (
 const (
 	MaxMainlineIntensity = 3 // 最大难度
 	MaxRankNum           = 3
+	MainLineBoss         = 3
 )
 
 ///聊天消息公告类型
diff --git a/modules/hero/api_chouka.go b/modules/hero/api_chouka.go
deleted file mode 100644
index b96cd75a7..000000000
--- a/modules/hero/api_chouka.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package hero
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
-)
-
-func (this *apiComp) ChoukaCheck(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode) {
-
-	return
-}
-
-//抽卡
-func (this *apiComp) Chouka(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode, data proto.Message) {
-	rsp := &pb.HeroChoukaResp{}
-
-	defer func() {
-		err := session.SendMsg(string(this.module.GetType()), HeroSubTypeChouka, rsp)
-		if err != nil {
-			code = pb.ErrorCode_SystemError
-			return
-		}
-	}()
-
-	heroCfgIds := req.HeroIds
-	if err := this.module.modelHero.createMultiHero(session.GetUserId(), heroCfgIds...); err != nil {
-		code = pb.ErrorCode_HeroCreate
-		return
-	}
-
-	rsp.Heroes = this.module.modelHero.getHeroList(session.GetUserId())
-
-	return
-}
diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go
index a7d519179..9f55cd5ce 100644
--- a/modules/mainline/api_challengeover.go
+++ b/modules/mainline/api_challengeover.go
@@ -61,7 +61,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
 		"chapterId":  mainline.ChapterId,
 		"branchID":   mainline.BranchID,
 	}
-	if node.Episodetype == 5 { // 打完boss 设置领奖状态
+	if node.Episodetype == comm.MainLineBoss { // 打完boss 设置领奖状态
 		update["awaredID"] = pb.AwaredType_TypeAvailable
 		mainline.AwaredID = pb.AwaredType_TypeAvailable
 	}
@@ -71,11 +71,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
 		return
 	}
 
-	if node.Episodetype == 5 { // 挑战完成 boss关
+	if node.Episodetype == comm.MainLineBoss { // 挑战完成 boss关
 		_data := &pb.DBMainline{}
 		conf := this.module.configure.GetMainlineChapter(mainline.ChapterId + 1)
 		_data.Id = primitive.NewObjectID().Hex()
 		_data.ChapterId = mainline.ChapterId + 1
+		_data.Intensity = mainline.Intensity
 		if conf == nil { // 这里就是切换下一个难度了
 			if mainline.Intensity < comm.MaxMainlineIntensity {
 				_data.Intensity = mainline.Intensity + 1 // 难度+1
diff --git a/pb/chat_msg.pb.go b/pb/chat_msg.pb.go
index 9c40be35d..f4f0341ba 100644
--- a/pb/chat_msg.pb.go
+++ b/pb/chat_msg.pb.go
@@ -363,110 +363,6 @@ func (x *ChatGetListResp) GetChats() []*DBChat {
 	return nil
 }
 
-//跨服请求聊天消息
-type ChatGetCrossListReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Channel   ChatChannel `protobuf:"varint,1,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道
-	ChannelId int32       `protobuf:"varint,2,opt,name=channelId,proto3" json:"channelId"`              //跨服频道id
-}
-
-func (x *ChatGetCrossListReq) Reset() {
-	*x = ChatGetCrossListReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChatGetCrossListReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChatGetCrossListReq) ProtoMessage() {}
-
-func (x *ChatGetCrossListReq) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[7]
-	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 ChatGetCrossListReq.ProtoReflect.Descriptor instead.
-func (*ChatGetCrossListReq) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ChatGetCrossListReq) GetChannel() ChatChannel {
-	if x != nil {
-		return x.Channel
-	}
-	return ChatChannel_World
-}
-
-func (x *ChatGetCrossListReq) GetChannelId() int32 {
-	if x != nil {
-		return x.ChannelId
-	}
-	return 0
-}
-
-//跨服请求聊天消息 回应
-type ChatGetCrossListResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Chats []*DBChat `protobuf:"bytes,1,rep,name=chats,proto3" json:"chats"`
-}
-
-func (x *ChatGetCrossListResp) Reset() {
-	*x = ChatGetCrossListResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChatGetCrossListResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChatGetCrossListResp) ProtoMessage() {}
-
-func (x *ChatGetCrossListResp) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[8]
-	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 ChatGetCrossListResp.ProtoReflect.Descriptor instead.
-func (*ChatGetCrossListResp) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ChatGetCrossListResp) GetChats() []*DBChat {
-	if x != nil {
-		return x.Chats
-	}
-	return nil
-}
-
 //消息发送请求
 type ChatSendReq struct {
 	state         protoimpl.MessageState
@@ -484,7 +380,7 @@ type ChatSendReq struct {
 func (x *ChatSendReq) Reset() {
 	*x = ChatSendReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[9]
+		mi := &file_chat_chat_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -497,7 +393,7 @@ func (x *ChatSendReq) String() string {
 func (*ChatSendReq) ProtoMessage() {}
 
 func (x *ChatSendReq) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[9]
+	mi := &file_chat_chat_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -510,7 +406,7 @@ func (x *ChatSendReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatSendReq.ProtoReflect.Descriptor instead.
 func (*ChatSendReq) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{9}
+	return file_chat_chat_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ChatSendReq) GetAvatar() string {
@@ -567,7 +463,7 @@ type ChatSendResp struct {
 func (x *ChatSendResp) Reset() {
 	*x = ChatSendResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[10]
+		mi := &file_chat_chat_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -580,7 +476,7 @@ func (x *ChatSendResp) String() string {
 func (*ChatSendResp) ProtoMessage() {}
 
 func (x *ChatSendResp) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[10]
+	mi := &file_chat_chat_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -593,7 +489,7 @@ func (x *ChatSendResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatSendResp.ProtoReflect.Descriptor instead.
 func (*ChatSendResp) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{10}
+	return file_chat_chat_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ChatSendResp) GetIssucc() bool {
@@ -603,142 +499,6 @@ func (x *ChatSendResp) GetIssucc() bool {
 	return false
 }
 
-//跨服消息发送请求
-type ChatSendCrossReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Avatar   string      `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"`                     //用户头像
-	Uname    string      `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"`                       //用户名
-	Ulv      int32       `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"`                          //用户等级
-	Channel  ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道
-	TargetId string      `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"`                 //目标用户id
-	Content  string      `protobuf:"bytes,6,opt,name=content,proto3" json:"content"`                   //内容
-}
-
-func (x *ChatSendCrossReq) Reset() {
-	*x = ChatSendCrossReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChatSendCrossReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChatSendCrossReq) ProtoMessage() {}
-
-func (x *ChatSendCrossReq) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[11]
-	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 ChatSendCrossReq.ProtoReflect.Descriptor instead.
-func (*ChatSendCrossReq) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *ChatSendCrossReq) GetAvatar() string {
-	if x != nil {
-		return x.Avatar
-	}
-	return ""
-}
-
-func (x *ChatSendCrossReq) GetUname() string {
-	if x != nil {
-		return x.Uname
-	}
-	return ""
-}
-
-func (x *ChatSendCrossReq) GetUlv() int32 {
-	if x != nil {
-		return x.Ulv
-	}
-	return 0
-}
-
-func (x *ChatSendCrossReq) GetChannel() ChatChannel {
-	if x != nil {
-		return x.Channel
-	}
-	return ChatChannel_World
-}
-
-func (x *ChatSendCrossReq) GetTargetId() string {
-	if x != nil {
-		return x.TargetId
-	}
-	return ""
-}
-
-func (x *ChatSendCrossReq) GetContent() string {
-	if x != nil {
-		return x.Content
-	}
-	return ""
-}
-
-//跨服消息发送请求 回应
-type ChatSendCrossResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"` //是否成功
-}
-
-func (x *ChatSendCrossResp) Reset() {
-	*x = ChatSendCrossResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_chat_msg_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChatSendCrossResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChatSendCrossResp) ProtoMessage() {}
-
-func (x *ChatSendCrossResp) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_chat_msg_proto_msgTypes[12]
-	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 ChatSendCrossResp.ProtoReflect.Descriptor instead.
-func (*ChatSendCrossResp) Descriptor() ([]byte, []int) {
-	return file_chat_chat_msg_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *ChatSendCrossResp) GetIssucc() bool {
-	if x != nil {
-		return x.Issucc
-	}
-	return false
-}
-
 var File_chat_chat_msg_proto protoreflect.FileDescriptor
 
 var file_chat_chat_msg_proto_rawDesc = []byte{
@@ -769,45 +529,21 @@ var file_chat_chat_msg_proto_rawDesc = []byte{
 	0x6e, 0x65, 0x6c, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74,
 	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x74,
 	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x43, 0x68, 0x61, 0x74,
-	0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0x5b, 0x0a, 0x13, 0x43, 0x68, 0x61, 0x74, 0x47,
-	0x65, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x26,
-	0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63,
-	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65,
-	0x6c, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e,
-	0x65, 0x6c, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x14, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, 0x43,
-	0x72, 0x6f, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05,
-	0x63, 0x68, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
-	0x43, 0x68, 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xab, 0x01, 0x0a, 0x0b,
-	0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61,
-	0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61,
-	0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63,
-	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43,
-	0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e,
-	0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12,
-	0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61,
-	0x74, 0x53, 0x65, 0x6e, 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, 0x22, 0xb0, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72,
-	0x6f, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14,
-	0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65,
-	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68,
-	0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a,
-	0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e,
-	0x74, 0x65, 0x6e, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64,
-	0x43, 0x72, 0x6f, 0x73, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xab, 0x01, 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74,
+	0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12,
+	0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e,
+	0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43,
+	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12,
+	0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63,
+	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e,
+	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, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -822,7 +558,7 @@ func file_chat_chat_msg_proto_rawDescGZIP() []byte {
 	return file_chat_chat_msg_proto_rawDescData
 }
 
-var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_chat_chat_msg_proto_goTypes = []interface{}{
 	(*ChatMessagePush)(nil),        // 0: ChatMessagePush
 	(*ChatCrossChannelReq)(nil),    // 1: ChatCrossChannelReq
@@ -831,28 +567,21 @@ var file_chat_chat_msg_proto_goTypes = []interface{}{
 	(*ChatChanageChannelResp)(nil), // 4: ChatChanageChannelResp
 	(*ChatGetListReq)(nil),         // 5: ChatGetListReq
 	(*ChatGetListResp)(nil),        // 6: ChatGetListResp
-	(*ChatGetCrossListReq)(nil),    // 7: ChatGetCrossListReq
-	(*ChatGetCrossListResp)(nil),   // 8: ChatGetCrossListResp
-	(*ChatSendReq)(nil),            // 9: ChatSendReq
-	(*ChatSendResp)(nil),           // 10: ChatSendResp
-	(*ChatSendCrossReq)(nil),       // 11: ChatSendCrossReq
-	(*ChatSendCrossResp)(nil),      // 12: ChatSendCrossResp
-	(*DBChat)(nil),                 // 13: DBChat
-	(ChatChannel)(0),               // 14: ChatChannel
+	(*ChatSendReq)(nil),            // 7: ChatSendReq
+	(*ChatSendResp)(nil),           // 8: ChatSendResp
+	(*DBChat)(nil),                 // 9: DBChat
+	(ChatChannel)(0),               // 10: ChatChannel
 }
 var file_chat_chat_msg_proto_depIdxs = []int32{
-	13, // 0: ChatMessagePush.chat:type_name -> DBChat
-	14, // 1: ChatGetListReq.channel:type_name -> ChatChannel
-	13, // 2: ChatGetListResp.chats:type_name -> DBChat
-	14, // 3: ChatGetCrossListReq.channel:type_name -> ChatChannel
-	13, // 4: ChatGetCrossListResp.chats:type_name -> DBChat
-	14, // 5: ChatSendReq.channel:type_name -> ChatChannel
-	14, // 6: ChatSendCrossReq.channel:type_name -> ChatChannel
-	7,  // [7:7] is the sub-list for method output_type
-	7,  // [7:7] is the sub-list for method input_type
-	7,  // [7:7] is the sub-list for extension type_name
-	7,  // [7:7] is the sub-list for extension extendee
-	0,  // [0:7] is the sub-list for field type_name
+	9,  // 0: ChatMessagePush.chat:type_name -> DBChat
+	10, // 1: ChatGetListReq.channel:type_name -> ChatChannel
+	9,  // 2: ChatGetListResp.chats:type_name -> DBChat
+	10, // 3: ChatSendReq.channel:type_name -> ChatChannel
+	4,  // [4:4] is the sub-list for method output_type
+	4,  // [4:4] is the sub-list for method input_type
+	4,  // [4:4] is the sub-list for extension type_name
+	4,  // [4:4] is the sub-list for extension extendee
+	0,  // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_chat_chat_msg_proto_init() }
@@ -947,30 +676,6 @@ func file_chat_chat_msg_proto_init() {
 			}
 		}
 		file_chat_chat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatGetCrossListReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_chat_chat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatGetCrossListResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_chat_chat_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChatSendReq); i {
 			case 0:
 				return &v.state
@@ -982,7 +687,7 @@ func file_chat_chat_msg_proto_init() {
 				return nil
 			}
 		}
-		file_chat_chat_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_chat_chat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChatSendResp); i {
 			case 0:
 				return &v.state
@@ -994,30 +699,6 @@ func file_chat_chat_msg_proto_init() {
 				return nil
 			}
 		}
-		file_chat_chat_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatSendCrossReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_chat_chat_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatSendCrossResp); 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{
@@ -1025,7 +706,7 @@ func file_chat_chat_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_chat_chat_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   13,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 8002cb667..115d9c365 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -1162,101 +1162,6 @@ func (x *HeroAwakenResp) GetHero() *DBHero {
 	return nil
 }
 
-//抽卡
-type HeroChoukaReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	HeroIds []string `protobuf:"bytes,1,rep,name=heroIds,proto3" json:"heroIds"`
-}
-
-func (x *HeroChoukaReq) Reset() {
-	*x = HeroChoukaReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeroChoukaReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeroChoukaReq) ProtoMessage() {}
-
-func (x *HeroChoukaReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[22]
-	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 HeroChoukaReq.ProtoReflect.Descriptor instead.
-func (*HeroChoukaReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{22}
-}
-
-func (x *HeroChoukaReq) GetHeroIds() []string {
-	if x != nil {
-		return x.HeroIds
-	}
-	return nil
-}
-
-type HeroChoukaResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Heroes []*DBHero `protobuf:"bytes,1,rep,name=heroes,proto3" json:"heroes"`
-}
-
-func (x *HeroChoukaResp) Reset() {
-	*x = HeroChoukaResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeroChoukaResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeroChoukaResp) ProtoMessage() {}
-
-func (x *HeroChoukaResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[23]
-	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 HeroChoukaResp.ProtoReflect.Descriptor instead.
-func (*HeroChoukaResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{23}
-}
-
-func (x *HeroChoukaResp) GetHeroes() []*DBHero {
-	if x != nil {
-		return x.Heroes
-	}
-	return nil
-}
-
 //英雄属性推送
 type HeroPropertyPush struct {
 	state         protoimpl.MessageState
@@ -1271,7 +1176,7 @@ type HeroPropertyPush struct {
 func (x *HeroPropertyPush) Reset() {
 	*x = HeroPropertyPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[24]
+		mi := &file_hero_hero_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1284,7 +1189,7 @@ func (x *HeroPropertyPush) String() string {
 func (*HeroPropertyPush) ProtoMessage() {}
 
 func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[24]
+	mi := &file_hero_hero_msg_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1297,7 +1202,7 @@ func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroPropertyPush.ProtoReflect.Descriptor instead.
 func (*HeroPropertyPush) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{24}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *HeroPropertyPush) GetHeroId() string {
@@ -1333,7 +1238,7 @@ type HeroLockReq struct {
 func (x *HeroLockReq) Reset() {
 	*x = HeroLockReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[25]
+		mi := &file_hero_hero_msg_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1346,7 +1251,7 @@ func (x *HeroLockReq) String() string {
 func (*HeroLockReq) ProtoMessage() {}
 
 func (x *HeroLockReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[25]
+	mi := &file_hero_hero_msg_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1359,7 +1264,7 @@ func (x *HeroLockReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroLockReq.ProtoReflect.Descriptor instead.
 func (*HeroLockReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{25}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *HeroLockReq) GetHeroid() string {
@@ -1381,7 +1286,7 @@ type HeroLockResp struct {
 func (x *HeroLockResp) Reset() {
 	*x = HeroLockResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[26]
+		mi := &file_hero_hero_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1394,7 +1299,7 @@ func (x *HeroLockResp) String() string {
 func (*HeroLockResp) ProtoMessage() {}
 
 func (x *HeroLockResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[26]
+	mi := &file_hero_hero_msg_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1407,7 +1312,7 @@ func (x *HeroLockResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroLockResp.ProtoReflect.Descriptor instead.
 func (*HeroLockResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{26}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *HeroLockResp) GetHero() *DBHero {
@@ -1432,7 +1337,7 @@ type HeroGetSpecifiedReq struct {
 func (x *HeroGetSpecifiedReq) Reset() {
 	*x = HeroGetSpecifiedReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[27]
+		mi := &file_hero_hero_msg_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1445,7 +1350,7 @@ func (x *HeroGetSpecifiedReq) String() string {
 func (*HeroGetSpecifiedReq) ProtoMessage() {}
 
 func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[27]
+	mi := &file_hero_hero_msg_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1458,7 +1363,7 @@ func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroGetSpecifiedReq.ProtoReflect.Descriptor instead.
 func (*HeroGetSpecifiedReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{27}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() string {
@@ -1500,7 +1405,7 @@ type HeroGetSpecifiedResp struct {
 func (x *HeroGetSpecifiedResp) Reset() {
 	*x = HeroGetSpecifiedResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[28]
+		mi := &file_hero_hero_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1513,7 +1418,7 @@ func (x *HeroGetSpecifiedResp) String() string {
 func (*HeroGetSpecifiedResp) ProtoMessage() {}
 
 func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[28]
+	mi := &file_hero_hero_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1526,7 +1431,7 @@ func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroGetSpecifiedResp.ProtoReflect.Descriptor instead.
 func (*HeroGetSpecifiedResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{28}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *HeroGetSpecifiedResp) GetHero() *DBHero {
@@ -1549,7 +1454,7 @@ type HeroDrawCardReq struct {
 func (x *HeroDrawCardReq) Reset() {
 	*x = HeroDrawCardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[29]
+		mi := &file_hero_hero_msg_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1562,7 +1467,7 @@ func (x *HeroDrawCardReq) String() string {
 func (*HeroDrawCardReq) ProtoMessage() {}
 
 func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[29]
+	mi := &file_hero_hero_msg_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1575,7 +1480,7 @@ func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroDrawCardReq.ProtoReflect.Descriptor instead.
 func (*HeroDrawCardReq) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{29}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *HeroDrawCardReq) GetDrawType() int32 {
@@ -1603,7 +1508,7 @@ type HeroDrawCardResp struct {
 func (x *HeroDrawCardResp) Reset() {
 	*x = HeroDrawCardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[30]
+		mi := &file_hero_hero_msg_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1616,7 +1521,7 @@ func (x *HeroDrawCardResp) String() string {
 func (*HeroDrawCardResp) ProtoMessage() {}
 
 func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[30]
+	mi := &file_hero_hero_msg_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1629,7 +1534,7 @@ func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroDrawCardResp.ProtoReflect.Descriptor instead.
 func (*HeroDrawCardResp) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{30}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *HeroDrawCardResp) GetHeroes() []string {
@@ -1651,7 +1556,7 @@ type HeroChangePush struct {
 func (x *HeroChangePush) Reset() {
 	*x = HeroChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_msg_proto_msgTypes[31]
+		mi := &file_hero_hero_msg_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1664,7 +1569,7 @@ func (x *HeroChangePush) String() string {
 func (*HeroChangePush) ProtoMessage() {}
 
 func (x *HeroChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_msg_proto_msgTypes[31]
+	mi := &file_hero_hero_msg_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1677,7 +1582,7 @@ func (x *HeroChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeroChangePush.ProtoReflect.Descriptor instead.
 func (*HeroChangePush) Descriptor() ([]byte, []int) {
-	return file_hero_hero_msg_proto_rawDescGZIP(), []int{31}
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *HeroChangePush) GetList() []*DBHero {
@@ -1785,59 +1690,53 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b,
 	0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68,
-	0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b,
-	0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31,
-	0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65,
-	0x73, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b,
-	0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50,
-	0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x44, 0x0a, 0x0b, 0x61,
-	0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50,
-	0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
-	0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e,
-	0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25,
-	0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
-	0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
-	0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63,
-	0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
+	0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
+	0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x44, 0x0a,
+	0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65,
+	0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12,
+	0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c,
+	0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
+	0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68,
+	0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49,
+	0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a,
+	0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a,
+	0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65,
-	0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72,
-	0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12,
-	0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
-	0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48,
-	0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
-	0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64,
-	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a,
-	0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72,
-	0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c,
-	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65,
-	0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22,
+	0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48,
+	0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a,
+	0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
+	0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1852,7 +1751,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
 	return file_hero_hero_msg_proto_rawDescData
 }
 
-var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
+var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 32)
 var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroInfoReq)(nil),                // 0: HeroInfoReq
 	(*HeroInfoResp)(nil),               // 1: HeroInfoResp
@@ -1876,46 +1775,43 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroResonanceUseEnergyResp)(nil), // 19: HeroResonanceUseEnergyResp
 	(*HeroAwakenReq)(nil),              // 20: HeroAwakenReq
 	(*HeroAwakenResp)(nil),             // 21: HeroAwakenResp
-	(*HeroChoukaReq)(nil),              // 22: HeroChoukaReq
-	(*HeroChoukaResp)(nil),             // 23: HeroChoukaResp
-	(*HeroPropertyPush)(nil),           // 24: HeroPropertyPush
-	(*HeroLockReq)(nil),                // 25: HeroLockReq
-	(*HeroLockResp)(nil),               // 26: HeroLockResp
-	(*HeroGetSpecifiedReq)(nil),        // 27: HeroGetSpecifiedReq
-	(*HeroGetSpecifiedResp)(nil),       // 28: HeroGetSpecifiedResp
-	(*HeroDrawCardReq)(nil),            // 29: HeroDrawCardReq
-	(*HeroDrawCardResp)(nil),           // 30: HeroDrawCardResp
-	(*HeroChangePush)(nil),             // 31: HeroChangePush
-	nil,                                // 32: HeroPropertyPush.PropertyEntry
-	nil,                                // 33: HeroPropertyPush.AddPropertyEntry
-	(*DBHero)(nil),                     // 34: DBHero
+	(*HeroPropertyPush)(nil),           // 22: HeroPropertyPush
+	(*HeroLockReq)(nil),                // 23: HeroLockReq
+	(*HeroLockResp)(nil),               // 24: HeroLockResp
+	(*HeroGetSpecifiedReq)(nil),        // 25: HeroGetSpecifiedReq
+	(*HeroGetSpecifiedResp)(nil),       // 26: HeroGetSpecifiedResp
+	(*HeroDrawCardReq)(nil),            // 27: HeroDrawCardReq
+	(*HeroDrawCardResp)(nil),           // 28: HeroDrawCardResp
+	(*HeroChangePush)(nil),             // 29: HeroChangePush
+	nil,                                // 30: HeroPropertyPush.PropertyEntry
+	nil,                                // 31: HeroPropertyPush.AddPropertyEntry
+	(*DBHero)(nil),                     // 32: DBHero
 }
 var file_hero_hero_msg_proto_depIdxs = []int32{
-	34, // 0: HeroInfoResp.base:type_name -> DBHero
-	34, // 1: HeroListResp.list:type_name -> DBHero
+	32, // 0: HeroInfoResp.base:type_name -> DBHero
+	32, // 1: HeroListResp.list:type_name -> DBHero
 	5,  // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32
-	34, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
+	32, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
 	8,  // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
 	8,  // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
-	34, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
-	34, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
-	34, // 8: HeroResonanceResp.hero:type_name -> DBHero
-	34, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
-	34, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
+	32, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
+	32, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
+	32, // 8: HeroResonanceResp.hero:type_name -> DBHero
+	32, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
+	32, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
 	17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData
-	34, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
-	34, // 13: HeroAwakenResp.hero:type_name -> DBHero
-	34, // 14: HeroChoukaResp.heroes:type_name -> DBHero
-	32, // 15: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
-	33, // 16: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
-	34, // 17: HeroLockResp.hero:type_name -> DBHero
-	34, // 18: HeroGetSpecifiedResp.hero:type_name -> DBHero
-	34, // 19: HeroChangePush.list:type_name -> DBHero
-	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
+	32, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
+	32, // 13: HeroAwakenResp.hero:type_name -> DBHero
+	30, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
+	31, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
+	32, // 16: HeroLockResp.hero:type_name -> DBHero
+	32, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
+	32, // 18: HeroChangePush.list:type_name -> DBHero
+	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
 }
 
 func init() { file_hero_hero_msg_proto_init() }
@@ -2190,30 +2086,6 @@ func file_hero_hero_msg_proto_init() {
 			}
 		}
 		file_hero_hero_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeroChoukaReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeroChoukaResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroPropertyPush); i {
 			case 0:
 				return &v.state
@@ -2225,7 +2097,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroLockReq); i {
 			case 0:
 				return &v.state
@@ -2237,7 +2109,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroLockResp); i {
 			case 0:
 				return &v.state
@@ -2249,7 +2121,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroGetSpecifiedReq); i {
 			case 0:
 				return &v.state
@@ -2261,7 +2133,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroGetSpecifiedResp); i {
 			case 0:
 				return &v.state
@@ -2273,7 +2145,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroDrawCardReq); i {
 			case 0:
 				return &v.state
@@ -2285,7 +2157,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroDrawCardResp); i {
 			case 0:
 				return &v.state
@@ -2297,7 +2169,7 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeroChangePush); i {
 			case 0:
 				return &v.state
@@ -2316,7 +2188,7 @@ func file_hero_hero_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hero_hero_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   34,
+			NumMessages:   32,
 			NumExtensions: 0,
 			NumServices:   0,
 		},