diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index 93bf1b3ca..ee5bf526a 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -26,6 +26,8 @@ const (
 
 	game_item = "game_item.json"
 	game_vip  = "game_vip.json"
+
+	game_equip = "game_equip.json" //装备信息表
 )
 
 ///配置管理基础组件
@@ -46,6 +48,7 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
 	err = this.LoadConfigure(game_playerlv, cfg.NewGamePlayerlv)
 	err = this.LoadConfigure(game_facemod, cfg.NewGameFacemod)
 	err = this.LoadConfigure(game_signreset, cfg.NewGameSignReset)
+	err = this.LoadConfigure(game_equip, cfg.NewGameEquip)
 	//err = this.LoadConfigure(game_sign, cfg.NewGameSign)
 	err = this.LoadConfigure(game_item, cfg.NewGameItem)
 	err = this.LoadConfigure(game_vip, cfg.NewGameVip)
@@ -343,3 +346,11 @@ func (this *MCompConfigure) GetItemConfigureByType(useType int32) (item []*cfg.G
 	}
 	return
 }
+func (this *MCompConfigure) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameEquipData) {
+
+	if v, err := this.GetConfigure(game_equip); err == nil {
+		configure = v.(*cfg.GameEquip).Get(equipmentId)
+		return
+	}
+	return
+}
diff --git a/modules/viking/api.go b/modules/viking/api.go
index 58c34b2f7..ab6c10711 100644
--- a/modules/viking/api.go
+++ b/modules/viking/api.go
@@ -23,6 +23,7 @@ type apiComp struct {
 	module    *Viking
 	friend    comm.IFriend
 	chat      comm.IChat
+	equip     comm.IEquipment
 }
 
 //组件初始化接口
@@ -46,5 +47,10 @@ func (this *apiComp) Start() (err error) {
 		return
 	}
 	this.chat = module.(comm.IChat)
+
+	if module, err = this.service.GetModule(comm.ModuleEquipment); err != nil {
+		return
+	}
+	this.equip = module.(comm.IEquipment)
 	return
 }
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 9827d8de2..d9661ae5f 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -24,12 +24,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	var (
 		mapData map[string]interface{}
 		reward  []*cfg.Gameatn
-		asset   []*pb.UserAssets
-		bWin    bool // 战斗是否胜利
+		bWin    bool           // 战斗是否胜利
+		atno    []*pb.UserAtno // atno 类型
+		del     []string       // 自动出售的装备
 	)
 	mapData = make(map[string]interface{}, 0)
 	reward = make([]*cfg.Gameatn, 0)
-	asset = make([]*pb.UserAssets, 0)
 	code = this.ChallengeOverCheck(session, req)
 	if code != pb.ErrorCode_Success {
 		return // 参数校验失败直接返回
@@ -96,34 +96,34 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 		if code = this.module.DispenseRes(session, vikingCfg.Firstprize, true); code != pb.ErrorCode_Success {
 			return
 		}
-		for _, v := range vikingCfg.Firstprize {
-			asset = append(asset, &pb.UserAssets{
-				A: v.A,
-				T: v.T,
-				N: v.N,
-			})
-		}
 	}
 
 	this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, viking, req.Report)
 	reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励
-	if code = this.module.DispenseRes(session, reward, true); code != pb.ErrorCode_Success {
+	if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success {
 		return
 	}
-	for _, v := range reward {
-		asset = append(asset, &pb.UserAssets{
-			A: v.A,
-			T: v.T,
-			N: v.N,
-		})
-	}
 
+	for _, v := range req.Star {
+		for _, v1 := range atno {
+			if v1.A == "equp" {
+				cfg := this.configure.GetEquipmentConfigureById(v1.T)
+				if cfg.Star == v {
+					del = append(del, v1.O)
+				}
+			}
+		}
+	}
+	if len(del) > 0 { // 自动出售
+		this.equip.SellEquipments(session, del)
+	}
 	mapData["bossTime"] = viking.BossTime // 更新时间
 
 	code = this.module.ModifyVikingData(session.GetUserId(), mapData)
 	session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{
 		Data:  viking,
-		Asset: asset,
+		Asset: atno,
+		Sell:  del,
 	})
 	if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil {
 		this.chat.SendSysChatToWorld(comm.ChatSystem14, nil, req.BossId, req.Difficulty, user.Name)
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index 2e0fb5712..d5de3524c 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -369,61 +369,6 @@ func (x *DBHero) GetHoroscopeProperty() map[string]int32 {
 	return nil
 }
 
-type Floor struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	H4 int32 `protobuf:"varint,1,opt,name=h4,proto3" json:"h4"` // 4星次数
-	H5 int32 `protobuf:"varint,2,opt,name=h5,proto3" json:"h5"` // 5星次数
-}
-
-func (x *Floor) Reset() {
-	*x = Floor{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_db_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Floor) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Floor) ProtoMessage() {}
-
-func (x *Floor) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_db_proto_msgTypes[1]
-	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 Floor.ProtoReflect.Descriptor instead.
-func (*Floor) Descriptor() ([]byte, []int) {
-	return file_hero_hero_db_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Floor) GetH4() int32 {
-	if x != nil {
-		return x.H4
-	}
-	return 0
-}
-
-func (x *Floor) GetH5() int32 {
-	if x != nil {
-		return x.H5
-	}
-	return 0
-}
-
 //英雄扩展数据
 type DBHeroRecord struct {
 	state         protoimpl.MessageState
@@ -447,7 +392,7 @@ type DBHeroRecord struct {
 func (x *DBHeroRecord) Reset() {
 	*x = DBHeroRecord{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_db_proto_msgTypes[2]
+		mi := &file_hero_hero_db_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -460,7 +405,7 @@ func (x *DBHeroRecord) String() string {
 func (*DBHeroRecord) ProtoMessage() {}
 
 func (x *DBHeroRecord) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_db_proto_msgTypes[2]
+	mi := &file_hero_hero_db_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -473,7 +418,7 @@ func (x *DBHeroRecord) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBHeroRecord.ProtoReflect.Descriptor instead.
 func (*DBHeroRecord) Descriptor() ([]byte, []int) {
-	return file_hero_hero_db_proto_rawDescGZIP(), []int{2}
+	return file_hero_hero_db_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *DBHeroRecord) GetId() string {
@@ -575,7 +520,7 @@ type DBHeroTalent struct {
 func (x *DBHeroTalent) Reset() {
 	*x = DBHeroTalent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_hero_hero_db_proto_msgTypes[3]
+		mi := &file_hero_hero_db_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -588,7 +533,7 @@ func (x *DBHeroTalent) String() string {
 func (*DBHeroTalent) ProtoMessage() {}
 
 func (x *DBHeroTalent) ProtoReflect() protoreflect.Message {
-	mi := &file_hero_hero_db_proto_msgTypes[3]
+	mi := &file_hero_hero_db_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -601,7 +546,7 @@ func (x *DBHeroTalent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBHeroTalent.ProtoReflect.Descriptor instead.
 func (*DBHeroTalent) Descriptor() ([]byte, []int) {
-	return file_hero_hero_db_proto_rawDescGZIP(), []int{3}
+	return file_hero_hero_db_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DBHeroTalent) GetId() string {
@@ -740,56 +685,54 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	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, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12,
-	0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12,
-	0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22,
-	0xf0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72,
-	0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14,
-	0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d,
-	0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a,
-	0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61,
-	0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61,
-	0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16,
-	0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 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, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72,
-	0x6f, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c,
-	0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a,
-	0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c,
-	0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74,
-	0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
+	0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12,
+	0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64,
+	0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+	0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44,
+	0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65,
+	0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72,
+	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72,
+	0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a,
+	0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f,
+	0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x1a, 0x3c, 0x0a,
+	0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48,
-	0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54,
-	0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f,
-	0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53,
+	0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42,
+	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+	0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65,
+	0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c,
+	0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e,
+	0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f,
+	0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12,
+	0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46,
+	0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -805,39 +748,38 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
 }
 
 var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_hero_hero_db_proto_goTypes = []interface{}{
 	(HeroType)(0),        // 0: HeroType
 	(*DBHero)(nil),       // 1: DBHero
-	(*Floor)(nil),        // 2: Floor
-	(*DBHeroRecord)(nil), // 3: DBHeroRecord
-	(*DBHeroTalent)(nil), // 4: DBHeroTalent
-	nil,                  // 5: DBHero.PropertyEntry
-	nil,                  // 6: DBHero.AddPropertyEntry
-	nil,                  // 7: DBHero.EnergyEntry
-	nil,                  // 8: DBHero.EnergyPropertyEntry
-	nil,                  // 9: DBHero.JuexPropertyEntry
-	nil,                  // 10: DBHero.TalentPropertyEntry
-	nil,                  // 11: DBHero.HoroscopePropertyEntry
-	nil,                  // 12: DBHeroRecord.ConditionEntry
-	nil,                  // 13: DBHeroRecord.Star5HeroEntry
-	nil,                  // 14: DBHeroTalent.TalentEntry
-	(*SkillData)(nil),    // 15: SkillData
+	(*DBHeroRecord)(nil), // 2: DBHeroRecord
+	(*DBHeroTalent)(nil), // 3: DBHeroTalent
+	nil,                  // 4: DBHero.PropertyEntry
+	nil,                  // 5: DBHero.AddPropertyEntry
+	nil,                  // 6: DBHero.EnergyEntry
+	nil,                  // 7: DBHero.EnergyPropertyEntry
+	nil,                  // 8: DBHero.JuexPropertyEntry
+	nil,                  // 9: DBHero.TalentPropertyEntry
+	nil,                  // 10: DBHero.HoroscopePropertyEntry
+	nil,                  // 11: DBHeroRecord.ConditionEntry
+	nil,                  // 12: DBHeroRecord.Star5HeroEntry
+	nil,                  // 13: DBHeroTalent.TalentEntry
+	(*SkillData)(nil),    // 14: SkillData
 }
 var file_hero_hero_db_proto_depIdxs = []int32{
-	15, // 0: DBHero.normalSkill:type_name -> SkillData
-	5,  // 1: DBHero.property:type_name -> DBHero.PropertyEntry
-	6,  // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
-	7,  // 3: DBHero.energy:type_name -> DBHero.EnergyEntry
-	8,  // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
-	9,  // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
+	14, // 0: DBHero.normalSkill:type_name -> SkillData
+	4,  // 1: DBHero.property:type_name -> DBHero.PropertyEntry
+	5,  // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
+	6,  // 3: DBHero.energy:type_name -> DBHero.EnergyEntry
+	7,  // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
+	8,  // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
 	0,  // 6: DBHero.status:type_name -> HeroType
-	10, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
-	15, // 8: DBHero.equipSkill:type_name -> SkillData
-	11, // 9: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
-	12, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
-	13, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
-	14, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
+	9,  // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
+	14, // 8: DBHero.equipSkill:type_name -> SkillData
+	10, // 9: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry
+	11, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry
+	12, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry
+	13, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
 	13, // [13:13] is the sub-list for method output_type
 	13, // [13:13] is the sub-list for method input_type
 	13, // [13:13] is the sub-list for extension type_name
@@ -865,18 +807,6 @@ func file_hero_hero_db_proto_init() {
 			}
 		}
 		file_hero_hero_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Floor); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_hero_hero_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBHeroRecord); i {
 			case 0:
 				return &v.state
@@ -888,7 +818,7 @@ func file_hero_hero_db_proto_init() {
 				return nil
 			}
 		}
-		file_hero_hero_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_hero_hero_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBHeroTalent); i {
 			case 0:
 				return &v.state
@@ -907,7 +837,7 @@ func file_hero_hero_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hero_hero_db_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   14,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go
index 38b8b4040..4f526bd36 100644
--- a/pb/library_db.pb.go
+++ b/pb/library_db.pb.go
@@ -233,9 +233,9 @@ type DBFetterstory struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id         string                `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                                                 //ID
-	Uid        string                `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                               //用户ID
-	FeeterTask map[int32]*FetterTask `protobuf:"bytes,3,rep,name=feeterTask,proto3" json:"feeterTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"feeterTask"` //已开启的羁绊任务 key:羁绊ID
+	Id         string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                                                 //ID
+	Uid        string                 `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                               //用户ID
+	FeeterTask map[int32]*FetterTasks `protobuf:"bytes,3,rep,name=feeterTask,proto3" json:"feeterTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"feeterTask"` //已开启的羁绊任务 key:羁绊ID
 }
 
 func (x *DBFetterstory) Reset() {
@@ -284,26 +284,74 @@ func (x *DBFetterstory) GetUid() string {
 	return ""
 }
 
-func (x *DBFetterstory) GetFeeterTask() map[int32]*FetterTask {
+func (x *DBFetterstory) GetFeeterTask() map[int32]*FetterTasks {
 	if x != nil {
 		return x.FeeterTask
 	}
 	return nil
 }
 
+type FetterTasks struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Tasks []int32 `protobuf:"varint,1,rep,packed,name=tasks,proto3" json:"tasks"`
+}
+
+func (x *FetterTasks) Reset() {
+	*x = FetterTasks{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_library_library_db_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FetterTasks) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FetterTasks) ProtoMessage() {}
+
+func (x *FetterTasks) ProtoReflect() protoreflect.Message {
+	mi := &file_library_library_db_proto_msgTypes[3]
+	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 FetterTasks.ProtoReflect.Descriptor instead.
+func (*FetterTasks) Descriptor() ([]byte, []int) {
+	return file_library_library_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *FetterTasks) GetTasks() []int32 {
+	if x != nil {
+		return x.Tasks
+	}
+	return nil
+}
+
 // 羁绊任务
 type FetterTask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskIds []int32 `protobuf:"varint,1,rep,packed,name=taskIds,proto3" json:"taskIds" bson:"taskIds"` //完成的任务
+	TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskId"` //任务Id
+	Status int32 `protobuf:"varint,2,opt,name=status,proto3" json:"status" bson:"status"` //状态 0锁定 1已完成
 }
 
 func (x *FetterTask) Reset() {
 	*x = FetterTask{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_library_library_db_proto_msgTypes[3]
+		mi := &file_library_library_db_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -316,7 +364,7 @@ func (x *FetterTask) String() string {
 func (*FetterTask) ProtoMessage() {}
 
 func (x *FetterTask) ProtoReflect() protoreflect.Message {
-	mi := &file_library_library_db_proto_msgTypes[3]
+	mi := &file_library_library_db_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -329,14 +377,21 @@ func (x *FetterTask) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetterTask.ProtoReflect.Descriptor instead.
 func (*FetterTask) Descriptor() ([]byte, []int) {
-	return file_library_library_db_proto_rawDescGZIP(), []int{3}
+	return file_library_library_db_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *FetterTask) GetTaskIds() []int32 {
+func (x *FetterTask) GetTaskId() int32 {
 	if x != nil {
-		return x.TaskIds
+		return x.TaskId
 	}
-	return nil
+	return 0
+}
+
+func (x *FetterTask) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
 }
 
 var File_library_library_db_proto protoreflect.FileDescriptor
@@ -379,22 +434,26 @@ var file_library_library_db_proto_rawDesc = []byte{
 	0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x72,
 	0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69,
 	0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a,
-	0x65, 0x22, 0xbd, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74,
+	0x65, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74,
 	0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54,
 	0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65,
 	0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72,
 	0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65,
-	0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4a, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54,
+	0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54,
 	0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74,
-	0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x26, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12,
-	0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
-	0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74,
+	0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b,
+	0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
+	0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65,
+	0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -409,21 +468,22 @@ func file_library_library_db_proto_rawDescGZIP() []byte {
 	return file_library_library_db_proto_rawDescData
 }
 
-var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_library_library_db_proto_goTypes = []interface{}{
 	(*DBLibrary)(nil),     // 0: DBLibrary
 	(*DBHeroFetter)(nil),  // 1: DBHeroFetter
 	(*DBFetterstory)(nil), // 2: DBFetterstory
-	(*FetterTask)(nil),    // 3: FetterTask
-	nil,                   // 4: DBLibrary.HeroEntry
-	nil,                   // 5: DBLibrary.PrizeEntry
-	nil,                   // 6: DBFetterstory.FeeterTaskEntry
+	(*FetterTasks)(nil),   // 3: FetterTasks
+	(*FetterTask)(nil),    // 4: FetterTask
+	nil,                   // 5: DBLibrary.HeroEntry
+	nil,                   // 6: DBLibrary.PrizeEntry
+	nil,                   // 7: DBFetterstory.FeeterTaskEntry
 }
 var file_library_library_db_proto_depIdxs = []int32{
-	4, // 0: DBLibrary.hero:type_name -> DBLibrary.HeroEntry
-	5, // 1: DBLibrary.prize:type_name -> DBLibrary.PrizeEntry
-	6, // 2: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry
-	3, // 3: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTask
+	5, // 0: DBLibrary.hero:type_name -> DBLibrary.HeroEntry
+	6, // 1: DBLibrary.prize:type_name -> DBLibrary.PrizeEntry
+	7, // 2: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry
+	3, // 3: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTasks
 	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
@@ -474,6 +534,18 @@ func file_library_library_db_proto_init() {
 			}
 		}
 		file_library_library_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FetterTasks); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_library_library_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetterTask); i {
 			case 0:
 				return &v.state
@@ -492,7 +564,7 @@ func file_library_library_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_library_library_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go
index 0607d1909..d636c5fa8 100644
--- a/pb/library_msg.pb.go
+++ b/pb/library_msg.pb.go
@@ -769,7 +769,7 @@ type LibraryFetterstoryTaskReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FetterId int32 `protobuf:"varint,1,opt,name=fetterId,proto3" json:"fetterId"` //章节ID
+	FetterId int32 `protobuf:"varint,1,opt,name=fetterId,proto3" json:"fetterId"` //羁绊ID
 }
 
 func (x *LibraryFetterstoryTaskReq) Reset() {
@@ -816,7 +816,7 @@ type LibraryFetterstoryTaskResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskIds []int32 `protobuf:"varint,1,rep,packed,name=taskIds,proto3" json:"taskIds"`
+	List []*FetterTask `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
 func (x *LibraryFetterstoryTaskResp) Reset() {
@@ -851,9 +851,9 @@ func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) {
 	return file_library_library_msg_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *LibraryFetterstoryTaskResp) GetTaskIds() []int32 {
+func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask {
 	if x != nil {
-		return x.TaskIds
+		return x.List
 	}
 	return nil
 }
@@ -929,12 +929,12 @@ var file_library_library_msg_proto_rawDesc = []byte{
 	0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74,
 	0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12,
 	0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x1a, 0x4c,
+	0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c,
 	0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72,
-	0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -971,6 +971,7 @@ var file_library_library_msg_proto_goTypes = []interface{}{
 	nil,                                 // 17: LibraryUseGiftReq.ItemsEntry
 	(*DBLibrary)(nil),                   // 18: DBLibrary
 	(*DBHeroFetter)(nil),                // 19: DBHeroFetter
+	(*FetterTask)(nil),                  // 20: FetterTask
 }
 var file_library_library_msg_proto_depIdxs = []int32{
 	18, // 0: LibraryGetListResp.data:type_name -> DBLibrary
@@ -983,11 +984,12 @@ var file_library_library_msg_proto_depIdxs = []int32{
 	18, // 7: LibraryChangePush.data:type_name -> DBLibrary
 	19, // 8: LibraryChangePush.fetter:type_name -> DBHeroFetter
 	19, // 9: LibraryLvRewardResp.data:type_name -> DBHeroFetter
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
+	20, // 10: LibraryFetterstoryTaskResp.list:type_name -> FetterTask
+	11, // [11:11] is the sub-list for method output_type
+	11, // [11:11] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_library_library_msg_proto_init() }
diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go
index 4167730fe..2ffb896c6 100644
--- a/pb/user_db.pb.go
+++ b/pb/user_db.pb.go
@@ -25,11 +25,11 @@ type CacheUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid              string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`                           //用户id
-	SessionId        string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"sessionId"`               //会话id
-	ServiceTag       string `protobuf:"bytes,3,opt,name=ServiceTag,proto3" json:"serviceTag"`             //所在服务集群 区服id
-	GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"gatewayServiceId"` //所在网关服务id
-	Ip               string `protobuf:"bytes,5,opt,name=ip,proto3" json:"ip"`                             //远程ip
+	Uid              string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                                        //用户id
+	SessionId        string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"SessionId" bson:"sessionId"`                      //会话id
+	ServiceTag       string `protobuf:"bytes,3,opt,name=ServiceTag,proto3" json:"ServiceTag" bson:"serviceTag"`                   //所在服务集群 区服id
+	GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId" bson:"gatewayServiceId"` //所在网关服务id
+	Ip               string `protobuf:"bytes,5,opt,name=ip,proto3" json:"ip" bson:"ip"`                                           //远程ip
 }
 
 func (x *CacheUser) Reset() {
@@ -104,32 +104,32 @@ type DBUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id                string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                            //ID
-	Uid               string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                          //用户ID
-	Uuid              string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"`                                       //玩家唯一uuid
-	Binduid           string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"`                              //玩家账号
-	Name              string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"`                                       //玩家名
-	Sid               string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"`                                          //区服id
-	Createip          string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"`                           //创建账号时的ip
-	Lastloginip       string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"`                  //最后一次登录时的ip
-	Ctime             int64  `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"`                                   //玩家创号时间戳
-	Logintime         int64  `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"`                      //最后一次登录时间
-	Gender            int32  `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"`                               //性别 0男1女
-	Avatar            string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"`                                //头像
-	Gold              int64  `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"`                                     //金币
-	Exp               int64  `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"`                                        //经验
-	Vipexp            int64  `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"`                               //vip经验
-	Starcoin          int64  `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"`                         //星座图币
-	Created           bool   `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"`                            //创角
-	Lv                int32  `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"`                                           //等级
-	Vip               int32  `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"`                                        // vip等级
-	Diamond           int64  `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"`                            // 钻石
-	Title             int32  `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"`                                  //头衔
-	Offlinetime       int64  `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"`                //离线时间
-	Figure            int32  `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"`                               //主角形象
-	Bgp               string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"`                                         //背景
-	Vit               int32  `protobuf:"varint,25,opt,name=vit,proto3" json:"vit" bson:"vit"`                                        //体力
-	LastRecoverVitSec int64  `protobuf:"varint,26,opt,name=lastRecoverVitSec,proto3" json:"lastRecoverVitSec" bson:"lastRecoverVit"` // 上次体会恢复时间
+	Id                string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                               //ID
+	Uid               string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                             //用户ID
+	Uuid              string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"`                                          //玩家唯一uuid
+	Binduid           string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"`                                 //玩家账号
+	Name              string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"`                                          //玩家名
+	Sid               string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"`                                             //区服id
+	Createip          string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"`                              //创建账号时的ip
+	Lastloginip       string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"`                     //最后一次登录时的ip
+	Ctime             int64  `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"`                                      //玩家创号时间戳
+	Logintime         int64  `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"`                         //最后一次登录时间
+	Gender            int32  `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"`                                  //性别 0男1女
+	Avatar            string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"`                                   //头像
+	Gold              int64  `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"`                                        //金币
+	Exp               int64  `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"`                                           //经验
+	Vipexp            int64  `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"`                                  //vip经验
+	Starcoin          int64  `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"`                            //星座图币
+	Created           bool   `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"`                               //创角
+	Lv                int32  `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"`                                              //等级
+	Vip               int32  `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"`                                           // vip等级
+	Diamond           int64  `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"`                               // 钻石
+	Title             int32  `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"`                                     //头衔
+	Offlinetime       int64  `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"`                   //离线时间
+	Figure            int32  `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"`                                  //主角形象
+	Bgp               string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"`                                            //背景
+	Vit               int32  `protobuf:"varint,25,opt,name=vit,proto3" json:"vit" bson:"vit"`                                           //体力
+	LastRecoverVitSec int64  `protobuf:"varint,26,opt,name=lastRecoverVitSec,proto3" json:"lastRecoverVitSec" bson:"lastRecoverVitSec"` // 上次体会恢复时间
 }
 
 func (x *DBUser) Reset() {
diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go
index a44eee262..cd572ae60 100644
--- a/pb/user_msg.pb.go
+++ b/pb/user_msg.pb.go
@@ -739,6 +739,53 @@ func (x *UserOtherTermLoginPush) GetUid() string {
 	return ""
 }
 
+type UserVitChangedPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Vit int32 `protobuf:"varint,1,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力
+}
+
+func (x *UserVitChangedPush) Reset() {
+	*x = UserVitChangedPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_user_user_msg_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UserVitChangedPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UserVitChangedPush) ProtoMessage() {}
+
+func (x *UserVitChangedPush) ProtoReflect() protoreflect.Message {
+	mi := &file_user_user_msg_proto_msgTypes[13]
+	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 UserVitChangedPush.ProtoReflect.Descriptor instead.
+func (*UserVitChangedPush) Descriptor() ([]byte, []int) {
+	return file_user_user_msg_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *UserVitChangedPush) GetVit() int32 {
+	if x != nil {
+		return x.Vit
+	}
+	return 0
+}
+
 //用户设置获取
 type UserGetSettingReq struct {
 	state         protoimpl.MessageState
@@ -749,7 +796,7 @@ type UserGetSettingReq struct {
 func (x *UserGetSettingReq) Reset() {
 	*x = UserGetSettingReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[13]
+		mi := &file_user_user_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -762,7 +809,7 @@ func (x *UserGetSettingReq) String() string {
 func (*UserGetSettingReq) ProtoMessage() {}
 
 func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[13]
+	mi := &file_user_user_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -775,7 +822,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{13}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{14}
 }
 
 type UserGetSettingResp struct {
@@ -789,7 +836,7 @@ type UserGetSettingResp struct {
 func (x *UserGetSettingResp) Reset() {
 	*x = UserGetSettingResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[14]
+		mi := &file_user_user_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -802,7 +849,7 @@ func (x *UserGetSettingResp) String() string {
 func (*UserGetSettingResp) ProtoMessage() {}
 
 func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[14]
+	mi := &file_user_user_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -815,7 +862,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{14}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *UserGetSettingResp) GetSetting() *DBUserSetting {
@@ -837,7 +884,7 @@ type UserUpdateSettingReq struct {
 func (x *UserUpdateSettingReq) Reset() {
 	*x = UserUpdateSettingReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[15]
+		mi := &file_user_user_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -850,7 +897,7 @@ func (x *UserUpdateSettingReq) String() string {
 func (*UserUpdateSettingReq) ProtoMessage() {}
 
 func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[15]
+	mi := &file_user_user_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -863,7 +910,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{15}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *UserUpdateSettingReq) GetSetting() *DBUserSetting {
@@ -884,7 +931,7 @@ type UserUpdateSettingResp struct {
 func (x *UserUpdateSettingResp) Reset() {
 	*x = UserUpdateSettingResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[16]
+		mi := &file_user_user_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -897,7 +944,7 @@ func (x *UserUpdateSettingResp) String() string {
 func (*UserUpdateSettingResp) ProtoMessage() {}
 
 func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[16]
+	mi := &file_user_user_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -910,7 +957,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{16}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *UserUpdateSettingResp) GetUid() string {
@@ -930,7 +977,7 @@ type UserVeriCodeReq struct {
 func (x *UserVeriCodeReq) Reset() {
 	*x = UserVeriCodeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[17]
+		mi := &file_user_user_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -943,7 +990,7 @@ func (x *UserVeriCodeReq) String() string {
 func (*UserVeriCodeReq) ProtoMessage() {}
 
 func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[17]
+	mi := &file_user_user_msg_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -956,7 +1003,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{17}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{18}
 }
 
 type UserVeriCodeResp struct {
@@ -970,7 +1017,7 @@ type UserVeriCodeResp struct {
 func (x *UserVeriCodeResp) Reset() {
 	*x = UserVeriCodeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[18]
+		mi := &file_user_user_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -983,7 +1030,7 @@ func (x *UserVeriCodeResp) String() string {
 func (*UserVeriCodeResp) ProtoMessage() {}
 
 func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[18]
+	mi := &file_user_user_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -996,7 +1043,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{18}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *UserVeriCodeResp) GetCode() int32 {
@@ -1018,7 +1065,7 @@ type UserInitdataReq struct {
 func (x *UserInitdataReq) Reset() {
 	*x = UserInitdataReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[19]
+		mi := &file_user_user_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1031,7 +1078,7 @@ func (x *UserInitdataReq) String() string {
 func (*UserInitdataReq) ProtoMessage() {}
 
 func (x *UserInitdataReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[19]
+	mi := &file_user_user_msg_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1044,7 +1091,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{19}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *UserInitdataReq) GetCode() int32 {
@@ -1065,7 +1112,7 @@ type UserInitdataResp struct {
 func (x *UserInitdataResp) Reset() {
 	*x = UserInitdataResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[20]
+		mi := &file_user_user_msg_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1078,7 +1125,7 @@ func (x *UserInitdataResp) String() string {
 func (*UserInitdataResp) ProtoMessage() {}
 
 func (x *UserInitdataResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[20]
+	mi := &file_user_user_msg_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1091,7 +1138,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{20}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *UserInitdataResp) GetUid() string {
@@ -1113,7 +1160,7 @@ type UserModifynameReq struct {
 func (x *UserModifynameReq) Reset() {
 	*x = UserModifynameReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[21]
+		mi := &file_user_user_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1126,7 +1173,7 @@ func (x *UserModifynameReq) String() string {
 func (*UserModifynameReq) ProtoMessage() {}
 
 func (x *UserModifynameReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[21]
+	mi := &file_user_user_msg_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1139,7 +1186,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{21}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *UserModifynameReq) GetName() string {
@@ -1162,7 +1209,7 @@ type UserModifynameResp struct {
 func (x *UserModifynameResp) Reset() {
 	*x = UserModifynameResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[22]
+		mi := &file_user_user_msg_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1175,7 +1222,7 @@ func (x *UserModifynameResp) String() string {
 func (*UserModifynameResp) ProtoMessage() {}
 
 func (x *UserModifynameResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[22]
+	mi := &file_user_user_msg_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1188,7 +1235,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{22}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *UserModifynameResp) GetUid() string {
@@ -1224,7 +1271,7 @@ type UserModifyavatarReq struct {
 func (x *UserModifyavatarReq) Reset() {
 	*x = UserModifyavatarReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[23]
+		mi := &file_user_user_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1237,7 +1284,7 @@ func (x *UserModifyavatarReq) String() string {
 func (*UserModifyavatarReq) ProtoMessage() {}
 
 func (x *UserModifyavatarReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[23]
+	mi := &file_user_user_msg_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1250,7 +1297,7 @@ func (x *UserModifyavatarReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifyavatarReq.ProtoReflect.Descriptor instead.
 func (*UserModifyavatarReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{23}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *UserModifyavatarReq) GetAvatarId() string {
@@ -1272,7 +1319,7 @@ type UserModifyavatarResp struct {
 func (x *UserModifyavatarResp) Reset() {
 	*x = UserModifyavatarResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[24]
+		mi := &file_user_user_msg_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1285,7 +1332,7 @@ func (x *UserModifyavatarResp) String() string {
 func (*UserModifyavatarResp) ProtoMessage() {}
 
 func (x *UserModifyavatarResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[24]
+	mi := &file_user_user_msg_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1298,7 +1345,7 @@ func (x *UserModifyavatarResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifyavatarResp.ProtoReflect.Descriptor instead.
 func (*UserModifyavatarResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{24}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *UserModifyavatarResp) GetUid() string {
@@ -1327,7 +1374,7 @@ type UserModifybgpReq struct {
 func (x *UserModifybgpReq) Reset() {
 	*x = UserModifybgpReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[25]
+		mi := &file_user_user_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1340,7 +1387,7 @@ func (x *UserModifybgpReq) String() string {
 func (*UserModifybgpReq) ProtoMessage() {}
 
 func (x *UserModifybgpReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[25]
+	mi := &file_user_user_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1353,7 +1400,7 @@ func (x *UserModifybgpReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifybgpReq.ProtoReflect.Descriptor instead.
 func (*UserModifybgpReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{25}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *UserModifybgpReq) GetBgpId() string {
@@ -1375,7 +1422,7 @@ type UserModifybgpResp struct {
 func (x *UserModifybgpResp) Reset() {
 	*x = UserModifybgpResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[26]
+		mi := &file_user_user_msg_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1388,7 +1435,7 @@ func (x *UserModifybgpResp) String() string {
 func (*UserModifybgpResp) ProtoMessage() {}
 
 func (x *UserModifybgpResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[26]
+	mi := &file_user_user_msg_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1401,7 +1448,7 @@ func (x *UserModifybgpResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifybgpResp.ProtoReflect.Descriptor instead.
 func (*UserModifybgpResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{26}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *UserModifybgpResp) GetUid() string {
@@ -1430,7 +1477,7 @@ type UserModifyfigureReq struct {
 func (x *UserModifyfigureReq) Reset() {
 	*x = UserModifyfigureReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[27]
+		mi := &file_user_user_msg_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1443,7 +1490,7 @@ func (x *UserModifyfigureReq) String() string {
 func (*UserModifyfigureReq) ProtoMessage() {}
 
 func (x *UserModifyfigureReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[27]
+	mi := &file_user_user_msg_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1456,7 +1503,7 @@ func (x *UserModifyfigureReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifyfigureReq.ProtoReflect.Descriptor instead.
 func (*UserModifyfigureReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{27}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *UserModifyfigureReq) GetFigureId() int32 {
@@ -1478,7 +1525,7 @@ type UserModifyfigureResp struct {
 func (x *UserModifyfigureResp) Reset() {
 	*x = UserModifyfigureResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[28]
+		mi := &file_user_user_msg_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1491,7 +1538,7 @@ func (x *UserModifyfigureResp) String() string {
 func (*UserModifyfigureResp) ProtoMessage() {}
 
 func (x *UserModifyfigureResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[28]
+	mi := &file_user_user_msg_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1504,7 +1551,7 @@ func (x *UserModifyfigureResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserModifyfigureResp.ProtoReflect.Descriptor instead.
 func (*UserModifyfigureResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{28}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *UserModifyfigureResp) GetUid() string {
@@ -1531,7 +1578,7 @@ type UserGetTujianReq struct {
 func (x *UserGetTujianReq) Reset() {
 	*x = UserGetTujianReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[29]
+		mi := &file_user_user_msg_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1544,7 +1591,7 @@ func (x *UserGetTujianReq) String() string {
 func (*UserGetTujianReq) ProtoMessage() {}
 
 func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[29]
+	mi := &file_user_user_msg_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1557,7 +1604,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{29}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{30}
 }
 
 type UserGetTujianResp struct {
@@ -1571,7 +1618,7 @@ type UserGetTujianResp struct {
 func (x *UserGetTujianResp) Reset() {
 	*x = UserGetTujianResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[30]
+		mi := &file_user_user_msg_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1584,7 +1631,7 @@ func (x *UserGetTujianResp) String() string {
 func (*UserGetTujianResp) ProtoMessage() {}
 
 func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[30]
+	mi := &file_user_user_msg_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1597,7 +1644,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{30}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *UserGetTujianResp) GetHeroids() []string {
@@ -1621,7 +1668,7 @@ type UserLvChangedPush struct {
 func (x *UserLvChangedPush) Reset() {
 	*x = UserLvChangedPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[31]
+		mi := &file_user_user_msg_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1634,7 +1681,7 @@ func (x *UserLvChangedPush) String() string {
 func (*UserLvChangedPush) ProtoMessage() {}
 
 func (x *UserLvChangedPush) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[31]
+	mi := &file_user_user_msg_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1647,7 +1694,7 @@ func (x *UserLvChangedPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserLvChangedPush.ProtoReflect.Descriptor instead.
 func (*UserLvChangedPush) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{31}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *UserLvChangedPush) GetUid() string {
@@ -1685,7 +1732,7 @@ type UserVipChangedPush struct {
 func (x *UserVipChangedPush) Reset() {
 	*x = UserVipChangedPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[32]
+		mi := &file_user_user_msg_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1698,7 +1745,7 @@ func (x *UserVipChangedPush) String() string {
 func (*UserVipChangedPush) ProtoMessage() {}
 
 func (x *UserVipChangedPush) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[32]
+	mi := &file_user_user_msg_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1711,7 +1758,7 @@ func (x *UserVipChangedPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserVipChangedPush.ProtoReflect.Descriptor instead.
 func (*UserVipChangedPush) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{32}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *UserVipChangedPush) GetUid() string {
@@ -1747,7 +1794,7 @@ type UserModifysignReq struct {
 func (x *UserModifysignReq) Reset() {
 	*x = UserModifysignReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[33]
+		mi := &file_user_user_msg_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1760,7 +1807,7 @@ func (x *UserModifysignReq) String() string {
 func (*UserModifysignReq) ProtoMessage() {}
 
 func (x *UserModifysignReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[33]
+	mi := &file_user_user_msg_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1773,7 +1820,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{33}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *UserModifysignReq) GetSign() string {
@@ -1794,7 +1841,7 @@ type UserModifysignResp struct {
 func (x *UserModifysignResp) Reset() {
 	*x = UserModifysignResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[34]
+		mi := &file_user_user_msg_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1807,7 +1854,7 @@ func (x *UserModifysignResp) String() string {
 func (*UserModifysignResp) ProtoMessage() {}
 
 func (x *UserModifysignResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[34]
+	mi := &file_user_user_msg_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1820,7 +1867,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{34}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *UserModifysignResp) GetUid() string {
@@ -1842,7 +1889,7 @@ type UserBattlerecordReq struct {
 func (x *UserBattlerecordReq) Reset() {
 	*x = UserBattlerecordReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[35]
+		mi := &file_user_user_msg_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1855,7 +1902,7 @@ func (x *UserBattlerecordReq) String() string {
 func (*UserBattlerecordReq) ProtoMessage() {}
 
 func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[35]
+	mi := &file_user_user_msg_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1868,7 +1915,7 @@ func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserBattlerecordReq.ProtoReflect.Descriptor instead.
 func (*UserBattlerecordReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{35}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *UserBattlerecordReq) GetUid() string {
@@ -1893,7 +1940,7 @@ type UserBattlerecordResp struct {
 func (x *UserBattlerecordResp) Reset() {
 	*x = UserBattlerecordResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[36]
+		mi := &file_user_user_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1906,7 +1953,7 @@ func (x *UserBattlerecordResp) String() string {
 func (*UserBattlerecordResp) ProtoMessage() {}
 
 func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[36]
+	mi := &file_user_user_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1919,7 +1966,7 @@ func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserBattlerecordResp.ProtoReflect.Descriptor instead.
 func (*UserBattlerecordResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{36}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *UserBattlerecordResp) GetData() *DBUser {
@@ -1969,7 +2016,7 @@ type UserSettingteamReq struct {
 func (x *UserSettingteamReq) Reset() {
 	*x = UserSettingteamReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[37]
+		mi := &file_user_user_msg_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1982,7 +2029,7 @@ func (x *UserSettingteamReq) String() string {
 func (*UserSettingteamReq) ProtoMessage() {}
 
 func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[37]
+	mi := &file_user_user_msg_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1995,7 +2042,7 @@ func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSettingteamReq.ProtoReflect.Descriptor instead.
 func (*UserSettingteamReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{37}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *UserSettingteamReq) GetHeroObjIds() []string {
@@ -2016,7 +2063,7 @@ type UserSettingteamResp struct {
 func (x *UserSettingteamResp) Reset() {
 	*x = UserSettingteamResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[38]
+		mi := &file_user_user_msg_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2029,7 +2076,7 @@ func (x *UserSettingteamResp) String() string {
 func (*UserSettingteamResp) ProtoMessage() {}
 
 func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[38]
+	mi := &file_user_user_msg_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2042,7 +2089,7 @@ func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSettingteamResp.ProtoReflect.Descriptor instead.
 func (*UserSettingteamResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{38}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *UserSettingteamResp) GetUid() string {
@@ -2062,7 +2109,7 @@ type UserShowteamReq struct {
 func (x *UserShowteamReq) Reset() {
 	*x = UserShowteamReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[39]
+		mi := &file_user_user_msg_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2075,7 +2122,7 @@ func (x *UserShowteamReq) String() string {
 func (*UserShowteamReq) ProtoMessage() {}
 
 func (x *UserShowteamReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[39]
+	mi := &file_user_user_msg_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2088,7 +2135,7 @@ func (x *UserShowteamReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserShowteamReq.ProtoReflect.Descriptor instead.
 func (*UserShowteamReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{39}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{40}
 }
 
 type UserShowteamResp struct {
@@ -2102,7 +2149,7 @@ type UserShowteamResp struct {
 func (x *UserShowteamResp) Reset() {
 	*x = UserShowteamResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[40]
+		mi := &file_user_user_msg_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2115,7 +2162,7 @@ func (x *UserShowteamResp) String() string {
 func (*UserShowteamResp) ProtoMessage() {}
 
 func (x *UserShowteamResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[40]
+	mi := &file_user_user_msg_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2128,7 +2175,7 @@ func (x *UserShowteamResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserShowteamResp.ProtoReflect.Descriptor instead.
 func (*UserShowteamResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{40}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *UserShowteamResp) GetHeroObjIds() []string {
@@ -2150,7 +2197,7 @@ type UserOnlineResp struct {
 func (x *UserOnlineResp) Reset() {
 	*x = UserOnlineResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[41]
+		mi := &file_user_user_msg_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2163,7 +2210,7 @@ func (x *UserOnlineResp) String() string {
 func (*UserOnlineResp) ProtoMessage() {}
 
 func (x *UserOnlineResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[41]
+	mi := &file_user_user_msg_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2176,7 +2223,7 @@ func (x *UserOnlineResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserOnlineResp.ProtoReflect.Descriptor instead.
 func (*UserOnlineResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{41}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *UserOnlineResp) GetUsers() []*CacheUser {
@@ -2198,7 +2245,7 @@ type UserDataListResp struct {
 func (x *UserDataListResp) Reset() {
 	*x = UserDataListResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[42]
+		mi := &file_user_user_msg_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2211,7 +2258,7 @@ func (x *UserDataListResp) String() string {
 func (*UserDataListResp) ProtoMessage() {}
 
 func (x *UserDataListResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[42]
+	mi := &file_user_user_msg_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2224,7 +2271,7 @@ func (x *UserDataListResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserDataListResp.ProtoReflect.Descriptor instead.
 func (*UserDataListResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{42}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *UserDataListResp) GetUsers() []*DBUser {
@@ -2243,7 +2290,7 @@ type UserGetServerDataReq struct {
 func (x *UserGetServerDataReq) Reset() {
 	*x = UserGetServerDataReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[43]
+		mi := &file_user_user_msg_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2256,7 +2303,7 @@ func (x *UserGetServerDataReq) String() string {
 func (*UserGetServerDataReq) ProtoMessage() {}
 
 func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[43]
+	mi := &file_user_user_msg_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2269,7 +2316,7 @@ func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetServerDataReq.ProtoReflect.Descriptor instead.
 func (*UserGetServerDataReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{43}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{44}
 }
 
 type UserGetServerDataResp struct {
@@ -2283,7 +2330,7 @@ type UserGetServerDataResp struct {
 func (x *UserGetServerDataResp) Reset() {
 	*x = UserGetServerDataResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[44]
+		mi := &file_user_user_msg_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2296,7 +2343,7 @@ func (x *UserGetServerDataResp) String() string {
 func (*UserGetServerDataResp) ProtoMessage() {}
 
 func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[44]
+	mi := &file_user_user_msg_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2309,7 +2356,7 @@ func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserGetServerDataResp.ProtoReflect.Descriptor instead.
 func (*UserGetServerDataResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{44}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *UserGetServerDataResp) GetData() *DBServerData {
@@ -2328,7 +2375,7 @@ type UserSignReq struct {
 func (x *UserSignReq) Reset() {
 	*x = UserSignReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[45]
+		mi := &file_user_user_msg_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2341,7 +2388,7 @@ func (x *UserSignReq) String() string {
 func (*UserSignReq) ProtoMessage() {}
 
 func (x *UserSignReq) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[45]
+	mi := &file_user_user_msg_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2354,7 +2401,7 @@ func (x *UserSignReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSignReq.ProtoReflect.Descriptor instead.
 func (*UserSignReq) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{45}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{46}
 }
 
 // 推送签到信息
@@ -2370,7 +2417,7 @@ type UserSignResp struct {
 func (x *UserSignResp) Reset() {
 	*x = UserSignResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_user_msg_proto_msgTypes[46]
+		mi := &file_user_user_msg_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2383,7 +2430,7 @@ func (x *UserSignResp) String() string {
 func (*UserSignResp) ProtoMessage() {}
 
 func (x *UserSignResp) ProtoReflect() protoreflect.Message {
-	mi := &file_user_user_msg_proto_msgTypes[46]
+	mi := &file_user_user_msg_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2396,7 +2443,7 @@ func (x *UserSignResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserSignResp.ProtoReflect.Descriptor instead.
 func (*UserSignResp) Descriptor() ([]byte, []int) {
-	return file_user_user_msg_proto_rawDescGZIP(), []int{46}
+	return file_user_user_msg_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *UserSignResp) GetData() *DBSign {
@@ -2482,122 +2529,125 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x76, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x74, 0x22, 0x2a,
 	0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c,
 	0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73,
-	0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22,
-	0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22,
-	0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69,
-	0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
-	0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-	0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f,
-	0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22,
-	0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24,
-	0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73,
+	0x65, 0x72, 0x56, 0x69, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76,
+	0x69, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47,
+	0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a,
+	0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07,
+	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12,
+	0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65,
+	0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a,
-	0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61,
-	0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72,
-	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
-	0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70,
-	0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
-	0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70,
-	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22,
-	0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65,
-	0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72,
-	0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11,
-	0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55,
-	0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
-	0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69,
-	0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12,
-	0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
-	0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
-	0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55,
-	0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
-	0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67,
-	0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34,
-	0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
-	0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56,
-	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e,
-	0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a,
-	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a,
-	0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68,
-	0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65,
-	0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
-	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a,
-	0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
-	0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72,
-	0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75,
-	0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15,
+	0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69,
+	0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56,
+	0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22,
+	0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52,
+	0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11,
+	0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65,
+	0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64,
+	0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d,
+	0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64,
+	0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67,
+	0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d,
+	0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64,
+	0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61,
+	0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54,
+	0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72,
+	0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f,
+	0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78,
+	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12,
+	0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70,
+	0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
+	0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55,
+	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a,
+	0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f,
+	0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68,
+	0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c,
+	0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
+	0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22,
+	0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65,
+	0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11,
+	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
+	0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61,
+	0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c,
+	0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73,
+	0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65,
+	0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44,
+	0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14,
 	0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72,
-	0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22,
+	0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e,
+	0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06,
+	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65,
+	0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2612,7 +2662,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, 47)
+var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48)
 var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserLoginReq)(nil),           // 0: UserLoginReq
 	(*UserLoginResp)(nil),          // 1: UserLoginResp
@@ -2627,69 +2677,70 @@ var file_user_user_msg_proto_goTypes = []interface{}{
 	(*UserCreateResp)(nil),         // 10: UserCreateResp
 	(*UserResChangedPush)(nil),     // 11: UserResChangedPush
 	(*UserOtherTermLoginPush)(nil), // 12: UserOtherTermLoginPush
-	(*UserGetSettingReq)(nil),      // 13: UserGetSettingReq
-	(*UserGetSettingResp)(nil),     // 14: UserGetSettingResp
-	(*UserUpdateSettingReq)(nil),   // 15: UserUpdateSettingReq
-	(*UserUpdateSettingResp)(nil),  // 16: UserUpdateSettingResp
-	(*UserVeriCodeReq)(nil),        // 17: UserVeriCodeReq
-	(*UserVeriCodeResp)(nil),       // 18: UserVeriCodeResp
-	(*UserInitdataReq)(nil),        // 19: UserInitdataReq
-	(*UserInitdataResp)(nil),       // 20: UserInitdataResp
-	(*UserModifynameReq)(nil),      // 21: UserModifynameReq
-	(*UserModifynameResp)(nil),     // 22: UserModifynameResp
-	(*UserModifyavatarReq)(nil),    // 23: UserModifyavatarReq
-	(*UserModifyavatarResp)(nil),   // 24: UserModifyavatarResp
-	(*UserModifybgpReq)(nil),       // 25: UserModifybgpReq
-	(*UserModifybgpResp)(nil),      // 26: UserModifybgpResp
-	(*UserModifyfigureReq)(nil),    // 27: UserModifyfigureReq
-	(*UserModifyfigureResp)(nil),   // 28: UserModifyfigureResp
-	(*UserGetTujianReq)(nil),       // 29: UserGetTujianReq
-	(*UserGetTujianResp)(nil),      // 30: UserGetTujianResp
-	(*UserLvChangedPush)(nil),      // 31: UserLvChangedPush
-	(*UserVipChangedPush)(nil),     // 32: UserVipChangedPush
-	(*UserModifysignReq)(nil),      // 33: UserModifysignReq
-	(*UserModifysignResp)(nil),     // 34: UserModifysignResp
-	(*UserBattlerecordReq)(nil),    // 35: UserBattlerecordReq
-	(*UserBattlerecordResp)(nil),   // 36: UserBattlerecordResp
-	(*UserSettingteamReq)(nil),     // 37: UserSettingteamReq
-	(*UserSettingteamResp)(nil),    // 38: UserSettingteamResp
-	(*UserShowteamReq)(nil),        // 39: UserShowteamReq
-	(*UserShowteamResp)(nil),       // 40: UserShowteamResp
-	(*UserOnlineResp)(nil),         // 41: UserOnlineResp
-	(*UserDataListResp)(nil),       // 42: UserDataListResp
-	(*UserGetServerDataReq)(nil),   // 43: UserGetServerDataReq
-	(*UserGetServerDataResp)(nil),  // 44: UserGetServerDataResp
-	(*UserSignReq)(nil),            // 45: UserSignReq
-	(*UserSignResp)(nil),           // 46: UserSignResp
-	(*DBUser)(nil),                 // 47: DBUser
-	(*DBUserExpand)(nil),           // 48: DBUserExpand
-	(ErrorCode)(0),                 // 49: ErrorCode
-	(*CacheUser)(nil),              // 50: CacheUser
-	(*DBUserSetting)(nil),          // 51: DBUserSetting
-	(*DBPagodaRecord)(nil),         // 52: DBPagodaRecord
-	(*DBHuntingRank)(nil),          // 53: DBHuntingRank
-	(*DBVikingRank)(nil),           // 54: DBVikingRank
-	(*DBServerData)(nil),           // 55: DBServerData
-	(*DBSign)(nil),                 // 56: DBSign
+	(*UserVitChangedPush)(nil),     // 13: UserVitChangedPush
+	(*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
+	(*UserModifyavatarReq)(nil),    // 24: UserModifyavatarReq
+	(*UserModifyavatarResp)(nil),   // 25: UserModifyavatarResp
+	(*UserModifybgpReq)(nil),       // 26: UserModifybgpReq
+	(*UserModifybgpResp)(nil),      // 27: UserModifybgpResp
+	(*UserModifyfigureReq)(nil),    // 28: UserModifyfigureReq
+	(*UserModifyfigureResp)(nil),   // 29: UserModifyfigureResp
+	(*UserGetTujianReq)(nil),       // 30: UserGetTujianReq
+	(*UserGetTujianResp)(nil),      // 31: UserGetTujianResp
+	(*UserLvChangedPush)(nil),      // 32: UserLvChangedPush
+	(*UserVipChangedPush)(nil),     // 33: UserVipChangedPush
+	(*UserModifysignReq)(nil),      // 34: UserModifysignReq
+	(*UserModifysignResp)(nil),     // 35: UserModifysignResp
+	(*UserBattlerecordReq)(nil),    // 36: UserBattlerecordReq
+	(*UserBattlerecordResp)(nil),   // 37: UserBattlerecordResp
+	(*UserSettingteamReq)(nil),     // 38: UserSettingteamReq
+	(*UserSettingteamResp)(nil),    // 39: UserSettingteamResp
+	(*UserShowteamReq)(nil),        // 40: UserShowteamReq
+	(*UserShowteamResp)(nil),       // 41: UserShowteamResp
+	(*UserOnlineResp)(nil),         // 42: UserOnlineResp
+	(*UserDataListResp)(nil),       // 43: UserDataListResp
+	(*UserGetServerDataReq)(nil),   // 44: UserGetServerDataReq
+	(*UserGetServerDataResp)(nil),  // 45: UserGetServerDataResp
+	(*UserSignReq)(nil),            // 46: UserSignReq
+	(*UserSignResp)(nil),           // 47: UserSignResp
+	(*DBUser)(nil),                 // 48: DBUser
+	(*DBUserExpand)(nil),           // 49: DBUserExpand
+	(ErrorCode)(0),                 // 50: ErrorCode
+	(*CacheUser)(nil),              // 51: CacheUser
+	(*DBUserSetting)(nil),          // 52: DBUserSetting
+	(*DBPagodaRecord)(nil),         // 53: DBPagodaRecord
+	(*DBHuntingRank)(nil),          // 54: DBHuntingRank
+	(*DBVikingRank)(nil),           // 55: DBVikingRank
+	(*DBServerData)(nil),           // 56: DBServerData
+	(*DBSign)(nil),                 // 57: DBSign
 }
 var file_user_user_msg_proto_depIdxs = []int32{
-	47, // 0: UserLoginResp.data:type_name -> DBUser
-	48, // 1: UserLoginResp.ex:type_name -> DBUserExpand
-	47, // 2: UserInfoResp.data:type_name -> DBUser
-	48, // 3: UserInfoResp.ex:type_name -> DBUserExpand
-	49, // 4: UserRegisterResp.Code:type_name -> ErrorCode
-	50, // 5: UserLoadResp.data:type_name -> CacheUser
-	51, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
-	51, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
-	47, // 8: UserBattlerecordResp.data:type_name -> DBUser
-	48, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
-	52, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
-	53, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
-	54, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
-	50, // 13: UserOnlineResp.users:type_name -> CacheUser
-	47, // 14: UserDataListResp.users:type_name -> DBUser
-	55, // 15: UserGetServerDataResp.data:type_name -> DBServerData
-	56, // 16: UserSignResp.data:type_name -> DBSign
+	48, // 0: UserLoginResp.data:type_name -> DBUser
+	49, // 1: UserLoginResp.ex:type_name -> DBUserExpand
+	48, // 2: UserInfoResp.data:type_name -> DBUser
+	49, // 3: UserInfoResp.ex:type_name -> DBUserExpand
+	50, // 4: UserRegisterResp.Code:type_name -> ErrorCode
+	51, // 5: UserLoadResp.data:type_name -> CacheUser
+	52, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
+	52, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
+	48, // 8: UserBattlerecordResp.data:type_name -> DBUser
+	49, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand
+	53, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
+	54, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
+	55, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
+	51, // 13: UserOnlineResp.users:type_name -> CacheUser
+	48, // 14: UserDataListResp.users:type_name -> DBUser
+	56, // 15: UserGetServerDataResp.data:type_name -> DBServerData
+	57, // 16: UserSignResp.data:type_name -> DBSign
 	17, // [17:17] is the sub-list for method output_type
 	17, // [17:17] is the sub-list for method input_type
 	17, // [17:17] is the sub-list for extension type_name
@@ -2867,7 +2918,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetSettingReq); i {
+			switch v := v.(*UserVitChangedPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2879,7 +2930,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetSettingResp); i {
+			switch v := v.(*UserGetSettingReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2891,7 +2942,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserUpdateSettingReq); i {
+			switch v := v.(*UserGetSettingResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2903,7 +2954,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserUpdateSettingResp); i {
+			switch v := v.(*UserUpdateSettingReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2915,7 +2966,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserVeriCodeReq); i {
+			switch v := v.(*UserUpdateSettingResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2927,7 +2978,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserVeriCodeResp); i {
+			switch v := v.(*UserVeriCodeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2939,7 +2990,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserInitdataReq); i {
+			switch v := v.(*UserVeriCodeResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2951,7 +3002,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserInitdataResp); i {
+			switch v := v.(*UserInitdataReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2963,7 +3014,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifynameReq); i {
+			switch v := v.(*UserInitdataResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2975,7 +3026,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifynameResp); i {
+			switch v := v.(*UserModifynameReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2987,7 +3038,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifyavatarReq); i {
+			switch v := v.(*UserModifynameResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2999,7 +3050,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifyavatarResp); i {
+			switch v := v.(*UserModifyavatarReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3011,7 +3062,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifybgpReq); i {
+			switch v := v.(*UserModifyavatarResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3023,7 +3074,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifybgpResp); i {
+			switch v := v.(*UserModifybgpReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3035,7 +3086,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifyfigureReq); i {
+			switch v := v.(*UserModifybgpResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3047,7 +3098,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifyfigureResp); i {
+			switch v := v.(*UserModifyfigureReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3059,7 +3110,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetTujianReq); i {
+			switch v := v.(*UserModifyfigureResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3071,7 +3122,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetTujianResp); i {
+			switch v := v.(*UserGetTujianReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3083,7 +3134,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserLvChangedPush); i {
+			switch v := v.(*UserGetTujianResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3095,7 +3146,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserVipChangedPush); i {
+			switch v := v.(*UserLvChangedPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3107,7 +3158,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifysignReq); i {
+			switch v := v.(*UserVipChangedPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3119,7 +3170,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserModifysignResp); i {
+			switch v := v.(*UserModifysignReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3131,7 +3182,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserBattlerecordReq); i {
+			switch v := v.(*UserModifysignResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3143,7 +3194,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserBattlerecordResp); i {
+			switch v := v.(*UserBattlerecordReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3155,7 +3206,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSettingteamReq); i {
+			switch v := v.(*UserBattlerecordResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3167,7 +3218,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSettingteamResp); i {
+			switch v := v.(*UserSettingteamReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3179,7 +3230,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserShowteamReq); i {
+			switch v := v.(*UserSettingteamResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3191,7 +3242,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserShowteamResp); i {
+			switch v := v.(*UserShowteamReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3203,7 +3254,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserOnlineResp); i {
+			switch v := v.(*UserShowteamResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3215,7 +3266,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserDataListResp); i {
+			switch v := v.(*UserOnlineResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3227,7 +3278,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetServerDataReq); i {
+			switch v := v.(*UserDataListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3239,7 +3290,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserGetServerDataResp); i {
+			switch v := v.(*UserGetServerDataReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3251,7 +3302,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserSignReq); i {
+			switch v := v.(*UserGetServerDataResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3263,6 +3314,18 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UserSignReq); 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[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserSignResp); i {
 			case 0:
 				return &v.state
@@ -3281,7 +3344,7 @@ func file_user_user_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_user_user_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   47,
+			NumMessages:   48,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go
index 94f67aa7f..f6882c466 100644
--- a/pb/viking_msg.pb.go
+++ b/pb/viking_msg.pb.go
@@ -240,6 +240,7 @@ type VikingChallengeOverReq struct {
 	BossId     int32         `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"`         // boos 类型
 	Difficulty int32         `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
 	Report     *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"`          //战报
+	Star       []int32       `protobuf:"varint,4,rep,packed,name=star,proto3" json:"star"`      // 自动出售装备的星级
 }
 
 func (x *VikingChallengeOverReq) Reset() {
@@ -295,14 +296,22 @@ func (x *VikingChallengeOverReq) GetReport() *BattleReport {
 	return nil
 }
 
+func (x *VikingChallengeOverReq) GetStar() []int32 {
+	if x != nil {
+		return x.Star
+	}
+	return nil
+}
+
 // 客户端通知服务器打赢了
 type VikingChallengeOverResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data  *DBViking     `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
-	Asset []*UserAssets `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` //  GameRe // 推送atn
+	Data  *DBViking   `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+	Asset []*UserAtno `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` //  推送atno
+	Sell  []string    `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"`   // 自动出售的装备
 }
 
 func (x *VikingChallengeOverResp) Reset() {
@@ -344,13 +353,20 @@ func (x *VikingChallengeOverResp) GetData() *DBViking {
 	return nil
 }
 
-func (x *VikingChallengeOverResp) GetAsset() []*UserAssets {
+func (x *VikingChallengeOverResp) GetAsset() []*UserAtno {
 	if x != nil {
 		return x.Asset
 	}
 	return nil
 }
 
+func (x *VikingChallengeOverResp) GetSell() []string {
+	if x != nil {
+		return x.Sell
+	}
+	return nil
+}
+
 // 购买
 type VikingBuyReq struct {
 	state         protoimpl.MessageState
@@ -576,35 +592,37 @@ var file_viking_viking_msg_proto_rawDesc = []byte{
 	0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
 	0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
 	0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66,
-	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x77, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66,
-	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69,
-	0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
-	0x5b, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
-	0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
+	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x8b, 0x01, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+	0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66,
+	0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64,
+	0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70,
+	0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04,
+	0x73, 0x74, 0x61, 0x72, 0x22, 0x6d, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68,
+	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f,
+	0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12,
+	0x12, 0x0a, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x65, 0x6c, 0x6c, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79,
+	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b,
+	0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
 	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
-	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x73, 0x73,
-	0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x22, 0x24, 0x0a, 0x0c,
-	0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b,
-	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54,
-	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56,
-	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52,
-	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b,
+	0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69,
+	0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -635,7 +653,7 @@ var file_viking_viking_msg_proto_goTypes = []interface{}{
 	(*BattleFormation)(nil),         // 11: BattleFormation
 	(*BattleInfo)(nil),              // 12: BattleInfo
 	(*BattleReport)(nil),            // 13: BattleReport
-	(*UserAssets)(nil),              // 14: UserAssets
+	(*UserAtno)(nil),                // 14: UserAtno
 	(*DBVikingRank)(nil),            // 15: DBVikingRank
 }
 var file_viking_viking_msg_proto_depIdxs = []int32{
@@ -644,7 +662,7 @@ var file_viking_viking_msg_proto_depIdxs = []int32{
 	12, // 2: VikingChallengeResp.info:type_name -> BattleInfo
 	13, // 3: VikingChallengeOverReq.report:type_name -> BattleReport
 	10, // 4: VikingChallengeOverResp.data:type_name -> DBViking
-	14, // 5: VikingChallengeOverResp.asset:type_name -> UserAssets
+	14, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno
 	10, // 6: VikingBuyResp.data:type_name -> DBViking
 	15, // 7: VikingRankListResp.ranks:type_name -> DBVikingRank
 	8,  // [8:8] is the sub-list for method output_type