diff --git a/modules/fitness/api.go b/modules/fitness/api.go
deleted file mode 100644
index 0155f3ac0..000000000
--- a/modules/fitness/api.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package fitness
-
-import (
-	"go_dreamfactory/modules"
-
-	"go_dreamfactory/lego/core"
-)
-
-/*
-API
-*/
-type apiComp struct {
-	modules.MCompGate
-	service core.IService
-	module  *Fitness
-}
-
-//组件初始化接口
-func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
-	this.MCompGate.Init(service, module, comp, options)
-	this.module = module.(*Fitness)
-	this.service = service
-	return
-}
-
-func (this *apiComp) Start() (err error) {
-	err = this.MCompGate.Start()
-	return
-}
diff --git a/modules/fitness/api_confirm.go b/modules/fitness/api_confirm.go
deleted file mode 100644
index 04d9c9053..000000000
--- a/modules/fitness/api_confirm.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package fitness
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
-)
-
-//参数校验
-func (this *apiComp) ConfirmCheck(session comm.IUserSession, req *pb.FitnessConfirmReq) (code pb.ErrorCode) {
-
-	return
-}
-
-///练功请求
-func (this *apiComp) Confirm(session comm.IUserSession, req *pb.FitnessConfirmReq) (code pb.ErrorCode, data proto.Message) {
-
-	this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
-		"globalbuff": req.Buffid,
-	})
-	session.SendMsg(string(this.module.GetType()), "confirm", &pb.FitnessConfirmResp{Buffid: req.Buffid})
-	return
-}
diff --git a/modules/fitness/configure.go b/modules/fitness/configure.go
deleted file mode 100644
index c397a16fb..000000000
--- a/modules/fitness/configure.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package fitness
-
-import (
-	"fmt"
-	"go_dreamfactory/comm"
-	"go_dreamfactory/modules"
-	"go_dreamfactory/sys/configure"
-	cfg "go_dreamfactory/sys/configure/structs"
-	"sync"
-
-	"go_dreamfactory/lego/core"
-)
-
-const (
-	game_pandamasmryl = "game_pandamasmryl.json"
-	game_pandamasbuff = "game_pandamasbuff.json"
-)
-
-/*
-配置读取组件
-*/
-type configureComp struct {
-	modules.MCompConfigure
-	module *Fitness
-	lock   sync.RWMutex
-	buffs  map[int32][]*cfg.GamePandamasBuffData
-}
-
-//组件初始化接口
-func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
-	this.MCompConfigure.Init(service, module, comp, options)
-	this.module = module.(*Fitness)
-	this.LoadConfigure(game_pandamasmryl, cfg.NewGamePandamasMryl)
-	configure.RegisterConfigure(game_pandamasbuff, cfg.NewGamePandamasBuff, func() {
-		this.lock.Lock()
-		if v, err := this.GetConfigure(game_pandamasbuff); err != nil {
-			this.module.Errorf("err:%v", err)
-			this.lock.Unlock()
-			return
-		} else {
-			this.buffs = make(map[int32][]*cfg.GamePandamasBuffData)
-			for _, v := range v.(*cfg.GamePandamasBuff).GetDataList() {
-				if this.buffs[v.BuffGroup] == nil {
-					this.buffs[v.Id] = make([]*cfg.GamePandamasBuffData, 0)
-				}
-				this.buffs[v.BuffGroup] = append(this.buffs[v.BuffGroup], v)
-			}
-		}
-		this.lock.Unlock()
-	})
-	return
-}
-
-func (this *configureComp) getPandamasMryl(id int32) (configure *cfg.GamePandamasMrylData, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(game_pandamasmryl); err != nil {
-		this.module.Errorln(err)
-		return
-	} else {
-		if configure, ok = v.(*cfg.GamePandamasMryl).GetDataMap()[id]; !ok {
-			err = fmt.Errorf("not found:%d ", id)
-			this.module.Errorln(err)
-			return
-		}
-	}
-	return
-}
-
-//随机获取buff权重
-func (this *configureComp) getGamePandamasBuff(groupid int32) (configure *cfg.GamePandamasBuffData, err error) {
-	var (
-		group  []*cfg.GamePandamasBuffData
-		weight []int32
-		index  int32
-		ok     bool
-	)
-	this.lock.RLock()
-	group, ok = this.buffs[groupid]
-	this.lock.RUnlock()
-	if !ok {
-		err = fmt.Errorf("no found groupid:%d", groupid)
-		this.module.Errorln(err)
-		return
-	}
-	weight = make([]int32, len(group))
-	for i, v := range group {
-		weight[i] = v.P
-	}
-	index = comm.GetRandW(weight)
-	configure = group[index]
-	return
-}
diff --git a/modules/fitness/modelFitness.go b/modules/fitness/modelFitness.go
deleted file mode 100644
index c86982cb7..000000000
--- a/modules/fitness/modelFitness.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package fitness
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/core"
-	"go_dreamfactory/modules"
-)
-
-/*
-数据读取组件
-*/
-type modelFitnessComp struct {
-	modules.MCompModel
-	module *Fitness
-}
-
-//组件初始化接口
-func (this *modelFitnessComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
-	this.TableName = comm.TableForum
-	this.MCompModel.Init(service, module, comp, opt)
-	this.module = module.(*Fitness)
-
-	//创建uid索引
-
-	return
-}
diff --git a/modules/fitness/module.go b/modules/fitness/module.go
deleted file mode 100644
index b82785a17..000000000
--- a/modules/fitness/module.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package fitness
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/core"
-	"go_dreamfactory/modules"
-)
-
-/*
-模块名:每日一健
-描述:武馆子系统 健身系统
-开发:李伟
-*/
-func NewModule() core.IModule {
-	m := new(Fitness)
-	return m
-}
-
-type Fitness struct {
-	modules.ModuleBase
-	api_comp     *apiComp
-	configure    *configureComp
-	modelFitness *modelFitnessComp
-}
-
-//模块名
-func (this *Fitness) GetType() core.M_Modules {
-	return comm.ModuleFitness
-}
-
-//模块初始化接口 注册用户创建角色事件
-func (this *Fitness) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
-	err = this.ModuleBase.Init(service, module, options)
-	return
-}
-
-//装备组件
-func (this *Fitness) OnInstallComp() {
-	this.ModuleBase.OnInstallComp()
-	this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
-	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
-	this.modelFitness = this.RegisterComp(new(modelFitnessComp)).(*modelFitnessComp)
-
-}
diff --git a/modules/fitness/api_getbuff.go b/modules/practice/api_getgymbuff.go
similarity index 67%
rename from modules/fitness/api_getbuff.go
rename to modules/practice/api_getgymbuff.go
index 38dcc7cd5..37684934a 100644
--- a/modules/fitness/api_getbuff.go
+++ b/modules/practice/api_getgymbuff.go
@@ -1,4 +1,4 @@
-package fitness
+package practice
 
 import (
 	"go_dreamfactory/comm"
@@ -9,13 +9,13 @@ import (
 )
 
 //参数校验
-func (this *apiComp) GetBuffCheck(session comm.IUserSession, req *pb.FitnessGetBuffReq) (code pb.ErrorCode) {
+func (this *apiComp) GetBuffCheck(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode) {
 
 	return
 }
 
 ///练功请求
-func (this *apiComp) GetBuff(session comm.IUserSession, req *pb.FitnessGetBuffReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode, data proto.Message) {
 	var (
 		mryl *cfg.GamePandamasMrylData
 		buff *cfg.GamePandamasBuffData
@@ -30,6 +30,6 @@ func (this *apiComp) GetBuff(session comm.IUserSession, req *pb.FitnessGetBuffRe
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "buff", &pb.FitnessGetBuffResp{Buffid: buff.Id})
+	session.SendMsg(string(this.module.GetType()), "buff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id})
 	return
 }
diff --git a/modules/practice/api_gymconfirm.go b/modules/practice/api_gymconfirm.go
new file mode 100644
index 000000000..920c6175f
--- /dev/null
+++ b/modules/practice/api_gymconfirm.go
@@ -0,0 +1,24 @@
+package practice
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///练功请求
+func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode, data proto.Message) {
+
+	this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
+		"globalbuff": req.Buffid,
+	})
+	session.SendMsg(string(this.module.GetType()), "confirm", &pb.PracticeGymConfirmResp{Buffid: req.Buffid})
+	return
+}
diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go
new file mode 100644
index 000000000..0a8ee8c18
--- /dev/null
+++ b/modules/practice/api_gyminfo.go
@@ -0,0 +1,28 @@
+package practice
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///练功请求
+func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		err  error
+		room *pb.DBPracticeRoom
+	)
+	if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "confirm", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
+	return
+}
diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go
new file mode 100644
index 000000000..a594a46e5
--- /dev/null
+++ b/modules/practice/api_gymrefresh.go
@@ -0,0 +1,28 @@
+package practice
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///练功请求
+func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		err  error
+		room *pb.DBPracticeRoom
+	)
+	if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "confirm", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
+	return
+}
diff --git a/modules/practice/configure.go b/modules/practice/configure.go
index 1fb9196ce..a8a7e69e2 100644
--- a/modules/practice/configure.go
+++ b/modules/practice/configure.go
@@ -2,9 +2,12 @@ package practice
 
 import (
 	"fmt"
+	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
+	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"sync"
 )
 
 const (
@@ -13,12 +16,16 @@ const (
 	game_pandamasjs   = "game_pandamasjs.json"
 	game_pandamasjx   = "game_pandamasjx.json"
 	game_pandamasyxjx = "game_pandamasyxjx.json"
+	game_pandamasmryl = "game_pandamasmryl.json"
+	game_pandamasbuff = "game_pandamasbuff.json"
 )
 
 ///背包配置管理组件
 type configureComp struct {
 	modules.MCompConfigure
 	module *Practice
+	lock   sync.RWMutex
+	buffs  map[int32][]*cfg.GamePandamasBuffData
 }
 
 //组件初始化接口
@@ -30,6 +37,24 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	this.LoadConfigure(game_pandamasjs, cfg.NewGamePandamasJs)
 	this.LoadConfigure(game_pandamasjx, cfg.NewGamePandamasJx)
 	this.LoadConfigure(game_pandamasyxjx, cfg.NewGamePandamasYxjx)
+	this.LoadConfigure(game_pandamasmryl, cfg.NewGamePandamasMryl)
+	configure.RegisterConfigure(game_pandamasbuff, cfg.NewGamePandamasBuff, func() {
+		this.lock.Lock()
+		if v, err := this.GetConfigure(game_pandamasbuff); err != nil {
+			this.module.Errorf("err:%v", err)
+			this.lock.Unlock()
+			return
+		} else {
+			this.buffs = make(map[int32][]*cfg.GamePandamasBuffData)
+			for _, v := range v.(*cfg.GamePandamasBuff).GetDataList() {
+				if this.buffs[v.BuffGroup] == nil {
+					this.buffs[v.Id] = make([]*cfg.GamePandamasBuffData, 0)
+				}
+				this.buffs[v.BuffGroup] = append(this.buffs[v.BuffGroup], v)
+			}
+		}
+		this.lock.Unlock()
+	})
 	return
 }
 
@@ -99,3 +124,46 @@ func (this *configureComp) getGamePandamasYxjx(id int32) (configure *cfg.GamePan
 	}
 	return
 }
+
+func (this *configureComp) getPandamasMryl(id int32) (configure *cfg.GamePandamasMrylData, err error) {
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(game_pandamasmryl); err != nil {
+		this.module.Errorln(err)
+		return
+	} else {
+		if configure, ok = v.(*cfg.GamePandamasMryl).GetDataMap()[id]; !ok {
+			err = fmt.Errorf("not found:%d ", id)
+			this.module.Errorln(err)
+			return
+		}
+	}
+	return
+}
+
+//随机获取buff权重
+func (this *configureComp) getGamePandamasBuff(groupid int32) (configure *cfg.GamePandamasBuffData, err error) {
+	var (
+		group  []*cfg.GamePandamasBuffData
+		weight []int32
+		index  int32
+		ok     bool
+	)
+	this.lock.RLock()
+	group, ok = this.buffs[groupid]
+	this.lock.RUnlock()
+	if !ok {
+		err = fmt.Errorf("no found groupid:%d", groupid)
+		this.module.Errorln(err)
+		return
+	}
+	weight = make([]int32, len(group))
+	for i, v := range group {
+		weight[i] = v.P
+	}
+	index = comm.GetRandW(weight)
+	configure = group[index]
+	return
+}
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index a4e82e47b..58f483a9e 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -279,6 +279,7 @@ type BattleRole struct {
 	Ishelp        bool             `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"`                                                                                             //是否是助战英雄
 	Isboos        int32            `protobuf:"varint,15,opt,name=isboos,proto3" json:"isboos"`                                                                                             //是否是boos
 	Monsterid     int32            `protobuf:"varint,16,opt,name=monsterid,proto3" json:"monsterid"`                                                                                       //怪物id
+	Currhp        int32            `protobuf:"varint,17,opt,name=currhp,proto3" json:"currhp"`                                                                                             //当前血量
 }
 
 func (x *BattleRole) Reset() {
@@ -425,6 +426,13 @@ func (x *BattleRole) GetMonsterid() int32 {
 	return 0
 }
 
+func (x *BattleRole) GetCurrhp() int32 {
+	if x != nil {
+		return x.Currhp
+	}
+	return 0
+}
+
 //战斗阵型信息
 type DBBattleFormt struct {
 	state         protoimpl.MessageState
@@ -646,7 +654,7 @@ var File_battle_battle_db_proto protoreflect.FileDescriptor
 var file_battle_battle_db_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f,
 	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x04, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbe, 0x04, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
 	0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03,
@@ -677,71 +685,73 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x73, 0x62, 0x6f,
 	0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x18,
 	0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64,
-	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, 0x22, 0x9e, 0x01,
-	0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 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, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61,
-	0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79,
-	0x73, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61,
-	0x6d, 0x12, 0x2b, 0x0a, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f,
-	0x6c, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd,
-	0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79,
-	0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70,
-	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65,
-	0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43,
-	0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64,
-	0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
-	0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
-	0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70,
-	0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18,
-	0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74,
-	0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
-	0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70,
-	0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b,
-	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x44,
-	0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03,
-	0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07,
-	0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03,
-	0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70,
-	0x76, 0x70, 0x10, 0x05, 0x2a, 0xc4, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d,
-	0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67,
-	0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03,
-	0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a,
-	0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f,
-	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72,
-	0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79,
-	0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69,
-	0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a,
-	0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x12, 0x0b, 0x0a,
-	0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x66, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, 0x65, 0x74, 0x10, 0x0d, 0x2a, 0x1f, 0x0a, 0x0c, 0x42,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69,
-	0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c,
-	0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04,
-	0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12,
-	0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 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, 0x22, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 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, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65,
+	0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65,
+	0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a, 0x0a, 0x62, 0x61, 0x63,
+	0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b,
+	0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
+	0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79,
+	0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74,
+	0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a,
+	0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74,
+	0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c,
+	0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75,
+	0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62,
+	0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e,
+	0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f,
+	0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x44, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a,
+	0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12,
+	0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10,
+	0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, 0x70, 0x10, 0x05, 0x2a, 0xc4, 0x01, 0x0a,
+	0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c,
+	0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10,
+	0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a,
+	0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74,
+	0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10,
+	0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79,
+	0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a,
+	0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65,
+	0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06,
+	0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68,
+	0x61, 0x6e, 0x74, 0x10, 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, 0x65,
+	0x74, 0x10, 0x0d, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65,
+	0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07,
+	0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10,
+	0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go
index 5b8e3b1f8..888fa552f 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -793,15 +793,16 @@ type BattleReport struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Info         *BattleInfo  `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
-	Costtime     int32        `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"`                //战斗时长 单位ms
-	WinSide      int32        `protobuf:"varint,3,opt,name=winSide,proto3" json:"winSide"`                  //胜利方 1 - red  2 = blue
-	Incmd        []*BattleCmd `protobuf:"bytes,4,rep,name=incmd,proto3" json:"incmd"`                       //输入指令
-	Outcmd       []*BattleCmd `protobuf:"bytes,5,rep,name=outcmd,proto3" json:"outcmd"`                     //输出指令
-	Completetask []int32      `protobuf:"varint,6,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
-	Death        int32        `protobuf:"varint,7,opt,name=death,proto3" json:"death"`                      // 死亡人数
-	Round        int32        `protobuf:"varint,8,opt,name=round,proto3" json:"round"`                      // 回合数
-	Harm         int32        `protobuf:"varint,9,opt,name=harm,proto3" json:"harm"`                        //伤害积分
+	Info         *BattleInfo   `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
+	Costtime     int32         `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"`                //战斗时长 单位ms
+	WinSide      int32         `protobuf:"varint,3,opt,name=winSide,proto3" json:"winSide"`                  //胜利方 1 - red  2 = blue
+	Incmd        []*BattleCmd  `protobuf:"bytes,4,rep,name=incmd,proto3" json:"incmd"`                       //输入指令
+	Outcmd       []*BattleCmd  `protobuf:"bytes,5,rep,name=outcmd,proto3" json:"outcmd"`                     //输出指令
+	Completetask []int32       `protobuf:"varint,6,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
+	Death        int32         `protobuf:"varint,7,opt,name=death,proto3" json:"death"`                      // 死亡人数
+	Round        int32         `protobuf:"varint,8,opt,name=round,proto3" json:"round"`                      // 回合数
+	Harm         int32         `protobuf:"varint,9,opt,name=harm,proto3" json:"harm"`                        //伤害积分
+	Alive        []*BattleRole `protobuf:"bytes,10,rep,name=alive,proto3" json:"alive"`                      //存活列表
 }
 
 func (x *BattleReport) Reset() {
@@ -899,6 +900,13 @@ func (x *BattleReport) GetHarm() int32 {
 	return 0
 }
 
+func (x *BattleReport) GetAlive() []*BattleRole {
+	if x != nil {
+		return x.Alive
+	}
+	return nil
+}
+
 //公用消息结构代码
 type BattleRpcMessage struct {
 	state         protoimpl.MessageState
@@ -1717,7 +1725,7 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05,
 	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x22, 0x8f, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
+	0x75, 0x65, 0x22, 0xb2, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
 	0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
 	0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65,
@@ -1734,68 +1742,70 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f,
 	0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64,
 	0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x68, 0x61, 0x72, 0x6d, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70,
-	0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2e, 0x0a, 0x10,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
-	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a,
-	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
-	0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a,
-	0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 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,
-	0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65,
-	0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64,
-	0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a,
-	0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02,
-	0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+	0x68, 0x61, 0x72, 0x6d, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0a, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65,
+	0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
+	0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22,
+	0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22,
+	0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
-	0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x2e,
-	0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75,
-	0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x42,
-	0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52,
-	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69,
-	0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63,
-	0x65, 0x64, 0x65, 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,
-	0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
-	0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e,
-	0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74,
-	0x43, 0x6d, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12,
+	0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 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, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d,
+	0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+	0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e,
+	0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
+	0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69,
+	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
+	0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74,
+	0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d,
+	0x64, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65,
+	0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
+	0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 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, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d,
+	0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a,
+	0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e,
+	0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1840,7 +1850,8 @@ var file_battle_battle_msg_proto_goTypes = []interface{}{
 	(*DBHero)(nil),                 // 25: DBHero
 	(BattleType)(0),                // 26: BattleType
 	(*DBBattleFormt)(nil),          // 27: DBBattleFormt
-	(*anypb.Any)(nil),              // 28: google.protobuf.Any
+	(*BattleRole)(nil),             // 28: BattleRole
+	(*anypb.Any)(nil),              // 29: google.protobuf.Any
 }
 var file_battle_battle_msg_proto_depIdxs = []int32{
 	24, // 0: BattleEVEReq.ptype:type_name -> PlayType
@@ -1863,20 +1874,21 @@ var file_battle_battle_msg_proto_depIdxs = []int32{
 	8,  // 17: BattleReport.info:type_name -> BattleInfo
 	9,  // 18: BattleReport.incmd:type_name -> BattleCmd
 	9,  // 19: BattleReport.outcmd:type_name -> BattleCmd
-	28, // 20: BattleRpcMessage.data:type_name -> google.protobuf.Any
-	23, // 21: BattleGetInfoResp.info:type_name -> BattleStateInfo
-	8,  // 22: BattleCreateServerReq.info:type_name -> BattleInfo
-	9,  // 23: BattleInCmdReq.in:type_name -> BattleCmd
-	9,  // 24: BattleInCmdResp.in:type_name -> BattleCmd
-	9,  // 25: BattleOutCmdPush.cmd:type_name -> BattleCmd
-	8,  // 26: BattleStateInfo.info:type_name -> BattleInfo
-	9,  // 27: BattleStateInfo.outCmds:type_name -> BattleCmd
-	9,  // 28: BattleStateInfo.inputCmds:type_name -> BattleCmd
-	29, // [29:29] is the sub-list for method output_type
-	29, // [29:29] is the sub-list for method input_type
-	29, // [29:29] is the sub-list for extension type_name
-	29, // [29:29] is the sub-list for extension extendee
-	0,  // [0:29] is the sub-list for field type_name
+	28, // 20: BattleReport.alive:type_name -> BattleRole
+	29, // 21: BattleRpcMessage.data:type_name -> google.protobuf.Any
+	23, // 22: BattleGetInfoResp.info:type_name -> BattleStateInfo
+	8,  // 23: BattleCreateServerReq.info:type_name -> BattleInfo
+	9,  // 24: BattleInCmdReq.in:type_name -> BattleCmd
+	9,  // 25: BattleInCmdResp.in:type_name -> BattleCmd
+	9,  // 26: BattleOutCmdPush.cmd:type_name -> BattleCmd
+	8,  // 27: BattleStateInfo.info:type_name -> BattleInfo
+	9,  // 28: BattleStateInfo.outCmds:type_name -> BattleCmd
+	9,  // 29: BattleStateInfo.inputCmds:type_name -> BattleCmd
+	30, // [30:30] is the sub-list for method output_type
+	30, // [30:30] is the sub-list for method input_type
+	30, // [30:30] is the sub-list for extension type_name
+	30, // [30:30] is the sub-list for extension extendee
+	0,  // [0:30] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_msg_proto_init() }
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 24aa67848..fb5ecbf5c 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -337,7 +337,10 @@ const (
 	ErrorCode_SmithyLvToolsFailed         ErrorCode = 4114 //
 	ErrorCode_SmithyLvToolsPre            ErrorCode = 4115 // 前置条件不足
 	// dispatch
-	ErrorCode_DispatchHeroNoReached ErrorCode = 4201 //英雄条件未达标
+	ErrorCode_DispatchHeroNoReached  ErrorCode = 4201 //英雄条件未达标
+	ErrorCode_DispatchNoFree         ErrorCode = 4202 //免费次数用尽
+	ErrorCode_DispatchTicketNoEnough ErrorCode = 4203 //门票不足
+	ErrorCode_DispatchHeroAssigned   ErrorCode = 4204 //英雄已派遣
 )
 
 // Enum value maps for ErrorCode.
@@ -625,6 +628,9 @@ var (
 		4114:  "SmithyLvToolsFailed",
 		4115:  "SmithyLvToolsPre",
 		4201:  "DispatchHeroNoReached",
+		4202:  "DispatchNoFree",
+		4203:  "DispatchTicketNoEnough",
+		4204:  "DispatchHeroAssigned",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                     0,
@@ -909,6 +915,9 @@ var (
 		"SmithyLvToolsFailed":         4114,
 		"SmithyLvToolsPre":            4115,
 		"DispatchHeroNoReached":       4201,
+		"DispatchNoFree":              4202,
+		"DispatchTicketNoEnough":      4203,
+		"DispatchHeroAssigned":        4204,
 	}
 )
 
@@ -943,7 +952,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, 0xa6, 0x33, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xf3, 0x33, 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,
@@ -1353,8 +1362,13 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68,
 	0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x1a,
 	0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f,
-	0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69,
+	0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12,
+	0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14,
+	0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69,
+	0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/fitness_db.pb.go b/pb/fitness_db.pb.go
deleted file mode 100644
index 961bac17b..000000000
--- a/pb/fitness_db.pb.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.20.0
-// source: fitness/fitness_db.proto
-
-package pb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-var File_fitness_fitness_db_proto protoreflect.FileDescriptor
-
-var file_fitness_fitness_db_proto_rawDesc = []byte{
-	0x0a, 0x18, 0x66, 0x69, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x2f, 0x66, 0x69, 0x74, 0x6e, 0x65, 0x73,
-	0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var file_fitness_fitness_db_proto_goTypes = []interface{}{}
-var file_fitness_fitness_db_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_fitness_fitness_db_proto_init() }
-func file_fitness_fitness_db_proto_init() {
-	if File_fitness_fitness_db_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_fitness_fitness_db_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_fitness_fitness_db_proto_goTypes,
-		DependencyIndexes: file_fitness_fitness_db_proto_depIdxs,
-	}.Build()
-	File_fitness_fitness_db_proto = out.File
-	file_fitness_fitness_db_proto_rawDesc = nil
-	file_fitness_fitness_db_proto_goTypes = nil
-	file_fitness_fitness_db_proto_depIdxs = nil
-}
diff --git a/pb/fitness_msg.pb.go b/pb/fitness_msg.pb.go
deleted file mode 100644
index 97d624ff2..000000000
--- a/pb/fitness_msg.pb.go
+++ /dev/null
@@ -1,335 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.20.0
-// source: fitness/fitness_msg.proto
-
-package pb
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-///健身获得buff请求
-type FitnessGetBuffReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Posture int32 `protobuf:"varint,1,opt,name=posture,proto3" json:"posture"`
-}
-
-func (x *FitnessGetBuffReq) Reset() {
-	*x = FitnessGetBuffReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_fitness_fitness_msg_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FitnessGetBuffReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FitnessGetBuffReq) ProtoMessage() {}
-
-func (x *FitnessGetBuffReq) ProtoReflect() protoreflect.Message {
-	mi := &file_fitness_fitness_msg_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FitnessGetBuffReq.ProtoReflect.Descriptor instead.
-func (*FitnessGetBuffReq) Descriptor() ([]byte, []int) {
-	return file_fitness_fitness_msg_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *FitnessGetBuffReq) GetPosture() int32 {
-	if x != nil {
-		return x.Posture
-	}
-	return 0
-}
-
-///健身获得buff请求 回应
-type FitnessGetBuffResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
-}
-
-func (x *FitnessGetBuffResp) Reset() {
-	*x = FitnessGetBuffResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_fitness_fitness_msg_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FitnessGetBuffResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FitnessGetBuffResp) ProtoMessage() {}
-
-func (x *FitnessGetBuffResp) ProtoReflect() protoreflect.Message {
-	mi := &file_fitness_fitness_msg_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FitnessGetBuffResp.ProtoReflect.Descriptor instead.
-func (*FitnessGetBuffResp) Descriptor() ([]byte, []int) {
-	return file_fitness_fitness_msg_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *FitnessGetBuffResp) GetBuffid() int32 {
-	if x != nil {
-		return x.Buffid
-	}
-	return 0
-}
-
-///健身 确认buff 请求
-type FitnessConfirmReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
-}
-
-func (x *FitnessConfirmReq) Reset() {
-	*x = FitnessConfirmReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_fitness_fitness_msg_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FitnessConfirmReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FitnessConfirmReq) ProtoMessage() {}
-
-func (x *FitnessConfirmReq) ProtoReflect() protoreflect.Message {
-	mi := &file_fitness_fitness_msg_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FitnessConfirmReq.ProtoReflect.Descriptor instead.
-func (*FitnessConfirmReq) Descriptor() ([]byte, []int) {
-	return file_fitness_fitness_msg_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *FitnessConfirmReq) GetBuffid() int32 {
-	if x != nil {
-		return x.Buffid
-	}
-	return 0
-}
-
-///健身 确认buff 请求回应
-type FitnessConfirmResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
-}
-
-func (x *FitnessConfirmResp) Reset() {
-	*x = FitnessConfirmResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_fitness_fitness_msg_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FitnessConfirmResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FitnessConfirmResp) ProtoMessage() {}
-
-func (x *FitnessConfirmResp) ProtoReflect() protoreflect.Message {
-	mi := &file_fitness_fitness_msg_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FitnessConfirmResp.ProtoReflect.Descriptor instead.
-func (*FitnessConfirmResp) Descriptor() ([]byte, []int) {
-	return file_fitness_fitness_msg_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *FitnessConfirmResp) GetBuffid() int32 {
-	if x != nil {
-		return x.Buffid
-	}
-	return 0
-}
-
-var File_fitness_fitness_msg_proto protoreflect.FileDescriptor
-
-var file_fitness_fitness_msg_proto_rawDesc = []byte{
-	0x0a, 0x19, 0x66, 0x69, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x2f, 0x66, 0x69, 0x74, 0x6e, 0x65, 0x73,
-	0x73, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 0x0a, 0x11, 0x46,
-	0x69, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71,
-	0x12, 0x18, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x2c, 0x0a, 0x12, 0x46, 0x69,
-	0x74, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x11, 0x46, 0x69, 0x74, 0x6e,
-	0x65, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
-	0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
-	0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x46, 0x69, 0x74, 0x6e, 0x65, 0x73, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62,
-	0x75, 0x66, 0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66,
-	0x66, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
-}
-
-var (
-	file_fitness_fitness_msg_proto_rawDescOnce sync.Once
-	file_fitness_fitness_msg_proto_rawDescData = file_fitness_fitness_msg_proto_rawDesc
-)
-
-func file_fitness_fitness_msg_proto_rawDescGZIP() []byte {
-	file_fitness_fitness_msg_proto_rawDescOnce.Do(func() {
-		file_fitness_fitness_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_fitness_fitness_msg_proto_rawDescData)
-	})
-	return file_fitness_fitness_msg_proto_rawDescData
-}
-
-var file_fitness_fitness_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_fitness_fitness_msg_proto_goTypes = []interface{}{
-	(*FitnessGetBuffReq)(nil),  // 0: FitnessGetBuffReq
-	(*FitnessGetBuffResp)(nil), // 1: FitnessGetBuffResp
-	(*FitnessConfirmReq)(nil),  // 2: FitnessConfirmReq
-	(*FitnessConfirmResp)(nil), // 3: FitnessConfirmResp
-}
-var file_fitness_fitness_msg_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_fitness_fitness_msg_proto_init() }
-func file_fitness_fitness_msg_proto_init() {
-	if File_fitness_fitness_msg_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_fitness_fitness_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FitnessGetBuffReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_fitness_fitness_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FitnessGetBuffResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_fitness_fitness_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FitnessConfirmReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_fitness_fitness_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FitnessConfirmResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_fitness_fitness_msg_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_fitness_fitness_msg_proto_goTypes,
-		DependencyIndexes: file_fitness_fitness_msg_proto_depIdxs,
-		MessageInfos:      file_fitness_fitness_msg_proto_msgTypes,
-	}.Build()
-	File_fitness_fitness_msg_proto = out.File
-	file_fitness_fitness_msg_proto_rawDesc = nil
-	file_fitness_fitness_msg_proto_goTypes = nil
-	file_fitness_fitness_msg_proto_depIdxs = nil
-}
diff --git a/pb/practice_db.pb.go b/pb/practice_db.pb.go
index a7f2b339c..87340ef43 100644
--- a/pb/practice_db.pb.go
+++ b/pb/practice_db.pb.go
@@ -210,14 +210,16 @@ type DBPracticeRoom struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id       string            `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`                                                                                                      //id
-	Uid      string            `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`                                                                                                    //用户id
-	Full     map[int32]int32   `protobuf:"bytes,3,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`        //满级登记
-	Knapsack map[string]int32  `protobuf:"bytes,4,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
-	Pillar1  *DBPracticePillar `protobuf:"bytes,5,opt,name=pillar1,proto3" json:"pillar1"`                                                                                            //柱子1
-	Pillar2  *DBPracticePillar `protobuf:"bytes,6,opt,name=pillar2,proto3" json:"pillar2"`                                                                                            //柱子2
-	Pillar3  *DBPracticePillar `protobuf:"bytes,7,opt,name=pillar3,proto3" json:"pillar3"`                                                                                            //柱子3
-	Pillarf  *DBPracticePillar `protobuf:"bytes,8,opt,name=pillarf,proto3" json:"pillarf"`                                                                                            //好友柱子
+	Id         string            `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`                                                                                                      //id
+	Uid        string            `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`                                                                                                    //用户id
+	Gymaction  int32             `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"`                                                                                       //健身房动作
+	Gymrefresh int32             `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"`                                                                                     //健身房刷新次数
+	Full       map[int32]int32   `protobuf:"bytes,5,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`        //满级登记
+	Knapsack   map[string]int32  `protobuf:"bytes,6,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
+	Pillar1    *DBPracticePillar `protobuf:"bytes,7,opt,name=pillar1,proto3" json:"pillar1"`                                                                                            //柱子1
+	Pillar2    *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar2,proto3" json:"pillar2"`                                                                                            //柱子2
+	Pillar3    *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar3,proto3" json:"pillar3"`                                                                                            //柱子3
+	Pillarf    *DBPracticePillar `protobuf:"bytes,10,opt,name=pillarf,proto3" json:"pillarf"`                                                                                           //好友柱子
 }
 
 func (x *DBPracticeRoom) Reset() {
@@ -266,6 +268,20 @@ func (x *DBPracticeRoom) GetUid() string {
 	return ""
 }
 
+func (x *DBPracticeRoom) GetGymaction() int32 {
+	if x != nil {
+		return x.Gymaction
+	}
+	return 0
+}
+
+func (x *DBPracticeRoom) GetGymrefresh() int32 {
+	if x != nil {
+		return x.Gymrefresh
+	}
+	return 0
+}
+
 func (x *DBPracticeRoom) GetFull() map[int32]int32 {
 	if x != nil {
 		return x.Full
@@ -332,37 +348,40 @@ var file_practice_practice_db_proto_rawDesc = []byte{
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
 	0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x18,
 	0x0a, 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xc6, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x50,
+	0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0x84, 0x04, 0x0a, 0x0e, 0x44, 0x42, 0x50,
 	0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 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, 0x2d, 0x0a,
-	0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42,
-	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c,
-	0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08,
-	0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d,
-	0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e,
-	0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b,
-	0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61,
-	0x72, 0x31, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
-	0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c,
-	0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
-	0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50,
-	0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b,
-	0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c,
-	0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x1a, 0x37, 0x0a, 0x09, 0x46,
-	0x75, 0x6c, 0x6c, 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, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
-	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,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
+	0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67,
+	0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x66,
+	0x75, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x6e,
+	0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44,
+	0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6e,
+	0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61,
+	0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74,
+	0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61,
+	0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
+	0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12,
+	0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c,
+	0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x07,
+	0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e,
+	0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72,
+	0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x1a, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c,
+	0x6c, 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, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 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 (
diff --git a/pb/practice_msg.pb.go b/pb/practice_msg.pb.go
index df89a04c1..b647d5f33 100644
--- a/pb/practice_msg.pb.go
+++ b/pb/practice_msg.pb.go
@@ -917,6 +917,386 @@ func (x *PracticeJXItemPush) GetId() []string {
 	return nil
 }
 
+///健身获得buff请求
+type PracticeGymInfoReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PracticeGymInfoReq) Reset() {
+	*x = PracticeGymInfoReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[17]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymInfoReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymInfoReq) ProtoMessage() {}
+
+func (x *PracticeGymInfoReq) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[17]
+	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 PracticeGymInfoReq.ProtoReflect.Descriptor instead.
+func (*PracticeGymInfoReq) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{17}
+}
+
+///健身获得buff请求
+type PracticeGymInfoResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Lastaction int32 `protobuf:"varint,1,opt,name=lastaction,proto3" json:"lastaction"`
+	Refreshnum int32 `protobuf:"varint,2,opt,name=refreshnum,proto3" json:"refreshnum"`
+}
+
+func (x *PracticeGymInfoResp) Reset() {
+	*x = PracticeGymInfoResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymInfoResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymInfoResp) ProtoMessage() {}
+
+func (x *PracticeGymInfoResp) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[18]
+	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 PracticeGymInfoResp.ProtoReflect.Descriptor instead.
+func (*PracticeGymInfoResp) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *PracticeGymInfoResp) GetLastaction() int32 {
+	if x != nil {
+		return x.Lastaction
+	}
+	return 0
+}
+
+func (x *PracticeGymInfoResp) GetRefreshnum() int32 {
+	if x != nil {
+		return x.Refreshnum
+	}
+	return 0
+}
+
+type PracticeGymRefreshReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PracticeGymRefreshReq) Reset() {
+	*x = PracticeGymRefreshReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymRefreshReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymRefreshReq) ProtoMessage() {}
+
+func (x *PracticeGymRefreshReq) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[19]
+	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 PracticeGymRefreshReq.ProtoReflect.Descriptor instead.
+func (*PracticeGymRefreshReq) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{19}
+}
+
+type PracticeGymRefreshResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Lastaction int32 `protobuf:"varint,1,opt,name=lastaction,proto3" json:"lastaction"`
+	Refreshnum int32 `protobuf:"varint,2,opt,name=refreshnum,proto3" json:"refreshnum"`
+}
+
+func (x *PracticeGymRefreshResp) Reset() {
+	*x = PracticeGymRefreshResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymRefreshResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymRefreshResp) ProtoMessage() {}
+
+func (x *PracticeGymRefreshResp) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[20]
+	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 PracticeGymRefreshResp.ProtoReflect.Descriptor instead.
+func (*PracticeGymRefreshResp) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *PracticeGymRefreshResp) GetLastaction() int32 {
+	if x != nil {
+		return x.Lastaction
+	}
+	return 0
+}
+
+func (x *PracticeGymRefreshResp) GetRefreshnum() int32 {
+	if x != nil {
+		return x.Refreshnum
+	}
+	return 0
+}
+
+///健身获得buff请求
+type PracticeGetGymBuffReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Posture int32 `protobuf:"varint,1,opt,name=posture,proto3" json:"posture"`
+}
+
+func (x *PracticeGetGymBuffReq) Reset() {
+	*x = PracticeGetGymBuffReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[21]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGetGymBuffReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGetGymBuffReq) ProtoMessage() {}
+
+func (x *PracticeGetGymBuffReq) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[21]
+	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 PracticeGetGymBuffReq.ProtoReflect.Descriptor instead.
+func (*PracticeGetGymBuffReq) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *PracticeGetGymBuffReq) GetPosture() int32 {
+	if x != nil {
+		return x.Posture
+	}
+	return 0
+}
+
+///健身获得buff请求 回应
+type PracticeGetGymBuffResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
+}
+
+func (x *PracticeGetGymBuffResp) Reset() {
+	*x = PracticeGetGymBuffResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[22]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGetGymBuffResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGetGymBuffResp) ProtoMessage() {}
+
+func (x *PracticeGetGymBuffResp) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[22]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PracticeGetGymBuffResp.ProtoReflect.Descriptor instead.
+func (*PracticeGetGymBuffResp) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *PracticeGetGymBuffResp) GetBuffid() int32 {
+	if x != nil {
+		return x.Buffid
+	}
+	return 0
+}
+
+///健身 确认buff 请求
+type PracticeGymConfirmReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
+}
+
+func (x *PracticeGymConfirmReq) Reset() {
+	*x = PracticeGymConfirmReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[23]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymConfirmReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymConfirmReq) ProtoMessage() {}
+
+func (x *PracticeGymConfirmReq) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[23]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PracticeGymConfirmReq.ProtoReflect.Descriptor instead.
+func (*PracticeGymConfirmReq) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{23}
+}
+
+func (x *PracticeGymConfirmReq) GetBuffid() int32 {
+	if x != nil {
+		return x.Buffid
+	}
+	return 0
+}
+
+///健身 确认buff 请求回应
+type PracticeGymConfirmResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Buffid int32 `protobuf:"varint,1,opt,name=buffid,proto3" json:"buffid"`
+}
+
+func (x *PracticeGymConfirmResp) Reset() {
+	*x = PracticeGymConfirmResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_practice_practice_msg_proto_msgTypes[24]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PracticeGymConfirmResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PracticeGymConfirmResp) ProtoMessage() {}
+
+func (x *PracticeGymConfirmResp) ProtoReflect() protoreflect.Message {
+	mi := &file_practice_practice_msg_proto_msgTypes[24]
+	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 PracticeGymConfirmResp.ProtoReflect.Descriptor instead.
+func (*PracticeGymConfirmResp) Descriptor() ([]byte, []int) {
+	return file_practice_practice_msg_proto_rawDescGZIP(), []int{24}
+}
+
+func (x *PracticeGymConfirmResp) GetBuffid() int32 {
+	if x != nil {
+		return x.Buffid
+	}
+	return 0
+}
+
 var File_practice_practice_msg_proto protoreflect.FileDescriptor
 
 var file_practice_practice_msg_proto_rawDesc = []byte{
@@ -1005,8 +1385,35 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
 	0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68,
 	0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a,
 	0x58, 0x49, 0x74, 0x65, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22,
+	0x55, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x72,
+	0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
+	0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22,
+	0x58, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x52, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6c, 0x61, 0x73,
+	0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6c,
+	0x61, 0x73, 0x74, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x31, 0x0a, 0x15, 0x50, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x52,
+	0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x22, 0x30, 0x0a, 0x16,
+	0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x65, 0x74, 0x47, 0x79, 0x6d, 0x42, 0x75,
+	0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22, 0x2f,
+	0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69, 0x64, 0x22,
+	0x30, 0x0a, 0x16, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x47, 0x79, 0x6d, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66,
+	0x66, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x69,
+	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -1021,7 +1428,7 @@ func file_practice_practice_msg_proto_rawDescGZIP() []byte {
 	return file_practice_practice_msg_proto_rawDescData
 }
 
-var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeInfoReq)(nil),        // 0: PracticeInfoReq
 	(*PracticeInfoResp)(nil),       // 1: PracticeInfoResp
@@ -1040,20 +1447,28 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
 	(*PracticeEnrolledReq)(nil),    // 14: PracticeEnrolledReq
 	(*PracticeEnrolledResp)(nil),   // 15: PracticeEnrolledResp
 	(*PracticeJXItemPush)(nil),     // 16: PracticeJXItemPush
-	nil,                            // 17: PracticeExpulsionResp.KnapsackEntry
-	nil,                            // 18: PracticeReceiveResp.KnapsackEntry
-	(*DBPracticeRoom)(nil),         // 19: DBPracticeRoom
-	(*DBPracticePillar)(nil),       // 20: DBPracticePillar
+	(*PracticeGymInfoReq)(nil),     // 17: PracticeGymInfoReq
+	(*PracticeGymInfoResp)(nil),    // 18: PracticeGymInfoResp
+	(*PracticeGymRefreshReq)(nil),  // 19: PracticeGymRefreshReq
+	(*PracticeGymRefreshResp)(nil), // 20: PracticeGymRefreshResp
+	(*PracticeGetGymBuffReq)(nil),  // 21: PracticeGetGymBuffReq
+	(*PracticeGetGymBuffResp)(nil), // 22: PracticeGetGymBuffResp
+	(*PracticeGymConfirmReq)(nil),  // 23: PracticeGymConfirmReq
+	(*PracticeGymConfirmResp)(nil), // 24: PracticeGymConfirmResp
+	nil,                            // 25: PracticeExpulsionResp.KnapsackEntry
+	nil,                            // 26: PracticeReceiveResp.KnapsackEntry
+	(*DBPracticeRoom)(nil),         // 27: DBPracticeRoom
+	(*DBPracticePillar)(nil),       // 28: DBPracticePillar
 }
 var file_practice_practice_msg_proto_depIdxs = []int32{
-	19, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
-	19, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom
-	20, // 2: PracticePracticeResp.pillar:type_name -> DBPracticePillar
-	20, // 3: PracticeLootResp.pillar:type_name -> DBPracticePillar
-	20, // 4: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
-	17, // 5: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
-	20, // 6: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
-	18, // 7: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
+	27, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
+	27, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom
+	28, // 2: PracticePracticeResp.pillar:type_name -> DBPracticePillar
+	28, // 3: PracticeLootResp.pillar:type_name -> DBPracticePillar
+	28, // 4: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
+	25, // 5: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
+	28, // 6: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
+	26, // 7: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
 	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
@@ -1272,6 +1687,102 @@ func file_practice_practice_msg_proto_init() {
 				return nil
 			}
 		}
+		file_practice_practice_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymInfoReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymInfoResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymRefreshReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymRefreshResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGetGymBuffReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGetGymBuffResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymConfirmReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_practice_practice_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PracticeGymConfirmResp); 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{
@@ -1279,7 +1790,7 @@ func file_practice_practice_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_practice_practice_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   27,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go
index 97bf9c330..2650e9bca 100644
--- a/pb/smithy_db.pb.go
+++ b/pb/smithy_db.pb.go
@@ -628,9 +628,8 @@ type DBTujianTask struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid      string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`
-	TaskId   int32  `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId" bson:"taskId"`       // 任务ID
-	Received int32  `protobuf:"varint,3,opt,name=received,proto3" json:"received" bson:"received"` //领取状态 0未领取 1待领取 2已领取
+	Uid   string        `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`
+	Tasks []*TujianTask `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks" bson:"tasks"` //  任务列表
 }
 
 func (x *DBTujianTask) Reset() {
@@ -672,14 +671,62 @@ func (x *DBTujianTask) GetUid() string {
 	return ""
 }
 
-func (x *DBTujianTask) GetTaskId() int32 {
+func (x *DBTujianTask) GetTasks() []*TujianTask {
+	if x != nil {
+		return x.Tasks
+	}
+	return nil
+}
+
+type TujianTask struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TaskId   int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskId"`       // 任务ID
+	Received int32 `protobuf:"varint,2,opt,name=received,proto3" json:"received" bson:"received"` //领取状态 0未领取 1待领取 2已领取
+}
+
+func (x *TujianTask) Reset() {
+	*x = TujianTask{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_smithy_smithy_db_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TujianTask) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TujianTask) ProtoMessage() {}
+
+func (x *TujianTask) ProtoReflect() protoreflect.Message {
+	mi := &file_smithy_smithy_db_proto_msgTypes[9]
+	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 TujianTask.ProtoReflect.Descriptor instead.
+func (*TujianTask) Descriptor() ([]byte, []int) {
+	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *TujianTask) GetTaskId() int32 {
 	if x != nil {
 		return x.TaskId
 	}
 	return 0
 }
 
-func (x *DBTujianTask) GetReceived() int32 {
+func (x *TujianTask) GetReceived() int32 {
 	if x != nil {
 		return x.Received
 	}
@@ -700,7 +747,7 @@ type Clang struct {
 func (x *Clang) Reset() {
 	*x = Clang{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_db_proto_msgTypes[9]
+		mi := &file_smithy_smithy_db_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -713,7 +760,7 @@ func (x *Clang) String() string {
 func (*Clang) ProtoMessage() {}
 
 func (x *Clang) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_db_proto_msgTypes[9]
+	mi := &file_smithy_smithy_db_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -726,7 +773,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Clang.ProtoReflect.Descriptor instead.
 func (*Clang) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{9}
+	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *Clang) GetDeskType() int32 {
@@ -763,7 +810,7 @@ type OrderClang struct {
 func (x *OrderClang) Reset() {
 	*x = OrderClang{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_db_proto_msgTypes[10]
+		mi := &file_smithy_smithy_db_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -776,7 +823,7 @@ func (x *OrderClang) String() string {
 func (*OrderClang) ProtoMessage() {}
 
 func (x *OrderClang) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_db_proto_msgTypes[10]
+	mi := &file_smithy_smithy_db_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -789,7 +836,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OrderClang.ProtoReflect.Descriptor instead.
 func (*OrderClang) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{10}
+	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *OrderClang) GetDeskType() int32 {
@@ -835,7 +882,7 @@ type DBSmithy struct {
 func (x *DBSmithy) Reset() {
 	*x = DBSmithy{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_db_proto_msgTypes[11]
+		mi := &file_smithy_smithy_db_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -848,7 +895,7 @@ func (x *DBSmithy) String() string {
 func (*DBSmithy) ProtoMessage() {}
 
 func (x *DBSmithy) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_db_proto_msgTypes[11]
+	mi := &file_smithy_smithy_db_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -861,7 +908,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead.
 func (*DBSmithy) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{11}
+	return file_smithy_smithy_db_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *DBSmithy) GetId() string {
@@ -1041,57 +1088,60 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12,
 	0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
 	0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x54, 0x0a, 0x0c, 0x44, 0x42, 0x54,
+	0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x43, 0x0a, 0x0c, 0x44, 0x42, 0x54,
 	0x75, 0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74,
-	0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22,
-	0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b,
-	0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54,
-	0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65,
-	0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a,
-	0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a,
-	0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x63,
-	0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61,
-	0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64,
-	0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65,
-	0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21,
-	0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
-	0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c,
-	0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a,
-	0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72,
-	0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
-	0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74,
-	0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
-	0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68,
-	0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73,
-	0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74,
-	0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69,
-	0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x74,
+	0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x54, 0x75, 0x6a,
+	0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x40,
+	0x0a, 0x0a, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06,
+	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61,
+	0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
+	0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73,
+	0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73,
+	0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73,
+	0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d,
+	0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12,
+	0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04,
+	0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05,
+	0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c,
+	0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72,
+	0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64,
+	0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12,
+	0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65,
+	0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69,
+	0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18,
+	0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65,
+	0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63,
+	0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f,
+	0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74,
+	0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a,
+	0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b,
+	0x69, 0x6c, 0x6c, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f,
+	0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -1106,7 +1156,7 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte {
 	return file_smithy_smithy_db_proto_rawDescData
 }
 
-var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
 var file_smithy_smithy_db_proto_goTypes = []interface{}{
 	(*Mastery)(nil),      // 0: Mastery
 	(*DBStove)(nil),      // 1: DBStove
@@ -1117,40 +1167,42 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
 	(*ForgeList)(nil),    // 6: ForgeList
 	(*ForgeData)(nil),    // 7: ForgeData
 	(*DBTujianTask)(nil), // 8: DBTujianTask
-	(*Clang)(nil),        // 9: Clang
-	(*OrderClang)(nil),   // 10: OrderClang
-	(*DBSmithy)(nil),     // 11: DBSmithy
-	nil,                  // 12: DBStove.DataEntry
-	nil,                  // 13: DBStove.SkillEntry
-	nil,                  // 14: DBStove.ForgeEntry
-	nil,                  // 15: DBAtlas.AtlasEntry
-	nil,                  // 16: DBAtlas.CollectEntry
-	nil,                  // 17: DBSmithy.SkillEntry
-	nil,                  // 18: DBSmithy.DeskFloorEntry
-	(*UserAssets)(nil),   // 19: UserAssets
+	(*TujianTask)(nil),   // 9: TujianTask
+	(*Clang)(nil),        // 10: Clang
+	(*OrderClang)(nil),   // 11: OrderClang
+	(*DBSmithy)(nil),     // 12: DBSmithy
+	nil,                  // 13: DBStove.DataEntry
+	nil,                  // 14: DBStove.SkillEntry
+	nil,                  // 15: DBStove.ForgeEntry
+	nil,                  // 16: DBAtlas.AtlasEntry
+	nil,                  // 17: DBAtlas.CollectEntry
+	nil,                  // 18: DBSmithy.SkillEntry
+	nil,                  // 19: DBSmithy.DeskFloorEntry
+	(*UserAssets)(nil),   // 20: UserAssets
 }
 var file_smithy_smithy_db_proto_depIdxs = []int32{
-	12, // 0: DBStove.data:type_name -> DBStove.DataEntry
-	13, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
-	14, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
+	13, // 0: DBStove.data:type_name -> DBStove.DataEntry
+	14, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
+	15, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
 	2,  // 3: DBCustomer.customers:type_name -> CustomerInfo
-	15, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry
-	16, // 5: DBAtlas.collect:type_name -> DBAtlas.CollectEntry
+	16, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry
+	17, // 5: DBAtlas.collect:type_name -> DBAtlas.CollectEntry
 	7,  // 6: ForgeList.data1:type_name -> ForgeData
 	7,  // 7: ForgeList.data2:type_name -> ForgeData
-	9,  // 8: DBSmithy.clang:type_name -> Clang
-	10, // 9: DBSmithy.orders:type_name -> OrderClang
-	19, // 10: DBSmithy.items:type_name -> UserAssets
-	17, // 11: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
-	18, // 12: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
-	0,  // 13: DBStove.DataEntry.value:type_name -> Mastery
-	6,  // 14: DBAtlas.AtlasEntry.value:type_name -> ForgeList
-	5,  // 15: DBAtlas.CollectEntry.value:type_name -> CollectData
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
+	9,  // 8: DBTujianTask.tasks:type_name -> TujianTask
+	10, // 9: DBSmithy.clang:type_name -> Clang
+	11, // 10: DBSmithy.orders:type_name -> OrderClang
+	20, // 11: DBSmithy.items:type_name -> UserAssets
+	18, // 12: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
+	19, // 13: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
+	0,  // 14: DBStove.DataEntry.value:type_name -> Mastery
+	6,  // 15: DBAtlas.AtlasEntry.value:type_name -> ForgeList
+	5,  // 16: DBAtlas.CollectEntry.value:type_name -> CollectData
+	17, // [17:17] is the sub-list for method output_type
+	17, // [17:17] is the sub-list for method input_type
+	17, // [17:17] is the sub-list for extension type_name
+	17, // [17:17] is the sub-list for extension extendee
+	0,  // [0:17] is the sub-list for field type_name
 }
 
 func init() { file_smithy_smithy_db_proto_init() }
@@ -1269,7 +1321,7 @@ func file_smithy_smithy_db_proto_init() {
 			}
 		}
 		file_smithy_smithy_db_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Clang); i {
+			switch v := v.(*TujianTask); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1281,7 +1333,7 @@ func file_smithy_smithy_db_proto_init() {
 			}
 		}
 		file_smithy_smithy_db_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OrderClang); i {
+			switch v := v.(*Clang); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1293,6 +1345,18 @@ func file_smithy_smithy_db_proto_init() {
 			}
 		}
 		file_smithy_smithy_db_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OrderClang); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_smithy_smithy_db_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBSmithy); i {
 			case 0:
 				return &v.state
@@ -1311,7 +1375,7 @@ func file_smithy_smithy_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_smithy_smithy_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   20,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go
index 7e64270a5..2d5d10110 100644
--- a/pb/smithy_msg.pb.go
+++ b/pb/smithy_msg.pb.go
@@ -1187,6 +1187,92 @@ func (x *SmithyTaskAwardResp) GetTaskId() int32 {
 	return 0
 }
 
+//图鉴任务查询
+type SmithyTasklistReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *SmithyTasklistReq) Reset() {
+	*x = SmithyTasklistReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SmithyTasklistReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyTasklistReq) ProtoMessage() {}
+
+func (x *SmithyTasklistReq) ProtoReflect() protoreflect.Message {
+	mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+	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 SmithyTasklistReq.ProtoReflect.Descriptor instead.
+func (*SmithyTasklistReq) Descriptor() ([]byte, []int) {
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
+}
+
+type SmithyTasklistResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Tasks *DBTujianTask `protobuf:"bytes,1,opt,name=tasks,proto3" json:"tasks"` //任务列表
+}
+
+func (x *SmithyTasklistResp) Reset() {
+	*x = SmithyTasklistResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SmithyTasklistResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SmithyTasklistResp) ProtoMessage() {}
+
+func (x *SmithyTasklistResp) ProtoReflect() protoreflect.Message {
+	mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+	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 SmithyTasklistResp.ProtoReflect.Descriptor instead.
+func (*SmithyTasklistResp) Descriptor() ([]byte, []int) {
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
+}
+
+func (x *SmithyTasklistResp) GetTasks() *DBTujianTask {
+	if x != nil {
+		return x.Tasks
+	}
+	return nil
+}
+
 //////////////////////////////////////////
 // 创建订单
 type SmithyCreateOrderReq struct {
@@ -1200,7 +1286,7 @@ type SmithyCreateOrderReq struct {
 func (x *SmithyCreateOrderReq) Reset() {
 	*x = SmithyCreateOrderReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1213,7 +1299,7 @@ func (x *SmithyCreateOrderReq) String() string {
 func (*SmithyCreateOrderReq) ProtoMessage() {}
 
 func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[24]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1226,7 +1312,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead.
 func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang {
@@ -1247,7 +1333,7 @@ type SmithyCreateOrderResp struct {
 func (x *SmithyCreateOrderResp) Reset() {
 	*x = SmithyCreateOrderResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1260,7 +1346,7 @@ func (x *SmithyCreateOrderResp) String() string {
 func (*SmithyCreateOrderResp) ProtoMessage() {}
 
 func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[25]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1273,7 +1359,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead.
 func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *SmithyCreateOrderResp) GetData() *DBSmithy {
@@ -1293,7 +1379,7 @@ type SmithyGetRewardReq struct {
 func (x *SmithyGetRewardReq) Reset() {
 	*x = SmithyGetRewardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1306,7 +1392,7 @@ func (x *SmithyGetRewardReq) String() string {
 func (*SmithyGetRewardReq) ProtoMessage() {}
 
 func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[26]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1319,7 +1405,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead.
 func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
 }
 
 type SmithyGetRewardResp struct {
@@ -1333,7 +1419,7 @@ type SmithyGetRewardResp struct {
 func (x *SmithyGetRewardResp) Reset() {
 	*x = SmithyGetRewardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1346,7 +1432,7 @@ func (x *SmithyGetRewardResp) String() string {
 func (*SmithyGetRewardResp) ProtoMessage() {}
 
 func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[27]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1359,7 +1445,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead.
 func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *SmithyGetRewardResp) GetData() *DBSmithy {
@@ -1381,7 +1467,7 @@ type SmithyDeskSkillLvReq struct {
 func (x *SmithyDeskSkillLvReq) Reset() {
 	*x = SmithyDeskSkillLvReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[28]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1394,7 +1480,7 @@ func (x *SmithyDeskSkillLvReq) String() string {
 func (*SmithyDeskSkillLvReq) ProtoMessage() {}
 
 func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[28]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1407,7 +1493,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead.
 func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *SmithyDeskSkillLvReq) GetDeskType() int32 {
@@ -1428,7 +1514,7 @@ type SmithyDeskSkillLvResp struct {
 func (x *SmithyDeskSkillLvResp) Reset() {
 	*x = SmithyDeskSkillLvResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[29]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1441,7 +1527,7 @@ func (x *SmithyDeskSkillLvResp) String() string {
 func (*SmithyDeskSkillLvResp) ProtoMessage() {}
 
 func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[29]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1454,7 +1540,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead.
 func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy {
@@ -1474,7 +1560,7 @@ type SmithyStoveSkillLvReq struct {
 func (x *SmithyStoveSkillLvReq) Reset() {
 	*x = SmithyStoveSkillLvReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[30]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1487,7 +1573,7 @@ func (x *SmithyStoveSkillLvReq) String() string {
 func (*SmithyStoveSkillLvReq) ProtoMessage() {}
 
 func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[30]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1500,7 +1586,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead.
 func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{30}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{32}
 }
 
 type SmithyStoveSkillLvResp struct {
@@ -1514,7 +1600,7 @@ type SmithyStoveSkillLvResp struct {
 func (x *SmithyStoveSkillLvResp) Reset() {
 	*x = SmithyStoveSkillLvResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[31]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1527,7 +1613,7 @@ func (x *SmithyStoveSkillLvResp) String() string {
 func (*SmithyStoveSkillLvResp) ProtoMessage() {}
 
 func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[31]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1540,7 +1626,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead.
 func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{31}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy {
@@ -1561,7 +1647,7 @@ type SmithyGetRandUserReq struct {
 func (x *SmithyGetRandUserReq) Reset() {
 	*x = SmithyGetRandUserReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[32]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1574,7 +1660,7 @@ func (x *SmithyGetRandUserReq) String() string {
 func (*SmithyGetRandUserReq) ProtoMessage() {}
 
 func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[32]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1587,7 +1673,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead.
 func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{32}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *SmithyGetRandUserReq) GetPeople() int32 {
@@ -1608,7 +1694,7 @@ type SmithyGetRandUserResp struct {
 func (x *SmithyGetRandUserResp) Reset() {
 	*x = SmithyGetRandUserResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[33]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1621,7 +1707,7 @@ func (x *SmithyGetRandUserResp) String() string {
 func (*SmithyGetRandUserResp) ProtoMessage() {}
 
 func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[33]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1634,7 +1720,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead.
 func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{33}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *SmithyGetRandUserResp) GetUser() []*DBUser {
@@ -1653,7 +1739,7 @@ type SmithyGetListReq struct {
 func (x *SmithyGetListReq) Reset() {
 	*x = SmithyGetListReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[34]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1666,7 +1752,7 @@ func (x *SmithyGetListReq) String() string {
 func (*SmithyGetListReq) ProtoMessage() {}
 
 func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[34]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1679,7 +1765,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead.
 func (*SmithyGetListReq) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{34}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{36}
 }
 
 // 返回进度信息
@@ -1694,7 +1780,7 @@ type SmithyGetListResp struct {
 func (x *SmithyGetListResp) Reset() {
 	*x = SmithyGetListResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_smithy_smithy_msg_proto_msgTypes[35]
+		mi := &file_smithy_smithy_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1707,7 +1793,7 @@ func (x *SmithyGetListResp) String() string {
 func (*SmithyGetListResp) ProtoMessage() {}
 
 func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
-	mi := &file_smithy_smithy_msg_proto_msgTypes[35]
+	mi := &file_smithy_smithy_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1720,7 +1806,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead.
 func (*SmithyGetListResp) Descriptor() ([]byte, []int) {
-	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{35}
+	return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *SmithyGetListResp) GetData() *DBSmithy {
@@ -1822,7 +1908,12 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
 	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a,
 	0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64,
 	0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x39, 0x0a, 0x14,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11,
+	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x71, 0x22, 0x39, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x6c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61,
+	0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x39, 0x0a, 0x14,
 	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65,
 	0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67,
@@ -1873,7 +1964,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte {
 	return file_smithy_smithy_msg_proto_rawDescData
 }
 
-var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
+var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
 var file_smithy_smithy_msg_proto_goTypes = []interface{}{
 	(*SmithyGetStoveInfoReq)(nil),   // 0: SmithyGetStoveInfoReq
 	(*SmithyGetStoveInfoResp)(nil),  // 1: SmithyGetStoveInfoResp
@@ -1899,51 +1990,55 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{
 	(*SmithyAtlasAwardResp)(nil),    // 21: SmithyAtlasAwardResp
 	(*SmithyTaskAwardReq)(nil),      // 22: SmithyTaskAwardReq
 	(*SmithyTaskAwardResp)(nil),     // 23: SmithyTaskAwardResp
-	(*SmithyCreateOrderReq)(nil),    // 24: SmithyCreateOrderReq
-	(*SmithyCreateOrderResp)(nil),   // 25: SmithyCreateOrderResp
-	(*SmithyGetRewardReq)(nil),      // 26: SmithyGetRewardReq
-	(*SmithyGetRewardResp)(nil),     // 27: SmithyGetRewardResp
-	(*SmithyDeskSkillLvReq)(nil),    // 28: SmithyDeskSkillLvReq
-	(*SmithyDeskSkillLvResp)(nil),   // 29: SmithyDeskSkillLvResp
-	(*SmithyStoveSkillLvReq)(nil),   // 30: SmithyStoveSkillLvReq
-	(*SmithyStoveSkillLvResp)(nil),  // 31: SmithyStoveSkillLvResp
-	(*SmithyGetRandUserReq)(nil),    // 32: SmithyGetRandUserReq
-	(*SmithyGetRandUserResp)(nil),   // 33: SmithyGetRandUserResp
-	(*SmithyGetListReq)(nil),        // 34: SmithyGetListReq
-	(*SmithyGetListResp)(nil),       // 35: SmithyGetListResp
-	(*DBStove)(nil),                 // 36: DBStove
-	(*DB_Equipment)(nil),            // 37: DB_Equipment
-	(*CustomerInfo)(nil),            // 38: CustomerInfo
-	(*DBAtlas)(nil),                 // 39: DBAtlas
-	(*OrderClang)(nil),              // 40: OrderClang
-	(*DBSmithy)(nil),                // 41: DBSmithy
-	(*DBUser)(nil),                  // 42: DBUser
+	(*SmithyTasklistReq)(nil),       // 24: SmithyTasklistReq
+	(*SmithyTasklistResp)(nil),      // 25: SmithyTasklistResp
+	(*SmithyCreateOrderReq)(nil),    // 26: SmithyCreateOrderReq
+	(*SmithyCreateOrderResp)(nil),   // 27: SmithyCreateOrderResp
+	(*SmithyGetRewardReq)(nil),      // 28: SmithyGetRewardReq
+	(*SmithyGetRewardResp)(nil),     // 29: SmithyGetRewardResp
+	(*SmithyDeskSkillLvReq)(nil),    // 30: SmithyDeskSkillLvReq
+	(*SmithyDeskSkillLvResp)(nil),   // 31: SmithyDeskSkillLvResp
+	(*SmithyStoveSkillLvReq)(nil),   // 32: SmithyStoveSkillLvReq
+	(*SmithyStoveSkillLvResp)(nil),  // 33: SmithyStoveSkillLvResp
+	(*SmithyGetRandUserReq)(nil),    // 34: SmithyGetRandUserReq
+	(*SmithyGetRandUserResp)(nil),   // 35: SmithyGetRandUserResp
+	(*SmithyGetListReq)(nil),        // 36: SmithyGetListReq
+	(*SmithyGetListResp)(nil),       // 37: SmithyGetListResp
+	(*DBStove)(nil),                 // 38: DBStove
+	(*DB_Equipment)(nil),            // 39: DB_Equipment
+	(*CustomerInfo)(nil),            // 40: CustomerInfo
+	(*DBAtlas)(nil),                 // 41: DBAtlas
+	(*DBTujianTask)(nil),            // 42: DBTujianTask
+	(*OrderClang)(nil),              // 43: OrderClang
+	(*DBSmithy)(nil),                // 44: DBSmithy
+	(*DBUser)(nil),                  // 45: DBUser
 }
 var file_smithy_smithy_msg_proto_depIdxs = []int32{
-	36, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
-	37, // 1: SmithyForgeEquipResp.equip:type_name -> DB_Equipment
-	36, // 2: SmithyForgeEquipResp.data:type_name -> DBStove
-	36, // 3: SmithyStoveUpResp.data:type_name -> DBStove
-	36, // 4: SmithyRiseResp.data:type_name -> DBStove
-	36, // 5: SmithyToolsUpResp.data:type_name -> DBStove
-	38, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
-	38, // 7: SmithySellResp.customers:type_name -> CustomerInfo
-	38, // 8: SmithyRefuseResp.customers:type_name -> CustomerInfo
-	39, // 9: SmithyAtlasListResp.data:type_name -> DBAtlas
-	39, // 10: SmithyAtlasActivateResp.data:type_name -> DBAtlas
-	39, // 11: SmithyAtlasAwardResp.data:type_name -> DBAtlas
-	40, // 12: SmithyCreateOrderReq.order:type_name -> OrderClang
-	41, // 13: SmithyCreateOrderResp.data:type_name -> DBSmithy
-	41, // 14: SmithyGetRewardResp.data:type_name -> DBSmithy
-	41, // 15: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
-	41, // 16: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
-	42, // 17: SmithyGetRandUserResp.user:type_name -> DBUser
-	41, // 18: SmithyGetListResp.data:type_name -> DBSmithy
-	19, // [19:19] is the sub-list for method output_type
-	19, // [19:19] is the sub-list for method input_type
-	19, // [19:19] is the sub-list for extension type_name
-	19, // [19:19] is the sub-list for extension extendee
-	0,  // [0:19] is the sub-list for field type_name
+	38, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
+	39, // 1: SmithyForgeEquipResp.equip:type_name -> DB_Equipment
+	38, // 2: SmithyForgeEquipResp.data:type_name -> DBStove
+	38, // 3: SmithyStoveUpResp.data:type_name -> DBStove
+	38, // 4: SmithyRiseResp.data:type_name -> DBStove
+	38, // 5: SmithyToolsUpResp.data:type_name -> DBStove
+	40, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
+	40, // 7: SmithySellResp.customers:type_name -> CustomerInfo
+	40, // 8: SmithyRefuseResp.customers:type_name -> CustomerInfo
+	41, // 9: SmithyAtlasListResp.data:type_name -> DBAtlas
+	41, // 10: SmithyAtlasActivateResp.data:type_name -> DBAtlas
+	41, // 11: SmithyAtlasAwardResp.data:type_name -> DBAtlas
+	42, // 12: SmithyTasklistResp.tasks:type_name -> DBTujianTask
+	43, // 13: SmithyCreateOrderReq.order:type_name -> OrderClang
+	44, // 14: SmithyCreateOrderResp.data:type_name -> DBSmithy
+	44, // 15: SmithyGetRewardResp.data:type_name -> DBSmithy
+	44, // 16: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
+	44, // 17: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
+	45, // 18: SmithyGetRandUserResp.user:type_name -> DBUser
+	44, // 19: SmithyGetListResp.data:type_name -> DBSmithy
+	20, // [20:20] is the sub-list for method output_type
+	20, // [20:20] is the sub-list for method input_type
+	20, // [20:20] is the sub-list for extension type_name
+	20, // [20:20] is the sub-list for extension extendee
+	0,  // [0:20] is the sub-list for field type_name
 }
 
 func init() { file_smithy_smithy_msg_proto_init() }
@@ -2244,7 +2339,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyCreateOrderReq); i {
+			switch v := v.(*SmithyTasklistReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2256,7 +2351,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyCreateOrderResp); i {
+			switch v := v.(*SmithyTasklistResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2268,7 +2363,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyGetRewardReq); i {
+			switch v := v.(*SmithyCreateOrderReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2280,7 +2375,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyGetRewardResp); i {
+			switch v := v.(*SmithyCreateOrderResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2292,7 +2387,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyDeskSkillLvReq); i {
+			switch v := v.(*SmithyGetRewardReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2304,7 +2399,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyDeskSkillLvResp); i {
+			switch v := v.(*SmithyGetRewardResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2316,7 +2411,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyStoveSkillLvReq); i {
+			switch v := v.(*SmithyDeskSkillLvReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2328,7 +2423,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyStoveSkillLvResp); i {
+			switch v := v.(*SmithyDeskSkillLvResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2340,7 +2435,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyGetRandUserReq); i {
+			switch v := v.(*SmithyStoveSkillLvReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2352,7 +2447,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyGetRandUserResp); i {
+			switch v := v.(*SmithyStoveSkillLvResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2364,7 +2459,7 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SmithyGetListReq); i {
+			switch v := v.(*SmithyGetRandUserReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2376,6 +2471,30 @@ func file_smithy_smithy_msg_proto_init() {
 			}
 		}
 		file_smithy_smithy_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SmithyGetRandUserResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_smithy_smithy_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SmithyGetListReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_smithy_smithy_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SmithyGetListResp); i {
 			case 0:
 				return &v.state
@@ -2394,7 +2513,7 @@ func file_smithy_smithy_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_smithy_smithy_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   36,
+			NumMessages:   38,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index 0a01334a8..2f94e09a3 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -58,7 +58,6 @@ type DBUserExpand struct {
 	Mline                    map[int32]int32  `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID
 	SuiteId                  []int32          `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"`                                                                             // 套装Id
 	Globalbuff               int32            `protobuf:"varint,36,opt,name=globalbuff,proto3" json:"globalbuff" bson:"globalbuff"`                                                                           // 全局buff
-	DispatchTicket           int32            `protobuf:"varint,37,opt,name=dispatchTicket,proto3" json:"dispatchTicket" bson:"dispatchTicket"`                                                               //派遣门票
 }
 
 func (x *DBUserExpand) Reset() {
@@ -317,18 +316,11 @@ func (x *DBUserExpand) GetGlobalbuff() int32 {
 	return 0
 }
 
-func (x *DBUserExpand) GetDispatchTicket() int32 {
-	if x != nil {
-		return x.DispatchTicket
-	}
-	return 0
-}
-
 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, 0xd4, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
+	0x74, 0x6f, 0x22, 0xac, 0x0a, 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,
@@ -403,18 +395,16 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03,
 	0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x67,
 	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x12, 0x26, 0x0a, 0x0e, 0x64,
-	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x25, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 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,
-	0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x3a, 0x0a, 0x0c, 0x45,
+	0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 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, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 0x65,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 81d136d3c..cbd192ced 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -167,7 +167,6 @@ type Tables struct {
 	SmithyAtlas        *GameSmithyAtlas
 	SmithyAtlasLv      *GameSmithyAtlasLv
 	SmithyAtlasScore   *GameSmithyAtlasScore
-	SmithyDrop         *GameSmithyDrop
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1114,8 +1113,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
 	if buf, err = loader("game_smithydrop"); err != nil {
 		return nil, err
 	}
-	if tables.SmithyDrop, err = NewGameSmithyDrop(buf); err != nil {
-		return nil, err
-	}
 	return tables, nil
 }