From eea7b8310173fabac509bc46cc7b07689dc62e3e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 28 Dec 2022 17:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E5=8D=8F=E8=AE=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                         |   4 +-
 modules/autoBattle/api_autochallenge.go |   4 +-
 modules/autoBattle/api_autoover.go      |  12 +-
 modules/enchant/api_challenge.go        |  11 +-
 modules/hunting/api_challenge.go        |  11 +-
 modules/viking/api_challenge.go         |  11 +-
 modules/viking/module.go                |  16 +-
 pb/auto_msg.pb.go                       | 219 +++++++++---------------
 pb/enchant_msg.pb.go                    | 117 ++++++-------
 pb/hunting_msg.pb.go                    | 132 +++++++-------
 pb/viking_msg.pb.go                     | 139 +++++++--------
 11 files changed, 298 insertions(+), 378 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 0994c34f2..bd94d62db 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -256,9 +256,9 @@ type (
 		// 自动购买门票
 		AutoBuyTicket(session IUserSession) (code pb.ErrorCode)
 		// 自动战斗 战斗信息
-		AutoBattleInfo(session IUserSession, Leadpos int32, format []string, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo)
+		AutoBattleInfo(session IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo)
 		AutoBattleOver(session IUserSession, bossId int32, difficulty int32, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (code pb.ErrorCode, atno []*pb.UserAtno)
-		CheckBattelParameter(session IUserSession, teamids []string, bossid, difficulty, leadpos int32) (code pb.ErrorCode)
+		CheckBattelParameter(session IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (code pb.ErrorCode)
 	}
 	IHunting interface {
 		CompleteAllLevel(session IUserSession) (code pb.ErrorCode)
diff --git a/modules/autoBattle/api_autochallenge.go b/modules/autoBattle/api_autochallenge.go
index 3e4d25bb7..5b5a798d0 100644
--- a/modules/autoBattle/api_autochallenge.go
+++ b/modules/autoBattle/api_autochallenge.go
@@ -58,13 +58,13 @@ func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattle
 	if req.Ptype == pb.PlayType_viking {
 		if req.AutoBuy {
 			this.viking.AutoBuyTicket(session)
-			code = this.viking.CheckBattelParameter(session, req.Teamids, req.BossId, req.Difficulty, req.Leadpos)
+			code = this.viking.CheckBattelParameter(session, req.Battle, req.BossId, req.Difficulty)
 			if code == pb.ErrorCode_Success {
 				session.SendMsg(string(this.module.GetType()), "challenge", &pb.AutoBattleChallengeResp{
 					Info: battleInfo,
 				})
 			}
-			code, battleInfo = this.viking.AutoBattleInfo(session, req.Leadpos, req.Teamids, req.BossId, req.Difficulty)
+			code, battleInfo = this.viking.AutoBattleInfo(session, req.Battle, req.BossId, req.Difficulty)
 			if code == pb.ErrorCode_Success {
 				session.SendMsg(string(this.module.GetType()), "challenge", &pb.AutoBattleChallengeResp{
 					Info: battleInfo,
diff --git a/modules/autoBattle/api_autoover.go b/modules/autoBattle/api_autoover.go
index 21c6940c7..12dc11e99 100644
--- a/modules/autoBattle/api_autoover.go
+++ b/modules/autoBattle/api_autoover.go
@@ -24,6 +24,7 @@ func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverR
 	var (
 		autoBattle *pb.DBAutoBattle
 		atno       []*pb.UserAtno
+		autoOver   bool
 	)
 	if code = this.AutoOverCheck(session, req); code != pb.ErrorCode_Success {
 		return
@@ -46,14 +47,17 @@ func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverR
 	if req.Ptype == pb.PlayType_viking {
 		if code, atno = this.viking.AutoBattleOver(session, autoBattle.BossId, autoBattle.Difficulty, req.Report, autoBattle); code != pb.ErrorCode_Success {
 			this.module.modelAutoBattle.DelListByObjId(session.GetUserId(), autoBattle.Id) // 自动战斗结束 删除数据
-			session.SendMsg(string(this.module.GetType()), "overenv", &pb.AutoBattleOverEnvPush{
-				Success: false,
-			})
-			return
+			// session.SendMsg(string(this.module.GetType()), "overenv", &pb.AutoBattleOverEnvPush{
+			// 	Success: false,
+			// })
+			//return
+			autoOver = true
 		}
 	}
 	session.SendMsg(string(this.module.GetType()), "over", &pb.AutoBattleOverResp{
 		Asset: atno,
+		Info:  &pb.BattleInfo{},
+		Over:  autoOver,
 	})
 	return
 }
diff --git a/modules/enchant/api_challenge.go b/modules/enchant/api_challenge.go
index 5b969aa98..1aa9f51c1 100644
--- a/modules/enchant/api_challenge.go
+++ b/modules/enchant/api_challenge.go
@@ -10,7 +10,7 @@ import (
 
 //参数校验
 func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode) {
-	if req.BossType <= 0 {
+	if req.BossType <= 0 || req.Battle != nil {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -64,12 +64,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen
 		}
 	}
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype: pb.PlayType_enchant,
-		Title: "",
-		Format: &pb.BattleFormation{
-			Leadpos: req.Leadpos,
-			Format:  req.Teamids,
-		},
+		Ptype:   pb.PlayType_enchant,
+		Title:   "",
+		Format:  req.Battle,
 		Mformat: format,
 	})
 
diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go
index 02fa65518..cb0ba8bcb 100644
--- a/modules/hunting/api_challenge.go
+++ b/modules/hunting/api_challenge.go
@@ -10,7 +10,7 @@ import (
 
 //参数校验
 func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.HuntingChallengeReq) (code pb.ErrorCode) {
-	if req.BossType <= 0 && req.Difficulty > 0 {
+	if req.BossType <= 0 && req.Difficulty > 0 || req.Battle != nil {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -60,12 +60,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype: pb.PlayType_hunting,
-		Title: "",
-		Format: &pb.BattleFormation{
-			Leadpos: req.Leadpos,
-			Format:  req.Teamids,
-		},
+		Ptype:   pb.PlayType_hunting,
+		Title:   "",
+		Format:  req.Battle,
 		Mformat: cfgData.Boss,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index d8fcd09d2..b6961d95e 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -10,7 +10,7 @@ import (
 
 //参数校验
 func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode) {
-	if req.BossId <= 0 && req.Difficulty > 0 || req.Leadpos >= 5 || len(req.Teamids) != 5 || req.Leadpos < 0 {
+	if req.BossId <= 0 && req.Difficulty > 0 || req.Battle != nil {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
@@ -59,12 +59,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 	}
 
 	code, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype: pb.PlayType_viking,
-		Title: "",
-		Format: &pb.BattleFormation{
-			Leadpos: req.Leadpos,
-			Format:  req.Teamids,
-		},
+		Ptype:   pb.PlayType_viking,
+		Title:   "",
+		Format:  req.Battle,
 		Mformat: cfgData.Boss,
 	})
 	if code != pb.ErrorCode_Success {
diff --git a/modules/viking/module.go b/modules/viking/module.go
index 3f4cdc61e..a8a8e4774 100644
--- a/modules/viking/module.go
+++ b/modules/viking/module.go
@@ -206,7 +206,7 @@ func (this *Viking) AutoBuyTicket(session comm.IUserSession) (code pb.ErrorCode)
 	return
 }
 
-func (this *Viking) AutoBattleInfo(session comm.IUserSession, Leadpos int32, format []string, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo) {
+func (this *Viking) AutoBattleInfo(session comm.IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo) {
 
 	cfgData := this.configure.GetVikingBossConfigData(bossId, difficulty)
 	if cfgData == nil {
@@ -214,12 +214,9 @@ func (this *Viking) AutoBattleInfo(session comm.IUserSession, Leadpos int32, for
 		return
 	}
 	code, record := this.battle.CreatePveBattle(session, &pb.BattlePVEReq{
-		Ptype: pb.PlayType_viking,
-		Title: "",
-		Format: &pb.BattleFormation{
-			Leadpos: Leadpos,
-			Format:  format,
-		},
+		Ptype:   pb.PlayType_viking,
+		Title:   "",
+		Format:  battle,
 		Mformat: cfgData.Boss,
 	})
 	if code == pb.ErrorCode_Success {
@@ -317,12 +314,11 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, bossId int32, diff
 	return
 }
 
-func (this *Viking) CheckBattelParameter(session comm.IUserSession, teamids []string, bossid, difficulty, leadpos int32) (code pb.ErrorCode) {
+func (this *Viking) CheckBattelParameter(session comm.IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (code pb.ErrorCode) {
 	code, _ = this.api.Challenge(session, &pb.VikingChallengeReq{
 		BossId:     bossid,
 		Difficulty: difficulty,
-		Leadpos:    leadpos,
-		Teamids:    teamids,
+		Battle:     battle,
 	})
 	return
 }
diff --git a/pb/auto_msg.pb.go b/pb/auto_msg.pb.go
index 471b958af..5b351f012 100644
--- a/pb/auto_msg.pb.go
+++ b/pb/auto_msg.pb.go
@@ -25,15 +25,14 @@ type AutoBattleChallengeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	BossId     int32    `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"`             // boos 类型
-	Difficulty int32    `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"`     // 难度
-	Leadpos    int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`           //队长位置
-	Teamids    []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`            //阵容信息
-	AutoWin    bool     `protobuf:"varint,5,opt,name=autoWin,proto3" json:"autoWin"`           // 失败自动停止
-	MaxExp     bool     `protobuf:"varint,6,opt,name=maxExp,proto3" json:"maxExp"`             //雄达到满级则停止连续战斗
-	AutoBuy    bool     `protobuf:"varint,7,opt,name=autoBuy,proto3" json:"autoBuy"`           // 自动购买
-	AutoSell   int32    `protobuf:"varint,8,opt,name=autoSell,proto3" json:"autoSell"`         // 自动出售星级装备
-	Ptype      PlayType `protobuf:"varint,9,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` // 类型
+	BossId     int32            `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"`         // boos 类型
+	Difficulty int32            `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+	Battle     *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"`
+	AutoWin    bool             `protobuf:"varint,4,opt,name=autoWin,proto3" json:"autoWin"`           // 失败自动停止
+	MaxExp     bool             `protobuf:"varint,5,opt,name=maxExp,proto3" json:"maxExp"`             //雄达到满级则停止连续战斗
+	AutoBuy    bool             `protobuf:"varint,6,opt,name=autoBuy,proto3" json:"autoBuy"`           // 自动购买
+	AutoSell   int32            `protobuf:"varint,7,opt,name=autoSell,proto3" json:"autoSell"`         // 自动出售星级装备
+	Ptype      PlayType         `protobuf:"varint,8,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` // 类型
 }
 
 func (x *AutoBattleChallengeReq) Reset() {
@@ -82,16 +81,9 @@ func (x *AutoBattleChallengeReq) GetDifficulty() int32 {
 	return 0
 }
 
-func (x *AutoBattleChallengeReq) GetLeadpos() int32 {
+func (x *AutoBattleChallengeReq) GetBattle() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *AutoBattleChallengeReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Battle
 	}
 	return nil
 }
@@ -240,6 +232,8 @@ type AutoBattleOverResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Asset []*UserAtno `protobuf:"bytes,1,rep,name=asset,proto3" json:"asset"` //  GameRe // 推送atn
+	Info  *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"`
+	Over  bool        `protobuf:"varint,3,opt,name=over,proto3" json:"over"` // 是否结束
 }
 
 func (x *AutoBattleOverResp) Reset() {
@@ -281,50 +275,16 @@ func (x *AutoBattleOverResp) GetAsset() []*UserAtno {
 	return nil
 }
 
-// 自动战斗结束
-type AutoBattleOverEnvPush struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success"`
-}
-
-func (x *AutoBattleOverEnvPush) Reset() {
-	*x = AutoBattleOverEnvPush{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_auto_auto_msg_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutoBattleOverEnvPush) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutoBattleOverEnvPush) ProtoMessage() {}
-
-func (x *AutoBattleOverEnvPush) ProtoReflect() protoreflect.Message {
-	mi := &file_auto_auto_msg_proto_msgTypes[4]
-	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 AutoBattleOverEnvPush.ProtoReflect.Descriptor instead.
-func (*AutoBattleOverEnvPush) Descriptor() ([]byte, []int) {
-	return file_auto_auto_msg_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *AutoBattleOverEnvPush) GetSuccess() bool {
+func (x *AutoBattleOverResp) GetInfo() *BattleInfo {
 	if x != nil {
-		return x.Success
+		return x.Info
+	}
+	return nil
+}
+
+func (x *AutoBattleOverResp) GetOver() bool {
+	if x != nil {
+		return x.Over
 	}
 	return false
 }
@@ -341,7 +301,7 @@ type AutoBattleStopReq struct {
 func (x *AutoBattleStopReq) Reset() {
 	*x = AutoBattleStopReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_auto_auto_msg_proto_msgTypes[5]
+		mi := &file_auto_auto_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -354,7 +314,7 @@ func (x *AutoBattleStopReq) String() string {
 func (*AutoBattleStopReq) ProtoMessage() {}
 
 func (x *AutoBattleStopReq) ProtoReflect() protoreflect.Message {
-	mi := &file_auto_auto_msg_proto_msgTypes[5]
+	mi := &file_auto_auto_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -367,7 +327,7 @@ func (x *AutoBattleStopReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AutoBattleStopReq.ProtoReflect.Descriptor instead.
 func (*AutoBattleStopReq) Descriptor() ([]byte, []int) {
-	return file_auto_auto_msg_proto_rawDescGZIP(), []int{5}
+	return file_auto_auto_msg_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *AutoBattleStopReq) GetPtype() PlayType {
@@ -389,7 +349,7 @@ type AutoBattleStopResp struct {
 func (x *AutoBattleStopResp) Reset() {
 	*x = AutoBattleStopResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_auto_auto_msg_proto_msgTypes[6]
+		mi := &file_auto_auto_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -402,7 +362,7 @@ func (x *AutoBattleStopResp) String() string {
 func (*AutoBattleStopResp) ProtoMessage() {}
 
 func (x *AutoBattleStopResp) ProtoReflect() protoreflect.Message {
-	mi := &file_auto_auto_msg_proto_msgTypes[6]
+	mi := &file_auto_auto_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -415,7 +375,7 @@ func (x *AutoBattleStopResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AutoBattleStopResp.ProtoReflect.Descriptor instead.
 func (*AutoBattleStopResp) Descriptor() ([]byte, []int) {
-	return file_auto_auto_msg_proto_rawDescGZIP(), []int{6}
+	return file_auto_auto_msg_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *AutoBattleStopResp) GetPtype() PlayType {
@@ -433,48 +393,47 @@ var file_auto_auto_msg_proto_rawDesc = []byte{
 	0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62,
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x8d, 0x02, 0x0a, 0x16, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x74, 0x6f, 0x22, 0x83, 0x02, 0x0a, 0x16, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
 	0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
 	0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
 	0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
 	0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
-	0x63, 0x75, 0x6c, 0x74, 0x79, 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, 0x61, 0x75, 0x74,
-	0x6f, 0x57, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x75, 0x74, 0x6f,
-	0x57, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x6d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x61,
-	0x75, 0x74, 0x6f, 0x42, 0x75, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x61, 0x75,
-	0x74, 0x6f, 0x42, 0x75, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x65, 0x6c,
-	0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x65, 0x6c,
-	0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79,
-	0x70, 0x65, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x5b,
-	0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72,
-	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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x35, 0x0a, 0x12, 0x41,
-	0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x73, 0x73,
-	0x65, 0x74, 0x22, 0x31, 0x0a, 0x15, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x4f, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x73,
-	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x34, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x70, 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, 0x22, 0x35, 0x0a, 0x12, 0x41,
-	0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x73,
-	0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x57, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x57, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x78,
+	0x45, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x6d, 0x61, 0x78, 0x45, 0x78,
+	0x70, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x42, 0x75, 0x79, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x07, 0x61, 0x75, 0x74, 0x6f, 0x42, 0x75, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x61,
+	0x75, 0x74, 0x6f, 0x53, 0x65, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61,
+	0x75, 0x74, 0x6f, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x0a, 0x17, 0x41, 0x75, 0x74, 0x6f,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52,
+	0x65, 0x73, 0x70, 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, 0x5b, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x25, 0x0a, 0x06, 0x72, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x22, 0x6a, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f,
+	0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+	0x6f, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6f, 0x76, 0x65,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x6f, 0x76, 0x65, 0x72, 0x22, 0x34, 0x0a,
+	0x11, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x70, 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, 0x22, 0x35, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x53, 0x74, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -489,33 +448,35 @@ func file_auto_auto_msg_proto_rawDescGZIP() []byte {
 	return file_auto_auto_msg_proto_rawDescData
 }
 
-var file_auto_auto_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_auto_auto_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_auto_auto_msg_proto_goTypes = []interface{}{
 	(*AutoBattleChallengeReq)(nil),  // 0: AutoBattleChallengeReq
 	(*AutoBattleChallengeResp)(nil), // 1: AutoBattleChallengeResp
 	(*AutoBattleOverReq)(nil),       // 2: AutoBattleOverReq
 	(*AutoBattleOverResp)(nil),      // 3: AutoBattleOverResp
-	(*AutoBattleOverEnvPush)(nil),   // 4: AutoBattleOverEnvPush
-	(*AutoBattleStopReq)(nil),       // 5: AutoBattleStopReq
-	(*AutoBattleStopResp)(nil),      // 6: AutoBattleStopResp
+	(*AutoBattleStopReq)(nil),       // 4: AutoBattleStopReq
+	(*AutoBattleStopResp)(nil),      // 5: AutoBattleStopResp
+	(*BattleFormation)(nil),         // 6: BattleFormation
 	(PlayType)(0),                   // 7: PlayType
 	(*BattleInfo)(nil),              // 8: BattleInfo
 	(*BattleReport)(nil),            // 9: BattleReport
 	(*UserAtno)(nil),                // 10: UserAtno
 }
 var file_auto_auto_msg_proto_depIdxs = []int32{
-	7,  // 0: AutoBattleChallengeReq.ptype:type_name -> PlayType
-	8,  // 1: AutoBattleChallengeResp.info:type_name -> BattleInfo
-	7,  // 2: AutoBattleOverReq.ptype:type_name -> PlayType
-	9,  // 3: AutoBattleOverReq.report:type_name -> BattleReport
-	10, // 4: AutoBattleOverResp.asset:type_name -> UserAtno
-	7,  // 5: AutoBattleStopReq.ptype:type_name -> PlayType
-	7,  // 6: AutoBattleStopResp.ptype:type_name -> PlayType
-	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
+	6,  // 0: AutoBattleChallengeReq.battle:type_name -> BattleFormation
+	7,  // 1: AutoBattleChallengeReq.ptype:type_name -> PlayType
+	8,  // 2: AutoBattleChallengeResp.info:type_name -> BattleInfo
+	7,  // 3: AutoBattleOverReq.ptype:type_name -> PlayType
+	9,  // 4: AutoBattleOverReq.report:type_name -> BattleReport
+	10, // 5: AutoBattleOverResp.asset:type_name -> UserAtno
+	8,  // 6: AutoBattleOverResp.info:type_name -> BattleInfo
+	7,  // 7: AutoBattleStopReq.ptype:type_name -> PlayType
+	7,  // 8: AutoBattleStopResp.ptype:type_name -> PlayType
+	9,  // [9:9] is the sub-list for method output_type
+	9,  // [9:9] is the sub-list for method input_type
+	9,  // [9:9] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_auto_auto_msg_proto_init() }
@@ -576,18 +537,6 @@ func file_auto_auto_msg_proto_init() {
 			}
 		}
 		file_auto_auto_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutoBattleOverEnvPush); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_auto_auto_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AutoBattleStopReq); i {
 			case 0:
 				return &v.state
@@ -599,7 +548,7 @@ func file_auto_auto_msg_proto_init() {
 				return nil
 			}
 		}
-		file_auto_auto_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_auto_auto_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AutoBattleStopResp); i {
 			case 0:
 				return &v.state
@@ -618,7 +567,7 @@ func file_auto_auto_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_auto_auto_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/enchant_msg.pb.go b/pb/enchant_msg.pb.go
index 4284242b0..cf5a6010d 100644
--- a/pb/enchant_msg.pb.go
+++ b/pb/enchant_msg.pb.go
@@ -111,9 +111,8 @@ type EnchantChallengeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	BossType int32    `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boos 类型
-	Leadpos  int32    `protobuf:"varint,2,opt,name=leadpos,proto3" json:"leadpos"`   //队长位置
-	Teamids  []string `protobuf:"bytes,3,rep,name=teamids,proto3" json:"teamids"`    //阵容信息
+	BossType int32            `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boos 类型
+	Battle   *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
 }
 
 func (x *EnchantChallengeReq) Reset() {
@@ -155,16 +154,9 @@ func (x *EnchantChallengeReq) GetBossType() int32 {
 	return 0
 }
 
-func (x *EnchantChallengeReq) GetLeadpos() int32 {
+func (x *EnchantChallengeReq) GetBattle() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *EnchantChallengeReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Battle
 	}
 	return nil
 }
@@ -545,45 +537,44 @@ var file_enchant_enchant_msg_proto_rawDesc = []byte{
 	0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x47, 0x65,
 	0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
 	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x45, 0x6e, 0x63, 0x68,
-	0x61, 0x6e, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x65, 0x0a, 0x13, 0x45, 0x6e, 0x63,
+	0x61, 0x6e, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x13, 0x45, 0x6e, 0x63,
 	0x68, 0x61, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71,
 	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 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, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73,
-	0x22, 0x53, 0x0a, 0x14, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x62, 0x6f, 0x73,
-	0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73,
-	0x73, 0x54, 0x79, 0x70, 0x65, 0x22, 0x72, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74,
-	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x06,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3a, 0x0a, 0x18, 0x45, 0x6e, 0x63,
-	0x68, 0x61, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x25, 0x0a, 0x0d, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74,
-	0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e,
-	0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
-	0x42, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48,
-	0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x45, 0x6e, 0x63, 0x68,
-	0x61, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x44, 0x42, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05,
-	0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x53, 0x0a, 0x14, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e,
+	0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x22, 0x72, 0x0a, 0x17, 0x45,
+	0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f,
+	0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
+	0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22,
+	0x3a, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+	0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x45, 0x6e,
+	0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x25, 0x0a, 0x0d, 0x45,
+	0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x48, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52,
+	0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f,
+	0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f,
+	0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b,
+	0x0a, 0x13, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74,
+	0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -611,22 +602,24 @@ var file_enchant_enchant_msg_proto_goTypes = []interface{}{
 	(*EnchantRankListReq)(nil),       // 8: EnchantRankListReq
 	(*EnchantRankListResp)(nil),      // 9: EnchantRankListResp
 	(*DBEnchant)(nil),                // 10: DBEnchant
-	(*BattleInfo)(nil),               // 11: BattleInfo
-	(*BattleReport)(nil),             // 12: BattleReport
-	(*DBEnchantRank)(nil),            // 13: DBEnchantRank
+	(*BattleFormation)(nil),          // 11: BattleFormation
+	(*BattleInfo)(nil),               // 12: BattleInfo
+	(*BattleReport)(nil),             // 13: BattleReport
+	(*DBEnchantRank)(nil),            // 14: DBEnchantRank
 }
 var file_enchant_enchant_msg_proto_depIdxs = []int32{
 	10, // 0: EnchantGetListResp.data:type_name -> DBEnchant
-	11, // 1: EnchantChallengeResp.info:type_name -> BattleInfo
-	12, // 2: EnchantChallengeOverReq.report:type_name -> BattleReport
-	10, // 3: EnchantChallengeOverResp.data:type_name -> DBEnchant
-	10, // 4: EnchantBuyResp.data:type_name -> DBEnchant
-	13, // 5: EnchantRankListResp.ranks:type_name -> DBEnchantRank
-	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
+	11, // 1: EnchantChallengeReq.battle:type_name -> BattleFormation
+	12, // 2: EnchantChallengeResp.info:type_name -> BattleInfo
+	13, // 3: EnchantChallengeOverReq.report:type_name -> BattleReport
+	10, // 4: EnchantChallengeOverResp.data:type_name -> DBEnchant
+	10, // 5: EnchantBuyResp.data:type_name -> DBEnchant
+	14, // 6: EnchantRankListResp.ranks:type_name -> DBEnchantRank
+	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_enchant_enchant_msg_proto_init() }
diff --git a/pb/hunting_msg.pb.go b/pb/hunting_msg.pb.go
index bab5b0418..18c71bb0c 100644
--- a/pb/hunting_msg.pb.go
+++ b/pb/hunting_msg.pb.go
@@ -111,10 +111,9 @@ type HuntingChallengeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	BossType   int32    `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"`     // boos 类型
-	Difficulty int32    `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
-	Leadpos    int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`       //队长位置
-	Teamids    []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`        //阵容信息
+	BossType   int32            `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"`     // boos 类型
+	Difficulty int32            `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+	Battle     *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"`
 }
 
 func (x *HuntingChallengeReq) Reset() {
@@ -163,16 +162,9 @@ func (x *HuntingChallengeReq) GetDifficulty() int32 {
 	return 0
 }
 
-func (x *HuntingChallengeReq) GetLeadpos() int32 {
+func (x *HuntingChallengeReq) GetBattle() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *HuntingChallengeReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Battle
 	}
 	return nil
 }
@@ -561,49 +553,49 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{
 	0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x47, 0x65,
 	0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
 	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74,
-	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x85, 0x01, 0x0a, 0x13, 0x48, 0x75,
-	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65,
-	0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a,
-	0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 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, 0x22, 0x73, 0x0a, 0x14, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c,
-	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x62, 0x6f,
-	0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f,
-	0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
-	0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66,
-	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x7c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
-	0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65,
-	0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a,
-	0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a,
-	0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x22, 0x3a, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43,
-	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
-	0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x22, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65,
-	0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e, 0x48, 0x75, 0x6e, 0x74, 0x69,
-	0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74,
-	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48, 0x0a, 0x12, 0x48, 0x75, 0x6e,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12,
-	0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61,
-	0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, 0x72, 0x61,
-	0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75,
-	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x7b, 0x0a, 0x13, 0x48, 0x75, 0x6e,
+	0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71,
+	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x28, 0x0a, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x73, 0x0a, 0x14, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64,
+	0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x7c, 0x0a, 0x17, 0x48,
+	0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f,
+	0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c,
+	0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3a, 0x0a, 0x18, 0x48, 0x75, 0x6e,
+	0x74, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x25, 0x0a, 0x0d, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
+	0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x30, 0x0a, 0x0e,
+	0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
+	0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x48,
+	0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x48, 0x75, 0x6e, 0x74,
+	0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05,
+	0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -631,22 +623,24 @@ var file_hunting_hunting_msg_proto_goTypes = []interface{}{
 	(*HuntingRankListReq)(nil),       // 8: HuntingRankListReq
 	(*HuntingRankListResp)(nil),      // 9: HuntingRankListResp
 	(*DBHunting)(nil),                // 10: DBHunting
-	(*BattleInfo)(nil),               // 11: BattleInfo
-	(*BattleReport)(nil),             // 12: BattleReport
-	(*DBHuntingRank)(nil),            // 13: DBHuntingRank
+	(*BattleFormation)(nil),          // 11: BattleFormation
+	(*BattleInfo)(nil),               // 12: BattleInfo
+	(*BattleReport)(nil),             // 13: BattleReport
+	(*DBHuntingRank)(nil),            // 14: DBHuntingRank
 }
 var file_hunting_hunting_msg_proto_depIdxs = []int32{
 	10, // 0: HuntingGetListResp.data:type_name -> DBHunting
-	11, // 1: HuntingChallengeResp.info:type_name -> BattleInfo
-	12, // 2: HuntingChallengeOverReq.report:type_name -> BattleReport
-	10, // 3: HuntingChallengeOverResp.data:type_name -> DBHunting
-	10, // 4: HuntingBuyResp.data:type_name -> DBHunting
-	13, // 5: HuntingRankListResp.ranks:type_name -> DBHuntingRank
-	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
+	11, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation
+	12, // 2: HuntingChallengeResp.info:type_name -> BattleInfo
+	13, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport
+	10, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting
+	10, // 5: HuntingBuyResp.data:type_name -> DBHunting
+	14, // 6: HuntingRankListResp.ranks:type_name -> DBHuntingRank
+	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_hunting_hunting_msg_proto_init() }
diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go
index 20d874693..94f67aa7f 100644
--- a/pb/viking_msg.pb.go
+++ b/pb/viking_msg.pb.go
@@ -111,10 +111,9 @@ type VikingChallengeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	BossId     int32    `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"`         // boos 类型
-	Difficulty int32    `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
-	Leadpos    int32    `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`       //队长位置
-	Teamids    []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"`        //阵容信息
+	BossId     int32            `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"`         // boos 类型
+	Difficulty int32            `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
+	Battle     *BattleFormation `protobuf:"bytes,3,opt,name=battle,proto3" json:"battle"`
 }
 
 func (x *VikingChallengeReq) Reset() {
@@ -163,16 +162,9 @@ func (x *VikingChallengeReq) GetDifficulty() int32 {
 	return 0
 }
 
-func (x *VikingChallengeReq) GetLeadpos() int32 {
+func (x *VikingChallengeReq) GetBattle() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *VikingChallengeReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Battle
 	}
 	return nil
 }
@@ -569,51 +561,50 @@ var file_viking_viking_msg_proto_rawDesc = []byte{
 	0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x56, 0x69,
 	0x6b, 0x69, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
 	0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
-	0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x80,
-	0x01, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
-	0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a,
-	0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 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, 0x22, 0x6e, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73,
-	0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49,
-	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
-	0x79, 0x22, 0x77, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62,
-	0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73,
-	0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
-	0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5b, 0x0a, 0x17, 0x56, 0x69,
-	0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73,
-	0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e,
-	0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a,
-	0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44,
-	0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a,
-	0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
-	0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05,
-	0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
-	0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b,
-	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x76,
+	0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
+	0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x28, 0x0a, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x6e, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x16,
+	0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
+	0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66,
+	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x77, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66,
+	0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69,
+	0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
+	0x5b, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+	0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
+	0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x73, 0x73,
+	0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
+	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x22, 0x24, 0x0a, 0x0c,
+	0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56,
+	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52,
+	0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -641,24 +632,26 @@ var file_viking_viking_msg_proto_goTypes = []interface{}{
 	(*VikingRankListReq)(nil),       // 8: VikingRankListReq
 	(*VikingRankListResp)(nil),      // 9: VikingRankListResp
 	(*DBViking)(nil),                // 10: DBViking
-	(*BattleInfo)(nil),              // 11: BattleInfo
-	(*BattleReport)(nil),            // 12: BattleReport
-	(*UserAssets)(nil),              // 13: UserAssets
-	(*DBVikingRank)(nil),            // 14: DBVikingRank
+	(*BattleFormation)(nil),         // 11: BattleFormation
+	(*BattleInfo)(nil),              // 12: BattleInfo
+	(*BattleReport)(nil),            // 13: BattleReport
+	(*UserAssets)(nil),              // 14: UserAssets
+	(*DBVikingRank)(nil),            // 15: DBVikingRank
 }
 var file_viking_viking_msg_proto_depIdxs = []int32{
 	10, // 0: VikingGetListResp.data:type_name -> DBViking
-	11, // 1: VikingChallengeResp.info:type_name -> BattleInfo
-	12, // 2: VikingChallengeOverReq.report:type_name -> BattleReport
-	10, // 3: VikingChallengeOverResp.data:type_name -> DBViking
-	13, // 4: VikingChallengeOverResp.asset:type_name -> UserAssets
-	10, // 5: VikingBuyResp.data:type_name -> DBViking
-	14, // 6: VikingRankListResp.ranks:type_name -> DBVikingRank
-	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
+	11, // 1: VikingChallengeReq.battle:type_name -> BattleFormation
+	12, // 2: VikingChallengeResp.info:type_name -> BattleInfo
+	13, // 3: VikingChallengeOverReq.report:type_name -> BattleReport
+	10, // 4: VikingChallengeOverResp.data:type_name -> DBViking
+	14, // 5: VikingChallengeOverResp.asset:type_name -> UserAssets
+	10, // 6: VikingBuyResp.data:type_name -> DBViking
+	15, // 7: VikingRankListResp.ranks:type_name -> DBVikingRank
+	8,  // [8:8] is the sub-list for method output_type
+	8,  // [8:8] is the sub-list for method input_type
+	8,  // [8:8] is the sub-list for extension type_name
+	8,  // [8:8] is the sub-list for extension extendee
+	0,  // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_viking_viking_msg_proto_init() }