From 19aad246b43ef845a86699d1cbf822ba4102af77 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 24 Oct 2022 18:12:34 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go                  |  3 ++
 modules/hero/api_talentlist.go | 20 ++++++++++
 modules/hero/model_talent.go   | 44 ++++++++++++++++++++++
 modules/hero/module.go         |  8 ++--
 pb/hero_db.pb.go               | 68 +++++++++++++++++-----------------
 pb/hero_msg.pb.go              | 41 ++++++++++----------
 6 files changed, 126 insertions(+), 58 deletions(-)
 create mode 100644 modules/hero/api_talentlist.go
 create mode 100644 modules/hero/model_talent.go

diff --git a/comm/const.go b/comm/const.go
index be0bd5d33..9689f07e1 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -155,6 +155,9 @@ const (
 
 	///竞技场
 	TableArena = "arena"
+
+	// 天赋
+	TableTalent = "herotalent"
 )
 
 //RPC服务接口定义处
diff --git a/modules/hero/api_talentlist.go b/modules/hero/api_talentlist.go
new file mode 100644
index 000000000..4ba498c82
--- /dev/null
+++ b/modules/hero/api_talentlist.go
@@ -0,0 +1,20 @@
+package hero
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) TalentListCheck(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode, data proto.Message) {
+	rsp := &pb.HeroTalentListResp{}
+	rsp.Telnet, _ = this.module.modelTalent.GetHerotalent(session.GetUserId())
+	session.SendMsg(string(this.module.GetType()), HeroSubTypeList, rsp)
+	return
+}
diff --git a/modules/hero/model_talent.go b/modules/hero/model_talent.go
new file mode 100644
index 000000000..575db1bee
--- /dev/null
+++ b/modules/hero/model_talent.go
@@ -0,0 +1,44 @@
+package hero
+
+import (
+	"errors"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/redis"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
+)
+
+// 英雄天赋组件
+type ModelTalent struct {
+	modules.MCompModel
+	module *Hero
+}
+
+func (this *ModelTalent) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.TableName = comm.TableTalent
+	err = this.MCompModel.Init(service, module, comp, options)
+	this.module = module.(*Hero)
+	return
+}
+
+//获取用户天赋数据
+func (this *ModelTalent) GetHerotalent(uid string) (result []*pb.DBHeroTalent, err error) {
+	result = make([]*pb.DBHeroTalent, 0)
+	if err = this.GetList(uid, result); err != nil && err != redis.RedisNil {
+		return
+	}
+	err = nil
+	return result, err
+}
+
+//修改天赋数据
+func (this *ModelTalent) ChangeHeroTalent(talent *pb.DBHeroTalent, update map[string]interface{}) (err error) {
+	if talent == nil || len(update) == 0 {
+		return errors.New("err")
+	}
+	if err := this.ChangeList(talent.Uid, talent.Id, update); err != nil {
+		this.module.Debugf("ChangeHeroTalent err %v", err)
+	}
+	return nil
+}
diff --git a/modules/hero/module.go b/modules/hero/module.go
index da48a997b..a6fb68eaa 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -23,10 +23,10 @@ type Hero struct {
 	api          *apiComp
 	configure    *configureComp
 	modelHero    *ModelHero
-	modelRecord  *ModelRecord
+	modelRecord  *ModelRecord // 英雄抽卡保底，次数等数据
+	modelTalent  *ModelTalent // 天赋系统
 	moduleFetter comm.IHeroFetter
-
-	service core.IService
+	service      core.IService
 }
 
 //模块名
@@ -47,8 +47,8 @@ func (this *Hero) OnInstallComp() {
 	this.api = this.RegisterComp(new(apiComp)).(*apiComp)
 	this.modelHero = this.RegisterComp(new(ModelHero)).(*ModelHero)
 	this.modelRecord = this.RegisterComp(new(ModelRecord)).(*ModelRecord)
+	this.modelTalent = this.RegisterComp(new(ModelTalent)).(*ModelTalent)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
-
 }
 func (this *Hero) Start() (err error) {
 	var module core.IModule
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index 105698f39..e9a61120e 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -544,7 +544,7 @@ func (x *DBHeroRecord) GetDrawcount() int32 {
 }
 
 // 英雄天赋系统
-type HeroTalent struct {
+type DBHeroTalent struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -552,11 +552,11 @@ type HeroTalent struct {
 	Id     string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                        //ID 主键id
 	Uid    string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                      //用户ID
 	HeroId string          `protobuf:"bytes,3,opt,name=heroId,proto3" json:"heroId"`                                                                                           // 英雄ID
-	Talnet map[int32]int32 `protobuf:"bytes,4,rep,name=talnet,proto3" json:"talnet" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 已经学习过的天赋
+	Talent map[int32]int32 `protobuf:"bytes,4,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 已经学习过的天赋
 }
 
-func (x *HeroTalent) Reset() {
-	*x = HeroTalent{}
+func (x *DBHeroTalent) Reset() {
+	*x = DBHeroTalent{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_hero_hero_db_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -564,13 +564,13 @@ func (x *HeroTalent) Reset() {
 	}
 }
 
-func (x *HeroTalent) String() string {
+func (x *DBHeroTalent) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*HeroTalent) ProtoMessage() {}
+func (*DBHeroTalent) ProtoMessage() {}
 
-func (x *HeroTalent) ProtoReflect() protoreflect.Message {
+func (x *DBHeroTalent) ProtoReflect() protoreflect.Message {
 	mi := &file_hero_hero_db_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -582,35 +582,35 @@ func (x *HeroTalent) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use HeroTalent.ProtoReflect.Descriptor instead.
-func (*HeroTalent) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBHeroTalent.ProtoReflect.Descriptor instead.
+func (*DBHeroTalent) Descriptor() ([]byte, []int) {
 	return file_hero_hero_db_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *HeroTalent) GetId() string {
+func (x *DBHeroTalent) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *HeroTalent) GetUid() string {
+func (x *DBHeroTalent) GetUid() string {
 	if x != nil {
 		return x.Uid
 	}
 	return ""
 }
 
-func (x *HeroTalent) GetHeroId() string {
+func (x *DBHeroTalent) GetHeroId() string {
 	if x != nil {
 		return x.HeroId
 	}
 	return ""
 }
 
-func (x *HeroTalent) GetTalnet() map[int32]int32 {
+func (x *DBHeroTalent) GetTalent() map[int32]int32 {
 	if x != nil {
-		return x.Talnet
+		return x.Talent
 	}
 	return nil
 }
@@ -718,22 +718,22 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	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,
-	0xb2, 0x01, 0x0a, 0x0a, 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, 0x2f, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x6e,
-	0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x54,
-	0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x6e, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x6e, 0x65, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c,
-	0x6e, 0x65, 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,
+	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 (
@@ -756,13 +756,13 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
 	(*DBHero)(nil),       // 2: DBHero
 	(*Floor)(nil),        // 3: Floor
 	(*DBHeroRecord)(nil), // 4: DBHeroRecord
-	(*HeroTalent)(nil),   // 5: HeroTalent
+	(*DBHeroTalent)(nil), // 5: DBHeroTalent
 	nil,                  // 6: DBHero.PropertyEntry
 	nil,                  // 7: DBHero.AddPropertyEntry
 	nil,                  // 8: DBHero.EnergyEntry
 	nil,                  // 9: DBHero.EnergyPropertyEntry
 	nil,                  // 10: DBHero.JuexPropertyEntry
-	nil,                  // 11: HeroTalent.TalnetEntry
+	nil,                  // 11: DBHeroTalent.TalentEntry
 }
 var file_hero_hero_db_proto_depIdxs = []int32{
 	1,  // 0: DBHero.normalSkill:type_name -> SkillData
@@ -772,7 +772,7 @@ var file_hero_hero_db_proto_depIdxs = []int32{
 	9,  // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
 	10, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
 	0,  // 6: DBHero.status:type_name -> HeroType
-	11, // 7: HeroTalent.talnet:type_name -> HeroTalent.TalnetEntry
+	11, // 7: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
 	8,  // [8:8] is the sub-list for method output_type
 	8,  // [8:8] is the sub-list for method input_type
 	8,  // [8:8] is the sub-list for extension type_name
@@ -835,7 +835,7 @@ func file_hero_hero_db_proto_init() {
 			}
 		}
 		file_hero_hero_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeroTalent); i {
+			switch v := v.(*DBHeroTalent); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 10b947754..1eb179cbc 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -1849,7 +1849,7 @@ type HeroTalentListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Telnet []*HeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"`
+	Telnet []*DBHeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"`
 }
 
 func (x *HeroTalentListResp) Reset() {
@@ -1884,7 +1884,7 @@ func (*HeroTalentListResp) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{35}
 }
 
-func (x *HeroTalentListResp) GetTelnet() []*HeroTalent {
+func (x *HeroTalentListResp) GetTelnet() []*DBHeroTalent {
 	if x != nil {
 		return x.Telnet
 	}
@@ -1952,7 +1952,7 @@ type HeroTalentLearnResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Telnet *HeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"`
+	Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"`
 }
 
 func (x *HeroTalentLearnResp) Reset() {
@@ -1987,7 +1987,7 @@ func (*HeroTalentLearnResp) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{37}
 }
 
-func (x *HeroTalentLearnResp) GetTelnet() *HeroTalent {
+func (x *HeroTalentLearnResp) GetTelnet() *DBHeroTalent {
 	if x != nil {
 		return x.Telnet
 	}
@@ -2159,19 +2159,20 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x48, 0x65,
 	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
-	0x39, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
-	0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x48, 0x0a, 0x12, 0x48, 0x65,
-	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, 0x65, 0x71,
-	0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06,
-	0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65,
-	0x72, 0x6f, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
-	0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x74,
-	0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x48, 0x65,
-	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x48, 0x0a, 0x12,
+	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52,
+	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x16,
+	0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a,
+	0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65,
+	0x6c, 0x6e, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2230,7 +2231,7 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 	nil,                                // 39: HeroPropertyPush.AddPropertyEntry
 	nil,                                // 40: HeroFusionReq.HerosEntry
 	(*DBHero)(nil),                     // 41: DBHero
-	(*HeroTalent)(nil),                 // 42: HeroTalent
+	(*DBHeroTalent)(nil),               // 42: DBHeroTalent
 }
 var file_hero_hero_msg_proto_depIdxs = []int32{
 	41, // 0: HeroInfoResp.base:type_name -> DBHero
@@ -2253,8 +2254,8 @@ var file_hero_hero_msg_proto_depIdxs = []int32{
 	41, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
 	41, // 18: HeroChangePush.list:type_name -> DBHero
 	40, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
-	42, // 20: HeroTalentListResp.telnet:type_name -> HeroTalent
-	42, // 21: HeroTalentLearnResp.telnet:type_name -> HeroTalent
+	42, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent
+	42, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
 	22, // [22:22] is the sub-list for method output_type
 	22, // [22:22] is the sub-list for method input_type
 	22, // [22:22] is the sub-list for extension type_name

From b3d7379f752b44de56574cc9edaf87573507f6c3 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 24 Oct 2022 18:51:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_herotalent.json                 |  662 ++++++++
 bin/json/game_talentskill.json                |  434 +++++
 modules/hero/configure_comp.go                |   72 +-
 sys/configure/structs/Game.HeroTalent.go      |   42 +
 sys/configure/structs/Game.HeroTalentData.go  |   97 ++
 sys/configure/structs/Game.TalentSkill.go     |   42 +
 sys/configure/structs/Game.TalentSkillData.go |   53 +
 sys/configure/structs/Tables.go               | 1436 +++++++++--------
 8 files changed, 2100 insertions(+), 738 deletions(-)
 create mode 100644 bin/json/game_herotalent.json
 create mode 100644 bin/json/game_talentskill.json
 create mode 100644 sys/configure/structs/Game.HeroTalent.go
 create mode 100644 sys/configure/structs/Game.HeroTalentData.go
 create mode 100644 sys/configure/structs/Game.TalentSkill.go
 create mode 100644 sys/configure/structs/Game.TalentSkillData.go

diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json
new file mode 100644
index 000000000..45538ff54
--- /dev/null
+++ b/bin/json/game_herotalent.json
@@ -0,0 +1,662 @@
+[
+  {
+    "id": 1,
+    "type": [
+      0
+    ],
+    "talentid": 40101,
+    "before": [
+      0
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 20000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      1,
+      1
+    ]
+  },
+  {
+    "id": 2,
+    "type": [
+      0
+    ],
+    "talentid": 40102,
+    "before": [
+      0
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 20000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      1,
+      3
+    ]
+  },
+  {
+    "id": 3,
+    "type": [
+      0
+    ],
+    "talentid": 40103,
+    "before": [
+      0
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 20000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      1,
+      5
+    ]
+  },
+  {
+    "id": 4,
+    "type": [
+      1
+    ],
+    "talentid": 10101,
+    "before": [
+      1
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      3,
+      1
+    ]
+  },
+  {
+    "id": 5,
+    "type": [
+      1
+    ],
+    "talentid": 10102,
+    "before": [
+      4
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      5,
+      1
+    ]
+  },
+  {
+    "id": 6,
+    "type": [
+      1
+    ],
+    "talentid": 10103,
+    "before": [
+      5
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      7,
+      1
+    ]
+  },
+  {
+    "id": 7,
+    "type": [
+      1
+    ],
+    "talentid": 10104,
+    "before": [
+      6,
+      23
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      9,
+      1
+    ]
+  },
+  {
+    "id": 8,
+    "type": [
+      1
+    ],
+    "talentid": 10105,
+    "before": [
+      7
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      11,
+      1
+    ]
+  },
+  {
+    "id": 9,
+    "type": [
+      1
+    ],
+    "talentid": 10106,
+    "before": [
+      8
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      13,
+      1
+    ]
+  },
+  {
+    "id": 10,
+    "type": [
+      2
+    ],
+    "talentid": 20101,
+    "before": [
+      2
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      3,
+      3
+    ]
+  },
+  {
+    "id": 11,
+    "type": [
+      2
+    ],
+    "talentid": 20102,
+    "before": [
+      10
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      5,
+      3
+    ]
+  },
+  {
+    "id": 12,
+    "type": [
+      2
+    ],
+    "talentid": 20103,
+    "before": [
+      11,
+      5,
+      18
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      7,
+      3
+    ]
+  },
+  {
+    "id": 13,
+    "type": [
+      2
+    ],
+    "talentid": 20104,
+    "before": [
+      23,
+      24
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      9,
+      3
+    ]
+  },
+  {
+    "id": 14,
+    "type": [
+      2
+    ],
+    "talentid": 20105,
+    "before": [
+      7,
+      13,
+      20
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      11,
+      3
+    ]
+  },
+  {
+    "id": 15,
+    "type": [
+      2
+    ],
+    "talentid": 20106,
+    "before": [
+      14
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      13,
+      3
+    ]
+  },
+  {
+    "id": 16,
+    "type": [
+      2
+    ],
+    "talentid": 20107,
+    "before": [
+      10
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      4,
+      2
+    ]
+  },
+  {
+    "id": 17,
+    "type": [
+      3
+    ],
+    "talentid": 30101,
+    "before": [
+      3
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      3,
+      5
+    ]
+  },
+  {
+    "id": 18,
+    "type": [
+      3
+    ],
+    "talentid": 30102,
+    "before": [
+      17
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      5,
+      5
+    ]
+  },
+  {
+    "id": 19,
+    "type": [
+      3
+    ],
+    "talentid": 30103,
+    "before": [
+      18
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      7,
+      5
+    ]
+  },
+  {
+    "id": 20,
+    "type": [
+      3
+    ],
+    "talentid": 30104,
+    "before": [
+      24
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      9,
+      5
+    ]
+  },
+  {
+    "id": 21,
+    "type": [
+      3
+    ],
+    "talentid": 30105,
+    "before": [
+      20
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      11,
+      5
+    ]
+  },
+  {
+    "id": 22,
+    "type": [
+      3
+    ],
+    "talentid": 30106,
+    "before": [
+      21
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 15000
+      },
+      {
+        "a": "hero",
+        "t": "44911",
+        "n": 1
+      }
+    ],
+    "position": [
+      13,
+      5
+    ]
+  },
+  {
+    "id": 23,
+    "type": [
+      999
+    ],
+    "talentid": 99101,
+    "before": [
+      6,
+      12
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 40000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      8,
+      2
+    ]
+  },
+  {
+    "id": 24,
+    "type": [
+      999
+    ],
+    "talentid": 99102,
+    "before": [
+      12,
+      19
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 40000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      8,
+      4
+    ]
+  },
+  {
+    "id": 25,
+    "type": [
+      999
+    ],
+    "talentid": 99103,
+    "before": [
+      9,
+      15,
+      22
+    ],
+    "thing": [
+      {
+        "a": "attr",
+        "t": "glod",
+        "n": 40000
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 5000
+      }
+    ],
+    "position": [
+      15,
+      3
+    ]
+  }
+]
\ No newline at end of file
diff --git a/bin/json/game_talentskill.json b/bin/json/game_talentskill.json
new file mode 100644
index 000000000..d9d8e4a10
--- /dev/null
+++ b/bin/json/game_talentskill.json
@@ -0,0 +1,434 @@
+[
+  {
+    "skillid": 40101,
+    "skilltyp": 0,
+    "skillname": "生命核心",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_icon_006",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 40102,
+    "skilltyp": 0,
+    "skillname": "攻击核心",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_icon_004",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 40103,
+    "skilltyp": 0,
+    "skillname": "防御核心",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_icon_005",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10101,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10102,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10103,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10104,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10105,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10106,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10107,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10108,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10109,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 10110,
+    "skilltyp": 1,
+    "skillname": "生命天赋",
+    "skilltxt": "这是生命天赋的描述tips",
+    "skillicon": "jn_dzj_0001",
+    "hp": 1800,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20101,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0002",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20102,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0003",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20103,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0004",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20104,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0005",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20105,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0006",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20106,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0007",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20107,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0008",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20108,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0009",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20109,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0010",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 20110,
+    "skilltyp": 1,
+    "skillname": "攻击天赋",
+    "skilltxt": "这是攻击天赋的描述tips",
+    "skillicon": "jn_dzj_0011",
+    "hp": -1,
+    "atk": -1,
+    "def": 1500,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30101,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0012",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30102,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0013",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30103,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0014",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30104,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0015",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30105,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0016",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30106,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0017",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30107,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0018",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30108,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0019",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30109,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0020",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 30110,
+    "skilltyp": 1,
+    "skillname": "防御天赋",
+    "skilltxt": "这是防御天赋的描述tips",
+    "skillicon": "jn_dzj_0021",
+    "hp": -1,
+    "atk": 1500,
+    "def": -1,
+    "crt": -1,
+    "speed": -1
+  },
+  {
+    "skillid": 99101,
+    "skilltyp": 2,
+    "skillname": "攻速天赋",
+    "skilltxt": "这是攻速天赋的描述tips",
+    "skillicon": "jn_icon_027",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": 3000
+  },
+  {
+    "skillid": 99102,
+    "skilltyp": 2,
+    "skillname": "攻速天赋",
+    "skilltxt": "这是攻速天赋的描述tips",
+    "skillicon": "jn_icon_027",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": -1,
+    "speed": 4000
+  },
+  {
+    "skillid": 99103,
+    "skilltyp": 2,
+    "skillname": "暴击天赋",
+    "skilltxt": "这是暴击天赋的描述tips",
+    "skillicon": "jn_icon_008",
+    "hp": -1,
+    "atk": -1,
+    "def": -1,
+    "crt": 10000,
+    "speed": -1
+  }
+]
\ No newline at end of file
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index bb29b9b43..3f1bbcdbc 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -11,22 +11,24 @@ import (
 )
 
 const (
-	new_hero        = "game_hero.json"           //英雄
-	hero_stargrow   = "game_herostargrow.json"   //英雄品质系数
-	hero_levelgrow  = "game_herolevelgrow.json"  //英雄成长系数
-	hero_starup     = "game_herostarup.json"     // 升星
-	hero_levelup    = "game_herolevelup.json"    //英雄等级基础属性
-	hero_exp        = "game_heroexp.json"        // 升级
-	hero_skillup    = "game_heroskilllevel.json" // 英雄技能升级
-	game_skillatk   = "game_skillatk.json"       // 英雄技能
-	hero_resonance  = "game_heroresonance.json"  // 英雄共鸣
-	hero_comatn     = "game_comatn.json"         // 英雄共鸣重置
-	hero_awaken     = "game_heroawaken.json"     // 英雄觉醒
-	hero_drawcard   = "game_drawcard.json"       // 抽卡
-	hero_drawupdraw = "game_drawupdraw.json"     // 抽卡概率调整
-	hero_drawcost   = "game_drawcost.json"       // 抽卡消耗
-	hero_fusion     = "game_herofusion.json"     // 卡牌融合
-	hero_starupsp   = "game_herostarupsp.json"   // 精灵升星
+	new_hero         = "game_hero.json"           //英雄
+	hero_stargrow    = "game_herostargrow.json"   //英雄品质系数
+	hero_levelgrow   = "game_herolevelgrow.json"  //英雄成长系数
+	hero_starup      = "game_herostarup.json"     // 升星
+	hero_levelup     = "game_herolevelup.json"    //英雄等级基础属性
+	hero_exp         = "game_heroexp.json"        // 升级
+	hero_skillup     = "game_heroskilllevel.json" // 英雄技能升级
+	game_skillatk    = "game_skillatk.json"       // 英雄技能
+	hero_resonance   = "game_heroresonance.json"  // 英雄共鸣
+	hero_comatn      = "game_comatn.json"         // 英雄共鸣重置
+	hero_awaken      = "game_heroawaken.json"     // 英雄觉醒
+	hero_drawcard    = "game_drawcard.json"       // 抽卡
+	hero_drawupdraw  = "game_drawupdraw.json"     // 抽卡概率调整
+	hero_drawcost    = "game_drawcost.json"       // 抽卡消耗
+	hero_fusion      = "game_herofusion.json"     // 卡牌融合
+	hero_starupsp    = "game_herostarupsp.json"   // 精灵升星
+	hero_talentskill = "game_talentskill.json"    // 天赋
+	hero_talent      = "game_herotalent.json"     // 天赋详细数据
 )
 
 ///配置管理组件
@@ -46,17 +48,19 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	err = this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*Hero)
 	err = this.LoadMultiConfigure(map[string]interface{}{
-		new_hero:       cfg.NewGameHero,
-		hero_stargrow:  cfg.NewGameHeroStargrow,
-		hero_levelgrow: cfg.NewGameHeroLevelgrow,
-		hero_levelup:   cfg.NewGameHeroLevelup,
-		hero_exp:       cfg.NewGameHeroExp,
-		hero_skillup:   cfg.NewGameHeroSkillLevel,
-		game_skillatk:  cfg.NewGameSkillAtk,
-		hero_comatn:    cfg.NewGameComAtn,
-		hero_drawcard:  cfg.NewGameDrawCard,
-		hero_fusion:    cfg.NewGameHerofusion,
-		hero_starupsp:  cfg.NewGameHeroStarupSp,
+		new_hero:         cfg.NewGameHero,
+		hero_stargrow:    cfg.NewGameHeroStargrow,
+		hero_levelgrow:   cfg.NewGameHeroLevelgrow,
+		hero_levelup:     cfg.NewGameHeroLevelup,
+		hero_exp:         cfg.NewGameHeroExp,
+		hero_skillup:     cfg.NewGameHeroSkillLevel,
+		game_skillatk:    cfg.NewGameSkillAtk,
+		hero_comatn:      cfg.NewGameComAtn,
+		hero_drawcard:    cfg.NewGameDrawCard,
+		hero_fusion:      cfg.NewGameHerofusion,
+		hero_starupsp:    cfg.NewGameHeroStarupSp,
+		hero_talentskill: cfg.NewGameTalentSkill,
+		hero_talent:      cfg.NewGameHeroTalent,
 	})
 	this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
 
@@ -416,3 +420,17 @@ func (this *configureComp) GetHeroSpriteStar(cid string) (hid string) {
 	}
 	return
 }
+
+func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData) {
+	if v, err := this.GetConfigure(hero_talent); err == nil {
+		if configure, ok := v.(*cfg.GameHeroTalent); !ok {
+			err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
+			return
+		} else {
+			data = configure.Get(id)
+		}
+	} else {
+		err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
+	}
+	return
+}
diff --git a/sys/configure/structs/Game.HeroTalent.go b/sys/configure/structs/Game.HeroTalent.go
new file mode 100644
index 000000000..740df43a3
--- /dev/null
+++ b/sys/configure/structs/Game.HeroTalent.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameHeroTalent struct {
+    _dataMap map[int32]*GameHeroTalentData
+    _dataList []*GameHeroTalentData
+}
+
+func NewGameHeroTalent(_buf []map[string]interface{}) (*GameHeroTalent, error) {
+	_dataList := make([]*GameHeroTalentData, 0, len(_buf))
+	dataMap := make(map[int32]*GameHeroTalentData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameHeroTalentData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameHeroTalent{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameHeroTalent) GetDataMap() map[int32]*GameHeroTalentData {
+    return table._dataMap
+}
+
+func (table *GameHeroTalent) GetDataList() []*GameHeroTalentData {
+    return table._dataList
+}
+
+func (table *GameHeroTalent) Get(key int32) *GameHeroTalentData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.HeroTalentData.go b/sys/configure/structs/Game.HeroTalentData.go
new file mode 100644
index 000000000..281e341a2
--- /dev/null
+++ b/sys/configure/structs/Game.HeroTalentData.go
@@ -0,0 +1,97 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameHeroTalentData struct {
+    Id int32
+    Type []int32
+    Talentid int32
+    Before []int32
+    Thing []*Gameatn
+    Position []int32
+}
+
+const TypeId_GameHeroTalentData = 1749022668
+
+func (*GameHeroTalentData) GetTypeId() int32 {
+    return 1749022668
+}
+
+func (_v *GameHeroTalentData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["type"].([]interface{}); !_ok_ { err = errors.New("type error"); return }
+
+                _v.Type = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Type = append(_v.Type, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["talentid"].(float64); !_ok_ { err = errors.New("talentid error"); return }; _v.Talentid = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["before"].([]interface{}); !_ok_ { err = errors.New("before error"); return }
+
+                _v.Before = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Before = append(_v.Before, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["thing"].([]interface{}); !_ok_ { err = errors.New("thing error"); return }
+
+                _v.Thing = make([]*Gameatn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Gameatn
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+                    _v.Thing = append(_v.Thing, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["position"].([]interface{}); !_ok_ { err = errors.New("position error"); return }
+
+                _v.Position = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Position = append(_v.Position, _list_v_)
+                }
+            }
+
+    return
+}
+
+func DeserializeGameHeroTalentData(_buf map[string]interface{}) (*GameHeroTalentData, error) {
+    v := &GameHeroTalentData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.TalentSkill.go b/sys/configure/structs/Game.TalentSkill.go
new file mode 100644
index 000000000..325141c19
--- /dev/null
+++ b/sys/configure/structs/Game.TalentSkill.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameTalentSkill struct {
+    _dataMap map[int32]*GameTalentSkillData
+    _dataList []*GameTalentSkillData
+}
+
+func NewGameTalentSkill(_buf []map[string]interface{}) (*GameTalentSkill, error) {
+	_dataList := make([]*GameTalentSkillData, 0, len(_buf))
+	dataMap := make(map[int32]*GameTalentSkillData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameTalentSkillData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Skillid] = _v
+		}
+	}
+	return &GameTalentSkill{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameTalentSkill) GetDataMap() map[int32]*GameTalentSkillData {
+    return table._dataMap
+}
+
+func (table *GameTalentSkill) GetDataList() []*GameTalentSkillData {
+    return table._dataList
+}
+
+func (table *GameTalentSkill) Get(key int32) *GameTalentSkillData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.TalentSkillData.go b/sys/configure/structs/Game.TalentSkillData.go
new file mode 100644
index 000000000..697f6ec35
--- /dev/null
+++ b/sys/configure/structs/Game.TalentSkillData.go
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameTalentSkillData struct {
+    Skillid int32
+    Skilltyp int32
+    Skillname string
+    Skilltxt string
+    Skillicon string
+    Hp int32
+    Atk int32
+    Def int32
+    Crt int32
+    Speed int32
+}
+
+const TypeId_GameTalentSkillData = -1949022189
+
+func (*GameTalentSkillData) GetTypeId() int32 {
+    return -1949022189
+}
+
+func (_v *GameTalentSkillData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilltyp"].(float64); !_ok_ { err = errors.New("skilltyp error"); return }; _v.Skilltyp = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Skillname, _ok_ = _buf["skillname"].(string); !_ok_ { err = errors.New("skillname error"); return } }
+    { var _ok_ bool; if _v.Skilltxt, _ok_ = _buf["skilltxt"].(string); !_ok_ { err = errors.New("skilltxt error"); return } }
+    { var _ok_ bool; if _v.Skillicon, _ok_ = _buf["skillicon"].(string); !_ok_ { err = errors.New("skillicon error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["crt"].(float64); !_ok_ { err = errors.New("crt error"); return }; _v.Crt = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speed"].(float64); !_ok_ { err = errors.New("speed error"); return }; _v.Speed = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameTalentSkillData(_buf map[string]interface{}) (*GameTalentSkillData, error) {
+    v := &GameTalentSkillData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index db10b6b11..392c1dc59 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -11,719 +11,733 @@ package cfg
 type JsonLoader func(string) ([]map[string]interface{}, error)
 
 type Tables struct {
-    Global *GameGlobal
-    Plot *GamePlot
-    Extservers *GameExtservers
-    SkillAtk *GameSkillAtk
-    SkillAfteratk *GameSkillAfteratk
-    SkillBuff *GameSkillBuff
-    SkillPassive *GameSkillPassive
-    Hero *GameHero
-    HeroStargrow *GameHeroStargrow
-    HeroLevelgrow *GameHeroLevelgrow
-    HeroStarup *GameHeroStarup
-    HeroStarupSp *GameHeroStarupSp
-    HeroExp *GameHeroExp
-    HeroLevelup *GameHeroLevelup
-    Equip *GameEquip
-    EquipAttrlibrary *GameEquipAttrlibrary
-    EquipSuit *GameEquipSuit
-    EquipColor *GameEquipColor
-    EquipIntensify *GameEquipIntensify
-    Item *GameItem
-    HeroSkillLevel *GameHeroSkillLevel
-    HeroResonance *GameHeroResonance
-    ComAtn *GameComAtn
-    HeroAwaken *GameHeroAwaken
-    HeroMethod *GameHeroMethod
-    Shop *GameShop
-    Shopitem *GameShopitem
-    ActiveReward *GameActiveReward
-    Model *GameModel
-    MainlineChapter *GameMainlineChapter
-    Mainline *GameMainline
-    RDMainlineChapter *GameRDMainlineChapter
-    RDMainline *GameRDMainline
-    DrawCard *GameDrawCard
-    ChatChannel *GameChatChannel
-    ChatSystem *GameChatSystem
-    ChatServerGroup *GameChatServerGroup
-    ChatChannelCom *GameChatChannelCom
-    ChatExpression *GameChatExpression
-    TaskRound *GameTaskRound
-    TaskActiveReward *GameTaskActiveReward
-    Coin *GameCoin
-    Initial *GameInitial
-    Monster *GameMonster
-    EquipPos *GameEquipPos
-    Playerlv *GamePlayerlv
-    Propsgroup *GamePropsgroup
-    Facemod *GameFacemod
-    Msgdistrib *GameMsgdistrib
-    Opencond *GameOpencond
-    Stroy *GameStroy
-    Pagoda *GamePagoda
-    SeasonLoop *GameSeasonLoop
-    PagodaTaskReward *GamePagodaTaskReward
-    PagodaSeasonReward *GamePagodaSeasonReward
-    Rdtask *GameRdtask
-    RdtaskCondi *GameRdtaskCondi
-    RdtaskChoose *GameRdtaskChoose
-    RdtaskSide *GameRdtaskSide
-    RdtaskBattle *GameRdtaskBattle
-    KungfuUnlock *GameKungfuUnlock
-    KungfuMasterworker *GameKungfuMasterworker
-    Gourmet *GameGourmet
-    Drop *GameDrop
-    Smithy *GameSmithy
-    SmithyStove *GameSmithyStove
-    SmithyText *GameSmithyText
-    VikingBoss *GameVikingBoss
-    VikingChallenge *GameVikingChallenge
-    DreamlandBoos *GameDreamlandBoos
-    DreamlandChallenge *GameDreamlandChallenge
-    DreamlandTrigger *GameDreamlandTrigger
-    HuntingBoss *GameHuntingBoss
-    HuntingChallenge *GameHuntingChallenge
-    HuntingOpenTime *GameHuntingOpenTime
-    HuntingLineup *GameHuntingLineup
-    MonsterFormat *GameMonsterFormat
-    Link *GameLink
-    GetResource *GameGetResource
-    Affix *GameAffix
-    VikingBossSkill *GameVikingBossSkill
-    LibraryFetter *GameLibraryFetter
-    LibraryStory *GameLibraryStory
-    FavorNum *GameFavorNum
-    LibraryHero *GameLibraryHero
-    LibraryHistory *GameLibraryHistory
-    LibraryFavor *GameLibraryFavor
-    LibraryFavorlv *GameLibraryFavorlv
-    LibraryPlayBack *GameLibraryPlayBack
-    Robot *GameRobot
-    Ip *GameIp
-    GameColor *GameGameColor
-    NameLibrary *GameNameLibrary
-    HeroConvertdata *GameHeroConvertdata
-    SubplotTimeLine *GameSubplotTimeLine
-    SubplotTaskLine *GameSubplotTaskLine
-    SubplotMainTask *GameSubplotMainTask
-    SubplotSubTask *GameSubplotSubTask
-    Captaintext *GameCaptaintext
-    Herofusion *GameHerofusion
-    PlayerInfor *GamePlayerInfor
+	Global             *GameGlobal
+	Plot               *GamePlot
+	Extservers         *GameExtservers
+	SkillAtk           *GameSkillAtk
+	SkillAfteratk      *GameSkillAfteratk
+	SkillBuff          *GameSkillBuff
+	SkillPassive       *GameSkillPassive
+	Hero               *GameHero
+	HeroStargrow       *GameHeroStargrow
+	HeroLevelgrow      *GameHeroLevelgrow
+	HeroStarup         *GameHeroStarup
+	HeroStarupSp       *GameHeroStarupSp
+	HeroExp            *GameHeroExp
+	HeroLevelup        *GameHeroLevelup
+	Equip              *GameEquip
+	EquipAttrlibrary   *GameEquipAttrlibrary
+	EquipSuit          *GameEquipSuit
+	EquipColor         *GameEquipColor
+	EquipIntensify     *GameEquipIntensify
+	Item               *GameItem
+	HeroSkillLevel     *GameHeroSkillLevel
+	HeroResonance      *GameHeroResonance
+	ComAtn             *GameComAtn
+	HeroAwaken         *GameHeroAwaken
+	HeroMethod         *GameHeroMethod
+	Shop               *GameShop
+	Shopitem           *GameShopitem
+	ActiveReward       *GameActiveReward
+	Model              *GameModel
+	MainlineChapter    *GameMainlineChapter
+	Mainline           *GameMainline
+	RDMainlineChapter  *GameRDMainlineChapter
+	RDMainline         *GameRDMainline
+	DrawCard           *GameDrawCard
+	ChatChannel        *GameChatChannel
+	ChatSystem         *GameChatSystem
+	ChatServerGroup    *GameChatServerGroup
+	ChatChannelCom     *GameChatChannelCom
+	ChatExpression     *GameChatExpression
+	TaskRound          *GameTaskRound
+	TaskActiveReward   *GameTaskActiveReward
+	Coin               *GameCoin
+	Initial            *GameInitial
+	Monster            *GameMonster
+	EquipPos           *GameEquipPos
+	Playerlv           *GamePlayerlv
+	Propsgroup         *GamePropsgroup
+	Facemod            *GameFacemod
+	Msgdistrib         *GameMsgdistrib
+	Opencond           *GameOpencond
+	Stroy              *GameStroy
+	Pagoda             *GamePagoda
+	SeasonLoop         *GameSeasonLoop
+	PagodaTaskReward   *GamePagodaTaskReward
+	PagodaSeasonReward *GamePagodaSeasonReward
+	Rdtask             *GameRdtask
+	RdtaskCondi        *GameRdtaskCondi
+	RdtaskChoose       *GameRdtaskChoose
+	RdtaskSide         *GameRdtaskSide
+	RdtaskBattle       *GameRdtaskBattle
+	KungfuUnlock       *GameKungfuUnlock
+	KungfuMasterworker *GameKungfuMasterworker
+	Gourmet            *GameGourmet
+	Drop               *GameDrop
+	Smithy             *GameSmithy
+	SmithyStove        *GameSmithyStove
+	SmithyText         *GameSmithyText
+	VikingBoss         *GameVikingBoss
+	VikingChallenge    *GameVikingChallenge
+	DreamlandBoos      *GameDreamlandBoos
+	DreamlandChallenge *GameDreamlandChallenge
+	DreamlandTrigger   *GameDreamlandTrigger
+	HuntingBoss        *GameHuntingBoss
+	HuntingChallenge   *GameHuntingChallenge
+	HuntingOpenTime    *GameHuntingOpenTime
+	HuntingLineup      *GameHuntingLineup
+	MonsterFormat      *GameMonsterFormat
+	Link               *GameLink
+	GetResource        *GameGetResource
+	Affix              *GameAffix
+	VikingBossSkill    *GameVikingBossSkill
+	LibraryFetter      *GameLibraryFetter
+	LibraryStory       *GameLibraryStory
+	FavorNum           *GameFavorNum
+	LibraryHero        *GameLibraryHero
+	LibraryHistory     *GameLibraryHistory
+	LibraryFavor       *GameLibraryFavor
+	LibraryFavorlv     *GameLibraryFavorlv
+	LibraryPlayBack    *GameLibraryPlayBack
+	Robot              *GameRobot
+	Ip                 *GameIp
+	GameColor          *GameGameColor
+	NameLibrary        *GameNameLibrary
+	HeroConvertdata    *GameHeroConvertdata
+	SubplotTimeLine    *GameSubplotTimeLine
+	SubplotTaskLine    *GameSubplotTaskLine
+	SubplotMainTask    *GameSubplotMainTask
+	SubplotSubTask     *GameSubplotSubTask
+	Captaintext        *GameCaptaintext
+	Herofusion         *GameHerofusion
+	PlayerInfor        *GamePlayerInfor
+	HeroTalent         *GameHeroTalent
+	TalentSkill        *GameTalentSkill
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
-    var err error
-    var buf []map[string]interface{}
+	var err error
+	var buf []map[string]interface{}
 
-    tables := &Tables{}
-    if buf, err = loader("game_global") ; err != nil {
-        return nil, err
-    }
-    if tables.Global, err = NewGameGlobal(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_plot") ; err != nil {
-        return nil, err
-    }
-    if tables.Plot, err = NewGamePlot(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_extservers") ; err != nil {
-        return nil, err
-    }
-    if tables.Extservers, err = NewGameExtservers(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_skillatk") ; err != nil {
-        return nil, err
-    }
-    if tables.SkillAtk, err = NewGameSkillAtk(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_skillafteratk") ; err != nil {
-        return nil, err
-    }
-    if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_skillbuff") ; err != nil {
-        return nil, err
-    }
-    if tables.SkillBuff, err = NewGameSkillBuff(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_skillpassive") ; err != nil {
-        return nil, err
-    }
-    if tables.SkillPassive, err = NewGameSkillPassive(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_hero") ; err != nil {
-        return nil, err
-    }
-    if tables.Hero, err = NewGameHero(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herostargrow") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroStargrow, err = NewGameHeroStargrow(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herolevelgrow") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herostarup") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroStarup, err = NewGameHeroStarup(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herostarupsp") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroStarupSp, err = NewGameHeroStarupSp(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heroexp") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroExp, err = NewGameHeroExp(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herolevelup") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroLevelup, err = NewGameHeroLevelup(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equip") ; err != nil {
-        return nil, err
-    }
-    if tables.Equip, err = NewGameEquip(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equipattrlibrary") ; err != nil {
-        return nil, err
-    }
-    if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equipsuit") ; err != nil {
-        return nil, err
-    }
-    if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equipcolor") ; err != nil {
-        return nil, err
-    }
-    if tables.EquipColor, err = NewGameEquipColor(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equipintensify") ; err != nil {
-        return nil, err
-    }
-    if tables.EquipIntensify, err = NewGameEquipIntensify(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_item") ; err != nil {
-        return nil, err
-    }
-    if tables.Item, err = NewGameItem(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heroskilllevel") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heroresonance") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroResonance, err = NewGameHeroResonance(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_comatn") ; err != nil {
-        return nil, err
-    }
-    if tables.ComAtn, err = NewGameComAtn(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heroawaken") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroAwaken, err = NewGameHeroAwaken(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heromethod") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroMethod, err = NewGameHeroMethod(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_shop") ; err != nil {
-        return nil, err
-    }
-    if tables.Shop, err = NewGameShop(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_shopitem") ; err != nil {
-        return nil, err
-    }
-    if tables.Shopitem, err = NewGameShopitem(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_activereward") ; err != nil {
-        return nil, err
-    }
-    if tables.ActiveReward, err = NewGameActiveReward(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_model") ; err != nil {
-        return nil, err
-    }
-    if tables.Model, err = NewGameModel(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_mainlinechapter") ; err != nil {
-        return nil, err
-    }
-    if tables.MainlineChapter, err = NewGameMainlineChapter(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_mainline") ; err != nil {
-        return nil, err
-    }
-    if tables.Mainline, err = NewGameMainline(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdmainlinechapter") ; err != nil {
-        return nil, err
-    }
-    if tables.RDMainlineChapter, err = NewGameRDMainlineChapter(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdmainline") ; err != nil {
-        return nil, err
-    }
-    if tables.RDMainline, err = NewGameRDMainline(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_drawcard") ; err != nil {
-        return nil, err
-    }
-    if tables.DrawCard, err = NewGameDrawCard(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_chatchannel") ; err != nil {
-        return nil, err
-    }
-    if tables.ChatChannel, err = NewGameChatChannel(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_chatsystem") ; err != nil {
-        return nil, err
-    }
-    if tables.ChatSystem, err = NewGameChatSystem(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_chatservergroup") ; err != nil {
-        return nil, err
-    }
-    if tables.ChatServerGroup, err = NewGameChatServerGroup(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_chatchannelcom") ; err != nil {
-        return nil, err
-    }
-    if tables.ChatChannelCom, err = NewGameChatChannelCom(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_chatexpression") ; err != nil {
-        return nil, err
-    }
-    if tables.ChatExpression, err = NewGameChatExpression(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_taskround") ; err != nil {
-        return nil, err
-    }
-    if tables.TaskRound, err = NewGameTaskRound(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_taskactivereward") ; err != nil {
-        return nil, err
-    }
-    if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_coin") ; err != nil {
-        return nil, err
-    }
-    if tables.Coin, err = NewGameCoin(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_initial") ; err != nil {
-        return nil, err
-    }
-    if tables.Initial, err = NewGameInitial(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_monster") ; err != nil {
-        return nil, err
-    }
-    if tables.Monster, err = NewGameMonster(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_equippos") ; err != nil {
-        return nil, err
-    }
-    if tables.EquipPos, err = NewGameEquipPos(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_playerlv") ; err != nil {
-        return nil, err
-    }
-    if tables.Playerlv, err = NewGamePlayerlv(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_propsgroup") ; err != nil {
-        return nil, err
-    }
-    if tables.Propsgroup, err = NewGamePropsgroup(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_facemod") ; err != nil {
-        return nil, err
-    }
-    if tables.Facemod, err = NewGameFacemod(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_msgdistrib") ; err != nil {
-        return nil, err
-    }
-    if tables.Msgdistrib, err = NewGameMsgdistrib(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_opencond") ; err != nil {
-        return nil, err
-    }
-    if tables.Opencond, err = NewGameOpencond(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_stroy") ; err != nil {
-        return nil, err
-    }
-    if tables.Stroy, err = NewGameStroy(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_pagoda") ; err != nil {
-        return nil, err
-    }
-    if tables.Pagoda, err = NewGamePagoda(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_seasonloop") ; err != nil {
-        return nil, err
-    }
-    if tables.SeasonLoop, err = NewGameSeasonLoop(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_pagodataskreward") ; err != nil {
-        return nil, err
-    }
-    if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_pagodaseasonreward") ; err != nil {
-        return nil, err
-    }
-    if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdtask") ; err != nil {
-        return nil, err
-    }
-    if tables.Rdtask, err = NewGameRdtask(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdtaskcondi") ; err != nil {
-        return nil, err
-    }
-    if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdtaskchoose") ; err != nil {
-        return nil, err
-    }
-    if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdtaskside") ; err != nil {
-        return nil, err
-    }
-    if tables.RdtaskSide, err = NewGameRdtaskSide(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_rdtaskbattle") ; err != nil {
-        return nil, err
-    }
-    if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_kungfuunlock") ; err != nil {
-        return nil, err
-    }
-    if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_kungfumasterworker") ; err != nil {
-        return nil, err
-    }
-    if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_gourmet") ; err != nil {
-        return nil, err
-    }
-    if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_drop") ; err != nil {
-        return nil, err
-    }
-    if tables.Drop, err = NewGameDrop(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_smithy") ; err != nil {
-        return nil, err
-    }
-    if tables.Smithy, err = NewGameSmithy(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_smithystove") ; err != nil {
-        return nil, err
-    }
-    if tables.SmithyStove, err = NewGameSmithyStove(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_smithytext") ; err != nil {
-        return nil, err
-    }
-    if tables.SmithyText, err = NewGameSmithyText(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_vikingboss") ; err != nil {
-        return nil, err
-    }
-    if tables.VikingBoss, err = NewGameVikingBoss(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_vikingchallenge") ; err != nil {
-        return nil, err
-    }
-    if tables.VikingChallenge, err = NewGameVikingChallenge(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_dreamlandboos") ; err != nil {
-        return nil, err
-    }
-    if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_dreamlandchallenge") ; err != nil {
-        return nil, err
-    }
-    if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_dreamlandtrigger") ; err != nil {
-        return nil, err
-    }
-    if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_huntingboss") ; err != nil {
-        return nil, err
-    }
-    if tables.HuntingBoss, err = NewGameHuntingBoss(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_huntingchallenge") ; err != nil {
-        return nil, err
-    }
-    if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_huntingopentime") ; err != nil {
-        return nil, err
-    }
-    if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_huntinglineup") ; err != nil {
-        return nil, err
-    }
-    if tables.HuntingLineup, err = NewGameHuntingLineup(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_monsterformat") ; err != nil {
-        return nil, err
-    }
-    if tables.MonsterFormat, err = NewGameMonsterFormat(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_link") ; err != nil {
-        return nil, err
-    }
-    if tables.Link, err = NewGameLink(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_getresource") ; err != nil {
-        return nil, err
-    }
-    if tables.GetResource, err = NewGameGetResource(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_affix") ; err != nil {
-        return nil, err
-    }
-    if tables.Affix, err = NewGameAffix(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_vikingbossskill") ; err != nil {
-        return nil, err
-    }
-    if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryfetter") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryFetter, err = NewGameLibraryFetter(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_librarystory") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryStory, err = NewGameLibraryStory(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_favornum") ; err != nil {
-        return nil, err
-    }
-    if tables.FavorNum, err = NewGameFavorNum(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryhero") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryHero, err = NewGameLibraryHero(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryhistory") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryHistory, err = NewGameLibraryHistory(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryfavor") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryFavor, err = NewGameLibraryFavor(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryfavorlv") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_libraryplayback") ; err != nil {
-        return nil, err
-    }
-    if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_robot") ; err != nil {
-        return nil, err
-    }
-    if tables.Robot, err = NewGameRobot(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_ip") ; err != nil {
-        return nil, err
-    }
-    if tables.Ip, err = NewGameIp(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_gamecolor") ; err != nil {
-        return nil, err
-    }
-    if tables.GameColor, err = NewGameGameColor(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_namelibrary") ; err != nil {
-        return nil, err
-    }
-    if tables.NameLibrary, err = NewGameNameLibrary(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_heroconvertdata") ; err != nil {
-        return nil, err
-    }
-    if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_subplottimeline") ; err != nil {
-        return nil, err
-    }
-    if tables.SubplotTimeLine, err = NewGameSubplotTimeLine(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_subplottaskline") ; err != nil {
-        return nil, err
-    }
-    if tables.SubplotTaskLine, err = NewGameSubplotTaskLine(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_subplotmaintask") ; err != nil {
-        return nil, err
-    }
-    if tables.SubplotMainTask, err = NewGameSubplotMainTask(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_subplotsubtask") ; err != nil {
-        return nil, err
-    }
-    if tables.SubplotSubTask, err = NewGameSubplotSubTask(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_captaintext") ; err != nil {
-        return nil, err
-    }
-    if tables.Captaintext, err = NewGameCaptaintext(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_herofusion") ; err != nil {
-        return nil, err
-    }
-    if tables.Herofusion, err = NewGameHerofusion(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_playerinfor") ; err != nil {
-        return nil, err
-    }
-    if tables.PlayerInfor, err = NewGamePlayerInfor(buf) ; err != nil {
-        return nil, err
-    }
-    return tables, nil
+	tables := &Tables{}
+	if buf, err = loader("game_global"); err != nil {
+		return nil, err
+	}
+	if tables.Global, err = NewGameGlobal(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_plot"); err != nil {
+		return nil, err
+	}
+	if tables.Plot, err = NewGamePlot(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_extservers"); err != nil {
+		return nil, err
+	}
+	if tables.Extservers, err = NewGameExtservers(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_skillatk"); err != nil {
+		return nil, err
+	}
+	if tables.SkillAtk, err = NewGameSkillAtk(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_skillafteratk"); err != nil {
+		return nil, err
+	}
+	if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_skillbuff"); err != nil {
+		return nil, err
+	}
+	if tables.SkillBuff, err = NewGameSkillBuff(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_skillpassive"); err != nil {
+		return nil, err
+	}
+	if tables.SkillPassive, err = NewGameSkillPassive(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_hero"); err != nil {
+		return nil, err
+	}
+	if tables.Hero, err = NewGameHero(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herostargrow"); err != nil {
+		return nil, err
+	}
+	if tables.HeroStargrow, err = NewGameHeroStargrow(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herolevelgrow"); err != nil {
+		return nil, err
+	}
+	if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herostarup"); err != nil {
+		return nil, err
+	}
+	if tables.HeroStarup, err = NewGameHeroStarup(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herostarupsp"); err != nil {
+		return nil, err
+	}
+	if tables.HeroStarupSp, err = NewGameHeroStarupSp(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heroexp"); err != nil {
+		return nil, err
+	}
+	if tables.HeroExp, err = NewGameHeroExp(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herolevelup"); err != nil {
+		return nil, err
+	}
+	if tables.HeroLevelup, err = NewGameHeroLevelup(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equip"); err != nil {
+		return nil, err
+	}
+	if tables.Equip, err = NewGameEquip(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equipattrlibrary"); err != nil {
+		return nil, err
+	}
+	if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equipsuit"); err != nil {
+		return nil, err
+	}
+	if tables.EquipSuit, err = NewGameEquipSuit(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equipcolor"); err != nil {
+		return nil, err
+	}
+	if tables.EquipColor, err = NewGameEquipColor(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equipintensify"); err != nil {
+		return nil, err
+	}
+	if tables.EquipIntensify, err = NewGameEquipIntensify(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_item"); err != nil {
+		return nil, err
+	}
+	if tables.Item, err = NewGameItem(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heroskilllevel"); err != nil {
+		return nil, err
+	}
+	if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heroresonance"); err != nil {
+		return nil, err
+	}
+	if tables.HeroResonance, err = NewGameHeroResonance(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_comatn"); err != nil {
+		return nil, err
+	}
+	if tables.ComAtn, err = NewGameComAtn(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heroawaken"); err != nil {
+		return nil, err
+	}
+	if tables.HeroAwaken, err = NewGameHeroAwaken(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heromethod"); err != nil {
+		return nil, err
+	}
+	if tables.HeroMethod, err = NewGameHeroMethod(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_shop"); err != nil {
+		return nil, err
+	}
+	if tables.Shop, err = NewGameShop(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_shopitem"); err != nil {
+		return nil, err
+	}
+	if tables.Shopitem, err = NewGameShopitem(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_activereward"); err != nil {
+		return nil, err
+	}
+	if tables.ActiveReward, err = NewGameActiveReward(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_model"); err != nil {
+		return nil, err
+	}
+	if tables.Model, err = NewGameModel(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_mainlinechapter"); err != nil {
+		return nil, err
+	}
+	if tables.MainlineChapter, err = NewGameMainlineChapter(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_mainline"); err != nil {
+		return nil, err
+	}
+	if tables.Mainline, err = NewGameMainline(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdmainlinechapter"); err != nil {
+		return nil, err
+	}
+	if tables.RDMainlineChapter, err = NewGameRDMainlineChapter(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdmainline"); err != nil {
+		return nil, err
+	}
+	if tables.RDMainline, err = NewGameRDMainline(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_drawcard"); err != nil {
+		return nil, err
+	}
+	if tables.DrawCard, err = NewGameDrawCard(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_chatchannel"); err != nil {
+		return nil, err
+	}
+	if tables.ChatChannel, err = NewGameChatChannel(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_chatsystem"); err != nil {
+		return nil, err
+	}
+	if tables.ChatSystem, err = NewGameChatSystem(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_chatservergroup"); err != nil {
+		return nil, err
+	}
+	if tables.ChatServerGroup, err = NewGameChatServerGroup(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_chatchannelcom"); err != nil {
+		return nil, err
+	}
+	if tables.ChatChannelCom, err = NewGameChatChannelCom(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_chatexpression"); err != nil {
+		return nil, err
+	}
+	if tables.ChatExpression, err = NewGameChatExpression(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_taskround"); err != nil {
+		return nil, err
+	}
+	if tables.TaskRound, err = NewGameTaskRound(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_taskactivereward"); err != nil {
+		return nil, err
+	}
+	if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_coin"); err != nil {
+		return nil, err
+	}
+	if tables.Coin, err = NewGameCoin(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_initial"); err != nil {
+		return nil, err
+	}
+	if tables.Initial, err = NewGameInitial(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_monster"); err != nil {
+		return nil, err
+	}
+	if tables.Monster, err = NewGameMonster(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_equippos"); err != nil {
+		return nil, err
+	}
+	if tables.EquipPos, err = NewGameEquipPos(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_playerlv"); err != nil {
+		return nil, err
+	}
+	if tables.Playerlv, err = NewGamePlayerlv(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_propsgroup"); err != nil {
+		return nil, err
+	}
+	if tables.Propsgroup, err = NewGamePropsgroup(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_facemod"); err != nil {
+		return nil, err
+	}
+	if tables.Facemod, err = NewGameFacemod(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_msgdistrib"); err != nil {
+		return nil, err
+	}
+	if tables.Msgdistrib, err = NewGameMsgdistrib(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_opencond"); err != nil {
+		return nil, err
+	}
+	if tables.Opencond, err = NewGameOpencond(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_stroy"); err != nil {
+		return nil, err
+	}
+	if tables.Stroy, err = NewGameStroy(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_pagoda"); err != nil {
+		return nil, err
+	}
+	if tables.Pagoda, err = NewGamePagoda(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_seasonloop"); err != nil {
+		return nil, err
+	}
+	if tables.SeasonLoop, err = NewGameSeasonLoop(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_pagodataskreward"); err != nil {
+		return nil, err
+	}
+	if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_pagodaseasonreward"); err != nil {
+		return nil, err
+	}
+	if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdtask"); err != nil {
+		return nil, err
+	}
+	if tables.Rdtask, err = NewGameRdtask(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdtaskcondi"); err != nil {
+		return nil, err
+	}
+	if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdtaskchoose"); err != nil {
+		return nil, err
+	}
+	if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdtaskside"); err != nil {
+		return nil, err
+	}
+	if tables.RdtaskSide, err = NewGameRdtaskSide(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_rdtaskbattle"); err != nil {
+		return nil, err
+	}
+	if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_kungfuunlock"); err != nil {
+		return nil, err
+	}
+	if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_kungfumasterworker"); err != nil {
+		return nil, err
+	}
+	if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_gourmet"); err != nil {
+		return nil, err
+	}
+	if tables.Gourmet, err = NewGameGourmet(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_drop"); err != nil {
+		return nil, err
+	}
+	if tables.Drop, err = NewGameDrop(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_smithy"); err != nil {
+		return nil, err
+	}
+	if tables.Smithy, err = NewGameSmithy(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_smithystove"); err != nil {
+		return nil, err
+	}
+	if tables.SmithyStove, err = NewGameSmithyStove(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_smithytext"); err != nil {
+		return nil, err
+	}
+	if tables.SmithyText, err = NewGameSmithyText(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_vikingboss"); err != nil {
+		return nil, err
+	}
+	if tables.VikingBoss, err = NewGameVikingBoss(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_vikingchallenge"); err != nil {
+		return nil, err
+	}
+	if tables.VikingChallenge, err = NewGameVikingChallenge(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_dreamlandboos"); err != nil {
+		return nil, err
+	}
+	if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_dreamlandchallenge"); err != nil {
+		return nil, err
+	}
+	if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_dreamlandtrigger"); err != nil {
+		return nil, err
+	}
+	if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_huntingboss"); err != nil {
+		return nil, err
+	}
+	if tables.HuntingBoss, err = NewGameHuntingBoss(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_huntingchallenge"); err != nil {
+		return nil, err
+	}
+	if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_huntingopentime"); err != nil {
+		return nil, err
+	}
+	if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_huntinglineup"); err != nil {
+		return nil, err
+	}
+	if tables.HuntingLineup, err = NewGameHuntingLineup(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_monsterformat"); err != nil {
+		return nil, err
+	}
+	if tables.MonsterFormat, err = NewGameMonsterFormat(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_link"); err != nil {
+		return nil, err
+	}
+	if tables.Link, err = NewGameLink(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_getresource"); err != nil {
+		return nil, err
+	}
+	if tables.GetResource, err = NewGameGetResource(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_affix"); err != nil {
+		return nil, err
+	}
+	if tables.Affix, err = NewGameAffix(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_vikingbossskill"); err != nil {
+		return nil, err
+	}
+	if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryfetter"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryFetter, err = NewGameLibraryFetter(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_librarystory"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryStory, err = NewGameLibraryStory(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_favornum"); err != nil {
+		return nil, err
+	}
+	if tables.FavorNum, err = NewGameFavorNum(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryhero"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryHero, err = NewGameLibraryHero(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryhistory"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryHistory, err = NewGameLibraryHistory(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryfavor"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryFavor, err = NewGameLibraryFavor(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryfavorlv"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_libraryplayback"); err != nil {
+		return nil, err
+	}
+	if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_robot"); err != nil {
+		return nil, err
+	}
+	if tables.Robot, err = NewGameRobot(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_ip"); err != nil {
+		return nil, err
+	}
+	if tables.Ip, err = NewGameIp(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_gamecolor"); err != nil {
+		return nil, err
+	}
+	if tables.GameColor, err = NewGameGameColor(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_namelibrary"); err != nil {
+		return nil, err
+	}
+	if tables.NameLibrary, err = NewGameNameLibrary(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_heroconvertdata"); err != nil {
+		return nil, err
+	}
+	if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_subplottimeline"); err != nil {
+		return nil, err
+	}
+	if tables.SubplotTimeLine, err = NewGameSubplotTimeLine(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_subplottaskline"); err != nil {
+		return nil, err
+	}
+	if tables.SubplotTaskLine, err = NewGameSubplotTaskLine(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_subplotmaintask"); err != nil {
+		return nil, err
+	}
+	if tables.SubplotMainTask, err = NewGameSubplotMainTask(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_subplotsubtask"); err != nil {
+		return nil, err
+	}
+	if tables.SubplotSubTask, err = NewGameSubplotSubTask(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_captaintext"); err != nil {
+		return nil, err
+	}
+	if tables.Captaintext, err = NewGameCaptaintext(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herofusion"); err != nil {
+		return nil, err
+	}
+	if tables.Herofusion, err = NewGameHerofusion(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_playerinfor"); err != nil {
+		return nil, err
+	}
+	if tables.PlayerInfor, err = NewGamePlayerInfor(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_herotalent"); err != nil {
+		return nil, err
+	}
+	if tables.HeroTalent, err = NewGameHeroTalent(buf); err != nil {
+		return nil, err
+	}
+	if buf, err = loader("game_talentskill"); err != nil {
+		return nil, err
+	}
+	if tables.TalentSkill, err = NewGameTalentSkill(buf); err != nil {
+		return nil, err
+	}
+	return tables, nil
 }

From 62d7a63f533fbc5470d4ad21498262428fb44f05 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 25 Oct 2022 10:30:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comp_configure.go            | 18 +++++-------
 modules/hero/api_strengthenUpStar.go |  1 -
 modules/hero/configure_comp.go       | 44 +++++++++-------------------
 3 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index 1ec54c2b9..cd9148327 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -106,9 +106,7 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.GameInitial, err
 		v  interface{}
 		ok bool
 	)
-	if v, err = this.GetConfigure(game_initial); err != nil {
-		return
-	} else {
+	if v, err = this.GetConfigure(game_initial); err == nil {
 		if configure, ok = v.(*cfg.GameInitial); !ok {
 			err = fmt.Errorf("%T no is *cfg.Game_comInitial", v)
 			return
@@ -122,15 +120,13 @@ func (this *MCompConfigure) GetGlobalAtnConf(key string) *cfg.GameComAtnData {
 		configure *cfg.GameComAtn
 		ok        bool
 	)
-	if v, err := this.GetConfigure(game_comatn); err != nil {
-		return nil
-	} else {
-		if configure, ok = v.(*cfg.GameComAtn); !ok {
-			err = fmt.Errorf("%T no is *cfg.Game_comatn", v)
-			return nil
+	if v, err := this.GetConfigure(game_comatn); err == nil {
+		if configure, ok = v.(*cfg.GameComAtn); ok {
+			return configure.Get(key)
 		}
 	}
-	return configure.Get(key)
+	fmt.Errorf("%T no is *cfg.GameComAtnData", key)
+	return nil
 }
 
 // 主角等级经验配置列表
@@ -241,7 +237,7 @@ func (this *MCompConfigure) GetColor(id int32) (item *cfg.GameGameColorData, err
 		v  interface{}
 		ok bool
 	)
-	if v, err = this.GetConfigure(game_gamecolor); err != nil {
+	if v, err = this.GetConfigure(game_gamecolor); err == nil {
 		return
 	} else {
 		if item, ok = v.(*cfg.GameGameColor).GetDataMap()[id]; !ok {
diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go
index 8ecf6d7e7..1aa785bf9 100644
--- a/modules/hero/api_strengthenUpStar.go
+++ b/modules/hero/api_strengthenUpStar.go
@@ -149,7 +149,6 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 			_hero.HeroID = hid
 			_heroMap["heroID"] = _hero.HeroID
 		}
-
 	}
 	// 保存数据
 	err := this.module.modelHero.ChangeList(session.GetUserId(), _hero.Id, _heroMap)
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index 3f1bbcdbc..7897b15f9 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -109,8 +109,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 			err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
 		}
 	})
-	hid := this.GetHeroSpriteStar("43901")
-	fmt.Printf("%s", hid)
+
 	return
 }
 
@@ -360,7 +359,6 @@ func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 {
 
 	if v, err := this.GetConfigure(game_skillatk); err == nil {
 		if configure, ok := v.(*cfg.GameSkillAtk); ok {
-			//return configure.Get(int32(skillId)).MaxLV
 			for _, v1 := range configure.GetDataList() {
 				if v1.Id == int32(skillId) {
 					return v1.MaxLV
@@ -377,16 +375,12 @@ func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GameComAtnDat
 		v interface{}
 	)
 	if v, err = this.GetConfigure(hero_comatn); err == nil {
-		if configure, ok := v.(*cfg.GameComAtn); !ok {
-			err = fmt.Errorf("%T no is *cfg.GamecomAtn", v)
-			return
-		} else {
+		if configure, ok := v.(*cfg.GameComAtn); ok {
 			data = configure.Get("hero_reset")
+			return
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.game_comatn", v)
 	}
-
+	this.module.Errorf("cfg.GameComAtnData GetHeroResonanceRestConfig:id = hero_reset")
 	return
 }
 
@@ -394,43 +388,33 @@ func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GameComAtnDat
 func (this *configureComp) GetHeroFucionConfig(cid string) (data *cfg.GameHerofusionData) {
 
 	if v, err := this.GetConfigure(hero_fusion); err == nil {
-		if configure, ok := v.(*cfg.GameHerofusion); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
-			return
-		} else {
+		if configure, ok := v.(*cfg.GameHerofusion); ok {
 			data = configure.Get(cid)
+			return
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
 	}
-
+	this.module.Errorf("cfg.GameHerofusionData GetHeroFucionConfig:id = %s", cid)
 	return
 }
 
 func (this *configureComp) GetHeroSpriteStar(cid string) (hid string) {
 	if v, err := this.GetConfigure(hero_starupsp); err == nil {
 		if configure, ok := v.(*cfg.GameHeroStarupSp); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
-			return
-		} else {
 			hid = configure.Get(cid).Starid
+			return
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
 	}
-	return
+	this.module.Errorf("cfg.GameHeroStarupSpData GetHeroSpriteStar:id = %s", cid)
+	return ""
 }
 
 func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData) {
 	if v, err := this.GetConfigure(hero_talent); err == nil {
-		if configure, ok := v.(*cfg.GameHeroTalent); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
-			return
-		} else {
+		if configure, ok := v.(*cfg.GameHeroTalent); ok {
 			data = configure.Get(id)
+			return
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHerofusionData", v)
 	}
-	return
+	this.module.Errorf("cfg.GameHeroTalentData GetHeroTalent:id = %d", id)
+	return nil
 }

From d744cb9c456f9d0fa447d8d541b8f16d8fc15070 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 25 Oct 2022 16:35:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E5=AD=A6=E4=B9=A0=20?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_herotalent.json   |  95 --------------
 modules/hero/api.go             |  31 ++---
 modules/hero/api_talentlearn.go | 114 +++++++++++++++++
 modules/hero/api_talentlist.go  |   2 +-
 modules/hero/api_talentreset.go |  55 +++++++++
 modules/hero/configure_comp.go  |  16 ++-
 modules/hero/model_hero.go      |  47 ++++++-
 modules/hero/model_talent.go    |  21 ++++
 modules/modulebase.go           |   2 +-
 pb/arena_db.pb.go               | 153 +++++++++++++++--------
 pb/arena_msg.pb.go              | 212 ++++++++++++++++++++++----------
 pb/equipment_msg.pb.go          |   2 +-
 pb/errorcode.pb.go              |  21 +++-
 pb/hero_db.pb.go                | 129 ++++++++++---------
 pb/hero_msg.pb.go               | 212 ++++++++++++++++++++++++++------
 15 files changed, 784 insertions(+), 328 deletions(-)
 create mode 100644 modules/hero/api_talentlearn.go
 create mode 100644 modules/hero/api_talentreset.go

diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json
index 45538ff54..b790e0dca 100644
--- a/bin/json/game_herotalent.json
+++ b/bin/json/game_herotalent.json
@@ -91,11 +91,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -117,11 +112,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -143,11 +133,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -170,11 +155,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -196,11 +176,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -222,11 +197,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -248,11 +218,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -274,11 +239,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -302,11 +262,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -329,11 +284,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -357,11 +307,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -383,11 +328,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -409,11 +349,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -435,11 +370,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -461,11 +391,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -487,11 +412,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -513,11 +433,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -539,11 +454,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
@@ -565,11 +475,6 @@
         "a": "attr",
         "t": "glod",
         "n": 15000
-      },
-      {
-        "a": "hero",
-        "t": "44911",
-        "n": 1
       }
     ],
     "position": [
diff --git a/modules/hero/api.go b/modules/hero/api.go
index 98810e07e..05c4e9467 100644
--- a/modules/hero/api.go
+++ b/modules/hero/api.go
@@ -13,20 +13,23 @@ type apiComp struct {
 }
 
 const ( //消息回复的头名称
-	StrengthenUplv     = "strengthenuplv"
-	HeroSubTypeInfo    = "info"               //英雄卡片信息
-	HeroSubTypeList    = "list"               //英雄列表
-	HeroSubTypeChouka  = "chouka"             //抽卡
-	ResonanceUseEnergy = "resonanceuseenergy" // 使用共鸣能量
-	Resonance          = "resonance"          // 英雄共鸣属性
-	ResonanceReset     = "resonancereset"     // 共鸣重置
-	StrengthenUpSkill  = "strengthenupskill"  // 技能强化
-	StrengthenUpStar   = "strengthenupstar"   // 英雄升星
-	Awaken             = "awaken"             // 英雄觉醒
-	HeroLock           = "lock"               // 英雄锁定
-	DrawCard           = "drawcard"           // 抽卡
-	DrawCardFloor      = "drawcardfloor"      // 抽卡保底
-	HeroFusionResp     = "fusion"
+	StrengthenUplv      = "strengthenuplv"
+	HeroSubTypeInfo     = "info"               //英雄卡片信息
+	HeroSubTypeList     = "list"               //英雄列表
+	HeroSubTypeChouka   = "chouka"             //抽卡
+	ResonanceUseEnergy  = "resonanceuseenergy" // 使用共鸣能量
+	Resonance           = "resonance"          // 英雄共鸣属性
+	ResonanceReset      = "resonancereset"     // 共鸣重置
+	StrengthenUpSkill   = "strengthenupskill"  // 技能强化
+	StrengthenUpStar    = "strengthenupstar"   // 英雄升星
+	Awaken              = "awaken"             // 英雄觉醒
+	HeroLock            = "lock"               // 英雄锁定
+	DrawCard            = "drawcard"           // 抽卡
+	DrawCardFloor       = "drawcardfloor"      // 抽卡保底
+	HeroFusionResp      = "fusion"
+	HeroTalentLearnResp = "talentlearn" // 天赋学习
+	HeroTalentListResp  = "talentlist"  // 天赋列表
+	HeroTalentResetResp = "talentreset" // 天赋重置
 )
 
 //组件初始化接口
diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go
new file mode 100644
index 000000000..4f86e2223
--- /dev/null
+++ b/modules/hero/api_talentlearn.go
@@ -0,0 +1,114 @@
+package hero
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) TalentLearnCheck(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode) {
+	if req.TalentID <= 0 {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+// 天赋学习
+func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		talent     *pb.DBHeroTalent
+		err        error
+		chanegCard []*pb.DBHero // 推送属性变化
+	)
+	chanegCard = make([]*pb.DBHero, 0)
+	if code = this.TalentLearnCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+	if req.ObjId != "" {
+		if talent, err = this.module.modelTalent.GetHerotalentByObjId(session.GetUserId(), req.ObjId); err != nil {
+			code = pb.ErrorCode_SystemError
+			return
+		}
+		this.module.Debugf("%v", talent)
+
+	} else {
+		if req.Heroid == "" { // 英雄id不能为空
+			code = pb.ErrorCode_ReqParameterError
+			return
+		}
+		// 数据校验
+		list, err := this.module.modelTalent.GetHerotalent(session.GetUserId())
+		if err != nil {
+			code = pb.ErrorCode_DBError
+			return
+		}
+		for _, v := range list {
+			if v.HeroId == req.Heroid {
+				talent = v
+				break
+			}
+		}
+		if talent == nil {
+			// 创建一条数据
+			talent, err = this.module.modelTalent.CreateHeroTalent(session.GetUserId(), req.Heroid)
+			if err != nil {
+				this.module.Errorf("create talent data failed:%v", err)
+			}
+		}
+	}
+
+	talentConf := this.module.configure.GetHeroTalent(req.TalentID)
+	if talentConf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	// 校验
+	if len(talentConf.Before) == 1 && talentConf.Before[0] == 0 { // 前置解锁技能为0
+		if _, ok := talent.Talent[req.TalentID]; ok {
+			code = pb.ErrorCode_TalentRepeatLearn // 重复激活
+			return
+		}
+	} else {
+		for _, v := range talentConf.Before {
+			if _, ok := talent.Talent[v]; !ok {
+				code = pb.ErrorCode_TalentUnLockerBefore // 前置技能不满足
+				return
+			}
+		}
+	}
+	// 校验消耗
+	if code = this.module.CheckRes(session, talentConf.Thing); code != pb.ErrorCode_Success {
+		return
+	}
+	if code = this.module.DispenseRes(session, talentConf.Thing, true); code != pb.ErrorCode_Success {
+		return
+	}
+	// 校验通过可以加
+	talent.Talent[req.TalentID] = 1
+	update := make(map[string]interface{}, 0)
+	update["talent"] = talent.Talent
+	if err = this.module.modelTalent.ChangeHeroTalent(talent, update); err != nil {
+		this.module.Errorf("update failed :%v", err)
+	}
+	talentSkill := this.module.configure.GetHeroTalentSkill(talentConf.Talentid)
+	if talentSkill == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	// 同步修改属性
+	heroList := this.module.GetHeroList(session.GetUserId())
+	for _, v := range heroList {
+		if v.HeroID == talent.HeroId { // 找到对应的英雄ID
+			this.module.modelHero.setTalentProperty(v, talentSkill)
+			chanegCard = append(chanegCard, v) // 添加推送属性变化信息
+		}
+	}
+
+	session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard})
+	session.SendMsg(string(this.module.GetType()), HeroTalentLearnResp, &pb.HeroTalentLearnResp{
+		Telnet: talent,
+	})
+	return
+}
diff --git a/modules/hero/api_talentlist.go b/modules/hero/api_talentlist.go
index 4ba498c82..3782526d8 100644
--- a/modules/hero/api_talentlist.go
+++ b/modules/hero/api_talentlist.go
@@ -15,6 +15,6 @@ func (this *apiComp) TalentListCheck(session comm.IUserSession, req *pb.HeroTale
 func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode, data proto.Message) {
 	rsp := &pb.HeroTalentListResp{}
 	rsp.Telnet, _ = this.module.modelTalent.GetHerotalent(session.GetUserId())
-	session.SendMsg(string(this.module.GetType()), HeroSubTypeList, rsp)
+	session.SendMsg(string(this.module.GetType()), HeroTalentListResp, rsp)
 	return
 }
diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go
new file mode 100644
index 000000000..2520dd153
--- /dev/null
+++ b/modules/hero/api_talentreset.go
@@ -0,0 +1,55 @@
+package hero
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) TalentResetCheck(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		heroList   []*pb.DBHero
+		chanegCard []*pb.DBHero // 推送属性变化
+	)
+	chanegCard = make([]*pb.DBHero, 0)
+	heroList = this.module.GetHeroList(session.GetUserId())
+	rsp := &pb.HeroTalentResetResp{}
+
+	globalCnf := this.module.configure.GetGlobalAtnConf("talent_reset") // 获取重置消耗
+	if globalCnf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	// 检查消耗够不够
+	if code = this.module.CheckRes(session, globalCnf.Var); code != pb.ErrorCode_Success {
+		return
+	}
+	if code = this.module.ConsumeRes(session, globalCnf.Var, true); code != pb.ErrorCode_Success {
+		return
+	}
+	list, _ := this.module.modelTalent.GetHerotalent(session.GetUserId())
+	for _, v := range list {
+		if len(v.Talent) > 0 {
+			update := make(map[string]interface{}, 0)
+			szTalent := map[int32]int32{}
+			update["talent"] = szTalent
+			this.module.modelTalent.ChangeHeroTalent(v, update)
+			for _, hero := range heroList {
+				if hero.HeroID == v.HeroId {
+					this.module.modelHero.cleanTalentProperty(hero)
+					chanegCard = append(chanegCard, hero) // 添加推送属性变化信息
+				}
+			}
+		}
+	}
+	session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard})
+	session.SendMsg(string(this.module.GetType()), HeroTalentResetResp, rsp)
+	return
+}
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index 7897b15f9..2deeb366a 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -63,7 +63,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 		hero_talent:      cfg.NewGameHeroTalent,
 	})
 	this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0)
-
 	configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig)
 	this.awakenMap = make(map[int64]*cfg.GameHeroAwakenData, 0)
 	configure.RegisterConfigure(hero_awaken, cfg.NewGameHeroAwaken, func() {
@@ -110,6 +109,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 		}
 	})
 
+	// 测试接口 功能完成后删
+	// _data := this.GetHeroTalentSkill(20101)
+	// _data1 := this.GetHeroTalent(1)
+	// this.module.Debugf("%v,%v", _data, _data1)
 	return
 }
 
@@ -418,3 +421,14 @@ func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData
 	this.module.Errorf("cfg.GameHeroTalentData GetHeroTalent:id = %d", id)
 	return nil
 }
+
+func (this *configureComp) GetHeroTalentSkill(skillId int32) (data *cfg.GameTalentSkillData) {
+	if v, err := this.GetConfigure(hero_talentskill); err == nil {
+		if configure, ok := v.(*cfg.GameTalentSkill); ok {
+			data = configure.Get(skillId)
+			return
+		}
+	}
+	this.module.Errorf("cfg.GameTalentSkillData GetHeroTalentSkill:skillId = %d", skillId)
+	return nil
+}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index ac8408fbf..952a92545 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -274,11 +274,11 @@ func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int
 	case comm.Speed:
 		hero.JuexProperty[comm.Speed] += value
 	case comm.ResonanceHpPro:
-		hero.JuexProperty[comm.Hp] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Hp])))
+		hero.JuexProperty[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
 	case comm.ResonanceAtkPro:
-		hero.JuexProperty[comm.Atk] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Atk])))
+		hero.JuexProperty[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk])))
 	case comm.ResonanceDefPro:
-		hero.JuexProperty[comm.Def] += int32(math.Floor((1.0 + float64(value)/1000) * float64(hero.Property[comm.Def])))
+		hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000)) * float64(hero.Property[comm.Def]))
 	}
 }
 
@@ -694,3 +694,44 @@ func (this *ModelHero) InitTempHero(heroCfgId string, star, lv int32) *pb.DBHero
 	this.initHeroSkill(newHero)
 	return newHero
 }
+
+//设置天赋属性
+func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameTalentSkillData) {
+	if conf == nil || hero == nil {
+		return
+	}
+	if conf.Hp != -1 {
+		hero.TalentProperty[comm.Hp] += int32(math.Floor((float64(conf.Hp) / 1000) * float64(hero.Property[comm.Hp])))
+	}
+	if conf.Atk != -1 {
+		hero.TalentProperty[comm.Atk] += int32(math.Floor((float64(conf.Atk) / 1000) * float64(hero.Property[comm.Atk])))
+	}
+	if conf.Def != -1 {
+		hero.TalentProperty[comm.Def] += int32(math.Floor((float64(conf.Def) / 1000) * float64(hero.Property[comm.Def])))
+	}
+	if conf.Crt != -1 {
+		hero.TalentProperty[comm.Cri] += int32(math.Floor((float64(conf.Crt) / 1000) * float64(hero.Property[comm.Cri])))
+	}
+	if conf.Speed != -1 {
+		hero.TalentProperty[comm.Speed] += int32(math.Floor((float64(conf.Speed) / 1000) * float64(hero.Property[comm.Speed])))
+	}
+
+	_heroMap := make(map[string]interface{}, 0)
+	_heroMap["talentProperty"] = hero.TalentProperty
+	if err := this.ChangeList(hero.Uid, hero.Id, _heroMap); err != nil {
+		this.moduleHero.Errorf("mergeenegryProperty err %v", err)
+	}
+}
+
+// 重置天赋属性
+func (this *ModelHero) cleanTalentProperty(hero *pb.DBHero) {
+	if hero == nil {
+		return
+	}
+	hero.TalentProperty = map[string]int32{}
+	_heroMap := make(map[string]interface{}, 0)
+	_heroMap["talentProperty"] = hero.TalentProperty
+	if err := this.ChangeList(hero.Uid, hero.Id, _heroMap); err != nil {
+		this.moduleHero.Errorf("mergeenegryProperty err %v", err)
+	}
+}
diff --git a/modules/hero/model_talent.go b/modules/hero/model_talent.go
index 575db1bee..50c05e8e1 100644
--- a/modules/hero/model_talent.go
+++ b/modules/hero/model_talent.go
@@ -7,6 +7,8 @@ import (
 	"go_dreamfactory/lego/sys/redis"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 // 英雄天赋组件
@@ -42,3 +44,22 @@ func (this *ModelTalent) ChangeHeroTalent(talent *pb.DBHeroTalent, update map[st
 	}
 	return nil
 }
+
+// 通过objId 查询天赋数据
+func (this *ModelTalent) GetHerotalentByObjId(uid string, oid string) (talent *pb.DBHeroTalent, err error) {
+	result := &pb.DBHeroTalent{}
+	err = this.GetListObj(uid, oid, result)
+	return
+}
+
+// 创建一条新的英雄天赋数据
+func (this *ModelTalent) CreateHeroTalent(uid, heroId string) (talent *pb.DBHeroTalent, err error) {
+	talent = &pb.DBHeroTalent{
+		Id:     primitive.NewObjectID().Hex(),
+		Uid:    "",
+		HeroId: heroId,
+		Talent: map[int32]int32{},
+	}
+	err = this.AddList(uid, talent.Id, talent)
+	return
+}
diff --git a/modules/modulebase.go b/modules/modulebase.go
index 8810de7f5..6ddee73e2 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -45,11 +45,11 @@ func (this *ModuleBase) NewOptions() (options core.IModuleOptions) {
 
 //模块初始化接口
 func (this *ModuleBase) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
-	err = this.ModuleBase.Init(service, module, options)
 	this.service = service.(base.IRPCXService)
 	this.module = module
 	this.options = options.(IOptions)
 	this.options.GetLog().SetName("module." + string(module.GetType()))
+	err = this.ModuleBase.Init(service, module, options)
 	return
 }
 
diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go
index 3dccb1f76..b68888535 100644
--- a/pb/arena_db.pb.go
+++ b/pb/arena_db.pb.go
@@ -84,8 +84,10 @@ type ArenaPlayer struct {
 
 	Uid      string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
 	Name     string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
-	Integral int32                `protobuf:"varint,3,opt,name=Integral,proto3" json:"Integral"`
-	Defend   *DBPlayerBattleFormt `protobuf:"bytes,4,opt,name=defend,proto3" json:"defend"` //防守
+	Dan      int32                `protobuf:"varint,3,opt,name=dan,proto3" json:"dan"` //段位
+	Integral int32                `protobuf:"varint,4,opt,name=Integral,proto3" json:"Integral"`
+	Defend   *DBPlayerBattleFormt `protobuf:"bytes,5,opt,name=defend,proto3" json:"defend"` //防守
+	Isai     bool                 `protobuf:"varint,6,opt,name=isai,proto3" json:"isai"`    //是否是ai
 }
 
 func (x *ArenaPlayer) Reset() {
@@ -134,6 +136,13 @@ func (x *ArenaPlayer) GetName() string {
 	return ""
 }
 
+func (x *ArenaPlayer) GetDan() int32 {
+	if x != nil {
+		return x.Dan
+	}
+	return 0
+}
+
 func (x *ArenaPlayer) GetIntegral() int32 {
 	if x != nil {
 		return x.Integral
@@ -148,6 +157,13 @@ func (x *ArenaPlayer) GetDefend() *DBPlayerBattleFormt {
 	return nil
 }
 
+func (x *ArenaPlayer) GetIsai() bool {
+	if x != nil {
+		return x.Isai
+	}
+	return false
+}
+
 //战斗记录
 type DBArenaBattleRecord struct {
 	state         protoimpl.MessageState
@@ -242,16 +258,19 @@ type DBArenaUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid        string                 `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`                //用户id
-	Name       string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`              //玩家名称
-	Integral   int32                  `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`     //积分
-	Attack     *DBPlayerBattleFormt   `protobuf:"bytes,4,opt,name=attack,proto3" json:"attack"`          //进攻阵型
-	Defend     *DBPlayerBattleFormt   `protobuf:"bytes,5,opt,name=defend,proto3" json:"defend"`          //防守阵型
-	Streak     int32                  `protobuf:"varint,6,opt,name=streak,proto3" json:"streak"`         //连胜
-	Attackrate int32                  `protobuf:"varint,7,opt,name=attackrate,proto3" json:"attackrate"` //进攻胜率
-	Defendrate int32                  `protobuf:"varint,8,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率
-	Rank       int32                  `protobuf:"varint,9,opt,name=rank,proto3" json:"rank"`             //排名
-	Record     []*DBArenaBattleRecord `protobuf:"bytes,10,rep,name=record,proto3" json:"record"`         //战斗记录
+	Uid        string                 `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`                 //用户id
+	Name       string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`               //玩家名称
+	Integral   int32                  `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`      //积分
+	Ticket     int32                  `protobuf:"varint,4,opt,name=ticket,proto3" json:"ticket"`          //挑战券
+	Dan        int32                  `protobuf:"varint,5,opt,name=dan,proto3" json:"dan"`                //段位
+	Attack     *DBPlayerBattleFormt   `protobuf:"bytes,6,opt,name=attack,proto3" json:"attack"`           //进攻阵型
+	Defend     *DBPlayerBattleFormt   `protobuf:"bytes,7,opt,name=defend,proto3" json:"defend"`           //防守阵型
+	Streak     int32                  `protobuf:"varint,8,opt,name=streak,proto3" json:"streak"`          //连胜
+	Attackrate int32                  `protobuf:"varint,9,opt,name=attackrate,proto3" json:"attackrate"`  //进攻胜率
+	Defendrate int32                  `protobuf:"varint,10,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率
+	Rank       int32                  `protobuf:"varint,11,opt,name=rank,proto3" json:"rank"`             //排名
+	Buynum     int32                  `protobuf:"varint,12,opt,name=buynum,proto3" json:"buynum"`         //购买次数
+	Record     []*DBArenaBattleRecord `protobuf:"bytes,13,rep,name=record,proto3" json:"record"`          //战斗记录
 }
 
 func (x *DBArenaUser) Reset() {
@@ -307,6 +326,20 @@ func (x *DBArenaUser) GetIntegral() int32 {
 	return 0
 }
 
+func (x *DBArenaUser) GetTicket() int32 {
+	if x != nil {
+		return x.Ticket
+	}
+	return 0
+}
+
+func (x *DBArenaUser) GetDan() int32 {
+	if x != nil {
+		return x.Dan
+	}
+	return 0
+}
+
 func (x *DBArenaUser) GetAttack() *DBPlayerBattleFormt {
 	if x != nil {
 		return x.Attack
@@ -349,6 +382,13 @@ func (x *DBArenaUser) GetRank() int32 {
 	return 0
 }
 
+func (x *DBArenaUser) GetBuynum() int32 {
+	if x != nil {
+		return x.Buynum
+	}
+	return 0
+}
+
 func (x *DBArenaUser) GetRecord() []*DBArenaBattleRecord {
 	if x != nil {
 		return x.Record
@@ -366,47 +406,54 @@ var file_arena_arena_db_proto_rawDesc = []byte{
 	0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66,
 	0x6f, 0x72, 0x6d, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
-	0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0x7d, 0x0a, 0x0b, 0x41, 0x72,
-	0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x64,
-	0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
-	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
-	0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa5, 0x01, 0x0a, 0x13, 0x44, 0x42,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a,
-	0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d,
-	0x65, 0x22, 0xc5, 0x02, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65,
-	0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63,
-	0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63,
-	0x6b, 0x72, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74, 0x74,
-	0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e,
-	0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66,
-	0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x72,
-	0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
-	0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xa3, 0x01, 0x0a, 0x0b, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
+	0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2c,
+	0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
+	0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x69, 0x73, 0x61, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69,
+	0x22, 0xa5, 0x01, 0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69,
+	0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
+	0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69,
+	0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72,
+	0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x41,
+	0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a,
+	0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69,
+	0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x64, 0x61, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61,
+	0x63, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
+	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61,
+	0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74,
+	0x74, 0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65,
+	0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65,
+	0x66, 0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06,
+	0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75,
+	0x79, 0x6e, 0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x0d,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f,
+	0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go
index f5ddefdbf..c8eafc6fc 100644
--- a/pb/arena_msg.pb.go
+++ b/pb/arena_msg.pb.go
@@ -320,9 +320,6 @@ type ArenaMatcheReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-
-	Minintegral int32 `protobuf:"varint,1,opt,name=minintegral,proto3" json:"minintegral"` //匹配最小分数段
-	Maxintegral int32 `protobuf:"varint,2,opt,name=maxintegral,proto3" json:"maxintegral"` //匹配最大分数段
 }
 
 func (x *ArenaMatcheReq) Reset() {
@@ -357,20 +354,6 @@ func (*ArenaMatcheReq) Descriptor() ([]byte, []int) {
 	return file_arena_arena_msg_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *ArenaMatcheReq) GetMinintegral() int32 {
-	if x != nil {
-		return x.Minintegral
-	}
-	return 0
-}
-
-func (x *ArenaMatcheReq) GetMaxintegral() int32 {
-	if x != nil {
-		return x.Maxintegral
-	}
-	return 0
-}
-
 //竞技场匹配 回应
 type ArenaMatcheResp struct {
 	state         protoimpl.MessageState
@@ -712,6 +695,83 @@ func (*ArenaRankResp) Descriptor() ([]byte, []int) {
 	return file_arena_arena_msg_proto_rawDescGZIP(), []int{13}
 }
 
+//购买票据
+type ArenaBuyReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ArenaBuyReq) Reset() {
+	*x = ArenaBuyReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaBuyReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaBuyReq) ProtoMessage() {}
+
+func (x *ArenaBuyReq) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[14]
+	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 ArenaBuyReq.ProtoReflect.Descriptor instead.
+func (*ArenaBuyReq) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{14}
+}
+
+type ArenaBuyResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ArenaBuyResp) Reset() {
+	*x = ArenaBuyResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaBuyResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaBuyResp) ProtoMessage() {}
+
+func (x *ArenaBuyResp) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[15]
+	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 ArenaBuyResp.ProtoReflect.Descriptor instead.
+func (*ArenaBuyResp) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{15}
+}
+
 var File_arena_arena_msg_proto protoreflect.FileDescriptor
 
 var file_arena_arena_msg_proto_rawDesc = []byte{
@@ -739,39 +799,37 @@ var file_arena_arena_msg_proto_rawDesc = []byte{
 	0x09, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0x2e, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e,
 	0x61, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70,
 	0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x54, 0x0a, 0x0e, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x69,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0b, 0x6d, 0x69, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x20, 0x0a, 0x0b,
-	0x6d, 0x61, 0x78, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x39,
-	0x0a, 0x0f, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x26, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x59, 0x0a, 0x11, 0x41, 0x72, 0x65,
-	0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a,
-	0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x22, 0x55, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61,
-	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e,
-	0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x17, 0x41,
-	0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x06,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x22, 0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c,
-	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x10, 0x0a, 0x0e, 0x41, 0x72, 0x65, 0x6e,
+	0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x0f, 0x41, 0x72,
+	0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a,
+	0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
+	0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x59, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68,
+	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x22, 0x55, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+	0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65,
+	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x17, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
+	0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+	0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
+	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
+	0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
+	0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
+	0x52, 0x65, 0x73, 0x70, 0x22, 0x0d, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79,
+	0x52, 0x65, 0x71, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -786,7 +844,7 @@ func file_arena_arena_msg_proto_rawDescGZIP() []byte {
 	return file_arena_arena_msg_proto_rawDescData
 }
 
-var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
 var file_arena_arena_msg_proto_goTypes = []interface{}{
 	(*ArenaInfoReq)(nil),             // 0: ArenaInfoReq
 	(*ArenaInfoResp)(nil),            // 1: ArenaInfoResp
@@ -802,20 +860,22 @@ var file_arena_arena_msg_proto_goTypes = []interface{}{
 	(*ArenaChallengeRewardResp)(nil), // 11: ArenaChallengeRewardResp
 	(*ArenaRankReq)(nil),             // 12: ArenaRankReq
 	(*ArenaRankResp)(nil),            // 13: ArenaRankResp
-	(*DBArenaUser)(nil),              // 14: DBArenaUser
-	(*ArenaPlayer)(nil),              // 15: ArenaPlayer
-	(*BattleFormation)(nil),          // 16: BattleFormation
-	(ErrorCode)(0),                   // 17: ErrorCode
-	(*BattleInfo)(nil),               // 18: BattleInfo
-	(*BattleReport)(nil),             // 19: BattleReport
+	(*ArenaBuyReq)(nil),              // 14: ArenaBuyReq
+	(*ArenaBuyResp)(nil),             // 15: ArenaBuyResp
+	(*DBArenaUser)(nil),              // 16: DBArenaUser
+	(*ArenaPlayer)(nil),              // 17: ArenaPlayer
+	(*BattleFormation)(nil),          // 18: BattleFormation
+	(ErrorCode)(0),                   // 19: ErrorCode
+	(*BattleInfo)(nil),               // 20: BattleInfo
+	(*BattleReport)(nil),             // 21: BattleReport
 }
 var file_arena_arena_msg_proto_depIdxs = []int32{
-	14, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
-	15, // 1: ArenaMatcheResp.players:type_name -> ArenaPlayer
-	16, // 2: ArenaChallengeReq.battle:type_name -> BattleFormation
-	17, // 3: ArenaChallengeResp.code:type_name -> ErrorCode
-	18, // 4: ArenaChallengeResp.info:type_name -> BattleInfo
-	19, // 5: ArenaChallengeRewardReq.report:type_name -> BattleReport
+	16, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
+	17, // 1: ArenaMatcheResp.players:type_name -> ArenaPlayer
+	18, // 2: ArenaChallengeReq.battle:type_name -> BattleFormation
+	19, // 3: ArenaChallengeResp.code:type_name -> ErrorCode
+	20, // 4: ArenaChallengeResp.info:type_name -> BattleInfo
+	21, // 5: ArenaChallengeRewardReq.report:type_name -> BattleReport
 	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
@@ -1000,6 +1060,30 @@ func file_arena_arena_msg_proto_init() {
 				return nil
 			}
 		}
+		file_arena_arena_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaBuyReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaBuyResp); 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{
@@ -1007,7 +1091,7 @@ func file_arena_arena_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_arena_arena_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   14,
+			NumMessages:   16,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/equipment_msg.pb.go b/pb/equipment_msg.pb.go
index c2b88459a..fc0310441 100644
--- a/pb/equipment_msg.pb.go
+++ b/pb/equipment_msg.pb.go
@@ -787,7 +787,7 @@ func (x *EquipmentWashResp) GetAdverbEntry() []*EquipmentAttributeEntry {
 	return nil
 }
 
-//谢怜确认
+//洗练确认
 type EquipmentWashConfirmReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 8b15078fb..ddb1b554c 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -197,6 +197,10 @@ const (
 	ErrorCode_LibraryLvReward   ErrorCode = 2805 // 领奖等级没达到
 	// Battle
 	ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败
+	// talent
+	ErrorCode_TalentRepeatLearn    ErrorCode = 3001 // 天赋已学习
+	ErrorCode_TalentErrData        ErrorCode = 3002 /// 天赋不存在
+	ErrorCode_TalentUnLockerBefore ErrorCode = 3003 //先解锁前置天赋
 )
 
 // Enum value maps for ErrorCode.
@@ -358,6 +362,9 @@ var (
 		2804: "LibraryReward",
 		2805: "LibraryLvReward",
 		2901: "BattleValidationFailed",
+		3001: "TalentRepeatLearn",
+		3002: "TalentErrData",
+		3003: "TalentUnLockerBefore",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                     0,
@@ -516,6 +523,9 @@ var (
 		"LibraryReward":               2804,
 		"LibraryLvReward":             2805,
 		"BattleValidationFailed":      2901,
+		"TalentRepeatLearn":           3001,
+		"TalentErrData":               3002,
+		"TalentUnLockerBefore":        3003,
 	}
 )
 
@@ -550,7 +560,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, 0x96, 0x1b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xdd, 0x1b, 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,
@@ -767,8 +777,13 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61,
 	0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a,
 	0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10,
+	0xb9, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44,
+	0x61, 0x74, 0x61, 0x10, 0xba, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
+	0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0xbb,
+	0x17, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index e9a61120e..f4ff25775 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -156,6 +156,7 @@ type DBHero struct {
 	Suite2Star           int32            `protobuf:"varint,28,opt,name=suite2Star,proto3" json:"suite2Star" bson:"suite2Star"`
 	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"` // // 天赋属性
 }
 
 func (x *DBHero) Reset() {
@@ -400,6 +401,13 @@ func (x *DBHero) GetSuite2Lv() int32 {
 	return 0
 }
 
+func (x *DBHero) GetTalentProperty() map[string]int32 {
+	if x != nil {
+		return x.TalentProperty
+	}
+	return nil
+}
+
 type Floor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -623,7 +631,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, 0xab, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
+	0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xb3, 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,
@@ -686,54 +694,63 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x73,
 	0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73,
-	0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 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,
+	0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x12, 0x43, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e,
+	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,
 	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, 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,
+	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, 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,
+	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,
 }
 
 var (
@@ -749,7 +766,7 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
 }
 
 var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_hero_hero_db_proto_goTypes = []interface{}{
 	(HeroType)(0),        // 0: HeroType
 	(*SkillData)(nil),    // 1: SkillData
@@ -762,7 +779,8 @@ var file_hero_hero_db_proto_goTypes = []interface{}{
 	nil,                  // 8: DBHero.EnergyEntry
 	nil,                  // 9: DBHero.EnergyPropertyEntry
 	nil,                  // 10: DBHero.JuexPropertyEntry
-	nil,                  // 11: DBHeroTalent.TalentEntry
+	nil,                  // 11: DBHero.TalentPropertyEntry
+	nil,                  // 12: DBHeroTalent.TalentEntry
 }
 var file_hero_hero_db_proto_depIdxs = []int32{
 	1,  // 0: DBHero.normalSkill:type_name -> SkillData
@@ -772,12 +790,13 @@ var file_hero_hero_db_proto_depIdxs = []int32{
 	9,  // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
 	10, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
 	0,  // 6: DBHero.status:type_name -> HeroType
-	11, // 7: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
-	8,  // [8:8] is the sub-list for method output_type
-	8,  // [8:8] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
+	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
 }
 
 func init() { file_hero_hero_db_proto_init() }
@@ -853,7 +872,7 @@ func file_hero_hero_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hero_hero_db_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   11,
+			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 1eb179cbc..db64d9152 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -1898,7 +1898,8 @@ type HeroTalentLearnReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	TalentID int32  `protobuf:"varint,1,opt,name=talentID,proto3" json:"talentID"` // 天赋ID
-	Heroid   string `protobuf:"bytes,2,opt,name=heroid,proto3" json:"heroid"`      // 英雄id
+	ObjId    string `protobuf:"bytes,2,opt,name=objId,proto3" json:"objId"`        // 对象唯一id
+	Heroid   string `protobuf:"bytes,3,opt,name=heroid,proto3" json:"heroid"`      //配置表的英雄id
 }
 
 func (x *HeroTalentLearnReq) Reset() {
@@ -1940,6 +1941,13 @@ func (x *HeroTalentLearnReq) GetTalentID() int32 {
 	return 0
 }
 
+func (x *HeroTalentLearnReq) GetObjId() string {
+	if x != nil {
+		return x.ObjId
+	}
+	return ""
+}
+
 func (x *HeroTalentLearnReq) GetHeroid() string {
 	if x != nil {
 		return x.Heroid
@@ -1994,6 +2002,101 @@ func (x *HeroTalentLearnResp) GetTelnet() *DBHeroTalent {
 	return nil
 }
 
+// 重置天赋
+type HeroTalentResetReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // 对象唯一id
+}
+
+func (x *HeroTalentResetReq) Reset() {
+	*x = HeroTalentResetReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hero_hero_msg_proto_msgTypes[38]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HeroTalentResetReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeroTalentResetReq) ProtoMessage() {}
+
+func (x *HeroTalentResetReq) ProtoReflect() protoreflect.Message {
+	mi := &file_hero_hero_msg_proto_msgTypes[38]
+	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 HeroTalentResetReq.ProtoReflect.Descriptor instead.
+func (*HeroTalentResetReq) Descriptor() ([]byte, []int) {
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{38}
+}
+
+func (x *HeroTalentResetReq) GetObjId() string {
+	if x != nil {
+		return x.ObjId
+	}
+	return ""
+}
+
+type HeroTalentResetResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Telnet []*DBHeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"`
+}
+
+func (x *HeroTalentResetResp) Reset() {
+	*x = HeroTalentResetResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_hero_hero_msg_proto_msgTypes[39]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HeroTalentResetResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeroTalentResetResp) ProtoMessage() {}
+
+func (x *HeroTalentResetResp) ProtoReflect() protoreflect.Message {
+	mi := &file_hero_hero_msg_proto_msgTypes[39]
+	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 HeroTalentResetResp.ProtoReflect.Descriptor instead.
+func (*HeroTalentResetResp) Descriptor() ([]byte, []int) {
+	return file_hero_hero_msg_proto_rawDescGZIP(), []int{39}
+}
+
+func (x *HeroTalentResetResp) GetTelnet() []*DBHeroTalent {
+	if x != nil {
+		return x.Telnet
+	}
+	return nil
+}
+
 var File_hero_hero_msg_proto protoreflect.FileDescriptor
 
 var file_hero_hero_msg_proto_rawDesc = []byte{
@@ -2162,14 +2265,22 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73,
 	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18,
 	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
-	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x48, 0x0a, 0x12,
+	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x5e, 0x0a, 0x12,
 	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52,
 	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x16,
-	0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
-	0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a,
-	0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x14,
+	0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f,
+	0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x13,
+	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
+	0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65,
+	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71,
+	0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a,
+	0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
 	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65,
 	0x6c, 0x6e, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x33,
@@ -2187,7 +2298,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
 	return file_hero_hero_msg_proto_rawDescData
 }
 
-var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 41)
+var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
 var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroInfoReq)(nil),                // 0: HeroInfoReq
 	(*HeroInfoResp)(nil),               // 1: HeroInfoResp
@@ -2227,40 +2338,43 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroTalentListResp)(nil),         // 35: HeroTalentListResp
 	(*HeroTalentLearnReq)(nil),         // 36: HeroTalentLearnReq
 	(*HeroTalentLearnResp)(nil),        // 37: HeroTalentLearnResp
-	nil,                                // 38: HeroPropertyPush.PropertyEntry
-	nil,                                // 39: HeroPropertyPush.AddPropertyEntry
-	nil,                                // 40: HeroFusionReq.HerosEntry
-	(*DBHero)(nil),                     // 41: DBHero
-	(*DBHeroTalent)(nil),               // 42: DBHeroTalent
+	(*HeroTalentResetReq)(nil),         // 38: HeroTalentResetReq
+	(*HeroTalentResetResp)(nil),        // 39: HeroTalentResetResp
+	nil,                                // 40: HeroPropertyPush.PropertyEntry
+	nil,                                // 41: HeroPropertyPush.AddPropertyEntry
+	nil,                                // 42: HeroFusionReq.HerosEntry
+	(*DBHero)(nil),                     // 43: DBHero
+	(*DBHeroTalent)(nil),               // 44: DBHeroTalent
 }
 var file_hero_hero_msg_proto_depIdxs = []int32{
-	41, // 0: HeroInfoResp.base:type_name -> DBHero
-	41, // 1: HeroListResp.list:type_name -> DBHero
+	43, // 0: HeroInfoResp.base:type_name -> DBHero
+	43, // 1: HeroListResp.list:type_name -> DBHero
 	5,  // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32
-	41, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
+	43, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero
 	8,  // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
 	8,  // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
-	41, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
-	41, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
-	41, // 8: HeroResonanceResp.hero:type_name -> DBHero
-	41, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
-	41, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
+	43, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero
+	43, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
+	43, // 8: HeroResonanceResp.hero:type_name -> DBHero
+	43, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero
+	43, // 10: HeroResonanceResetResp.hero:type_name -> DBHero
 	17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData
-	41, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
-	41, // 13: HeroAwakenResp.hero:type_name -> DBHero
-	38, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
-	39, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
-	41, // 16: HeroLockResp.hero:type_name -> DBHero
-	41, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
-	41, // 18: HeroChangePush.list:type_name -> DBHero
-	40, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
-	42, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent
-	42, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
-	22, // [22:22] is the sub-list for method output_type
-	22, // [22:22] is the sub-list for method input_type
-	22, // [22:22] is the sub-list for extension type_name
-	22, // [22:22] is the sub-list for extension extendee
-	0,  // [0:22] is the sub-list for field type_name
+	43, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
+	43, // 13: HeroAwakenResp.hero:type_name -> DBHero
+	40, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry
+	41, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry
+	43, // 16: HeroLockResp.hero:type_name -> DBHero
+	43, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero
+	43, // 18: HeroChangePush.list:type_name -> DBHero
+	42, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry
+	44, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent
+	44, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent
+	44, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent
+	23, // [23:23] is the sub-list for method output_type
+	23, // [23:23] is the sub-list for method input_type
+	23, // [23:23] is the sub-list for extension type_name
+	23, // [23:23] is the sub-list for extension extendee
+	0,  // [0:23] is the sub-list for field type_name
 }
 
 func init() { file_hero_hero_msg_proto_init() }
@@ -2726,6 +2840,30 @@ func file_hero_hero_msg_proto_init() {
 				return nil
 			}
 		}
+		file_hero_hero_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HeroTalentResetReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_hero_hero_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HeroTalentResetResp); 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{
@@ -2733,7 +2871,7 @@ func file_hero_hero_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_hero_hero_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   41,
+			NumMessages:   43,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

From 5e3cdcd6c456ecec67e4b1fb77e880e4738b82f2 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 25 Oct 2022 16:47:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=9A=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E7=9A=84=E5=A4=A9=E8=B5=8Bid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_talentlearn.go |   3 +-
 pb/arena_db.pb.go               |  95 ++++++++++++++++-------------
 pb/arena_msg.pb.go              | 105 +++++++++++++++++++++++---------
 pb/errorcode.pb.go              |  53 ++++++++++------
 pb/hero_msg.pb.go               |  31 ++++++----
 pb/userexpand.pb.go             |  24 +++++---
 6 files changed, 204 insertions(+), 107 deletions(-)

diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go
index 4f86e2223..a0f8423bd 100644
--- a/modules/hero/api_talentlearn.go
+++ b/modules/hero/api_talentlearn.go
@@ -108,7 +108,8 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
 
 	session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard})
 	session.SendMsg(string(this.module.GetType()), HeroTalentLearnResp, &pb.HeroTalentLearnResp{
-		Telnet: talent,
+		Telnet:   talent,
+		TalentID: req.TalentID, // 返回刚学习过的天赋ID
 	})
 	return
 }
diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go
index b68888535..056f01f33 100644
--- a/pb/arena_db.pb.go
+++ b/pb/arena_db.pb.go
@@ -82,12 +82,13 @@ type ArenaPlayer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid      string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
-	Name     string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
-	Dan      int32                `protobuf:"varint,3,opt,name=dan,proto3" json:"dan"` //段位
-	Integral int32                `protobuf:"varint,4,opt,name=Integral,proto3" json:"Integral"`
-	Defend   *DBPlayerBattleFormt `protobuf:"bytes,5,opt,name=defend,proto3" json:"defend"` //防守
-	Isai     bool                 `protobuf:"varint,6,opt,name=isai,proto3" json:"isai"`    //是否是ai
+	Uid       string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Name      string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
+	Dan       int32                `protobuf:"varint,3,opt,name=dan,proto3" json:"dan"` //段位
+	Integral  int32                `protobuf:"varint,4,opt,name=Integral,proto3" json:"Integral"`
+	Defend    *DBPlayerBattleFormt `protobuf:"bytes,5,opt,name=defend,proto3" json:"defend"`        //防守
+	Isai      bool                 `protobuf:"varint,6,opt,name=isai,proto3" json:"isai"`           //是否是ai
+	Mformatid int32                `protobuf:"varint,7,opt,name=mformatid,proto3" json:"mformatid"` // AIId
 }
 
 func (x *ArenaPlayer) Reset() {
@@ -164,6 +165,13 @@ func (x *ArenaPlayer) GetIsai() bool {
 	return false
 }
 
+func (x *ArenaPlayer) GetMformatid() int32 {
+	if x != nil {
+		return x.Mformatid
+	}
+	return 0
+}
+
 //战斗记录
 type DBArenaBattleRecord struct {
 	state         protoimpl.MessageState
@@ -406,7 +414,7 @@ var file_arena_arena_db_proto_rawDesc = []byte{
 	0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66,
 	0x6f, 0x72, 0x6d, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
-	0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xa3, 0x01, 0x0a, 0x0b, 0x41,
+	0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xc1, 0x01, 0x0a, 0x0b, 0x41,
 	0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
 	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
@@ -417,43 +425,44 @@ var file_arena_arena_db_proto_rawDesc = []byte{
 	0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
 	0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04,
 	0x69, 0x73, 0x61, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69,
-	0x22, 0xa5, 0x01, 0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69,
-	0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
-	0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69,
-	0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72,
-	0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x41,
-	0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x64, 0x61, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61,
-	0x63, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01,
+	0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x22, 0xa5,
+	0x01, 0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77,
+	0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18,
+	0x0a, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61,
+	0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76,
+	0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x87, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65,
+	0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
+	0x61, 0x6e, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x06, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61,
-	0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74,
-	0x74, 0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65,
-	0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65,
-	0x66, 0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06,
-	0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75,
-	0x79, 0x6e, 0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x0d,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
+	0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x16,
+	0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b,
+	0x72, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61,
+	0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64,
+	0x72, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66, 0x65,
+	0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75,
+	0x79, 0x6e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x6e,
+	0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x0d, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go
index c8eafc6fc..472ae0a42 100644
--- a/pb/arena_msg.pb.go
+++ b/pb/arena_msg.pb.go
@@ -408,8 +408,10 @@ type ArenaChallengeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Playerid string           `protobuf:"bytes,1,opt,name=playerid,proto3" json:"playerid"`
-	Battle   *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型
+	Playerid  string           `protobuf:"bytes,1,opt,name=playerid,proto3" json:"playerid"`
+	Isai      bool             `protobuf:"varint,2,opt,name=isai,proto3" json:"isai"`           //是否是ai
+	MformatId int32            `protobuf:"varint,3,opt,name=mformatId,proto3" json:"mformatId"` // AIId
+	Battle    *BattleFormation `protobuf:"bytes,4,opt,name=battle,proto3" json:"battle"`        //战斗类型
 }
 
 func (x *ArenaChallengeReq) Reset() {
@@ -451,6 +453,20 @@ func (x *ArenaChallengeReq) GetPlayerid() string {
 	return ""
 }
 
+func (x *ArenaChallengeReq) GetIsai() bool {
+	if x != nil {
+		return x.Isai
+	}
+	return false
+}
+
+func (x *ArenaChallengeReq) GetMformatId() int32 {
+	if x != nil {
+		return x.MformatId
+	}
+	return 0
+}
+
 func (x *ArenaChallengeReq) GetBattle() *BattleFormation {
 	if x != nil {
 		return x.Battle
@@ -700,6 +716,8 @@ type ArenaBuyReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	BuyNum int32 `protobuf:"varint,1,opt,name=buyNum,proto3" json:"buyNum"`
 }
 
 func (x *ArenaBuyReq) Reset() {
@@ -734,10 +752,20 @@ func (*ArenaBuyReq) Descriptor() ([]byte, []int) {
 	return file_arena_arena_msg_proto_rawDescGZIP(), []int{14}
 }
 
+func (x *ArenaBuyReq) GetBuyNum() int32 {
+	if x != nil {
+		return x.BuyNum
+	}
+	return 0
+}
+
 type ArenaBuyResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Issucc bool  `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"` //是否成功
+	Ticket int32 `protobuf:"varint,2,opt,name=ticket,proto3" json:"ticket"` //当前挑战次数
 }
 
 func (x *ArenaBuyResp) Reset() {
@@ -772,6 +800,20 @@ func (*ArenaBuyResp) Descriptor() ([]byte, []int) {
 	return file_arena_arena_msg_proto_rawDescGZIP(), []int{15}
 }
 
+func (x *ArenaBuyResp) GetIssucc() bool {
+	if x != nil {
+		return x.Issucc
+	}
+	return false
+}
+
+func (x *ArenaBuyResp) GetTicket() int32 {
+	if x != nil {
+		return x.Ticket
+	}
+	return 0
+}
+
 var File_arena_arena_msg_proto protoreflect.FileDescriptor
 
 var file_arena_arena_msg_proto_rawDesc = []byte{
@@ -804,32 +846,39 @@ var file_arena_arena_msg_proto_rawDesc = []byte{
 	0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a,
 	0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
 	0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x59, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68,
-	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x22, 0x55, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
-	0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65,
-	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x17, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
-	0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
-	0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
-	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
-	0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
-	0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b,
-	0x52, 0x65, 0x73, 0x70, 0x22, 0x0d, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79,
-	0x52, 0x65, 0x71, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x8b, 0x01, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43,
+	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6d,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+	0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x22, 0x55, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c,
+	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
+	0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
+	0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x56, 0x0a, 0x17, 0x41, 0x72,
+	0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x06, 0x72,
+	0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x22, 0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52,
+	0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52,
+	0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x25, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e,
+	0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index ddb1b554c..e795d196f 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -197,10 +197,16 @@ const (
 	ErrorCode_LibraryLvReward   ErrorCode = 2805 // 领奖等级没达到
 	// Battle
 	ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败
+	// sociaty
+	ErrorCode_SociatyAdded           ErrorCode = 3001 //已在公会里
+	ErrorCode_SociatyDiamondNoEnough ErrorCode = 3002 //钻石不足
+	ErrorCode_SociatyApply           ErrorCode = 3003 //申请失败
+	// arena
+	ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限
 	// talent
-	ErrorCode_TalentRepeatLearn    ErrorCode = 3001 // 天赋已学习
-	ErrorCode_TalentErrData        ErrorCode = 3002 /// 天赋不存在
-	ErrorCode_TalentUnLockerBefore ErrorCode = 3003 //先解锁前置天赋
+	ErrorCode_TalentRepeatLearn    ErrorCode = 3201 // 天赋已学习
+	ErrorCode_TalentErrData        ErrorCode = 3202 /// 天赋不存在
+	ErrorCode_TalentUnLockerBefore ErrorCode = 3203 //先解锁前置天赋
 )
 
 // Enum value maps for ErrorCode.
@@ -362,9 +368,13 @@ var (
 		2804: "LibraryReward",
 		2805: "LibraryLvReward",
 		2901: "BattleValidationFailed",
-		3001: "TalentRepeatLearn",
-		3002: "TalentErrData",
-		3003: "TalentUnLockerBefore",
+		3001: "SociatyAdded",
+		3002: "SociatyDiamondNoEnough",
+		3003: "SociatyApply",
+		3101: "ArenaTicketBuyUp",
+		3201: "TalentRepeatLearn",
+		3202: "TalentErrData",
+		3203: "TalentUnLockerBefore",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                     0,
@@ -523,9 +533,13 @@ var (
 		"LibraryReward":               2804,
 		"LibraryLvReward":             2805,
 		"BattleValidationFailed":      2901,
-		"TalentRepeatLearn":           3001,
-		"TalentErrData":               3002,
-		"TalentUnLockerBefore":        3003,
+		"SociatyAdded":                3001,
+		"SociatyDiamondNoEnough":      3002,
+		"SociatyApply":                3003,
+		"ArenaTicketBuyUp":            3101,
+		"TalentRepeatLearn":           3201,
+		"TalentErrData":               3202,
+		"TalentUnLockerBefore":        3203,
 	}
 )
 
@@ -560,7 +574,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, 0xdd, 0x1b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb7, 0x1c, 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,
@@ -777,13 +791,18 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61,
 	0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a,
 	0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61,
-	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10,
-	0xb9, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44,
-	0x61, 0x74, 0x61, 0x10, 0xba, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
-	0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0xbb,
-	0x17, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a,
+	0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e,
+	0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x15, 0x0a,
+	0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55,
+	0x70, 0x10, 0x9d, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d,
+	0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19,
+	0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b,
+	0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index db64d9152..edb804d7f 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -1960,7 +1960,8 @@ type HeroTalentLearnResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"`
+	Telnet   *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"`
+	TalentID int32         `protobuf:"varint,2,opt,name=talentID,proto3" json:"talentID"` // 刚学习的天赋ID
 }
 
 func (x *HeroTalentLearnResp) Reset() {
@@ -2002,6 +2003,13 @@ func (x *HeroTalentLearnResp) GetTelnet() *DBHeroTalent {
 	return nil
 }
 
+func (x *HeroTalentLearnResp) GetTalentID() int32 {
+	if x != nil {
+		return x.TalentID
+	}
+	return 0
+}
+
 // 重置天赋
 type HeroTalentResetReq struct {
 	state         protoimpl.MessageState
@@ -2271,19 +2279,20 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x14,
 	0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f,
 	0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x13,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x13,
 	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
-	0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65,
-	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71,
-	0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
-	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a,
-	0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65,
-	0x6c, 0x6e, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a,
+	0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c,
+	0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65,
+	0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index aebe9c6a0..1453cfa92 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -45,6 +45,7 @@ type DBUserExpand struct {
 	CompletePagoda     bool             `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"`                                                  //通关普通塔
 	RtaskId            int32            `protobuf:"varint,22,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"`                                                                       // 当前完成的随机任务ID
 	TeamHeroIds        []string         `protobuf:"bytes,23,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"`                                                            //阵容英雄IDs
+	SociatyId          string           `protobuf:"bytes,24,opt,name=sociatyId,proto3" json:"sociatyId"`                                                                                   //@go_tags(`bson:"sociatyId") 公会ID
 }
 
 func (x *DBUserExpand) Reset() {
@@ -212,11 +213,18 @@ func (x *DBUserExpand) GetTeamHeroIds() []string {
 	return nil
 }
 
+func (x *DBUserExpand) GetSociatyId() string {
+	if x != nil {
+		return x.SociatyId
+	}
+	return ""
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
 	0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0xe4, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
+	0x74, 0x6f, 0x22, 0x82, 0x06, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
 	0x61, 0x6e, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
@@ -258,12 +266,14 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x64, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x16, 0x20,
 	0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b,
 	0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x1a, 0x39,
-	0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c,
+	0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x1a, 0x39, 0x0a, 0x0b,
+	0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (