diff --git a/comm/const.go b/comm/const.go
index ede3e4ba3..c87476ff3 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -32,39 +32,39 @@ const (
 
 //模块名定义处
 const (
-	ModuleSys           core.M_Modules = "sys"           //系统
-	ModuleGate          core.M_Modules = "gateway"       //gate模块 	网关服务模块
-	ModuleWeb           core.M_Modules = "web"           //后台模块
-	ModuleUser          core.M_Modules = "user"          //用户模块
-	ModulePack          core.M_Modules = "pack"          //背包模块
-	ModuleMail          core.M_Modules = "mail"          //邮件模块
-	ModuleFriend        core.M_Modules = "friend"        //好友模块
-	ModuleMgoLog        core.M_Modules = "mgolog"        //日志模块
-	ModuleEquipment     core.M_Modules = "equipment"     //装备模块
-	ModuleHero          core.M_Modules = "hero"          //英雄模块
-	ModuleForum         core.M_Modules = "forum"         //论坛模块
-	ModuleItems         core.M_Modules = "items"         //道具模块
-	ModuleShop          core.M_Modules = "shop"          //商店模块
-	ModuleTask          core.M_Modules = "task"          //任务模块
-	ModuleMainline      core.M_Modules = "mainline"      //主线模块
-	ModuleNotify        core.M_Modules = "notify"        //公告模块
-	ModuleChat          core.M_Modules = "chat"          //聊天模块
-	ModuleGM            core.M_Modules = "gm"            //gm模块
-	ModulePagoda        core.M_Modules = "pagoda"        //魔塔模块
-	ModuleMartialhall   core.M_Modules = "martialhall"   //武馆模块
-	ModuleGourmet       core.M_Modules = "gourmet"       //美食馆
-	ModuleRtask         core.M_Modules = "rtask"         //随机任务
-	ModuleSmithy        core.M_Modules = "smithy"        //铁匠铺
-	ModuleTimer         core.M_Modules = "timer"         //定时任务模块
-	ModuleViking        core.M_Modules = "viking"        //维京远征
-	ModuleMoonfantasy   core.M_Modules = "moonfantasy"   //月之秘境模块
-	ModuleHunting       core.M_Modules = "hunting"       //狩猎
-	ModuleLinestory     core.M_Modules = "linestory"     //支线剧情
-	ModuleBattle        core.M_Modules = "battle"        //战斗
-	ModuleLibrary       core.M_Modules = "library"       //藏书馆
-	ModuleArena         core.M_Modules = "arena"         //竞技场
-	ModuleTroll         core.M_Modules = "troll"         //巨怪商队
-	ModuleConstellation core.M_Modules = "constellation" //星座图
+	ModuleSys         core.M_Modules = "sys"         //系统
+	ModuleGate        core.M_Modules = "gateway"     //gate模块 	网关服务模块
+	ModuleWeb         core.M_Modules = "web"         //后台模块
+	ModuleUser        core.M_Modules = "user"        //用户模块
+	ModulePack        core.M_Modules = "pack"        //背包模块
+	ModuleMail        core.M_Modules = "mail"        //邮件模块
+	ModuleFriend      core.M_Modules = "friend"      //好友模块
+	ModuleMgoLog      core.M_Modules = "mgolog"      //日志模块
+	ModuleEquipment   core.M_Modules = "equipment"   //装备模块
+	ModuleHero        core.M_Modules = "hero"        //英雄模块
+	ModuleForum       core.M_Modules = "forum"       //论坛模块
+	ModuleItems       core.M_Modules = "items"       //道具模块
+	ModuleShop        core.M_Modules = "shop"        //商店模块
+	ModuleTask        core.M_Modules = "task"        //任务模块
+	ModuleMainline    core.M_Modules = "mainline"    //主线模块
+	ModuleNotify      core.M_Modules = "notify"      //公告模块
+	ModuleChat        core.M_Modules = "chat"        //聊天模块
+	ModuleGM          core.M_Modules = "gm"          //gm模块
+	ModulePagoda      core.M_Modules = "pagoda"      //魔塔模块
+	ModuleMartialhall core.M_Modules = "martialhall" //武馆模块
+	ModuleGourmet     core.M_Modules = "gourmet"     //美食馆
+	ModuleRtask       core.M_Modules = "rtask"       //随机任务
+	ModuleSmithy      core.M_Modules = "smithy"      //铁匠铺
+	ModuleTimer       core.M_Modules = "timer"       //定时任务模块
+	ModuleViking      core.M_Modules = "viking"      //维京远征
+	ModuleMoonfantasy core.M_Modules = "moonfantasy" //月之秘境模块
+	ModuleHunting     core.M_Modules = "hunting"     //狩猎
+	ModuleLinestory   core.M_Modules = "linestory"   //支线剧情
+	ModuleBattle      core.M_Modules = "battle"      //战斗
+	ModuleLibrary     core.M_Modules = "library"     //藏书馆
+	ModuleArena       core.M_Modules = "arena"       //竞技场
+	ModuleTroll       core.M_Modules = "troll"       //巨怪商队
+	ModuleHoroscope   core.M_Modules = "horoscope"   //星座图
 	//ModuleFetter      core.M_Modules = "herofetter"  //好友模块
 )
 
@@ -161,6 +161,9 @@ const (
 	// 天赋
 	TableTalent = "herotalent"
 	TableTroll  = "trolltrain"
+
+	//星座图
+	TableHoroscope = "horoscope"
 )
 
 //RPC服务接口定义处
diff --git a/modules/constellation/module.go b/modules/constellation/module.go
deleted file mode 100644
index d62973b85..000000000
--- a/modules/constellation/module.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package constellation
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/base"
-	"go_dreamfactory/lego/core"
-	"go_dreamfactory/modules"
-)
-
-/*
-模块名:星座图
-描述:全局属性增幅器
-开发:李伟
-*/
-func NewModule() core.IModule {
-	m := new(Constellation)
-	return m
-}
-
-type Constellation struct {
-	modules.ModuleBase
-	service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口
-	options *Options
-}
-
-//模块名
-func (this *Constellation) GetType() core.M_Modules {
-	return comm.ModuleChat
-}
diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go
index 6e2cd4467..859cf0bcc 100644
--- a/modules/equipment/api_upgrade.go
+++ b/modules/equipment/api_upgrade.go
@@ -16,7 +16,6 @@ import (
 
 //参数校验
 func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode) {
-
 	if req.EquipmentId == "" {
 		code = pb.ErrorCode_ReqParameterError
 		return
diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index fb6692c40..8e67ab302 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -218,19 +218,27 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
 		UId:            uid,
 		OverlayNum:     1,
 		IsInitialState: false,
-		AdverbEntry:    make([]*pb.EquipmentAttributeEntry, 0),
 	}
 	if mattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Leadlibrary); err != nil || len(mattr) == 0 {
 		return
 	}
-	equipment.MainEntry = &pb.EquipmentAttributeEntry{
-		Id:        mattr[0].Key,
-		Libraryid: mattr[0].Libraryid,
-		Lv:        1,
-		AttrName:  mattr[0].Attrkey,
-		Value:     mattr[0].Attrvar,
-		BaseValue: mattr[0].Attrvar,
+	if conf.EquipId == 1 {
+		equipment.MainEntry = &pb.EquipmentAttributeEntry{
+			Id:        mattr[0].Key,
+			Libraryid: mattr[0].Libraryid,
+			Lv:        1,
+			AttrName:  mattr[0].Attrkey,
+			Value:     mattr[0].Attrvar,
+			BaseValue: mattr[0].Attrvar,
+		}
+	} else {
+		equipment.Mainskill = &pb.EquipmentSkillEntry{
+			Id:      mattr[0].Key,
+			SkillId: mattr[0].Attrkey,
+			Lv:      1,
+		}
 	}
+
 	if sattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(mattr) == 0 {
 		return
 	}
@@ -247,15 +255,27 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
 	}
 	if satterNum > 0 && satterNum <= 4 {
 		r := rand.New(rand.NewSource(time.Now().Unix()))
-		for _, v := range r.Perm(len(sattr))[:satterNum] {
-			equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{
-				Id:        sattr[v].Key,
-				Libraryid: sattr[v].Libraryid,
-				Lv:        1,
-				AttrName:  sattr[v].Attrkey,
-				Value:     sattr[v].Attrvar,
-				BaseValue: sattr[v].Attrvar,
-			})
+		if conf.EquipId == 1 {
+			equipment.AdverbEntry = make([]*pb.EquipmentAttributeEntry, 0)
+			for _, v := range r.Perm(len(sattr))[:satterNum] {
+				equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{
+					Id:        sattr[v].Key,
+					Libraryid: sattr[v].Libraryid,
+					Lv:        1,
+					AttrName:  sattr[v].Attrkey,
+					Value:     sattr[v].Attrvar,
+					BaseValue: sattr[v].Attrvar,
+				})
+			}
+		} else {
+			equipment.Adverbskill = make([]*pb.EquipmentSkillEntry, 0)
+			for _, v := range r.Perm(len(sattr))[:satterNum] {
+				equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
+					Id:      sattr[v].Key,
+					SkillId: sattr[v].Attrkey,
+					Lv:      1,
+				})
+			}
 		}
 	}
 	return
@@ -290,23 +310,37 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 		}
 		r := rand.New(rand.NewSource(time.Now().Unix()))
 		index := r.Perm(len(sattr))[0]
-		equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{
-			Id:        sattr[index].Key,
-			Libraryid: sattr[index].Libraryid,
-			Lv:        1,
-			AttrName:  sattr[index].Attrkey,
-			Value:     sattr[index].Attrvar,
-		})
-	} else { //随机一个副词条 强化
-		var attrlibrary *cfg.GameEquipAttrlibraryData
-		r := rand.New(rand.NewSource(time.Now().Unix()))
-		index := r.Perm(len(equipment.AdverbEntry))[0]
-
-		if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
-			return
+		if equip.EquipId == 1 {
+			equipment.AdverbEntry = append(equipment.AdverbEntry, &pb.EquipmentAttributeEntry{
+				Id:        sattr[index].Key,
+				Libraryid: sattr[index].Libraryid,
+				Lv:        1,
+				AttrName:  sattr[index].Attrkey,
+				Value:     sattr[index].Attrvar,
+			})
+		} else {
+			equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
+				Id:      sattr[index].Key,
+				SkillId: sattr[index].Attrkey,
+				Lv:      1,
+			})
+		}
+	} else { //随机一个副词条 强化
+		if equip.EquipId == 1 {
+			var attrlibrary *cfg.GameEquipAttrlibraryData
+			r := rand.New(rand.NewSource(time.Now().Unix()))
+			index := r.Perm(len(equipment.AdverbEntry))[0]
+
+			if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
+				return
+			}
+			equipment.AdverbEntry[index].Value = equipment.AdverbEntry[index].BaseValue + int32(float64(attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1])/1000.0*float64(equipment.AdverbEntry[index].BaseValue))
+			equipment.AdverbEntry[index].Lv++
+		} else {
+			r := rand.New(rand.NewSource(time.Now().Unix()))
+			index := r.Perm(len(equipment.AdverbEntry))[0]
+			equipment.AdverbEntry[index].Lv++
 		}
-		equipment.AdverbEntry[index].Value = equipment.AdverbEntry[index].BaseValue + int32(float64(attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1])/1000.0*float64(equipment.AdverbEntry[index].BaseValue))
-		equipment.AdverbEntry[index].Lv++
 	}
 	return
 }
diff --git a/modules/constellation/api.go b/modules/horoscope/api.go
similarity index 89%
rename from modules/constellation/api.go
rename to modules/horoscope/api.go
index 3aed3aecf..1fb9dda27 100644
--- a/modules/constellation/api.go
+++ b/modules/horoscope/api.go
@@ -13,13 +13,13 @@ API
 type apiComp struct {
 	modules.MCompGate
 	service base.IRPCXService
-	module  *Constellation
+	module  *Horoscope
 }
 
 //组件初始化接口
 func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	this.MCompGate.Init(service, module, comp, options)
-	this.module = module.(*Constellation)
+	this.module = module.(*Horoscope)
 	this.service = service.(base.IRPCXService)
 	return
 }
diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go
new file mode 100644
index 000000000..7d4ae8a81
--- /dev/null
+++ b/modules/horoscope/api_info.go
@@ -0,0 +1,25 @@
+package constellation
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///获取自己的排行榜信息
+func (this *apiComp) Info(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data proto.Message) {
+	var ()
+	if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "info", &pb.EquipmentWashConfirmResp{})
+	return
+}
diff --git a/modules/horoscope/configure.go b/modules/horoscope/configure.go
new file mode 100644
index 000000000..b1ac78c25
--- /dev/null
+++ b/modules/horoscope/configure.go
@@ -0,0 +1,29 @@
+package constellation
+
+import (
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"sync"
+)
+
+const (
+	game_arenabuychallenge = "game_arenabuychallenge.json" //购买挑战记录
+
+)
+
+///竞技场配置管理组件
+type configureComp struct {
+	modules.MCompConfigure
+	module *Horoscope
+	lock   sync.RWMutex
+	ais    map[int32][]*cfg.GameArenaRobotData
+}
+
+//组件初始化接口
+func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.MCompConfigure.Init(service, module, comp, options)
+	this.module = module.(*Horoscope)
+	this.LoadConfigure(game_arenabuychallenge, cfg.NewGameArenaBuyChallenge)
+	return
+}
diff --git a/modules/horoscope/modelhoroscope.go b/modules/horoscope/modelhoroscope.go
new file mode 100644
index 000000000..a21d760f1
--- /dev/null
+++ b/modules/horoscope/modelhoroscope.go
@@ -0,0 +1,33 @@
+package constellation
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/mgo"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
+)
+
+///星座图 数据组件
+type modelHoroscope struct {
+	modules.MCompModel
+	module *Horoscope
+}
+
+//组件初始化接口
+func (this *modelHoroscope) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
+	this.TableName = comm.TableHoroscope
+	this.MCompModel.Init(service, module, comp, opt)
+	this.module = module.(*Horoscope)
+	return
+}
+
+//查询用户装备数据
+func (this *modelHoroscope) queryInfo(uId string) (result *pb.DBArenaUser, err error) {
+	result = &pb.DBArenaUser{}
+	if err = this.Get(uId, result); err != nil && err != mgo.MongodbNil {
+		this.module.Errorln(err)
+		return
+	}
+	return
+}
diff --git a/modules/horoscope/module.go b/modules/horoscope/module.go
new file mode 100644
index 000000000..6cb195c8d
--- /dev/null
+++ b/modules/horoscope/module.go
@@ -0,0 +1,41 @@
+package constellation
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/base"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+)
+
+/*
+模块名:星座图
+描述:全局属性增幅器
+开发:李伟
+*/
+func NewModule() core.IModule {
+	m := new(Horoscope)
+	return m
+}
+
+type Horoscope struct {
+	modules.ModuleBase
+	service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口
+	options *Options
+}
+
+//模块名
+func (this *Horoscope) GetType() core.M_Modules {
+	return comm.ModuleHoroscope
+}
+
+//模块初始化接口 注册用户创建角色事件
+func (this *Horoscope) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+	err = this.ModuleBase.Init(service, module, options)
+	this.service = service.(base.IRPCXService)
+	return
+}
+
+func (this *Horoscope) Start() (err error) {
+	err = this.ModuleBase.Start()
+	return
+}
diff --git a/modules/constellation/options.go b/modules/horoscope/options.go
similarity index 100%
rename from modules/constellation/options.go
rename to modules/horoscope/options.go
diff --git a/pb/equipment_db.pb.go b/pb/equipment_db.pb.go
index e6372b01a..431bf2f9c 100644
--- a/pb/equipment_db.pb.go
+++ b/pb/equipment_db.pb.go
@@ -108,13 +108,77 @@ func (x *EquipmentAttributeEntry) GetBaseValue() int32 {
 	return 0
 }
 
+//装备技能词条 特殊装备/武器or饰品
+type EquipmentSkillEntry struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id      int32  `protobuf:"varint,1,opt,name=Id,proto3" json:"Id"`          //属性词条主键id 唯一
+	SkillId string `protobuf:"bytes,2,opt,name=SkillId,proto3" json:"SkillId"` //属性名
+	Lv      int32  `protobuf:"varint,3,opt,name=Lv,proto3" json:"Lv"`          //属性等级
+}
+
+func (x *EquipmentSkillEntry) Reset() {
+	*x = EquipmentSkillEntry{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_equipment_equipment_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EquipmentSkillEntry) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EquipmentSkillEntry) ProtoMessage() {}
+
+func (x *EquipmentSkillEntry) ProtoReflect() protoreflect.Message {
+	mi := &file_equipment_equipment_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 EquipmentSkillEntry.ProtoReflect.Descriptor instead.
+func (*EquipmentSkillEntry) Descriptor() ([]byte, []int) {
+	return file_equipment_equipment_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *EquipmentSkillEntry) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *EquipmentSkillEntry) GetSkillId() string {
+	if x != nil {
+		return x.SkillId
+	}
+	return ""
+}
+
+func (x *EquipmentSkillEntry) GetLv() int32 {
+	if x != nil {
+		return x.Lv
+	}
+	return 0
+}
+
 //武器数据
 type DB_Equipment struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id             string                     `protobuf:"bytes,1,opt,name=Id,proto3" json:"Id" bson:"_id"`                                      //装备id
+	Id             string                     `protobuf:"bytes,1,opt,name=Id,proto3" json:"Id" bson:"_id"`                                      //   装备id
 	CId            string                     `protobuf:"bytes,2,opt,name=cId,proto3" json:"cId" bson:"cId"`                                    //   配置Id
 	UId            string                     `protobuf:"bytes,3,opt,name=uId,proto3" json:"uId" bson:"uid"`                                    //   所属玩家Id
 	HeroId         string                     `protobuf:"bytes,4,opt,name=heroId,proto3" json:"heroId" bson:"heroId"`                           // 挂在的英雄卡片id 未装备 填 ''
@@ -125,12 +189,14 @@ type DB_Equipment struct {
 	OverlayNum     uint32                     `protobuf:"varint,9,opt,name=overlayNum,proto3" json:"overlayNum" bson:"overlayNum"`              //叠加数量
 	IsInitialState bool                       `protobuf:"varint,10,opt,name=isInitialState,proto3" json:"isInitialState" bson:"isInitialState"` //是否初始状态
 	Islock         bool                       `protobuf:"varint,11,opt,name=islock,proto3" json:"islock" bson:"islock"`                         //是否锁
+	Mainskill      *EquipmentSkillEntry       `protobuf:"bytes,12,opt,name=mainskill,proto3" json:"mainskill" bson:"mainskill"`                 //主技能
+	Adverbskill    []*EquipmentSkillEntry     `protobuf:"bytes,13,rep,name=adverbskill,proto3" json:"adverbskill" bson:"adverbskill"`           //装备副技能
 }
 
 func (x *DB_Equipment) Reset() {
 	*x = DB_Equipment{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_equipment_equipment_db_proto_msgTypes[1]
+		mi := &file_equipment_equipment_db_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -143,7 +209,7 @@ func (x *DB_Equipment) String() string {
 func (*DB_Equipment) ProtoMessage() {}
 
 func (x *DB_Equipment) ProtoReflect() protoreflect.Message {
-	mi := &file_equipment_equipment_db_proto_msgTypes[1]
+	mi := &file_equipment_equipment_db_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -156,7 +222,7 @@ func (x *DB_Equipment) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DB_Equipment.ProtoReflect.Descriptor instead.
 func (*DB_Equipment) Descriptor() ([]byte, []int) {
-	return file_equipment_equipment_db_proto_rawDescGZIP(), []int{1}
+	return file_equipment_equipment_db_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DB_Equipment) GetId() string {
@@ -236,6 +302,20 @@ func (x *DB_Equipment) GetIslock() bool {
 	return false
 }
 
+func (x *DB_Equipment) GetMainskill() *EquipmentSkillEntry {
+	if x != nil {
+		return x.Mainskill
+	}
+	return nil
+}
+
+func (x *DB_Equipment) GetAdverbskill() []*EquipmentSkillEntry {
+	if x != nil {
+		return x.Adverbskill
+	}
+	return nil
+}
+
 var File_equipment_equipment_db_proto protoreflect.FileDescriptor
 
 var file_equipment_equipment_db_proto_rawDesc = []byte{
@@ -251,30 +331,42 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
 	0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
 	0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61,
 	0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42,
-	0x61, 0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x5f,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
-	0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61, 0x69,
-	0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x65, 0x70,
-	0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75,
-	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x08,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b,
-	0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x6f,
-	0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x69,
-	0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x73, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4f, 0x0a, 0x13, 0x45, 0x71, 0x75, 0x69,
+	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12,
+	0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x22, 0xcc, 0x03, 0x0a, 0x0c, 0x44, 0x42,
+	0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16,
+	0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x65, 0x65, 0x70, 0x46, 0x61,
+	0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6b, 0x65, 0x65,
+	0x70, 0x46, 0x61, 0x69, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x36, 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71,
+	0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18,
+	0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
+	0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a,
+	0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e,
+	0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x69, 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x32, 0x0a, 0x09,
+	0x6d, 0x61, 0x69, 0x6e, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x14, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
+	0x12, 0x36, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
+	0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e,
+	0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76,
+	0x65, 0x72, 0x62, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -289,19 +381,22 @@ func file_equipment_equipment_db_proto_rawDescGZIP() []byte {
 	return file_equipment_equipment_db_proto_rawDescData
 }
 
-var file_equipment_equipment_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_equipment_equipment_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_equipment_equipment_db_proto_goTypes = []interface{}{
 	(*EquipmentAttributeEntry)(nil), // 0: EquipmentAttributeEntry
-	(*DB_Equipment)(nil),            // 1: DB_Equipment
+	(*EquipmentSkillEntry)(nil),     // 1: EquipmentSkillEntry
+	(*DB_Equipment)(nil),            // 2: DB_Equipment
 }
 var file_equipment_equipment_db_proto_depIdxs = []int32{
 	0, // 0: DB_Equipment.mainEntry:type_name -> EquipmentAttributeEntry
 	0, // 1: DB_Equipment.adverbEntry:type_name -> EquipmentAttributeEntry
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	1, // 2: DB_Equipment.mainskill:type_name -> EquipmentSkillEntry
+	1, // 3: DB_Equipment.adverbskill:type_name -> EquipmentSkillEntry
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_equipment_equipment_db_proto_init() }
@@ -323,6 +418,18 @@ func file_equipment_equipment_db_proto_init() {
 			}
 		}
 		file_equipment_equipment_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EquipmentSkillEntry); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_equipment_equipment_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DB_Equipment); i {
 			case 0:
 				return &v.state
@@ -341,7 +448,7 @@ func file_equipment_equipment_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_equipment_equipment_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index f4ff25775..a8f8076ef 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -157,6 +157,7 @@ type DBHero struct {
 	Suite1Lv             int32            `protobuf:"varint,29,opt,name=suite1Lv,proto3" json:"suite1Lv" bson:"suite1Lv"`
 	Suite2Lv             int32            `protobuf:"varint,30,opt,name=suite2Lv,proto3" json:"suite2Lv" bson:"suite2Lv"`
 	TalentProperty       map[string]int32 `protobuf:"bytes,31,rep,name=talentProperty,proto3" json:"talentProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"talentProperty"` // // 天赋属性
+	EquipSkill           []*SkillData     `protobuf:"bytes,32,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"`                                                                                                      //装备技能
 }
 
 func (x *DBHero) Reset() {
@@ -408,6 +409,13 @@ func (x *DBHero) GetTalentProperty() map[string]int32 {
 	return nil
 }
 
+func (x *DBHero) GetEquipSkill() []*SkillData {
+	if x != nil {
+		return x.EquipSkill
+	}
+	return nil
+}
+
 type Floor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -631,7 +639,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, 0x0b, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
+	0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xdf, 0x0b, 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,
@@ -698,59 +706,61 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32,
 	0x1b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50,
 	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61,
-	0x6c, 0x65, 0x6e, 0x74, 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,
+	0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x2a, 0x0a, 0x0a,
+	0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, 0x71,
+	0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 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, 0x1a, 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65,
-	0x6e, 0x74, 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, 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,
+	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, 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 (
@@ -791,12 +801,13 @@ var file_hero_hero_db_proto_depIdxs = []int32{
 	10, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
 	0,  // 6: DBHero.status:type_name -> HeroType
 	11, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
-	12, // 8: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
-	9,  // [9:9] is the sub-list for method output_type
-	9,  // [9:9] is the sub-list for method input_type
-	9,  // [9:9] is the sub-list for extension type_name
-	9,  // [9:9] is the sub-list for extension extendee
-	0,  // [0:9] is the sub-list for field type_name
+	1,  // 8: DBHero.equipSkill:type_name -> SkillData
+	12, // 9: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
+	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
 }
 
 func init() { file_hero_hero_db_proto_init() }
diff --git a/pb/horoscope_db.pb.go b/pb/horoscope_db.pb.go
new file mode 100644
index 000000000..e35d2535f
--- /dev/null
+++ b/pb/horoscope_db.pb.go
@@ -0,0 +1,159 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.20.0
+// source: horoscope/horoscope_db.proto
+
+package pb
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//星座图数据
+type DBHoroscope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid   string          `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"_id"`
+	Nodes map[int32]int32 `protobuf:"bytes,2,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //节点信息
+}
+
+func (x *DBHoroscope) Reset() {
+	*x = DBHoroscope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_horoscope_horoscope_db_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBHoroscope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBHoroscope) ProtoMessage() {}
+
+func (x *DBHoroscope) ProtoReflect() protoreflect.Message {
+	mi := &file_horoscope_horoscope_db_proto_msgTypes[0]
+	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 DBHoroscope.ProtoReflect.Descriptor instead.
+func (*DBHoroscope) Descriptor() ([]byte, []int) {
+	return file_horoscope_horoscope_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBHoroscope) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *DBHoroscope) GetNodes() map[int32]int32 {
+	if x != nil {
+		return x.Nodes
+	}
+	return nil
+}
+
+var File_horoscope_horoscope_db_proto protoreflect.FileDescriptor
+
+var file_horoscope_horoscope_db_proto_rawDesc = []byte{
+	0x0a, 0x1c, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2f, 0x68, 0x6f, 0x72, 0x6f,
+	0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x88,
+	0x01, 0x0a, 0x0b, 0x44, 0x42, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x10,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x12, 0x2d, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x44, 0x42, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x1a,
+	0x38, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_horoscope_horoscope_db_proto_rawDescOnce sync.Once
+	file_horoscope_horoscope_db_proto_rawDescData = file_horoscope_horoscope_db_proto_rawDesc
+)
+
+func file_horoscope_horoscope_db_proto_rawDescGZIP() []byte {
+	file_horoscope_horoscope_db_proto_rawDescOnce.Do(func() {
+		file_horoscope_horoscope_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_horoscope_horoscope_db_proto_rawDescData)
+	})
+	return file_horoscope_horoscope_db_proto_rawDescData
+}
+
+var file_horoscope_horoscope_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_horoscope_horoscope_db_proto_goTypes = []interface{}{
+	(*DBHoroscope)(nil), // 0: DBHoroscope
+	nil,                 // 1: DBHoroscope.NodesEntry
+}
+var file_horoscope_horoscope_db_proto_depIdxs = []int32{
+	1, // 0: DBHoroscope.nodes:type_name -> DBHoroscope.NodesEntry
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_horoscope_horoscope_db_proto_init() }
+func file_horoscope_horoscope_db_proto_init() {
+	if File_horoscope_horoscope_db_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_horoscope_horoscope_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBHoroscope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_horoscope_horoscope_db_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_horoscope_horoscope_db_proto_goTypes,
+		DependencyIndexes: file_horoscope_horoscope_db_proto_depIdxs,
+		MessageInfos:      file_horoscope_horoscope_db_proto_msgTypes,
+	}.Build()
+	File_horoscope_horoscope_db_proto = out.File
+	file_horoscope_horoscope_db_proto_rawDesc = nil
+	file_horoscope_horoscope_db_proto_goTypes = nil
+	file_horoscope_horoscope_db_proto_depIdxs = nil
+}
diff --git a/pb/horoscope_msg.pb.go b/pb/horoscope_msg.pb.go
new file mode 100644
index 000000000..9c4f6370f
--- /dev/null
+++ b/pb/horoscope_msg.pb.go
@@ -0,0 +1,349 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.20.0
+// source: horoscope/horoscope_msg.proto
+
+package pb
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//获取评论列表
+type HoroscopeInfoReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Herocid string `protobuf:"bytes,1,opt,name=herocid,proto3" json:"herocid"` //英雄配置id
+}
+
+func (x *HoroscopeInfoReq) Reset() {
+	*x = HoroscopeInfoReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_horoscope_horoscope_msg_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HoroscopeInfoReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HoroscopeInfoReq) ProtoMessage() {}
+
+func (x *HoroscopeInfoReq) ProtoReflect() protoreflect.Message {
+	mi := &file_horoscope_horoscope_msg_proto_msgTypes[0]
+	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 HoroscopeInfoReq.ProtoReflect.Descriptor instead.
+func (*HoroscopeInfoReq) Descriptor() ([]byte, []int) {
+	return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *HoroscopeInfoReq) GetHerocid() string {
+	if x != nil {
+		return x.Herocid
+	}
+	return ""
+}
+
+//获取评论回应
+type HoroscopeInfoResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Info *DBHoroscope `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+}
+
+func (x *HoroscopeInfoResp) Reset() {
+	*x = HoroscopeInfoResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_horoscope_horoscope_msg_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HoroscopeInfoResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HoroscopeInfoResp) ProtoMessage() {}
+
+func (x *HoroscopeInfoResp) ProtoReflect() protoreflect.Message {
+	mi := &file_horoscope_horoscope_msg_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 HoroscopeInfoResp.ProtoReflect.Descriptor instead.
+func (*HoroscopeInfoResp) Descriptor() ([]byte, []int) {
+	return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *HoroscopeInfoResp) GetInfo() *DBHoroscope {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+//升级节点
+type HoroscopeUpgradeReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Nid int32 `protobuf:"varint,1,opt,name=nid,proto3" json:"nid"`
+}
+
+func (x *HoroscopeUpgradeReq) Reset() {
+	*x = HoroscopeUpgradeReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_horoscope_horoscope_msg_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HoroscopeUpgradeReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HoroscopeUpgradeReq) ProtoMessage() {}
+
+func (x *HoroscopeUpgradeReq) ProtoReflect() protoreflect.Message {
+	mi := &file_horoscope_horoscope_msg_proto_msgTypes[2]
+	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 HoroscopeUpgradeReq.ProtoReflect.Descriptor instead.
+func (*HoroscopeUpgradeReq) Descriptor() ([]byte, []int) {
+	return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *HoroscopeUpgradeReq) GetNid() int32 {
+	if x != nil {
+		return x.Nid
+	}
+	return 0
+}
+
+//升级节点
+type HoroscopeUpgradeResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Nid int32 `protobuf:"varint,1,opt,name=nid,proto3" json:"nid"`
+	Lv  int32 `protobuf:"varint,2,opt,name=lv,proto3" json:"lv"`
+}
+
+func (x *HoroscopeUpgradeResp) Reset() {
+	*x = HoroscopeUpgradeResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_horoscope_horoscope_msg_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HoroscopeUpgradeResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HoroscopeUpgradeResp) ProtoMessage() {}
+
+func (x *HoroscopeUpgradeResp) ProtoReflect() protoreflect.Message {
+	mi := &file_horoscope_horoscope_msg_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 HoroscopeUpgradeResp.ProtoReflect.Descriptor instead.
+func (*HoroscopeUpgradeResp) Descriptor() ([]byte, []int) {
+	return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *HoroscopeUpgradeResp) GetNid() int32 {
+	if x != nil {
+		return x.Nid
+	}
+	return 0
+}
+
+func (x *HoroscopeUpgradeResp) GetLv() int32 {
+	if x != nil {
+		return x.Lv
+	}
+	return 0
+}
+
+var File_horoscope_horoscope_msg_proto protoreflect.FileDescriptor
+
+var file_horoscope_horoscope_msg_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2f, 0x68, 0x6f, 0x72, 0x6f,
+	0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x1c, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2f, 0x68, 0x6f, 0x72, 0x6f, 0x73,
+	0x63, 0x6f, 0x70, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2c, 0x0a,
+	0x10, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+	0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x63, 0x69, 0x64, 0x22, 0x35, 0x0a, 0x11, 0x48,
+	0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c,
+	0x2e, 0x44, 0x42, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x04, 0x69, 0x6e,
+	0x66, 0x6f, 0x22, 0x27, 0x0a, 0x13, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55,
+	0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x38, 0x0a, 0x14, 0x48,
+	0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_horoscope_horoscope_msg_proto_rawDescOnce sync.Once
+	file_horoscope_horoscope_msg_proto_rawDescData = file_horoscope_horoscope_msg_proto_rawDesc
+)
+
+func file_horoscope_horoscope_msg_proto_rawDescGZIP() []byte {
+	file_horoscope_horoscope_msg_proto_rawDescOnce.Do(func() {
+		file_horoscope_horoscope_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_horoscope_horoscope_msg_proto_rawDescData)
+	})
+	return file_horoscope_horoscope_msg_proto_rawDescData
+}
+
+var file_horoscope_horoscope_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_horoscope_horoscope_msg_proto_goTypes = []interface{}{
+	(*HoroscopeInfoReq)(nil),     // 0: HoroscopeInfoReq
+	(*HoroscopeInfoResp)(nil),    // 1: HoroscopeInfoResp
+	(*HoroscopeUpgradeReq)(nil),  // 2: HoroscopeUpgradeReq
+	(*HoroscopeUpgradeResp)(nil), // 3: HoroscopeUpgradeResp
+	(*DBHoroscope)(nil),          // 4: DBHoroscope
+}
+var file_horoscope_horoscope_msg_proto_depIdxs = []int32{
+	4, // 0: HoroscopeInfoResp.info:type_name -> DBHoroscope
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_horoscope_horoscope_msg_proto_init() }
+func file_horoscope_horoscope_msg_proto_init() {
+	if File_horoscope_horoscope_msg_proto != nil {
+		return
+	}
+	file_horoscope_horoscope_db_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_horoscope_horoscope_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HoroscopeInfoReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_horoscope_horoscope_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HoroscopeInfoResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_horoscope_horoscope_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HoroscopeUpgradeReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_horoscope_horoscope_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HoroscopeUpgradeResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_horoscope_horoscope_msg_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_horoscope_horoscope_msg_proto_goTypes,
+		DependencyIndexes: file_horoscope_horoscope_msg_proto_depIdxs,
+		MessageInfos:      file_horoscope_horoscope_msg_proto_msgTypes,
+	}.Build()
+	File_horoscope_horoscope_msg_proto = out.File
+	file_horoscope_horoscope_msg_proto_rawDesc = nil
+	file_horoscope_horoscope_msg_proto_goTypes = nil
+	file_horoscope_horoscope_msg_proto_depIdxs = nil
+}
diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go
index 8df4aa8bc..f48d7658c 100644
--- a/sys/configure/structs/game.equipData.go
+++ b/sys/configure/structs/game.equipData.go
@@ -12,6 +12,7 @@ import "errors"
 
 type GameEquipData struct {
     Id string
+    EquipId int32
     Name string
     Suittype int32
     Suitintr string
@@ -36,6 +37,7 @@ func (*GameEquipData) GetTypeId() int32 {
 
 func (_v *GameEquipData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["equip_id"].(float64); !_ok_ { err = errors.New("equip_id error"); return }; _v.EquipId = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["suitintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Suitintr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Suitintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
diff --git a/sys/configure/structs/game.equipIntensifyData.go b/sys/configure/structs/game.equipIntensifyData.go
index 0cf199050..068098086 100644
--- a/sys/configure/structs/game.equipIntensifyData.go
+++ b/sys/configure/structs/game.equipIntensifyData.go
@@ -12,6 +12,7 @@ import "errors"
 
 type GameEquipIntensifyData struct {
     Key int32
+    TypeId int32
     Star int32
     Level int32
     Need []*Gameatn
@@ -29,6 +30,7 @@ func (*GameEquipIntensifyData) GetTypeId() int32 {
 
 func (_v *GameEquipIntensifyData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
      {