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,
 		},
diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go
index 1c01551cf..eceee096f 100644
--- a/pb/user_msg.pb.go
+++ b/pb/user_msg.pb.go
@@ -563,101 +563,6 @@ func (x *UserCreateResp) GetIsSucc() bool {
 	return false
 }
 
-//添加用户资源
-type UserAddResReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Res *UserAssets `protobuf:"bytes,1,opt,name=res,proto3" json:"res"` //资源类型
-}
-
-func (x *UserAddResReq) Reset() {
-	*x = UserAddResReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UserAddResReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UserAddResReq) ProtoMessage() {}
-
-func (x *UserAddResReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_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 UserAddResReq.ProtoReflect.Descriptor instead.
-func (*UserAddResReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *UserAddResReq) GetRes() *UserAssets {
-	if x != nil {
-		return x.Res
-	}
-	return nil
-}
-
-type UserAddResResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Res *UserAssets `protobuf:"bytes,1,opt,name=res,proto3" json:"res"` //资源类型
-}
-
-func (x *UserAddResResp) Reset() {
-	*x = UserAddResResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UserAddResResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UserAddResResp) ProtoMessage() {}
-
-func (x *UserAddResResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_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 UserAddResResp.ProtoReflect.Descriptor instead.
-func (*UserAddResResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *UserAddResResp) GetRes() *UserAssets {
-	if x != nil {
-		return x.Res
-	}
-	return nil
-}
-
 // 玩家资源变更推送
 type UserResChangePush struct {
 	state         protoimpl.MessageState
@@ -675,7 +580,7 @@ type UserResChangePush struct {
 func (x *UserResChangePush) Reset() {
 	*x = UserResChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[13]
+		mi := &file_user_user_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -688,7 +593,7 @@ func (x *UserResChangePush) String() string {
 func (*UserResChangePush) ProtoMessage() {}
 
 func (x *UserResChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[13]
+	mi := &file_user_user_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -701,7 +606,7 @@ func (x *UserResChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserResChangePush.ProtoReflect.Descriptor instead.
 func (*UserResChangePush) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{13}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *UserResChangePush) GetGold() int32 {
@@ -756,7 +661,7 @@ type UserGetSettingReq struct {
 func (x *UserGetSettingReq) Reset() {
 	*x = UserGetSettingReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[14]
+		mi := &file_user_user_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -769,7 +674,7 @@ func (x *UserGetSettingReq) String() string {
 func (*UserGetSettingReq) ProtoMessage() {}
 
 func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[14]
+	mi := &file_user_user_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -782,7 +687,7 @@ func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetSettingReq.ProtoReflect.Descriptor instead.
 func (*UserGetSettingReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{14}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{12}
 }
 
 type UserGetSettingResp struct {
@@ -796,7 +701,7 @@ type UserGetSettingResp struct {
 func (x *UserGetSettingResp) Reset() {
 	*x = UserGetSettingResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[15]
+		mi := &file_user_user_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -809,7 +714,7 @@ func (x *UserGetSettingResp) String() string {
 func (*UserGetSettingResp) ProtoMessage() {}
 
 func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[15]
+	mi := &file_user_user_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -822,7 +727,7 @@ func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetSettingResp.ProtoReflect.Descriptor instead.
 func (*UserGetSettingResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{15}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *UserGetSettingResp) GetSetting() *DBUserSetting {
@@ -844,7 +749,7 @@ type UserUpdateSettingReq struct {
 func (x *UserUpdateSettingReq) Reset() {
 	*x = UserUpdateSettingReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[16]
+		mi := &file_user_user_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -857,7 +762,7 @@ func (x *UserUpdateSettingReq) String() string {
 func (*UserUpdateSettingReq) ProtoMessage() {}
 
 func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[16]
+	mi := &file_user_user_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -870,7 +775,7 @@ func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserUpdateSettingReq.ProtoReflect.Descriptor instead.
 func (*UserUpdateSettingReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{16}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *UserUpdateSettingReq) GetSetting() *DBUserSetting {
@@ -891,7 +796,7 @@ type UserUpdateSettingResp struct {
 func (x *UserUpdateSettingResp) Reset() {
 	*x = UserUpdateSettingResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[17]
+		mi := &file_user_user_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -904,7 +809,7 @@ func (x *UserUpdateSettingResp) String() string {
 func (*UserUpdateSettingResp) ProtoMessage() {}
 
 func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[17]
+	mi := &file_user_user_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -917,7 +822,7 @@ func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserUpdateSettingResp.ProtoReflect.Descriptor instead.
 func (*UserUpdateSettingResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{17}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *UserUpdateSettingResp) GetUid() string {
@@ -937,7 +842,7 @@ type UserVeriCodeReq struct {
 func (x *UserVeriCodeReq) Reset() {
 	*x = UserVeriCodeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[18]
+		mi := &file_user_user_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -950,7 +855,7 @@ func (x *UserVeriCodeReq) String() string {
 func (*UserVeriCodeReq) ProtoMessage() {}
 
 func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[18]
+	mi := &file_user_user_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -963,7 +868,7 @@ func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserVeriCodeReq.ProtoReflect.Descriptor instead.
 func (*UserVeriCodeReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{18}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{16}
 }
 
 type UserVeriCodeResp struct {
@@ -977,7 +882,7 @@ type UserVeriCodeResp struct {
 func (x *UserVeriCodeResp) Reset() {
 	*x = UserVeriCodeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[19]
+		mi := &file_user_user_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -990,7 +895,7 @@ func (x *UserVeriCodeResp) String() string {
 func (*UserVeriCodeResp) ProtoMessage() {}
 
 func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[19]
+	mi := &file_user_user_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1003,7 +908,7 @@ func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserVeriCodeResp.ProtoReflect.Descriptor instead.
 func (*UserVeriCodeResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{19}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *UserVeriCodeResp) GetCode() int32 {
@@ -1025,7 +930,7 @@ type UserInitdataReq struct {
 func (x *UserInitdataReq) Reset() {
 	*x = UserInitdataReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[20]
+		mi := &file_user_user_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1038,7 +943,7 @@ func (x *UserInitdataReq) String() string {
 func (*UserInitdataReq) ProtoMessage() {}
 
 func (x *UserInitdataReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[20]
+	mi := &file_user_user_msg_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1051,7 +956,7 @@ func (x *UserInitdataReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserInitdataReq.ProtoReflect.Descriptor instead.
 func (*UserInitdataReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{20}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *UserInitdataReq) GetCode() int32 {
@@ -1072,7 +977,7 @@ type UserInitdataResp struct {
 func (x *UserInitdataResp) Reset() {
 	*x = UserInitdataResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[21]
+		mi := &file_user_user_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1085,7 +990,7 @@ func (x *UserInitdataResp) String() string {
 func (*UserInitdataResp) ProtoMessage() {}
 
 func (x *UserInitdataResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[21]
+	mi := &file_user_user_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1098,7 +1003,7 @@ func (x *UserInitdataResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserInitdataResp.ProtoReflect.Descriptor instead.
 func (*UserInitdataResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{21}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *UserInitdataResp) GetUid() string {
@@ -1120,7 +1025,7 @@ type UserModifynameReq struct {
 func (x *UserModifynameReq) Reset() {
 	*x = UserModifynameReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[22]
+		mi := &file_user_user_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1133,7 +1038,7 @@ func (x *UserModifynameReq) String() string {
 func (*UserModifynameReq) ProtoMessage() {}
 
 func (x *UserModifynameReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[22]
+	mi := &file_user_user_msg_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1146,7 +1051,7 @@ func (x *UserModifynameReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifynameReq.ProtoReflect.Descriptor instead.
 func (*UserModifynameReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{22}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *UserModifynameReq) GetName() string {
@@ -1169,7 +1074,7 @@ type UserModifynameResp struct {
 func (x *UserModifynameResp) Reset() {
 	*x = UserModifynameResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[23]
+		mi := &file_user_user_msg_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1182,7 +1087,7 @@ func (x *UserModifynameResp) String() string {
 func (*UserModifynameResp) ProtoMessage() {}
 
 func (x *UserModifynameResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[23]
+	mi := &file_user_user_msg_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1195,7 +1100,7 @@ func (x *UserModifynameResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifynameResp.ProtoReflect.Descriptor instead.
 func (*UserModifynameResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{23}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *UserModifynameResp) GetUid() string {
@@ -1229,7 +1134,7 @@ type UserGetTujianReq struct {
 func (x *UserGetTujianReq) Reset() {
 	*x = UserGetTujianReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[24]
+		mi := &file_user_user_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1242,7 +1147,7 @@ func (x *UserGetTujianReq) String() string {
 func (*UserGetTujianReq) ProtoMessage() {}
 
 func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[24]
+	mi := &file_user_user_msg_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1255,7 +1160,7 @@ func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetTujianReq.ProtoReflect.Descriptor instead.
 func (*UserGetTujianReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{24}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{22}
 }
 
 type UserGetTujianResp struct {
@@ -1269,7 +1174,7 @@ type UserGetTujianResp struct {
 func (x *UserGetTujianResp) Reset() {
 	*x = UserGetTujianResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[25]
+		mi := &file_user_user_msg_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1282,7 +1187,7 @@ func (x *UserGetTujianResp) String() string {
 func (*UserGetTujianResp) ProtoMessage() {}
 
 func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[25]
+	mi := &file_user_user_msg_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1295,7 +1200,7 @@ func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetTujianResp.ProtoReflect.Descriptor instead.
 func (*UserGetTujianResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{25}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *UserGetTujianResp) GetHeroids() []string {
@@ -1319,7 +1224,7 @@ type UserChangedPush struct {
 func (x *UserChangedPush) Reset() {
 	*x = UserChangedPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[26]
+		mi := &file_user_user_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1332,7 +1237,7 @@ func (x *UserChangedPush) String() string {
 func (*UserChangedPush) ProtoMessage() {}
 
 func (x *UserChangedPush) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[26]
+	mi := &file_user_user_msg_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1345,7 +1250,7 @@ func (x *UserChangedPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserChangedPush.ProtoReflect.Descriptor instead.
 func (*UserChangedPush) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{26}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *UserChangedPush) GetUid() string {
@@ -1387,7 +1292,7 @@ type UserFigureReq struct {
 func (x *UserFigureReq) Reset() {
 	*x = UserFigureReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[27]
+		mi := &file_user_user_msg_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1400,7 +1305,7 @@ func (x *UserFigureReq) String() string {
 func (*UserFigureReq) ProtoMessage() {}
 
 func (x *UserFigureReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[27]
+	mi := &file_user_user_msg_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1413,7 +1318,7 @@ func (x *UserFigureReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserFigureReq.ProtoReflect.Descriptor instead.
 func (*UserFigureReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{27}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *UserFigureReq) GetPreinstall() int32 {
@@ -1478,7 +1383,7 @@ type UserFigureResp struct {
 func (x *UserFigureResp) Reset() {
 	*x = UserFigureResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[28]
+		mi := &file_user_user_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1491,7 +1396,7 @@ func (x *UserFigureResp) String() string {
 func (*UserFigureResp) ProtoMessage() {}
 
 func (x *UserFigureResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[28]
+	mi := &file_user_user_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1504,7 +1409,7 @@ func (x *UserFigureResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserFigureResp.ProtoReflect.Descriptor instead.
 func (*UserFigureResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{28}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *UserFigureResp) GetUid() string {
@@ -1540,7 +1445,7 @@ type UserModifysignReq struct {
 func (x *UserModifysignReq) Reset() {
 	*x = UserModifysignReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[29]
+		mi := &file_user_user_msg_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1553,7 +1458,7 @@ func (x *UserModifysignReq) String() string {
 func (*UserModifysignReq) ProtoMessage() {}
 
 func (x *UserModifysignReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[29]
+	mi := &file_user_user_msg_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1566,7 +1471,7 @@ func (x *UserModifysignReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifysignReq.ProtoReflect.Descriptor instead.
 func (*UserModifysignReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{29}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *UserModifysignReq) GetSign() string {
@@ -1587,7 +1492,7 @@ type UserModifysignResp struct {
 func (x *UserModifysignResp) Reset() {
 	*x = UserModifysignResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[30]
+		mi := &file_user_user_msg_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1600,7 +1505,7 @@ func (x *UserModifysignResp) String() string {
 func (*UserModifysignResp) ProtoMessage() {}
 
 func (x *UserModifysignResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[30]
+	mi := &file_user_user_msg_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1613,7 +1518,7 @@ func (x *UserModifysignResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifysignResp.ProtoReflect.Descriptor instead.
 func (*UserModifysignResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{30}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *UserModifysignResp) GetUid() string {
@@ -1629,28 +1534,9 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x0a, 0x13, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65,
-	0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61,
-	0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72,
-	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
-	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65,
-	0x78, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, 0x0d, 0x0a, 0x0b, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4a, 0x0a, 0x0c, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
-	0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61,
-	0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f,
-	0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4c,
-	0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65,
-	0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
+	0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x75, 0x73, 0x65, 0x72,
+	0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c,
+	0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
 	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61,
 	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
@@ -1772,7 +1658,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte {
 	return file_user_user_msg_proto_rawDescData
 }
 
-var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
+var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
 var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserLoginReq)(nil),          // 0: UserLoginReq
 	(*UserLoginResp)(nil),         // 1: UserLoginResp
@@ -1785,61 +1671,56 @@ var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserLoadResp)(nil),          // 8: UserLoadResp
 	(*UserCreateReq)(nil),         // 9: UserCreateReq
 	(*UserCreateResp)(nil),        // 10: UserCreateResp
-	(*UserAddResReq)(nil),         // 11: UserAddResReq
-	(*UserAddResResp)(nil),        // 12: UserAddResResp
-	(*UserResChangePush)(nil),     // 13: UserResChangePush
-	(*UserGetSettingReq)(nil),     // 14: UserGetSettingReq
-	(*UserGetSettingResp)(nil),    // 15: UserGetSettingResp
-	(*UserUpdateSettingReq)(nil),  // 16: UserUpdateSettingReq
-	(*UserUpdateSettingResp)(nil), // 17: UserUpdateSettingResp
-	(*UserVeriCodeReq)(nil),       // 18: UserVeriCodeReq
-	(*UserVeriCodeResp)(nil),      // 19: UserVeriCodeResp
-	(*UserInitdataReq)(nil),       // 20: UserInitdataReq
-	(*UserInitdataResp)(nil),      // 21: UserInitdataResp
-	(*UserModifynameReq)(nil),     // 22: UserModifynameReq
-	(*UserModifynameResp)(nil),    // 23: UserModifynameResp
-	(*UserGetTujianReq)(nil),      // 24: UserGetTujianReq
-	(*UserGetTujianResp)(nil),     // 25: UserGetTujianResp
-	(*UserChangedPush)(nil),       // 26: UserChangedPush
-	(*UserFigureReq)(nil),         // 27: UserFigureReq
-	(*UserFigureResp)(nil),        // 28: UserFigureResp
-	(*UserModifysignReq)(nil),     // 29: UserModifysignReq
-	(*UserModifysignResp)(nil),    // 30: UserModifysignResp
-	(*DBUser)(nil),                // 31: DBUser
-	(*DBUserExpand)(nil),          // 32: DBUserExpand
-	(ErrorCode)(0),                // 33: ErrorCode
-	(*CacheUser)(nil),             // 34: CacheUser
-	(*UserAssets)(nil),            // 35: UserAssets
-	(*DBUserSetting)(nil),         // 36: DBUserSetting
-	(*Hair)(nil),                  // 37: Hair
-	(*Eyes)(nil),                  // 38: Eyes
-	(*Mouth)(nil),                 // 39: Mouth
-	(*Body)(nil),                  // 40: Body
-	(*Complexion)(nil),            // 41: Complexion
-	(*Figure)(nil),                // 42: Figure
+	(*UserResChangePush)(nil),     // 11: UserResChangePush
+	(*UserGetSettingReq)(nil),     // 12: UserGetSettingReq
+	(*UserGetSettingResp)(nil),    // 13: UserGetSettingResp
+	(*UserUpdateSettingReq)(nil),  // 14: UserUpdateSettingReq
+	(*UserUpdateSettingResp)(nil), // 15: UserUpdateSettingResp
+	(*UserVeriCodeReq)(nil),       // 16: UserVeriCodeReq
+	(*UserVeriCodeResp)(nil),      // 17: UserVeriCodeResp
+	(*UserInitdataReq)(nil),       // 18: UserInitdataReq
+	(*UserInitdataResp)(nil),      // 19: UserInitdataResp
+	(*UserModifynameReq)(nil),     // 20: UserModifynameReq
+	(*UserModifynameResp)(nil),    // 21: UserModifynameResp
+	(*UserGetTujianReq)(nil),      // 22: UserGetTujianReq
+	(*UserGetTujianResp)(nil),     // 23: UserGetTujianResp
+	(*UserChangedPush)(nil),       // 24: UserChangedPush
+	(*UserFigureReq)(nil),         // 25: UserFigureReq
+	(*UserFigureResp)(nil),        // 26: UserFigureResp
+	(*UserModifysignReq)(nil),     // 27: UserModifysignReq
+	(*UserModifysignResp)(nil),    // 28: UserModifysignResp
+	(*DBUser)(nil),                // 29: DBUser
+	(*DBUserExpand)(nil),          // 30: DBUserExpand
+	(ErrorCode)(0),                // 31: ErrorCode
+	(*CacheUser)(nil),             // 32: CacheUser
+	(*DBUserSetting)(nil),         // 33: DBUserSetting
+	(*Hair)(nil),                  // 34: Hair
+	(*Eyes)(nil),                  // 35: Eyes
+	(*Mouth)(nil),                 // 36: Mouth
+	(*Body)(nil),                  // 37: Body
+	(*Complexion)(nil),            // 38: Complexion
+	(*Figure)(nil),                // 39: Figure
 }
 var file_user_user_msg_proto_depIdxs = []int32{
-	31, // 0: UserLoginResp.data:type_name -> DBUser
-	32, // 1: UserLoginResp.ex:type_name -> DBUserExpand
-	31, // 2: UserInfoResp.data:type_name -> DBUser
-	32, // 3: UserInfoResp.ex:type_name -> DBUserExpand
-	33, // 4: UserRegisterResp.Code:type_name -> ErrorCode
-	34, // 5: UserLoadResp.data:type_name -> CacheUser
-	35, // 6: UserAddResReq.res:type_name -> UserAssets
-	35, // 7: UserAddResResp.res:type_name -> UserAssets
-	36, // 8: UserGetSettingResp.setting:type_name -> DBUserSetting
-	36, // 9: UserUpdateSettingReq.setting:type_name -> DBUserSetting
-	37, // 10: UserFigureReq.hair:type_name -> Hair
-	38, // 11: UserFigureReq.eyes:type_name -> Eyes
-	39, // 12: UserFigureReq.mouth:type_name -> Mouth
-	40, // 13: UserFigureReq.body:type_name -> Body
-	41, // 14: UserFigureReq.complexion:type_name -> Complexion
-	42, // 15: UserFigureResp.figure:type_name -> Figure
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
+	29, // 0: UserLoginResp.data:type_name -> DBUser
+	30, // 1: UserLoginResp.ex:type_name -> DBUserExpand
+	29, // 2: UserInfoResp.data:type_name -> DBUser
+	30, // 3: UserInfoResp.ex:type_name -> DBUserExpand
+	31, // 4: UserRegisterResp.Code:type_name -> ErrorCode
+	32, // 5: UserLoadResp.data:type_name -> CacheUser
+	33, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
+	33, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
+	34, // 8: UserFigureReq.hair:type_name -> Hair
+	35, // 9: UserFigureReq.eyes:type_name -> Eyes
+	36, // 10: UserFigureReq.mouth:type_name -> Mouth
+	37, // 11: UserFigureReq.body:type_name -> Body
+	38, // 12: UserFigureReq.complexion:type_name -> Complexion
+	39, // 13: UserFigureResp.figure:type_name -> Figure
+	14, // [14:14] is the sub-list for method output_type
+	14, // [14:14] is the sub-list for method input_type
+	14, // [14:14] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for extension extendee
+	0,  // [0:14] is the sub-list for field type_name
 }
 
 func init() { file_user_user_msg_proto_init() }
@@ -1849,7 +1730,6 @@ func file_user_user_msg_proto_init() {
 	}
 	file_errorcode_proto_init()
 	file_user_user_db_proto_init()
-	file_comm_proto_init()
 	file_userexpand_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_user_user_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
@@ -1985,30 +1865,6 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserAddResReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_user_user_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserAddResResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_user_user_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserResChangePush); i {
 			case 0:
 				return &v.state
@@ -2020,7 +1876,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserGetSettingReq); i {
 			case 0:
 				return &v.state
@@ -2032,7 +1888,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserGetSettingResp); i {
 			case 0:
 				return &v.state
@@ -2044,7 +1900,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserUpdateSettingReq); i {
 			case 0:
 				return &v.state
@@ -2056,7 +1912,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserUpdateSettingResp); i {
 			case 0:
 				return &v.state
@@ -2068,7 +1924,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserVeriCodeReq); i {
 			case 0:
 				return &v.state
@@ -2080,7 +1936,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserVeriCodeResp); i {
 			case 0:
 				return &v.state
@@ -2092,7 +1948,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserInitdataReq); i {
 			case 0:
 				return &v.state
@@ -2104,7 +1960,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserInitdataResp); i {
 			case 0:
 				return &v.state
@@ -2116,7 +1972,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserModifynameReq); i {
 			case 0:
 				return &v.state
@@ -2128,7 +1984,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserModifynameResp); i {
 			case 0:
 				return &v.state
@@ -2140,7 +1996,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserGetTujianReq); i {
 			case 0:
 				return &v.state
@@ -2152,7 +2008,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserGetTujianResp); i {
 			case 0:
 				return &v.state
@@ -2164,7 +2020,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserChangedPush); i {
 			case 0:
 				return &v.state
@@ -2176,7 +2032,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserFigureReq); i {
 			case 0:
 				return &v.state
@@ -2188,7 +2044,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserFigureResp); i {
 			case 0:
 				return &v.state
@@ -2200,7 +2056,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserModifysignReq); i {
 			case 0:
 				return &v.state
@@ -2212,7 +2068,7 @@ func file_user_user_msg_proto_init() {
 				return nil
 			}
 		}
-		file_user_user_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_user_user_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserModifysignResp); i {
 			case 0:
 				return &v.state
@@ -2231,7 +2087,7 @@ func file_user_user_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_user_user_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   31,
+			NumMessages:   29,
 			NumExtensions: 0,
 			NumServices:   0,
 		},