diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index ad8536796..a4f77ac0b 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -24546,7 +24546,7 @@
     "notify": [],
     "type_sp": 1,
     "tasktxt": {
-      "key": "1",
+      "key": "buried_buried_condi_tasktxt_867",
       "text": "加入鼻涕粗战斗"
     },
     "type": 70,
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 3096e16f6..e459683f5 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -18916,10 +18916,10 @@
       4,
       4500
     ],
-    "FollowSK": [],
-    "SucFollowSK": [
+    "FollowSK": [
       243001313
     ],
+    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -18941,10 +18941,10 @@
       4,
       4500
     ],
-    "FollowSK": [],
-    "SucFollowSK": [
+    "FollowSK": [
       243001313
     ],
+    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go
index 7ecaf9452..e03094bf0 100644
--- a/modules/arena/api_info.go
+++ b/modules/arena/api_info.go
@@ -6,6 +6,8 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math/rand"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 // 参数校验
@@ -46,6 +48,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
 	if err == mgo.MongodbNil {
 		global = this.module.ModuleTools.GetGlobalConf()
 		info = &pb.DBArenaUser{
+			Id:              primitive.NewObjectID().Hex(),
 			Uid:             session.GetUserId(),
 			Name:            user.Name,
 			Lv:              user.Lv,
diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go
index 47c6c03e7..a4ccfdd59 100644
--- a/modules/arena/modelarena.go
+++ b/modules/arena/modelarena.go
@@ -76,9 +76,8 @@ func (this *modelArena) queryArenaPlayer(uId string) (result *pb.ArenaPlayer, er
 		return
 	}
 	result = &pb.ArenaPlayer{
-		Uid:  temp.Uid,
-		Name: temp.Name,
-		// Avatar:   temp.Avatar,
+		Uid:      temp.Uid,
+		Name:     temp.Name,
 		Lv:       temp.Lv,
 		Sex:      temp.Sex,
 		Skin:     temp.Skin,
@@ -117,10 +116,9 @@ func (this *modelArena) updateArenaUserInfo(info *pb.DBArenaUser) (err error) {
 	}
 	info.Dan = dan
 	this.Change(info.Uid, map[string]interface{}{
-		"integral": info.Integral,
-		"dan":      dan,
-		"rank":     info.Rank,
-		// "ticket":          info.Ticket,
+		"integral":        info.Integral,
+		"dan":             dan,
+		"rank":            info.Rank,
 		"buynum":          info.Buynum,
 		"lastrtickettime": info.Lastrtickettime,
 		"attack":          info.Attack,
@@ -314,9 +312,10 @@ func (this *modelArena) matchePlayer(uid string, dan, num int32) (results []*pb.
 				return
 			}
 			results = append(results, &pb.ArenaPlayer{
-				Uid:  temp.Uid,
-				Name: temp.Name,
-				// Avatar:   temp.Avatar,
+				Uid:      temp.Uid,
+				Name:     temp.Name,
+				Sex:      temp.Sex,
+				Skin:     temp.Skin,
 				Lv:       temp.Lv,
 				Dan:      temp.Dan,
 				Integral: temp.Integral,
diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go
index 73915b680..ff864083c 100644
--- a/modules/dragon/api_train.go
+++ b/modules/dragon/api_train.go
@@ -96,7 +96,7 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e
 			dragon.Property["sprint"] = c.Sprint
 			dragon.Property["acceleration"] = c.Acceleration
 			dragon.Property["deceleration"] = c.Deceleration
-			dragon.Property["itemsprint"] = c.Itemsprint
+			// dragon.Property["itemsprint"] = c.Itemsprint
 			dragon.Property["caddtime"] = c.Caddtime
 			dragon.Property["csubtime"] = c.Csubtime
 			update["property"] = dragon.Property // 更新属性
diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go
index c384d3f7e..ff595c255 100644
--- a/modules/dragon/model_dragon.go
+++ b/modules/dragon/model_dragon.go
@@ -118,7 +118,7 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str
 					dragon.Property["sprint"] = c.Sprint
 					dragon.Property["acceleration"] = c.Acceleration
 					dragon.Property["deceleration"] = c.Deceleration
-					dragon.Property["itemsprint"] = c.Itemsprint
+					// dragon.Property["itemsprint"] = c.Itemsprint
 					dragon.Property["caddtime"] = c.Caddtime
 					dragon.Property["csubtime"] = c.Csubtime
 				}
diff --git a/modules/dragon/module.go b/modules/dragon/module.go
index 3197c075b..3a009ee3b 100644
--- a/modules/dragon/module.go
+++ b/modules/dragon/module.go
@@ -84,7 +84,7 @@ func (this *Dragon) CreateRobotDragon(dragonid string, lv int32) (dragon *pb.DBD
 		dragon.Property["sprint"] = c.Sprint
 		dragon.Property["acceleration"] = c.Acceleration
 		dragon.Property["deceleration"] = c.Deceleration
-		dragon.Property["itemsprint"] = c.Itemsprint
+		// dragon.Property["itemsprint"] = c.Itemsprint
 		dragon.Property["caddtime"] = c.Caddtime
 		dragon.Property["csubtime"] = c.Csubtime
 	}
diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go
index 919fd8393..07f46be3f 100644
--- a/pb/arena_db.pb.go
+++ b/pb/arena_db.pb.go
@@ -146,13 +146,12 @@ type ArenaPlayer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid  string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
-	// string avatar = 3; //@go_tags(`bson:"avatar"`) 头像
-	Lv             int32                `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级
-	Sex            int32                `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`         //性别
-	Skin           string               `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"`        //时装
-	Dan            int32                `protobuf:"varint,7,opt,name=dan,proto3" json:"dan"`         //段位
+	Uid            string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Name           string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name" bson:"avatar"` // string avatar = 3; //头像
+	Lv             int32                `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"`        //等级
+	Sex            int32                `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`                //性别
+	Skin           string               `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"`               //时装
+	Dan            int32                `protobuf:"varint,7,opt,name=dan,proto3" json:"dan"`                //段位
 	Integral       int32                `protobuf:"varint,8,opt,name=integral,proto3" json:"integral"`
 	Rank           int32                `protobuf:"varint,9,opt,name=rank,proto3" json:"rank"`                      //排名
 	Defend         *DBPlayerBattleFormt `protobuf:"bytes,10,opt,name=defend,proto3" json:"defend"`                  //防守
@@ -530,9 +529,9 @@ type DBArenaUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid  string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`   //用户id
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //玩家名称
-	// string avatar = 3;                        //@go_tags(`bson:"avatar"`) 头像
+	Id              string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                  //ID
+	Uid             string                 `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`                                                                                           //用户id
+	Name            string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`                                                                                         //玩家名称
 	Lv              int32                  `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"`                                                                                  //等级
 	Integral        int32                  `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"`                                                                                //积分
 	Sex             int32                  `protobuf:"varint,6,opt,name=sex,proto3" json:"sex"`                                                                                          //性别
@@ -589,6 +588,13 @@ func (*DBArenaUser) Descriptor() ([]byte, []int) {
 	return file_arena_arena_db_proto_rawDescGZIP(), []int{4}
 }
 
+func (x *DBArenaUser) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
 func (x *DBArenaUser) GetUid() string {
 	if x != nil {
 		return x.Uid
@@ -983,10 +989,11 @@ var file_arena_arena_db_proto_rawDesc = []byte{
 	0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65,
 	0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20,
 	0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9c,
-	0x06, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0xac,
+	0x06, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index a3bc6a083..cdd37fbc4 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -95,7 +95,7 @@ const (
 	PlayType_arena        PlayType = 7  //竞技场
 	PlayType_academy      PlayType = 8  //联盟学院
 	PlayType_heroteaching PlayType = 9  //英雄教学
-	PlayType_combat       PlayType = 10 //新关卡
+	PlayType_combat       PlayType = 10 //旧时光
 	PlayType_enchant      PlayType = 11 //附魔副本
 	PlayType_sociaty      PlayType = 12 //工会战
 	PlayType_friendsmeet  PlayType = 13 //好友切磋
diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go
index d676c96a6..01cd39c2c 100644
--- a/pb/battle_struct.pb.go
+++ b/pb/battle_struct.pb.go
@@ -37,6 +37,10 @@ const (
 	EffectTipsType_Sub_Operate  EffectTipsType = 11 //减少行动值
 	EffectTipsType_Standoff     EffectTipsType = 12 //对峙
 	EffectTipsType_Undead       EffectTipsType = 13 //不死
+	EffectTipsType_Poisoned     EffectTipsType = 14 //中毒
+	EffectTipsType_Bleed        EffectTipsType = 15 //流血
+	EffectTipsType_Recovery     EffectTipsType = 16 //复苏
+	EffectTipsType_BeatBack     EffectTipsType = 17 //反击
 )
 
 // Enum value maps for EffectTipsType.
@@ -56,6 +60,10 @@ var (
 		11: "Sub_Operate",
 		12: "Standoff",
 		13: "Undead",
+		14: "Poisoned",
+		15: "Bleed",
+		16: "Recovery",
+		17: "BeatBack",
 	}
 	EffectTipsType_value = map[string]int32{
 		"Eff_Success":  0,
@@ -72,6 +80,10 @@ var (
 		"Sub_Operate":  11,
 		"Standoff":     12,
 		"Undead":       13,
+		"Poisoned":     14,
+		"Bleed":        15,
+		"Recovery":     16,
+		"BeatBack":     17,
 	}
 )
 
@@ -1886,7 +1898,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
 	0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72,
 	0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0xe7, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x9c, 0x02, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
 	0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
 	0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
 	0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
@@ -1900,8 +1912,12 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
 	0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61,
 	0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72,
 	0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66,
-	0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x42,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12,
+	0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a,
+	0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61,
+	0x63, 0x6b, 0x10, 0x11, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/capturesheep_db.pb.go b/pb/capturesheep_db.pb.go
index 1a2465904..a35c03f7d 100644
--- a/pb/capturesheep_db.pb.go
+++ b/pb/capturesheep_db.pb.go
@@ -195,9 +195,10 @@ type CaptureSheepRaceMember struct {
 	Name   string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`      //用户名称
 	Skin   string `protobuf:"bytes,3,opt,name=skin,proto3" json:"skin"`      //皮肤
 	Sex    int32  `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`       //性别
-	Mount  string `protobuf:"bytes,5,opt,name=mount,proto3" json:"mount"`    //上阵坐骑 配置id
-	Maxhp  int32  `protobuf:"varint,6,opt,name=maxhp,proto3" json:"maxhp"`   //初始血量
-	Currhp int32  `protobuf:"varint,7,opt,name=currhp,proto3" json:"currhp"` //当前血量
+	Isai   bool   `protobuf:"varint,5,opt,name=isai,proto3" json:"isai"`     //是否是ai数据
+	Mount  string `protobuf:"bytes,6,opt,name=mount,proto3" json:"mount"`    //上阵坐骑 配置id
+	Maxhp  int32  `protobuf:"varint,7,opt,name=maxhp,proto3" json:"maxhp"`   //初始血量
+	Currhp int32  `protobuf:"varint,8,opt,name=currhp,proto3" json:"currhp"` //当前血量
 }
 
 func (x *CaptureSheepRaceMember) Reset() {
@@ -260,6 +261,13 @@ func (x *CaptureSheepRaceMember) GetSex() int32 {
 	return 0
 }
 
+func (x *CaptureSheepRaceMember) GetIsai() bool {
+	if x != nil {
+		return x.Isai
+	}
+	return false
+}
+
 func (x *CaptureSheepRaceMember) GetMount() string {
 	if x != nil {
 		return x.Mount
@@ -380,35 +388,36 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
 	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18,
 	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a,
 	0x03, 0x6c, 0x6f, 0x63, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22,
-	0xa8, 0x01, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70,
+	0xbc, 0x01, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70,
 	0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
 	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
 	0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
-	0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78,
-	0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x22, 0xdb, 0x01, 0x0a, 0x12, 0x44,
-	0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63,
-	0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
-	0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x6d,
-	0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61,
-	0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65,
-	0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12,
-	0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x07, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65,
-	0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75,
-	0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74,
-	0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x72,
-	0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f,
+	0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x22, 0xdb,
+	0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
+	0x70, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
+	0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79,
+	0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09,
+	0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61,
+	0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65,
+	0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72,
+	0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14,
+	0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12,
+	0x0a, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/capturesheep_msg.pb.go b/pb/capturesheep_msg.pb.go
index f3b15f382..1b757c4bc 100644
--- a/pb/capturesheep_msg.pb.go
+++ b/pb/capturesheep_msg.pb.go
@@ -160,6 +160,8 @@ type CapturesheepChangeMtsResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Mid string `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"` //坐骑id
 }
 
 func (x *CapturesheepChangeMtsResp) Reset() {
@@ -194,6 +196,13 @@ func (*CapturesheepChangeMtsResp) Descriptor() ([]byte, []int) {
 	return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{3}
 }
 
+func (x *CapturesheepChangeMtsResp) GetMid() string {
+	if x != nil {
+		return x.Mid
+	}
+	return ""
+}
+
 type CapturesheepMatcheReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -320,22 +329,23 @@ var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{
 	0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2c, 0x0a,
 	0x18, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61,
 	0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x43,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x2d, 0x0a, 0x19, 0x43,
 	0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67,
-	0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61, 0x70, 0x74,
-	0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65,
-	0x71, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52,
-	0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74,
-	0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69,
-	0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
-	0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x15, 0x43, 0x61,
+	0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65,
+	0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x16, 0x43, 0x61,
+	0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x74, 0x69,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x74, 0x69, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
+	0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go
index 6552486c1..b6701d023 100644
--- a/sys/configure/structs/Game.BuzkashiMountData.go
+++ b/sys/configure/structs/Game.BuzkashiMountData.go
@@ -25,11 +25,13 @@ type GameBuzkashiMountData struct {
     Hp int32
     Moderate int32
     Sprint int32
+    Sprinttime int32
     Acceleration int32
     Deceleration int32
-    Itemsprint int32
     Caddtime int32
     Csubtime int32
+    Energyrecover int32
+    Maxenergy int32
 }
 
 const TypeId_GameBuzkashiMountData = 1598069936
@@ -66,11 +68,13 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moderate"].(float64); !_ok_ { err = errors.New("moderate error"); return }; _v.Moderate = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprint"].(float64); !_ok_ { err = errors.New("sprint error"); return }; _v.Sprint = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprinttime"].(float64); !_ok_ { err = errors.New("sprinttime error"); return }; _v.Sprinttime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["acceleration"].(float64); !_ok_ { err = errors.New("acceleration error"); return }; _v.Acceleration = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deceleration"].(float64); !_ok_ { err = errors.New("deceleration error"); return }; _v.Deceleration = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itemsprint"].(float64); !_ok_ { err = errors.New("itemsprint error"); return }; _v.Itemsprint = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["caddtime"].(float64); !_ok_ { err = errors.New("caddtime error"); return }; _v.Caddtime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["csubtime"].(float64); !_ok_ { err = errors.New("csubtime error"); return }; _v.Csubtime = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["energyrecover"].(float64); !_ok_ { err = errors.New("energyrecover error"); return }; _v.Energyrecover = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxenergy"].(float64); !_ok_ { err = errors.New("maxenergy error"); return }; _v.Maxenergy = int32(_tempNum_) }
     return
 }