diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index b78ebc465..62ee29118 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -55,11 +55,11 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
 		Buleflist:  make([]*pb.DBBattleFormt, len(req.Mformat)),
 	}
 	record.Redflist[0] = &pb.DBBattleFormt{
-		Leadpos: req.Leadpos,
-		Team:    make([]*pb.BattleRole, len(req.Teamids)),
+		Leadpos: req.Format.Leadpos,
+		Team:    make([]*pb.BattleRole, len(req.Format.Format)),
 	}
 	model := db.NewDBModel(comm.TableHero, time.Hour, conn)
-	for i, v := range req.Teamids {
+	for i, v := range req.Format.Format {
 		if v != "" {
 			hero := &pb.DBHero{}
 			if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
@@ -120,7 +120,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
 		} else {
 			record.Buleflist[i] = &pb.DBBattleFormt{
 				Leadpos: mf.CaptainId,
-				Team:    make([]*pb.BattleRole, len(req.Teamids)),
+				Team:    make([]*pb.BattleRole, len(req.Mformat)),
 			}
 			for i1, v1 := range mf.MonsterList {
 				if v1 == -1 {
diff --git a/modules/battle/module.go b/modules/battle/module.go
index 9b6008363..e8a3a572b 100644
--- a/modules/battle/module.go
+++ b/modules/battle/module.go
@@ -83,7 +83,7 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
 		return
 	}
 	if req.Ptype < 0 || req.Ptype > 4 ||
-		req.Teamids == nil || len(req.Teamids) != 5 {
+		req.Format == nil || req.Format.Format == nil || len(req.Format.Format) != 5 {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -110,7 +110,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVE
 		return
 	}
 	if req.Ptype < 0 || req.Ptype > 4 ||
-		req.Teamids == nil || len(req.Teamids) != 5 {
+		req.Format == nil || req.Format.Format == nil || len(req.Format.Format) != 5 {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go
index ff17cf596..2cf19e1a8 100644
--- a/modules/hunting/api_challenge.go
+++ b/modules/hunting/api_challenge.go
@@ -50,10 +50,12 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype:   pb.PlayType_hunting,
-		Title:   "",
-		Leadpos: req.Leadpos,
-		Teamids: req.Teamids,
+		Ptype: pb.PlayType_hunting,
+		Title: "",
+		Format: &pb.BattleFormation{
+			Leadpos: req.Leadpos,
+			Format:  req.Teamids,
+		},
 		Mformat: cfgData.Boss,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go
index 8fe104bc6..bbb95bef2 100644
--- a/modules/mainline/api_challenge.go
+++ b/modules/mainline/api_challenge.go
@@ -50,10 +50,12 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype:   pb.PlayType_mainline,
-		Title:   "",
-		Leadpos: req.Leadpos,
-		Teamids: req.Teamids,
+		Ptype: pb.PlayType_mainline,
+		Title: "",
+		Format: &pb.BattleFormation{
+			Leadpos: req.Leadpos,
+			Format:  req.Teamids,
+		},
 		Mformat: node.FormatList,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go
index 467688a52..bf4dde985 100644
--- a/modules/moonfantasy/api_battle.go
+++ b/modules/moonfantasy/api_battle.go
@@ -110,9 +110,11 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 	}
 
 	cd, record = this.module.battle.CreatePvbBattle(session, &pb.BattlePVEReq{
-		Ptype:   pb.PlayType_moonfantasy,
-		Leadpos: req.Leadpos,
-		Teamids: req.Teamids,
+		Ptype: pb.PlayType_moonfantasy,
+		Format: &pb.BattleFormation{
+			Leadpos: req.Leadpos,
+			Format:  req.Teamids,
+		},
 		Mformat: boss.Monsterformatid,
 	})
 	return
diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go
index 8af6694be..b28fb6be5 100644
--- a/modules/pagoda/api_challenge.go
+++ b/modules/pagoda/api_challenge.go
@@ -57,10 +57,12 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng
 		}
 	}
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype:   pb.PlayType_pagoda,
-		Title:   "",
-		Leadpos: req.Leadpos,
-		Teamids: req.Teamids,
+		Ptype: pb.PlayType_pagoda,
+		Title: "",
+		Format: &pb.BattleFormation{
+			Leadpos: req.Leadpos,
+			Format:  req.Teamids,
+		},
 		Mformat: conf.MonsterId,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/modules/rtask/api_battlestart.go b/modules/rtask/api_battlestart.go
index 9fdb509a4..40cffb61e 100644
--- a/modules/rtask/api_battlestart.go
+++ b/modules/rtask/api_battlestart.go
@@ -39,9 +39,11 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.RtaskBattleS
 			resp   *pb.RtaskBattleStartResp
 		)
 		code, record = b.CreatePveBattle(session, &pb.BattlePVEReq{
-			Ptype:   pb.PlayType_rtask,
-			Leadpos: req.Leadpos,
-			Teamids: req.Teamids,
+			Ptype: pb.PlayType_rtask,
+			Format: &pb.BattleFormation{
+				Leadpos: req.Leadpos,
+				Format:  req.Teamids,
+			},
 			Mformat: battleConf.FormatList,
 		})
 
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index 33870aebd..e3af48bbe 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -50,10 +50,12 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype:   pb.PlayType_viking,
-		Title:   "",
-		Leadpos: req.Leadpos,
-		Teamids: req.Teamids,
+		Ptype: pb.PlayType_viking,
+		Title: "",
+		Format: &pb.BattleFormation{
+			Leadpos: req.Leadpos,
+			Format:  req.Teamids,
+		},
 		Mformat: cfgData.Boss,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index 94860b92d..f9db83f44 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -247,6 +247,7 @@ type BattleRole struct {
 	SubSuitSkill  int32            `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"`                                                              /// 副套装技能
 	NormalSkill   []*SkillData     `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"`                                                                 //普通技能
 	Property      map[string]int32 `protobuf:"bytes,11,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
+	Ishelp        bool             `protobuf:"varint,12,opt,name=ishelp,proto3" json:"ishelp"`                                                                                             //是否是助战英雄
 }
 
 func (x *BattleRole) Reset() {
@@ -358,6 +359,13 @@ func (x *BattleRole) GetProperty() map[string]int32 {
 	return nil
 }
 
+func (x *BattleRole) GetIshelp() bool {
+	if x != nil {
+		return x.Ishelp
+	}
+	return false
+}
+
 //战斗阵型信息
 type DBBattleFormt struct {
 	state         protoimpl.MessageState
@@ -555,7 +563,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, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68,
-	0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8e, 0x03, 0x0a,
+	0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x03, 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,
@@ -577,57 +585,58 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x42, 0x61,
 	0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
 	0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
-	0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 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, 0x22, 0xa7, 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, 0x2a, 0x30, 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, 0x2a, 0x63, 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, 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, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 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, 0x4a, 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, 0x22, 0xa7, 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, 0x2a, 0x30, 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, 0x2a, 0x63, 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, 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 bdb96d7f4..0b77903c2 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -83,23 +83,94 @@ func (x *LineUp) GetLv() int32 {
 	return 0
 }
 
+//战斗布阵请求
+type BattleFormation struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Leadpos      int32    `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"`          //队长位置
+	FriendId     string   `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"`         //助阵好友Id
+	Format       []string `protobuf:"bytes,3,rep,name=format,proto3" json:"format"`             //自己英雄阵容信息 0-5
+	Friendformat []string `protobuf:"bytes,4,rep,name=friendformat,proto3" json:"friendformat"` //好友英雄阵容信息 0-5
+}
+
+func (x *BattleFormation) Reset() {
+	*x = BattleFormation{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_battle_battle_msg_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BattleFormation) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BattleFormation) ProtoMessage() {}
+
+func (x *BattleFormation) ProtoReflect() protoreflect.Message {
+	mi := &file_battle_battle_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 BattleFormation.ProtoReflect.Descriptor instead.
+func (*BattleFormation) Descriptor() ([]byte, []int) {
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *BattleFormation) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *BattleFormation) GetFriendId() string {
+	if x != nil {
+		return x.FriendId
+	}
+	return ""
+}
+
+func (x *BattleFormation) GetFormat() []string {
+	if x != nil {
+		return x.Format
+	}
+	return nil
+}
+
+func (x *BattleFormation) GetFriendformat() []string {
+	if x != nil {
+		return x.Friendformat
+	}
+	return nil
+}
+
 // pve 战斗创建请求       (此请求 为服务端间使用 客户端可忽略)
 type BattlePVEReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Ptype   PlayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
-	Title   string   `protobuf:"bytes,2,opt,name=title,proto3" json:"title"`                //战斗标题
-	Leadpos int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`           //队长位置
-	Teamids []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`            //阵容信息
-	Mformat []int32  `protobuf:"varint,5,rep,packed,name=mformat,proto3" json:"mformat"`    //敌方增容信息
+	Ptype   PlayType         `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
+	Title   string           `protobuf:"bytes,2,opt,name=title,proto3" json:"title"`                //战斗标题
+	Format  *BattleFormation `protobuf:"bytes,4,opt,name=format,proto3" json:"format"`              //布阵信息
+	Mformat []int32          `protobuf:"varint,5,rep,packed,name=mformat,proto3" json:"mformat"`    //敌方增容信息
 }
 
 func (x *BattlePVEReq) Reset() {
 	*x = BattlePVEReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[1]
+		mi := &file_battle_battle_msg_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -112,7 +183,7 @@ func (x *BattlePVEReq) String() string {
 func (*BattlePVEReq) ProtoMessage() {}
 
 func (x *BattlePVEReq) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[1]
+	mi := &file_battle_battle_msg_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -125,7 +196,7 @@ func (x *BattlePVEReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattlePVEReq.ProtoReflect.Descriptor instead.
 func (*BattlePVEReq) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{1}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *BattlePVEReq) GetPtype() PlayType {
@@ -142,16 +213,9 @@ func (x *BattlePVEReq) GetTitle() string {
 	return ""
 }
 
-func (x *BattlePVEReq) GetLeadpos() int32 {
+func (x *BattlePVEReq) GetFormat() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *BattlePVEReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Format
 	}
 	return nil
 }
@@ -182,7 +246,7 @@ type BattleInfo struct {
 func (x *BattleInfo) Reset() {
 	*x = BattleInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[2]
+		mi := &file_battle_battle_msg_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -195,7 +259,7 @@ func (x *BattleInfo) String() string {
 func (*BattleInfo) ProtoMessage() {}
 
 func (x *BattleInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[2]
+	mi := &file_battle_battle_msg_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -208,7 +272,7 @@ func (x *BattleInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleInfo.ProtoReflect.Descriptor instead.
 func (*BattleInfo) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{2}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *BattleInfo) GetId() string {
@@ -280,7 +344,7 @@ type BattleReport struct {
 func (x *BattleReport) Reset() {
 	*x = BattleReport{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[3]
+		mi := &file_battle_battle_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -293,7 +357,7 @@ func (x *BattleReport) String() string {
 func (*BattleReport) ProtoMessage() {}
 
 func (x *BattleReport) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[3]
+	mi := &file_battle_battle_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -306,7 +370,7 @@ func (x *BattleReport) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleReport.ProtoReflect.Descriptor instead.
 func (*BattleReport) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{3}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *BattleReport) GetInfo() *BattleInfo {
@@ -333,39 +397,47 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a,
 	0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61,
 	0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c,
-	0x76, 0x22, 0x93, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x52,
-	0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61,
-	0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64,
-	0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x12, 0x18, 0x0a,
-	0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07,
-	0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x8e, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 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, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x05, 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, 0x06, 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, 0x07, 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, 0x08, 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, 0x22, 0x4b, 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, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73,
-	0x74, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x22, 0x83, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 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,
+	0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
+	0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
+	0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x22, 0x8e, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 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, 0x1c, 0x0a, 0x09,
+	0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x05, 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, 0x06, 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, 0x07, 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, 0x08, 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, 0x22, 0x4b, 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, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d,
+	0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -380,28 +452,30 @@ func file_battle_battle_msg_proto_rawDescGZIP() []byte {
 	return file_battle_battle_msg_proto_rawDescData
 }
 
-var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_battle_battle_msg_proto_goTypes = []interface{}{
-	(*LineUp)(nil),        // 0: LineUp
-	(*BattlePVEReq)(nil),  // 1: BattlePVEReq
-	(*BattleInfo)(nil),    // 2: BattleInfo
-	(*BattleReport)(nil),  // 3: BattleReport
-	(PlayType)(0),         // 4: PlayType
-	(BattleType)(0),       // 5: BattleType
-	(*DBBattleFormt)(nil), // 6: DBBattleFormt
+	(*LineUp)(nil),          // 0: LineUp
+	(*BattleFormation)(nil), // 1: BattleFormation
+	(*BattlePVEReq)(nil),    // 2: BattlePVEReq
+	(*BattleInfo)(nil),      // 3: BattleInfo
+	(*BattleReport)(nil),    // 4: BattleReport
+	(PlayType)(0),           // 5: PlayType
+	(BattleType)(0),         // 6: BattleType
+	(*DBBattleFormt)(nil),   // 7: DBBattleFormt
 }
 var file_battle_battle_msg_proto_depIdxs = []int32{
-	4, // 0: BattlePVEReq.ptype:type_name -> PlayType
-	5, // 1: BattleInfo.btype:type_name -> BattleType
-	4, // 2: BattleInfo.ptype:type_name -> PlayType
-	6, // 3: BattleInfo.redflist:type_name -> DBBattleFormt
-	6, // 4: BattleInfo.buleflist:type_name -> DBBattleFormt
-	2, // 5: BattleReport.info:type_name -> BattleInfo
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
+	5, // 0: BattlePVEReq.ptype:type_name -> PlayType
+	1, // 1: BattlePVEReq.format:type_name -> BattleFormation
+	6, // 2: BattleInfo.btype:type_name -> BattleType
+	5, // 3: BattleInfo.ptype:type_name -> PlayType
+	7, // 4: BattleInfo.redflist:type_name -> DBBattleFormt
+	7, // 5: BattleInfo.buleflist:type_name -> DBBattleFormt
+	3, // 6: BattleReport.info:type_name -> BattleInfo
+	7, // [7:7] is the sub-list for method output_type
+	7, // [7:7] is the sub-list for method input_type
+	7, // [7:7] is the sub-list for extension type_name
+	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_msg_proto_init() }
@@ -424,7 +498,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattlePVEReq); i {
+			switch v := v.(*BattleFormation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -436,7 +510,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleInfo); i {
+			switch v := v.(*BattlePVEReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -448,6 +522,18 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BattleInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_battle_battle_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BattleReport); i {
 			case 0:
 				return &v.state
@@ -466,7 +552,7 @@ func file_battle_battle_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_battle_battle_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},