共鸣觉醒百分百属性计算

modules/hero/api_awaken.go

@@ -89,12 +89,14 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 			return
 		}
 	} else { // 加属性
-		property := make(map[string]int32, 0)
+
+		// property := make(map[string]int32, 0)
 		value, err := strconv.Atoi(awakenData.Phasebonus[1])
 		if err == nil {
-			property[awakenData.Phasebonus[0]] += int32(value)
+			this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value))
+			//property[awakenData.Phasebonus[0]] += int32(value)
 		}
-		this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero, property)
+		// this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero, property)
 		_hero.JuexingLv += 1
 		_heroMap := map[string]interface{}{
 			"juexingLv":   _hero.JuexingLv,

modules/hero/api_resonanceReset.go

@@ -60,11 +60,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 	if code != pb.ErrorCode_Success {
 		return
 	}
-	property := make(map[string]int32, 0)
+	_hero.EnergyProperty = nil
-	property[comm.HpPro] -= _hero.AddProperty[comm.HpPro]
-	property[comm.AtkPro] -= _hero.AddProperty[comm.AtkPro]
-	property[comm.DefPro] -= _hero.AddProperty[comm.DefPro]
-	this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero, property)
 	for k := range _hero.Energy { // 清除玩家选择的共鸣属性
 		delete(_hero.Energy, k)
 	}
@@ -73,6 +69,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 		"distributionResonate": _hero.DistributionResonate,
 		"energy":               _hero.Energy,
 		"isOverlying":          false,
+		"energyProperty":       _hero.EnergyProperty,
 	}
 
 	err1 = this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
@@ -82,7 +79,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 		return
 	}
 	// 计算属性
-	this.module.modelHero.setEnergyProperty(_hero)
+	//this.module.modelHero.setEnergyProperty(_hero)
 	//session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}})
 	session.SendMsg(string(this.module.GetType()), ResonanceReset, &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum})
 	return

modules/hero/model_hero.go

@@ -261,6 +261,43 @@ func (this *ModelHero) getHeroList(uid string) []*pb.DBHero {
 	return heroes
 }
 
+// 觉醒
+func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int32) {
+	if hero.JuexProperty == nil {
+		hero.JuexProperty = make(map[string]int32)
+	}
+	JuexingProperty := make(map[string]int32) //副属性
+	switch key {
+	case comm.Hp:
+		hero.JuexProperty[comm.Hp] += value
+	case comm.Def:
+		hero.JuexProperty[comm.Def] += value
+	case comm.Atk:
+		hero.JuexProperty[comm.Atk] += value
+	case comm.Speed:
+		hero.JuexProperty[comm.Speed] += value
+	case comm.ResonanceHpPro:
+		hero.JuexProperty[comm.Hp] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Hp])))
+	case comm.ResonanceAtkPro:
+		hero.JuexProperty[comm.Atk] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Atk])))
+	case comm.ResonanceDefPro:
+		hero.JuexProperty[comm.Def] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Def])))
+	}
+	for k, v := range hero.JuexProperty {
+		JuexingProperty[k] = v
+	}
+	this.mergeJuexingProperty(hero.Uid, hero, JuexingProperty)
+}
+func (this *ModelHero) mergeJuexingProperty(uid string, hero *pb.DBHero, data map[string]int32) {
+	hero.EnergyProperty = data
+
+	if err := this.ChangeList(uid, hero.Id, map[string]interface{}{
+		"juexProperty": data,
+	}); err != nil {
+		this.moduleHero.Errorf("mergeAddProperty err %v", err)
+	}
+}
+
 // 设置共鸣能量点数属性
 func (this *ModelHero) setEnergyProperty(hero *pb.DBHero) {
 	resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, hero.Star)

pb/chat_db.pb.go

@@ -81,8 +81,9 @@ type ChatType int32
 const (
 	ChatType_Text           ChatType = 0 //文泵聊天消息
 	ChatType_Moonfantasy    ChatType = 1 //月子秘境消息
-	ChatType_HeroShare      ChatType = 2 //英雄分享
+	ChatType_Share          ChatType = 2 //分享类型
-	ChatType_EquipmentShare ChatType = 3 //装备分享
+	ChatType_HeroShare      ChatType = 3 //英雄分享
+	ChatType_EquipmentShare ChatType = 4 //装备分享
 )
 
 // Enum value maps for ChatType.
@@ -90,14 +91,16 @@ var (
 	ChatType_name = map[int32]string{
 		0: "Text",
 		1: "Moonfantasy",
-		2: "HeroShare",
+		2: "Share",
-		3: "EquipmentShare",
+		3: "HeroShare",
+		4: "EquipmentShare",
 	}
 	ChatType_value = map[string]int32{
 		"Text":           0,
 		"Moonfantasy":    1,
-		"HeroShare":      2,
+		"Share":          2,
-		"EquipmentShare": 3,
+		"HeroShare":      3,
+		"EquipmentShare": 4,
 	}
 )
 
@@ -149,6 +152,7 @@ type DBChat struct {
 	AppendInt   int64       `protobuf:"varint,14,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"`    //聊天附加数据
 	AppendStr   string      `protobuf:"bytes,15,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"`     //聊天附加数据
 	AppendBool  string      `protobuf:"bytes,16,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"`  //聊天附加数据
+	AppendBytes []byte      `protobuf:"bytes,17,opt,name=appendBytes,proto3" json:"appendBytes" bson:"appendInt"` //聊天附加数据
 }
 
 func (x *DBChat) Reset() {
@@ -295,11 +299,18 @@ func (x *DBChat) GetAppendBool() string {
 	return ""
 }
 
+func (x *DBChat) GetAppendBytes() []byte {
+	if x != nil {
+		return x.AppendBytes
+	}
+	return nil
+}
+
 var File_chat_chat_db_proto protoreflect.FileDescriptor
 
 var file_chat_chat_db_proto_rawDesc = []byte{
 	0x0a, 0x12, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa1, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x43, 0x68, 0x61, 0x74, 0x12,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x43, 0x68, 0x61, 0x74, 0x12,
 	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
 	0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
 	0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07,
@@ -325,18 +336,20 @@ var file_chat_chat_db_proto_rawDesc = []byte{
 	0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61,
 	0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65,
 	0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70,
-	0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x2a, 0x4d, 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74,
+	0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65,
-	0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x57, 0x6f, 0x72, 0x6c, 0x64,
+	0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61,
-	0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x0b, 0x0a,
+	0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x2a, 0x4d, 0x0a, 0x0b, 0x43, 0x68,
-	0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x72,
+	0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x57, 0x6f, 0x72,
-	0x6f, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x53,
+	0x6c, 0x64, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12,
-	0x79, 0x73, 0x74, 0x65, 0x6d, 0x10, 0x04, 0x2a, 0x48, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x54,
+	0x0b, 0x0a, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b,
-	0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x65, 0x78, 0x74, 0x10, 0x00, 0x12, 0x0f, 0x0a,
+	0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x03, 0x12, 0x0a, 0x0a,
-	0x0b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01, 0x12, 0x0d,
+	0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x10, 0x04, 0x2a, 0x53, 0x0a, 0x08, 0x43, 0x68, 0x61,
-	0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x12, 0x0a,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x65, 0x78, 0x74, 0x10, 0x00, 0x12,
-	0x0e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10,
+	0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01,
-	0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x09, 0x0a, 0x05, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x48,
-	0x33,
+	0x65, 0x72, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x45, 0x71,
+	0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x04, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/chat_msg.pb.go

@@ -478,7 +478,12 @@ type ChatSendReq struct {
 	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"`                   //内容
+	Ctype       ChatType    `protobuf:"varint,6,opt,name=ctype,proto3,enum=ChatType" json:"ctype"`                //消息类型
+	Content     string      `protobuf:"bytes,7,opt,name=content,proto3" json:"content"`                           //内容
+	AppendInt   int64       `protobuf:"varint,8,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"`     //聊天附加数据
+	AppendStr   string      `protobuf:"bytes,9,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"`      //聊天附加数据
+	AppendBool  string      `protobuf:"bytes,10,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"`  //聊天附加数据
+	AppendBytes []byte      `protobuf:"bytes,11,opt,name=appendBytes,proto3" json:"appendBytes" bson:"appendInt"` //聊天附加数据
 }
 
 func (x *ChatSendReq) Reset() {
@@ -548,6 +553,13 @@ func (x *ChatSendReq) GetTargetId() string {
 	return ""
 }
 
+func (x *ChatSendReq) GetCtype() ChatType {
+	if x != nil {
+		return x.Ctype
+	}
+	return ChatType_Text
+}
+
 func (x *ChatSendReq) GetContent() string {
 	if x != nil {
 		return x.Content
@@ -555,6 +567,34 @@ func (x *ChatSendReq) GetContent() string {
 	return ""
 }
 
+func (x *ChatSendReq) GetAppendInt() int64 {
+	if x != nil {
+		return x.AppendInt
+	}
+	return 0
+}
+
+func (x *ChatSendReq) GetAppendStr() string {
+	if x != nil {
+		return x.AppendStr
+	}
+	return ""
+}
+
+func (x *ChatSendReq) GetAppendBool() string {
+	if x != nil {
+		return x.AppendBool
+	}
+	return ""
+}
+
+func (x *ChatSendReq) GetAppendBytes() []byte {
+	if x != nil {
+		return x.AppendBytes
+	}
+	return nil
+}
+
 //消息发送请求 回应
 type ChatSendResp struct {
 	state         protoimpl.MessageState
@@ -614,7 +654,12 @@ type ChatSendCrossReq struct {
 	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"`                   //内容
+	Ctype       ChatType    `protobuf:"varint,6,opt,name=ctype,proto3,enum=ChatType" json:"ctype"`                //消息类型
+	Content     string      `protobuf:"bytes,7,opt,name=content,proto3" json:"content"`                           //内容
+	AppendInt   int64       `protobuf:"varint,8,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"`     //聊天附加数据
+	AppendStr   string      `protobuf:"bytes,9,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"`      //聊天附加数据
+	AppendBool  string      `protobuf:"bytes,10,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"`  //聊天附加数据
+	AppendBytes []byte      `protobuf:"bytes,11,opt,name=appendBytes,proto3" json:"appendBytes" bson:"appendInt"` //聊天附加数据
 }
 
 func (x *ChatSendCrossReq) Reset() {
@@ -684,6 +729,13 @@ func (x *ChatSendCrossReq) GetTargetId() string {
 	return ""
 }
 
+func (x *ChatSendCrossReq) GetCtype() ChatType {
+	if x != nil {
+		return x.Ctype
+	}
+	return ChatType_Text
+}
+
 func (x *ChatSendCrossReq) GetContent() string {
 	if x != nil {
 		return x.Content
@@ -691,6 +743,34 @@ func (x *ChatSendCrossReq) GetContent() string {
 	return ""
 }
 
+func (x *ChatSendCrossReq) GetAppendInt() int64 {
+	if x != nil {
+		return x.AppendInt
+	}
+	return 0
+}
+
+func (x *ChatSendCrossReq) GetAppendStr() string {
+	if x != nil {
+		return x.AppendStr
+	}
+	return ""
+}
+
+func (x *ChatSendCrossReq) GetAppendBool() string {
+	if x != nil {
+		return x.AppendBool
+	}
+	return ""
+}
+
+func (x *ChatSendCrossReq) GetAppendBytes() []byte {
+	if x != nil {
+		return x.AppendBytes
+	}
+	return nil
+}
+
 //跨服消息发送请求 回应
 type ChatSendCrossResp struct {
 	state         protoimpl.MessageState
@@ -778,7 +858,7 @@ var file_chat_chat_msg_proto_rawDesc = []byte{
 	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, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xca, 0x02, 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,
@@ -788,26 +868,45 @@ var file_chat_chat_msg_proto_rawDesc = []byte{
 	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,
+	0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09,
-	0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61,
+	0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65,
-	0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
+	0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70,
-	0x63, 0x22, 0xb0, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72,
+	0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61,
-	0x6f, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
+	0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14,
+	0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70,
-	0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75,
+	0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65,
-	0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65,
+	0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68,
+	0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70,
-	0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a,
+	0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74,
-	0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f,
+	0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e,
+	0x22, 0xcf, 0x02, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, 0x6f,
-	0x74, 0x65, 0x6e, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64,
+	0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18,
-	0x43, 0x72, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a,
-	0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, 0x6e,
-	0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x33,
+	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, 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e,
+	0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49,
+	0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72,
+	0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c,
+	0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74,
+	0x65, 0x73, 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,
 }
 
 var (
@@ -839,6 +938,7 @@ var file_chat_chat_msg_proto_goTypes = []interface{}{
 	(*ChatSendCrossResp)(nil),      // 12: ChatSendCrossResp
 	(*DBChat)(nil),                 // 13: DBChat
 	(ChatChannel)(0),               // 14: ChatChannel
+	(ChatType)(0),                  // 15: ChatType
 }
 var file_chat_chat_msg_proto_depIdxs = []int32{
 	13, // 0: ChatMessagePush.chat:type_name -> DBChat
@@ -847,12 +947,14 @@ var file_chat_chat_msg_proto_depIdxs = []int32{
 	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
+	15, // 6: ChatSendReq.ctype:type_name -> ChatType
-	7,  // [7:7] is the sub-list for method output_type
+	14, // 7: ChatSendCrossReq.channel:type_name -> ChatChannel
-	7,  // [7:7] is the sub-list for method input_type
+	15, // 8: ChatSendCrossReq.ctype:type_name -> ChatType
-	7,  // [7:7] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for method output_type
-	7,  // [7:7] is the sub-list for extension extendee
+	9,  // [9:9] is the sub-list for method input_type
-	0,  // [0:7] is the sub-list for field type_name
+	9,  // [9:9] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_chat_chat_msg_proto_init() }