diff --git a/cmd/v2/lib/common/lang.go b/cmd/v2/lib/common/lang.go
index d06ee0f1d..7f9c6298b 100644
--- a/cmd/v2/lib/common/lang.go
+++ b/cmd/v2/lib/common/lang.go
@@ -152,6 +152,7 @@ const (
 	USERINFO_BTN_REFRESH = "刷新"
 	USERINFO_PANEL_TITLE = "用户信息"
 	USERINFO_UID         = "UID"
+	USERINFO_SERVER      = "区服"
 	USERINFO_ACC         = "账号"
 	USERINFO_NAME        = "昵称"
 	USERINFO_TITLE       = "头衔"
diff --git a/cmd/v2/package.bat b/cmd/v2/package.bat
new file mode 100644
index 000000000..880676c07
--- /dev/null
+++ b/cmd/v2/package.bat
@@ -0,0 +1,4 @@
+SET GOOS=windows
+SET GOARCH=amd64
+
+go build -o robot.exe
\ No newline at end of file
diff --git a/cmd/v2/ui/toy_userinfo.go b/cmd/v2/ui/toy_userinfo.go
index 390f6ca2b..b8f813d95 100644
--- a/cmd/v2/ui/toy_userinfo.go
+++ b/cmd/v2/ui/toy_userinfo.go
@@ -96,18 +96,19 @@ func (this *toyUserInfo) dataListener() {
 
 			// _ = this.data.Append(fmt.Sprintf("%-3s\t: %s", common.USERINFO_UID, this.userInfo.DbUser.Uid))
 			_ = this.data.Append(this.getAcc())           //0
-			_ = this.data.Append(this.getName())          //1
-			_ = this.data.Append(this.getAvatar())        //2
-			_ = this.data.Append(this.getVip())           //3
-			_ = this.data.Append(this.getLv())            //4
-			_ = this.data.Append(this.getGold())          //5
-			_ = this.data.Append(this.getExp())           //6
-			_ = this.data.Append(this.getTitle())         //7
-			_ = this.data.Append(this.getActiveDay())     //8
-			_ = this.data.Append(this.getActiveWeek())    //9
-			_ = this.data.Append(this.getFriendPoint())   //10
-			_ = this.data.Append(this.getModiNameCount()) //11
-			_ = this.data.Append(this.getSign())          //12
+			_ = this.data.Append(this.getSid())           //1
+			_ = this.data.Append(this.getName())          //2
+			_ = this.data.Append(this.getAvatar())        //3
+			_ = this.data.Append(this.getVip())           //4
+			_ = this.data.Append(this.getLv())            //5
+			_ = this.data.Append(this.getGold())          //6
+			_ = this.data.Append(this.getExp())           //7
+			_ = this.data.Append(this.getTitle())         //8
+			_ = this.data.Append(this.getActiveDay())     //9
+			_ = this.data.Append(this.getActiveWeek())    //10
+			_ = this.data.Append(this.getFriendPoint())   //11
+			_ = this.data.Append(this.getModiNameCount()) //12
+			_ = this.data.Append(this.getSign())          //13
 		},
 	})
 
@@ -122,7 +123,7 @@ func (this *toyUserInfo) dataListener() {
 					logrus.Error("unmarshal err")
 				}
 				// updatename
-				this.setProp(1, common.USERINFO_NAME, rsp.Name)
+				this.setProp(2, common.USERINFO_NAME, rsp.Name)
 			}
 
 			//update info
@@ -133,17 +134,19 @@ func (this *toyUserInfo) dataListener() {
 					logrus.Error("unmarshal err")
 					return
 				}
-				this.setProp(2, common.USERINFO_AVATAR, rsp.Data.Avatar)
-				this.setProp(3, common.USERINFO_VIP, rsp.Data.Vip)
-				this.setProp(4, common.USERINFO_LV, rsp.Data.Lv)
-				this.setProp(5, common.USERINFO_GOLD, rsp.Data.Gold)
-				this.setProp(6, common.USERINFO_EXP, rsp.Data.Exp)
-				this.setProp(7, common.USERINFO_TITLE, rsp.Data.Title)
-				this.setProp(8, common.USERINFO_ACTIVE_DAY, rsp.Ex.Activeday)
-				this.setProp(9, common.USERINFO_ACTIVE_WEEK, rsp.Ex.Activeweek)
-				this.setProp(10, common.USERINFO_FRIENDPOINT, rsp.Ex.FriendPoint)
-				this.setProp(11, common.USERINFO_MODINAME, rsp.Ex.ModifynameCount)
-				this.setProp(12, common.USERINFO_SIGN, rsp.Ex.Sign)
+				this.setProp(1, common.USERINFO_SERVER, rsp.Data.Sid)
+				this.setProp(2, common.USERINFO_NAME, rsp.Data.Name)
+				this.setProp(3, common.USERINFO_AVATAR, rsp.Data.Avatar)
+				this.setProp(4, common.USERINFO_VIP, rsp.Data.Vip)
+				this.setProp(5, common.USERINFO_LV, rsp.Data.Lv)
+				this.setProp(6, common.USERINFO_GOLD, rsp.Data.Gold)
+				this.setProp(7, common.USERINFO_EXP, rsp.Data.Exp)
+				this.setProp(8, common.USERINFO_TITLE, rsp.Data.Title)
+				this.setProp(9, common.USERINFO_ACTIVE_DAY, rsp.Ex.Activeday)
+				this.setProp(10, common.USERINFO_ACTIVE_WEEK, rsp.Ex.Activeweek)
+				this.setProp(11, common.USERINFO_FRIENDPOINT, rsp.Ex.FriendPoint)
+				this.setProp(12, common.USERINFO_MODINAME, rsp.Ex.ModifynameCount)
+				this.setProp(13, common.USERINFO_SIGN, rsp.Ex.Sign)
 			}
 		},
 	})
@@ -180,6 +183,10 @@ func (this *toyUserInfo) getAcc() string {
 	return fmt.Sprintf("%-3s\t: %s", common.USERINFO_ACC, this.userInfo.DbUser.Binduid)
 }
 
+func (this *toyUserInfo) getSid() string {
+	return fmt.Sprintf("%-3s\t: %s", common.USERINFO_SERVER, this.userInfo.DbUser.Sid)
+}
+
 func (this *toyUserInfo) getName() string {
 	return fmt.Sprintf("%-3s\t: %s", common.USERINFO_NAME, this.userInfo.DbUser.Name)
 }
diff --git a/modules/friend/api.go b/modules/friend/api.go
index c631bc5b4..e6aab76c1 100644
--- a/modules/friend/api.go
+++ b/modules/friend/api.go
@@ -3,6 +3,7 @@ package friend
 import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
 )
 
 const (
@@ -33,3 +34,18 @@ func (this *apiComp) Init(service core.IService, module core.IModule, comp core.
 	this.moduleFriend = module.(*Friend)
 	return
 }
+
+func (this *apiComp) setDefaultFriendUserBaseInfo(userId string) *pb.FriendBase {
+	user := this.moduleFriend.ModuleUser.GetUser(userId)
+	if user != nil {
+		return &pb.FriendBase{
+			ServerId:    user.Sid,
+			UserId:      userId,
+			NickName:    user.Name,
+			Level:       user.Lv,
+			Avatar:      user.Avatar,
+			OfflineTime: user.Offlinetime,
+		}
+	}
+	return nil
+}
diff --git a/modules/friend/api_applylist.go b/modules/friend/api_applylist.go
index 443576914..4dd95cc34 100644
--- a/modules/friend/api_applylist.go
+++ b/modules/friend/api_applylist.go
@@ -37,17 +37,10 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyLis
 	}
 
 	for _, userId := range self.ApplyIds {
-		user := this.moduleFriend.ModuleUser.GetUser(userId)
-		if user == nil {
-			continue
+		base := this.setDefaultFriendUserBaseInfo(userId)
+		if base != nil {
+			list = append(list, base)
 		}
-		//TODO 组装FriendBase明细数据
-		list = append(list, &pb.FriendBase{
-			UserId:   userId,
-			NickName: user.Name,
-			Level:    user.Lv,
-			Avatar:   user.Avatar,
-		})
 	}
 
 	return
diff --git a/modules/friend/api_blacklist.go b/modules/friend/api_blacklist.go
index cf8bb00ae..453be5dfa 100644
--- a/modules/friend/api_blacklist.go
+++ b/modules/friend/api_blacklist.go
@@ -38,16 +38,10 @@ func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackLis
 	}
 
 	for _, userId := range self.BlackIds {
-		user := this.moduleFriend.ModuleUser.GetUser(userId)
-		if user == nil {
-			continue
+		base := this.setDefaultFriendUserBaseInfo(userId)
+		if base != nil {
+			list = append(list, base)
 		}
-
-		list = append(list, &pb.FriendBase{
-			UserId:   userId,
-			NickName: user.Name,
-			Level:    user.Lv,
-		})
 	}
 
 	return
diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go
index 7b82e24e7..e144627d6 100644
--- a/modules/friend/api_list.go
+++ b/modules/friend/api_list.go
@@ -44,22 +44,15 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (cod
 	// 我的好友
 	for _, userId := range self.FriendIds {
 		// 获取好友详情
-		user := this.moduleFriend.ModuleUser.GetUser(userId)
-		if user == nil {
+		base := this.setDefaultFriendUserBaseInfo(userId)
+		if base == nil {
 			continue
 		}
 
-		base := &pb.FriendBase{
-			UserId:   userId,
-			NickName: user.Name,
-			Level:    user.Lv,
-			Avatar:   user.Avatar,
-		}
-
 		// 判断用户在线状态
 		us := this.moduleFriend.ModuleUser.GetUserSession(userId)
-		if us == nil || us.SessionId == "" {
-			base.OfflineTime = user.Offlinetime //离线时间
+		if us != nil {
+			base.OfflineTime = 0 //在线
 		}
 
 		// 判断是否已点赞
diff --git a/modules/friend/api_randlist.go b/modules/friend/api_randlist.go
index 230063655..79217b67d 100644
--- a/modules/friend/api_randlist.go
+++ b/modules/friend/api_randlist.go
@@ -1,7 +1,6 @@
 package friend
 
 import (
-	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
@@ -25,10 +24,14 @@ func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistR
 	}
 
 	// 只随机选择5个在线玩家
-	// var randOnlineUsers []string
+	var randOnlineUsers []string
 	if len(cu) > 5 {
-		fmt.Println(utils.Numbers(0, len(cu), 5))
-
+		randArr := utils.Numbers(0, len(cu), 5)
+		for _, v := range randArr {
+			if cu[v] != nil {
+				randOnlineUsers = append(randOnlineUsers, cu[v].Uid)
+			}
+		}
 	}
 
 	// 当前玩家好友数据
@@ -40,33 +43,31 @@ func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistR
 
 	var userList []*pb.FriendBase
 
-	for _, v := range cu {
+	for _, uid := range randOnlineUsers {
 		// 将自己从在线玩家中过滤掉
-		if v.Uid == session.GetUserId() {
+		if uid == session.GetUserId() {
 			continue
 		}
 		// 将自己的好友从在线玩家中过滤掉
-		if _, ok := utils.Findx(self.FriendIds, v.Uid); ok {
+		if _, ok := utils.Findx(self.FriendIds, uid); ok {
 			continue
 		}
 
 		// 判断当前在线好友是否在自己的申请列表中，如果存在也过滤掉
-		target := this.moduleFriend.modelFriend.GetFriend(v.Uid)
+		target := this.moduleFriend.modelFriend.GetFriend(uid)
 		if target == nil {
 			continue
 		}
 
 		// 获取在线好友的信息
-		user := this.moduleFriend.ModuleUser.GetUser(v.Uid)
+		user := this.moduleFriend.ModuleUser.GetUser(uid)
 		if user == nil {
 			continue
 		}
 
-		base := &pb.FriendBase{
-			UserId:      user.Uid,
-			NickName:    user.Name,
-			Level:       user.Lv,
-			OfflineTime: user.Offlinetime,
+		base := this.setDefaultFriendUserBaseInfo(uid)
+		if base == nil {
+			continue
 		}
 
 		// 申请过的在线好友，设置申请状态
diff --git a/modules/friend/api_zanlist.go b/modules/friend/api_zanlist.go
index 3c0045be7..46f135adc 100644
--- a/modules/friend/api_zanlist.go
+++ b/modules/friend/api_zanlist.go
@@ -13,7 +13,7 @@ func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanli
 	return
 }
 
-// Deprecated: 
+// Deprecated:
 func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data proto.Message) {
 	if code = this.ZanlistCheck(session, req); code != pb.ErrorCode_Success {
 		return
@@ -31,15 +31,10 @@ func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq
 	}
 
 	for _, v := range self.ZanIds {
-		user := this.moduleFriend.ModuleUser.GetUser(v)
-		if user == nil {
-			continue
+		base := this.setDefaultFriendUserBaseInfo(v)
+		if base != nil {
+			list = append(list, base)
 		}
-
-		list = append(list, &pb.FriendBase{
-			UserId:   v,
-			NickName: user.Name,
-		})
 	}
 
 	rsp := &pb.FriendZanlistResp{
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index d826f7260..1c67f8477 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -84,31 +84,30 @@ const (
 	ErrorCode_ItemsGirdAmountUpper ErrorCode = 1203 //背包格子容量已达上限
 	ErrorCode_ItemsUseNotSupported ErrorCode = 1204 //暂不支持使用
 	// hero
-	ErrorCode_HeroNoExist             ErrorCode = 1300 //英雄不存在
-	ErrorCode_HeroNoEnough            ErrorCode = 1301 //英雄数量不足
-	ErrorCode_HeroMaxLv               ErrorCode = 1302 //英雄达到最大等级
-	ErrorCode_HeroInitCreat           ErrorCode = 1303 //初始化英雄
-	ErrorCode_HeroColorErr            ErrorCode = 1304 // 品质不匹配
-	ErrorCode_HeroSkillUpErr          ErrorCode = 1305 // 技能升级失败
-	ErrorCode_HeroMaxResonate         ErrorCode = 1306 // 达到最大共鸣次数
-	ErrorCode_HeroNoResonate          ErrorCode = 1307 // 没有共鸣
-	ErrorCode_HeroNotNeedResonate     ErrorCode = 1308 // 不需要重置共鸣
-	ErrorCode_HeroNoEnergy            ErrorCode = 1309 // 没有能量点数
-	ErrorCode_HeroCreate              ErrorCode = 1310 // 创建卡失败
-	ErrorCode_HeroEquipUpdate         ErrorCode = 1311 // 更新装备失败
-	ErrorCode_HeroMaxAwaken           ErrorCode = 1312 // 达到最大觉醒等级
-	ErrorCode_HeroIsLock              ErrorCode = 1313 // 英雄被锁定不能被消耗
-	ErrorCode_HeroMaxCount            ErrorCode = 1314 // 英雄达到最大数量
-	ErrorCode_HeroCostTypeErr         ErrorCode = 1315 // 消耗英雄参数不匹配
-	ErrorCode_HeroStarErr             ErrorCode = 1316 // 不满足升星条件
-	ErrorCode_HeroTypeErr             ErrorCode = 1317 // 升级英雄类型不对
-	ErrorCode_HeroExpTypeErr          ErrorCode = 1318 // 技能升级卡类型不对
-	ErrorCode_HeroAddMaxExp           ErrorCode = 1319 // 升级经验卡溢出 检查传入的数量
-	ErrorCode_HeroStarLvErr           ErrorCode = 1320 // 升星等级不够
-	ErrorCode_HeroMaxStarLv           ErrorCode = 1321 // 达到最大升星等级
-	ErrorCode_DrawCardTypeNotFound    ErrorCode = 1322 // 抽卡类型不匹配
-	ErrorCode_HeroMaxSkillLv          ErrorCode = 1323 // 达到最大技能等级
-	ErrorCode_HeroAlreadyKongFuStatus ErrorCode = 1324 // 已经是练功状态
+	ErrorCode_HeroNoExist          ErrorCode = 1300 //英雄不存在
+	ErrorCode_HeroNoEnough         ErrorCode = 1301 //英雄数量不足
+	ErrorCode_HeroMaxLv            ErrorCode = 1302 //英雄达到最大等级
+	ErrorCode_HeroInitCreat        ErrorCode = 1303 //初始化英雄
+	ErrorCode_HeroColorErr         ErrorCode = 1304 // 品质不匹配
+	ErrorCode_HeroSkillUpErr       ErrorCode = 1305 // 技能升级失败
+	ErrorCode_HeroMaxResonate      ErrorCode = 1306 // 达到最大共鸣次数
+	ErrorCode_HeroNoResonate       ErrorCode = 1307 // 没有共鸣
+	ErrorCode_HeroNotNeedResonate  ErrorCode = 1308 // 不需要重置共鸣
+	ErrorCode_HeroNoEnergy         ErrorCode = 1309 // 没有能量点数
+	ErrorCode_HeroCreate           ErrorCode = 1310 // 创建卡失败
+	ErrorCode_HeroEquipUpdate      ErrorCode = 1311 // 更新装备失败
+	ErrorCode_HeroMaxAwaken        ErrorCode = 1312 // 达到最大觉醒等级
+	ErrorCode_HeroIsLock           ErrorCode = 1313 // 英雄被锁定不能被消耗
+	ErrorCode_HeroMaxCount         ErrorCode = 1314 // 英雄达到最大数量
+	ErrorCode_HeroCostTypeErr      ErrorCode = 1315 // 消耗英雄参数不匹配
+	ErrorCode_HeroStarErr          ErrorCode = 1316 // 不满足升星条件
+	ErrorCode_HeroTypeErr          ErrorCode = 1317 // 升级英雄类型不对
+	ErrorCode_HeroExpTypeErr       ErrorCode = 1318 // 技能升级卡类型不对
+	ErrorCode_HeroAddMaxExp        ErrorCode = 1319 // 升级经验卡溢出 检查传入的数量
+	ErrorCode_HeroStarLvErr        ErrorCode = 1320 // 升星等级不够
+	ErrorCode_HeroMaxStarLv        ErrorCode = 1321 // 达到最大升星等级
+	ErrorCode_DrawCardTypeNotFound ErrorCode = 1322 // 抽卡类型不匹配
+	ErrorCode_HeroMaxSkillLv       ErrorCode = 1323 // 达到最大技能等级
 	// equipment
 	ErrorCode_EquipmentOnFoundEquipment ErrorCode = 1400 // 未找到武器
 	ErrorCode_EquipmentLvlimitReached   ErrorCode = 1401 // 武器等级已达上限
@@ -239,7 +238,6 @@ var (
 		1321: "HeroMaxStarLv",
 		1322: "DrawCardTypeNotFound",
 		1323: "HeroMaxSkillLv",
-		1324: "HeroAlreadyKongFuStatus",
 		1400: "EquipmentOnFoundEquipment",
 		1401: "EquipmentLvlimitReached",
 		1402: "EquipmentIsWorn",
@@ -358,7 +356,6 @@ var (
 		"HeroMaxStarLv":             1321,
 		"DrawCardTypeNotFound":      1322,
 		"HeroMaxSkillLv":            1323,
-		"HeroAlreadyKongFuStatus":   1324,
 		"EquipmentOnFoundEquipment": 1400,
 		"EquipmentLvlimitReached":   1401,
 		"EquipmentIsWorn":           1402,
@@ -428,7 +425,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xd4, 0x13, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb6, 0x13, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -533,60 +530,58 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72,
 	0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a,
 	0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
-	0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72,
-	0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x10, 0xac, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9,
-	0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73,
-	0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65,
-	0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d,
-	0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10,
-	0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72,
-	0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14,
-	0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65,
-	0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72,
-	0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74,
-	0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74,
-	0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c,
-	0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65,
-	0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41,
-	0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11,
-	0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e,
-	0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69,
-	0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a,
-	0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10,
-	0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
-	0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67,
-	0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61,
-	0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a,
-	0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64,
-	0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f,
-	0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75,
-	0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10,
-	0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46,
-	0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64,
-	0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50,
-	0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72,
-	0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a,
-	0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55,
-	0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61,
-	0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1,
-	0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c,
-	0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47,
-	0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54,
-	0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65,
-	0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12,
-	0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10,
-	0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64,
+	0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
+	0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70,
+	0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+	0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a,
+	0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
+	0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19,
+	0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74,
+	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77,
+	0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e,
+	0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73,
+	0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73,
+	0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16,
+	0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f,
+	0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63,
+	0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12,
+	0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
+	0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54,
+	0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61,
+	0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c,
+	0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12,
+	0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f,
+	0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70,
+	0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
+	0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72,
+	0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f,
+	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67,
+	0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a,
+	0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61,
+	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12,
+	0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f,
+	0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10,
+	0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65,
+	0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61,
+	0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x19, 0x0a,
+	0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72,
+	0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10,
+	0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
+	0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 0c641ad89..13f626649 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -30,7 +30,7 @@ type FriendBase struct {
 	Level       int32  `protobuf:"varint,3,opt,name=level,proto3" json:"level"`             //等级
 	Avatar      string `protobuf:"bytes,4,opt,name=avatar,proto3" json:"avatar"`            //头像
 	Strength    int64  `protobuf:"varint,5,opt,name=strength,proto3" json:"strength"`       //战力
-	ServerId    int32  `protobuf:"varint,6,opt,name=serverId,proto3" json:"serverId"`       //服务编号
+	ServerId    string `protobuf:"bytes,6,opt,name=serverId,proto3" json:"serverId"`        //服务编号
 	OfflineTime int64  `protobuf:"varint,7,opt,name=offlineTime,proto3" json:"offlineTime"` //最近一次下线时间 0在线
 	IsApplied   bool   `protobuf:"varint,8,opt,name=isApplied,proto3" json:"isApplied"`     //是否已申请加好友
 	IsZaned     bool   `protobuf:"varint,9,opt,name=isZaned,proto3" json:"isZaned"`         //是否已点赞
@@ -104,11 +104,11 @@ func (x *FriendBase) GetStrength() int64 {
 	return 0
 }
 
-func (x *FriendBase) GetServerId() int32 {
+func (x *FriendBase) GetServerId() string {
 	if x != nil {
 		return x.ServerId
 	}
-	return 0
+	return ""
 }
 
 func (x *FriendBase) GetOfflineTime() int64 {
@@ -1676,7 +1676,7 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74,
 	0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74,
 	0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
 	0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d,
 	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65,
 	0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65,
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index 372b05636..412337e60 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -20,52 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type HeroType int32
-
-const (
-	HeroType_HeroTypeNil    HeroType = 0
-	HeroType_HeroTypeKongFu HeroType = 1
-)
-
-// Enum value maps for HeroType.
-var (
-	HeroType_name = map[int32]string{
-		0: "HeroTypeNil",
-		1: "HeroTypeKongFu",
-	}
-	HeroType_value = map[string]int32{
-		"HeroTypeNil":    0,
-		"HeroTypeKongFu": 1,
-	}
-)
-
-func (x HeroType) Enum() *HeroType {
-	p := new(HeroType)
-	*p = x
-	return p
-}
-
-func (x HeroType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HeroType) Descriptor() protoreflect.EnumDescriptor {
-	return file_hero_hero_db_proto_enumTypes[0].Descriptor()
-}
-
-func (HeroType) Type() protoreflect.EnumType {
-	return &file_hero_hero_db_proto_enumTypes[0]
-}
-
-func (x HeroType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HeroType.Descriptor instead.
-func (HeroType) EnumDescriptor() ([]byte, []int) {
-	return file_hero_hero_db_proto_rawDescGZIP(), []int{0}
-}
-
 type SkillData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -151,7 +105,6 @@ type DBHero struct {
 	IsOverlying          bool             `protobuf:"varint,23,opt,name=isOverlying,proto3" json:"isOverlying"`                                                                                                                     // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true
 	EnergyProperty       map[string]int32 `protobuf:"bytes,24,rep,name=energyProperty,proto3" json:"energyProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"energyProperty"` //
 	JuexProperty         map[string]int32 `protobuf:"bytes,25,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"`       ////hp
-	Status               HeroType         `protobuf:"varint,26,opt,name=status,proto3,enum=HeroType" json:"status"`                                                                                                                 // 状态 (1 练功)
 }
 
 func (x *DBHero) Reset() {
@@ -361,13 +314,6 @@ func (x *DBHero) GetJuexProperty() map[string]int32 {
 	return nil
 }
 
-func (x *DBHero) GetStatus() HeroType {
-	if x != nil {
-		return x.Status
-	}
-	return HeroType_HeroTypeNil
-}
-
 type Floor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -519,7 +465,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73,
 	0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b,
-	0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xb3, 0x09, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
+	0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x90, 0x09, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
 	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, 0x44, 0x18, 0x03, 0x20, 0x01,
@@ -572,45 +518,40 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x19, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x4a, 0x75, 0x65,
 	0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c,
-	0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x21, 0x0a, 0x06,
-	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x48,
-	0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a,
-	0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10,
-	0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b,
-	0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d,
+	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64,
+	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65,
+	0x72, 0x67, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
 	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
 	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67,
-	0x79, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75,
-	0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 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, 0x90, 0x01, 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, 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,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 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, 0x90, 0x01, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -625,33 +566,30 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
 	return file_hero_hero_db_proto_rawDescData
 }
 
-var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_hero_hero_db_proto_goTypes = []interface{}{
-	(HeroType)(0),        // 0: HeroType
-	(*SkillData)(nil),    // 1: SkillData
-	(*DBHero)(nil),       // 2: DBHero
-	(*Floor)(nil),        // 3: Floor
-	(*DBHeroRecord)(nil), // 4: DBHeroRecord
-	nil,                  // 5: DBHero.PropertyEntry
-	nil,                  // 6: DBHero.AddPropertyEntry
-	nil,                  // 7: DBHero.EnergyEntry
-	nil,                  // 8: DBHero.EnergyPropertyEntry
-	nil,                  // 9: DBHero.JuexPropertyEntry
+	(*SkillData)(nil),    // 0: SkillData
+	(*DBHero)(nil),       // 1: DBHero
+	(*Floor)(nil),        // 2: Floor
+	(*DBHeroRecord)(nil), // 3: DBHeroRecord
+	nil,                  // 4: DBHero.PropertyEntry
+	nil,                  // 5: DBHero.AddPropertyEntry
+	nil,                  // 6: DBHero.EnergyEntry
+	nil,                  // 7: DBHero.EnergyPropertyEntry
+	nil,                  // 8: DBHero.JuexPropertyEntry
 }
 var file_hero_hero_db_proto_depIdxs = []int32{
-	1, // 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
-	0, // 6: DBHero.status:type_name -> HeroType
-	7, // [7:7] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension extendee
-	0, // [0:7] is the sub-list for field type_name
+	0, // 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
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_hero_hero_db_proto_init() }
@@ -714,14 +652,13 @@ func file_hero_hero_db_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hero_hero_db_proto_rawDesc,
-			NumEnums:      1,
+			NumEnums:      0,
 			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
 		GoTypes:           file_hero_hero_db_proto_goTypes,
 		DependencyIndexes: file_hero_hero_db_proto_depIdxs,
-		EnumInfos:         file_hero_hero_db_proto_enumTypes,
 		MessageInfos:      file_hero_hero_db_proto_msgTypes,
 	}.Build()
 	File_hero_hero_db_proto = out.File