diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go
index 38a266eea..330a3d29b 100644
--- a/modules/arena/api_info.go
+++ b/modules/arena/api_info.go
@@ -13,8 +13,8 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq)
 	return
 }
 
-///匹配
+///获取自己的排行榜信息
 func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data proto.Message) {
-
+	
 	return
 }
diff --git a/modules/arena/api_setdefformt.go b/modules/arena/api_setdefformt.go
new file mode 100644
index 000000000..f0ead56c7
--- /dev/null
+++ b/modules/arena/api_setdefformt.go
@@ -0,0 +1,46 @@
+package arena
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/mgo"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///设置防守阵型
+func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data proto.Message) {
+	var (
+		info  *pb.DBArenaUser
+		heros []*pb.DBHero
+		err   error
+	)
+	if code = this.SetDefFormtCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+	if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	if err == mgo.MongodbNil {
+		info = &pb.DBArenaUser{
+			Uid: session.GetUserId(),
+		}
+	}
+	if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	info.Defend = &pb.DBPlayerBattleFormt{
+		Leadpos: req.Leadpos,
+		Formt:   heros,
+	}
+
+	return
+}
diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go
index fa8a7b977..87c5e4c10 100644
--- a/modules/arena/modelarena.go
+++ b/modules/arena/modelarena.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 
@@ -30,8 +31,30 @@ func (this *modelArena) Init(service core.IService, module core.IModule, comp co
 	return
 }
 
+//查询用户装备数据
+func (this *modelArena) queryPlayerInfo(uId string) (result *pb.DBArenaUser, err error) {
+	result = &pb.DBArenaUser{}
+	if err = this.Get(uId, result); err != nil && err != mgo.MongodbNil {
+		this.module.Errorln(err)
+		return
+	}
+	return
+}
+
+//查询用户英雄数据
+func (this *modelArena) queryUserHeros(uid string, heroids []string) (results []*pb.DBHero, err error) {
+
+	return
+}
+
+///保存用户竞技场信息
+func (this *modelArena) UpdateArenaUserInfo(info *pb.DBArenaUser) (err error) {
+	this.Change(info.Uid, map[string]interface{}{})
+	return
+}
+
 //获取目标去陪数据
-func (this *modelArena) matche(integral int32) (results []*pb.DBArenaUser, err error) {
+func (this *modelArena) matchePlayer(integral int32) (results []*pb.DBArenaUser, err error) {
 	var (
 		cursor *mongo.Cursor
 	)
@@ -54,3 +77,9 @@ func (this *modelArena) matche(integral int32) (results []*pb.DBArenaUser, err e
 	}
 	return
 }
+
+//匹配机器人
+func (this *modelArena) matcheAI() (results []*pb.DBArenaUser, err error) {
+
+	return
+}
diff --git a/modules/arena/module.go b/modules/arena/module.go
index cbb212110..122413414 100644
--- a/modules/arena/module.go
+++ b/modules/arena/module.go
@@ -18,6 +18,8 @@ func NewModule() core.IModule {
 
 type Arena struct {
 	modules.ModuleBase
+	api        *apiComp
+	modelArena *modelArena
 }
 
 //模块名
@@ -31,3 +33,10 @@ func (this *Arena) Init(service core.IService, module core.IModule, options core
 
 	return
 }
+
+//装备组件
+func (this *Arena) OnInstallComp() {
+	this.ModuleBase.OnInstallComp()
+	this.api = this.RegisterComp(new(apiComp)).(*apiComp)
+	this.modelArena = this.RegisterComp(new(modelArena)).(*modelArena)
+}
diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go
index bf4dde985..753885c4c 100644
--- a/modules/moonfantasy/api_battle.go
+++ b/modules/moonfantasy/api_battle.go
@@ -110,11 +110,8 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 	}
 
 	cd, record = this.module.battle.CreatePvbBattle(session, &pb.BattlePVEReq{
-		Ptype: pb.PlayType_moonfantasy,
-		Format: &pb.BattleFormation{
-			Leadpos: req.Leadpos,
-			Format:  req.Teamids,
-		},
+		Ptype:   pb.PlayType_moonfantasy,
+		Format:  req.Battle,
 		Mformat: boss.Monsterformatid,
 	})
 	return
diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go
index 6f57b80b0..7d7808aee 100644
--- a/pb/arena_db.pb.go
+++ b/pb/arena_db.pb.go
@@ -25,6 +25,9 @@ type DBPlayerBattleFormt struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Leadpos int32     `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
+	Formt   []*DBHero `protobuf:"bytes,2,rep,name=formt,proto3" json:"formt"`
 }
 
 func (x *DBPlayerBattleFormt) Reset() {
@@ -59,22 +62,201 @@ func (*DBPlayerBattleFormt) Descriptor() ([]byte, []int) {
 	return file_arena_arena_db_proto_rawDescGZIP(), []int{0}
 }
 
+func (x *DBPlayerBattleFormt) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *DBPlayerBattleFormt) GetFormt() []*DBHero {
+	if x != nil {
+		return x.Formt
+	}
+	return nil
+}
+
+//玩家基本信息
+type ArenaPlayer struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid      string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Name     string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
+	Integral string               `protobuf:"bytes,3,opt,name=Integral,proto3" json:"Integral"`
+	Attack   *DBPlayerBattleFormt `protobuf:"bytes,4,opt,name=attack,proto3" json:"attack"` //进攻阵型
+}
+
+func (x *ArenaPlayer) Reset() {
+	*x = ArenaPlayer{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaPlayer) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaPlayer) ProtoMessage() {}
+
+func (x *ArenaPlayer) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_db_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 ArenaPlayer.ProtoReflect.Descriptor instead.
+func (*ArenaPlayer) Descriptor() ([]byte, []int) {
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *ArenaPlayer) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *ArenaPlayer) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ArenaPlayer) GetIntegral() string {
+	if x != nil {
+		return x.Integral
+	}
+	return ""
+}
+
+func (x *ArenaPlayer) GetAttack() *DBPlayerBattleFormt {
+	if x != nil {
+		return x.Attack
+	}
+	return nil
+}
+
+//战斗记录
+type DBArenaBattleRecord struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Bid       string `protobuf:"bytes,1,opt,name=bid,proto3" json:"bid"`             //战斗id
+	Time      int64  `protobuf:"varint,2,opt,name=time,proto3" json:"time"`          //战斗时间
+	Iswin     bool   `protobuf:"varint,3,opt,name=iswin,proto3" json:"iswin"`        //是否胜利
+	Isdefend  bool   `protobuf:"varint,4,opt,name=isdefend,proto3" json:"isdefend"`  //是否防守
+	Rivalid   string `protobuf:"bytes,5,opt,name=rivalid,proto3" json:"rivalid"`     //对手id
+	Rivalname string `protobuf:"bytes,6,opt,name=rivalname,proto3" json:"rivalname"` //对手名称
+}
+
+func (x *DBArenaBattleRecord) Reset() {
+	*x = DBArenaBattleRecord{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_db_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBArenaBattleRecord) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBArenaBattleRecord) ProtoMessage() {}
+
+func (x *DBArenaBattleRecord) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_db_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DBArenaBattleRecord.ProtoReflect.Descriptor instead.
+func (*DBArenaBattleRecord) Descriptor() ([]byte, []int) {
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBArenaBattleRecord) GetBid() string {
+	if x != nil {
+		return x.Bid
+	}
+	return ""
+}
+
+func (x *DBArenaBattleRecord) GetTime() int64 {
+	if x != nil {
+		return x.Time
+	}
+	return 0
+}
+
+func (x *DBArenaBattleRecord) GetIswin() bool {
+	if x != nil {
+		return x.Iswin
+	}
+	return false
+}
+
+func (x *DBArenaBattleRecord) GetIsdefend() bool {
+	if x != nil {
+		return x.Isdefend
+	}
+	return false
+}
+
+func (x *DBArenaBattleRecord) GetRivalid() string {
+	if x != nil {
+		return x.Rivalid
+	}
+	return ""
+}
+
+func (x *DBArenaBattleRecord) GetRivalname() string {
+	if x != nil {
+		return x.Rivalname
+	}
+	return ""
+}
+
+//竞技场用户数据
 type DBArenaUser struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid      string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`            //用户id
-	Integral int32                `protobuf:"varint,2,opt,name=Integral,proto3" json:"Integral"` //积分
-	Attack   *DBPlayerBattleFormt `protobuf:"bytes,3,opt,name=attack,proto3" json:"attack"`      //进攻阵型
-	Defend   *DBPlayerBattleFormt `protobuf:"bytes,4,opt,name=defend,proto3" json:"defend"`      //防守阵型
-	Streak   int32                `protobuf:"varint,5,opt,name=streak,proto3" json:"streak"`     //连胜
+	Uid        string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`                //用户id
+	Integral   int32                `protobuf:"varint,2,opt,name=Integral,proto3" json:"Integral"`     //积分
+	Leadpos    int32                `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"`       //队长位置
+	Attack     []string             `protobuf:"bytes,4,rep,name=attack,proto3" json:"attack"`          //进攻阵型
+	Defend     *DBPlayerBattleFormt `protobuf:"bytes,5,opt,name=defend,proto3" json:"defend"`          //防守阵型
+	Streak     int32                `protobuf:"varint,6,opt,name=streak,proto3" json:"streak"`         //连胜
+	Attackrate int32                `protobuf:"varint,7,opt,name=attackrate,proto3" json:"attackrate"` //进攻胜率
+	Defendrate int32                `protobuf:"varint,8,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率
+	Rank       int32                `protobuf:"varint,9,opt,name=rank,proto3" json:"rank"`             //排名
 }
 
 func (x *DBArenaUser) Reset() {
 	*x = DBArenaUser{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_db_proto_msgTypes[1]
+		mi := &file_arena_arena_db_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -87,7 +269,7 @@ func (x *DBArenaUser) String() string {
 func (*DBArenaUser) ProtoMessage() {}
 
 func (x *DBArenaUser) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_db_proto_msgTypes[1]
+	mi := &file_arena_arena_db_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -100,7 +282,7 @@ func (x *DBArenaUser) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBArenaUser.ProtoReflect.Descriptor instead.
 func (*DBArenaUser) Descriptor() ([]byte, []int) {
-	return file_arena_arena_db_proto_rawDescGZIP(), []int{1}
+	return file_arena_arena_db_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *DBArenaUser) GetUid() string {
@@ -117,7 +299,14 @@ func (x *DBArenaUser) GetIntegral() int32 {
 	return 0
 }
 
-func (x *DBArenaUser) GetAttack() *DBPlayerBattleFormt {
+func (x *DBArenaUser) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *DBArenaUser) GetAttack() []string {
 	if x != nil {
 		return x.Attack
 	}
@@ -138,24 +327,74 @@ func (x *DBArenaUser) GetStreak() int32 {
 	return 0
 }
 
+func (x *DBArenaUser) GetAttackrate() int32 {
+	if x != nil {
+		return x.Attackrate
+	}
+	return 0
+}
+
+func (x *DBArenaUser) GetDefendrate() int32 {
+	if x != nil {
+		return x.Defendrate
+	}
+	return 0
+}
+
+func (x *DBArenaUser) GetRank() int32 {
+	if x != nil {
+		return x.Rank
+	}
+	return 0
+}
+
 var File_arena_arena_db_proto protoreflect.FileDescriptor
 
 var file_arena_arena_db_proto_rawDesc = []byte{
 	0x0a, 0x14, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x64, 0x62,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xaf, 0x01,
-	0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
-	0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x61,
-	0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
+	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, 0x4e, 0x0a, 0x13, 0x44, 0x42,
 	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
-	0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66,
-	0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52,
-	0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x42,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66,
+	0x6f, 0x72, 0x6d, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0x7d, 0x0a, 0x0b, 0x41, 0x72,
+	0x65, 0x6e, 0x61, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x61,
+	0x74, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
+	0x74, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x22, 0xa5, 0x01, 0x0a, 0x13, 0x44, 0x42,
+	0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a,
+	0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d,
+	0x65, 0x22, 0x87, 0x02, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65,
+	0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 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, 0x16, 0x0a, 0x06, 0x61, 0x74, 0x74,
+	0x61, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63,
+	0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63,
+	0x6b, 0x72, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x74, 0x74,
+	0x61, 0x63, 0x6b, 0x72, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x65, 0x6e,
+	0x64, 0x72, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x66,
+	0x65, 0x6e, 0x64, 0x72, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -170,19 +409,23 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte {
 	return file_arena_arena_db_proto_rawDescData
 }
 
-var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_arena_arena_db_proto_goTypes = []interface{}{
 	(*DBPlayerBattleFormt)(nil), // 0: DBPlayerBattleFormt
-	(*DBArenaUser)(nil),         // 1: DBArenaUser
+	(*ArenaPlayer)(nil),         // 1: ArenaPlayer
+	(*DBArenaBattleRecord)(nil), // 2: DBArenaBattleRecord
+	(*DBArenaUser)(nil),         // 3: DBArenaUser
+	(*DBHero)(nil),              // 4: DBHero
 }
 var file_arena_arena_db_proto_depIdxs = []int32{
-	0, // 0: DBArenaUser.attack:type_name -> DBPlayerBattleFormt
-	0, // 1: DBArenaUser.defend:type_name -> DBPlayerBattleFormt
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	4, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
+	0, // 1: ArenaPlayer.attack:type_name -> DBPlayerBattleFormt
+	0, // 2: DBArenaUser.defend:type_name -> DBPlayerBattleFormt
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_arena_arena_db_proto_init() }
@@ -190,6 +433,7 @@ func file_arena_arena_db_proto_init() {
 	if File_arena_arena_db_proto != nil {
 		return
 	}
+	file_hero_hero_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_arena_arena_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBPlayerBattleFormt); i {
@@ -204,6 +448,30 @@ func file_arena_arena_db_proto_init() {
 			}
 		}
 		file_arena_arena_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaPlayer); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBArenaBattleRecord); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBArenaUser); i {
 			case 0:
 				return &v.state
@@ -222,7 +490,7 @@ func file_arena_arena_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_arena_arena_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go
index 5b8b8fc17..8bb379171 100644
--- a/pb/arena_msg.pb.go
+++ b/pb/arena_msg.pb.go
@@ -64,6 +64,8 @@ type ArenaInfoResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Info *DBArenaUser `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
 }
 
 func (x *ArenaInfoResp) Reset() {
@@ -98,6 +100,117 @@ func (*ArenaInfoResp) Descriptor() ([]byte, []int) {
 	return file_arena_arena_msg_proto_rawDescGZIP(), []int{1}
 }
 
+func (x *ArenaInfoResp) GetInfo() *DBArenaUser {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+//设置防守阵型
+type ArenaSetDefFormtReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Leadpos int32    `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
+	Formt   []string `protobuf:"bytes,2,rep,name=formt,proto3" json:"formt"`      //防守阵型
+}
+
+func (x *ArenaSetDefFormtReq) Reset() {
+	*x = ArenaSetDefFormtReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaSetDefFormtReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaSetDefFormtReq) ProtoMessage() {}
+
+func (x *ArenaSetDefFormtReq) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ArenaSetDefFormtReq.ProtoReflect.Descriptor instead.
+func (*ArenaSetDefFormtReq) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *ArenaSetDefFormtReq) GetLeadpos() int32 {
+	if x != nil {
+		return x.Leadpos
+	}
+	return 0
+}
+
+func (x *ArenaSetDefFormtReq) GetFormt() []string {
+	if x != nil {
+		return x.Formt
+	}
+	return nil
+}
+
+//设置防守阵型
+type ArenaSetDefFormtResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
+}
+
+func (x *ArenaSetDefFormtResp) Reset() {
+	*x = ArenaSetDefFormtResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaSetDefFormtResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaSetDefFormtResp) ProtoMessage() {}
+
+func (x *ArenaSetDefFormtResp) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ArenaSetDefFormtResp.ProtoReflect.Descriptor instead.
+func (*ArenaSetDefFormtResp) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *ArenaSetDefFormtResp) GetIssucc() bool {
+	if x != nil {
+		return x.Issucc
+	}
+	return false
+}
+
 //竞技场匹配 请求
 type ArenaMatcheReq struct {
 	state         protoimpl.MessageState
@@ -108,7 +221,7 @@ type ArenaMatcheReq struct {
 func (x *ArenaMatcheReq) Reset() {
 	*x = ArenaMatcheReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[2]
+		mi := &file_arena_arena_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -121,7 +234,7 @@ func (x *ArenaMatcheReq) String() string {
 func (*ArenaMatcheReq) ProtoMessage() {}
 
 func (x *ArenaMatcheReq) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[2]
+	mi := &file_arena_arena_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -134,7 +247,7 @@ func (x *ArenaMatcheReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaMatcheReq.ProtoReflect.Descriptor instead.
 func (*ArenaMatcheReq) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{2}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{4}
 }
 
 //竞技场匹配 回应
@@ -142,12 +255,14 @@ type ArenaMatcheResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Players []*ArenaPlayer `protobuf:"bytes,1,rep,name=players,proto3" json:"players"`
 }
 
 func (x *ArenaMatcheResp) Reset() {
 	*x = ArenaMatcheResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[3]
+		mi := &file_arena_arena_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -160,7 +275,7 @@ func (x *ArenaMatcheResp) String() string {
 func (*ArenaMatcheResp) ProtoMessage() {}
 
 func (x *ArenaMatcheResp) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[3]
+	mi := &file_arena_arena_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -173,7 +288,14 @@ func (x *ArenaMatcheResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaMatcheResp.ProtoReflect.Descriptor instead.
 func (*ArenaMatcheResp) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{3}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ArenaMatcheResp) GetPlayers() []*ArenaPlayer {
+	if x != nil {
+		return x.Players
+	}
+	return nil
 }
 
 //竞技场挑战 请求
@@ -181,12 +303,15 @@ type ArenaChallengeReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Playerid string           `protobuf:"bytes,1,opt,name=playerid,proto3" json:"playerid"`
+	Battle   *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型
 }
 
 func (x *ArenaChallengeReq) Reset() {
 	*x = ArenaChallengeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[4]
+		mi := &file_arena_arena_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -199,7 +324,7 @@ func (x *ArenaChallengeReq) String() string {
 func (*ArenaChallengeReq) ProtoMessage() {}
 
 func (x *ArenaChallengeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[4]
+	mi := &file_arena_arena_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -212,7 +337,21 @@ func (x *ArenaChallengeReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaChallengeReq.ProtoReflect.Descriptor instead.
 func (*ArenaChallengeReq) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{4}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *ArenaChallengeReq) GetPlayerid() string {
+	if x != nil {
+		return x.Playerid
+	}
+	return ""
+}
+
+func (x *ArenaChallengeReq) GetBattle() *BattleFormation {
+	if x != nil {
+		return x.Battle
+	}
+	return nil
 }
 
 //竞技场挑战 回应
@@ -220,12 +359,15 @@ type ArenaChallengeResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Code ErrorCode   `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功
+	Info *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"`
 }
 
 func (x *ArenaChallengeResp) Reset() {
 	*x = ArenaChallengeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[5]
+		mi := &file_arena_arena_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -238,7 +380,7 @@ func (x *ArenaChallengeResp) String() string {
 func (*ArenaChallengeResp) ProtoMessage() {}
 
 func (x *ArenaChallengeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[5]
+	mi := &file_arena_arena_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -251,7 +393,116 @@ func (x *ArenaChallengeResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaChallengeResp.ProtoReflect.Descriptor instead.
 func (*ArenaChallengeResp) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{5}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ArenaChallengeResp) GetCode() ErrorCode {
+	if x != nil {
+		return x.Code
+	}
+	return ErrorCode_Success
+}
+
+func (x *ArenaChallengeResp) GetInfo() *BattleInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+//领取战斗奖励
+type ArenaChallengeRewardReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Report *BattleReport `protobuf:"bytes,1,opt,name=report,proto3" json:"report"` //战报
+}
+
+func (x *ArenaChallengeRewardReq) Reset() {
+	*x = ArenaChallengeRewardReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaChallengeRewardReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaChallengeRewardReq) ProtoMessage() {}
+
+func (x *ArenaChallengeRewardReq) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[8]
+	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 ArenaChallengeRewardReq.ProtoReflect.Descriptor instead.
+func (*ArenaChallengeRewardReq) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *ArenaChallengeRewardReq) GetReport() *BattleReport {
+	if x != nil {
+		return x.Report
+	}
+	return nil
+}
+
+type ArenaChallengeRewardResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
+}
+
+func (x *ArenaChallengeRewardResp) Reset() {
+	*x = ArenaChallengeRewardResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_arena_arena_msg_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ArenaChallengeRewardResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ArenaChallengeRewardResp) ProtoMessage() {}
+
+func (x *ArenaChallengeRewardResp) ProtoReflect() protoreflect.Message {
+	mi := &file_arena_arena_msg_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ArenaChallengeRewardResp.ProtoReflect.Descriptor instead.
+func (*ArenaChallengeRewardResp) Descriptor() ([]byte, []int) {
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *ArenaChallengeRewardResp) GetIssucc() bool {
+	if x != nil {
+		return x.Issucc
+	}
+	return false
 }
 
 //竞技场排行榜 请求
@@ -264,7 +515,7 @@ type ArenaRankReq struct {
 func (x *ArenaRankReq) Reset() {
 	*x = ArenaRankReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[6]
+		mi := &file_arena_arena_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -277,7 +528,7 @@ func (x *ArenaRankReq) String() string {
 func (*ArenaRankReq) ProtoMessage() {}
 
 func (x *ArenaRankReq) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[6]
+	mi := &file_arena_arena_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -290,7 +541,7 @@ func (x *ArenaRankReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaRankReq.ProtoReflect.Descriptor instead.
 func (*ArenaRankReq) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{6}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{10}
 }
 
 //竞技场排行榜 回应
@@ -303,7 +554,7 @@ type ArenaRankResp struct {
 func (x *ArenaRankResp) Reset() {
 	*x = ArenaRankResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_arena_arena_msg_proto_msgTypes[7]
+		mi := &file_arena_arena_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -316,7 +567,7 @@ func (x *ArenaRankResp) String() string {
 func (*ArenaRankResp) ProtoMessage() {}
 
 func (x *ArenaRankResp) ProtoReflect() protoreflect.Message {
-	mi := &file_arena_arena_msg_proto_msgTypes[7]
+	mi := &file_arena_arena_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -329,24 +580,56 @@ func (x *ArenaRankResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArenaRankResp.ProtoReflect.Descriptor instead.
 func (*ArenaRankResp) Descriptor() ([]byte, []int) {
-	return file_arena_arena_msg_proto_rawDescGZIP(), []int{7}
+	return file_arena_arena_msg_proto_rawDescGZIP(), []int{11}
 }
 
 var File_arena_arena_msg_proto protoreflect.FileDescriptor
 
 var file_arena_arena_msg_proto_rawDesc = []byte{
 	0x0a, 0x15, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x5f, 0x6d, 0x73,
-	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61,
-	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x10, 0x0a, 0x0e, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x71, 0x22, 0x11, 0x0a, 0x0f, 0x41, 0x72,
-	0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x13, 0x0a,
-	0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52,
-	0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e,
-	0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x2f, 0x61,
+	0x72, 0x65, 0x6e, 0x61, 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, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61,
+	0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x45, 0x0a, 0x13, 0x41, 0x72,
+	0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x65,
+	0x71, 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, 0x14, 0x0a, 0x05, 0x66,
+	0x6f, 0x72, 0x6d, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d,
+	0x74, 0x22, 0x2e, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x53, 0x65, 0x74, 0x44, 0x65, 0x66,
+	0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
+	0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x63, 0x22, 0x10, 0x0a, 0x0e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x0f, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x07, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x22, 0x59,
+	0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
+	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x69, 0x64, 0x12,
+	0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x55, 0x0a, 0x12, 0x41, 0x72, 0x65,
+	0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12,
+	0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x22, 0x40, 0x0a, 0x17, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+	0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x06, 0x72,
+	0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x22, 0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52,
+	0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52,
+	0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -361,23 +644,39 @@ func file_arena_arena_msg_proto_rawDescGZIP() []byte {
 	return file_arena_arena_msg_proto_rawDescData
 }
 
-var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_arena_arena_msg_proto_goTypes = []interface{}{
-	(*ArenaInfoReq)(nil),       // 0: ArenaInfoReq
-	(*ArenaInfoResp)(nil),      // 1: ArenaInfoResp
-	(*ArenaMatcheReq)(nil),     // 2: ArenaMatcheReq
-	(*ArenaMatcheResp)(nil),    // 3: ArenaMatcheResp
-	(*ArenaChallengeReq)(nil),  // 4: ArenaChallengeReq
-	(*ArenaChallengeResp)(nil), // 5: ArenaChallengeResp
-	(*ArenaRankReq)(nil),       // 6: ArenaRankReq
-	(*ArenaRankResp)(nil),      // 7: ArenaRankResp
+	(*ArenaInfoReq)(nil),             // 0: ArenaInfoReq
+	(*ArenaInfoResp)(nil),            // 1: ArenaInfoResp
+	(*ArenaSetDefFormtReq)(nil),      // 2: ArenaSetDefFormtReq
+	(*ArenaSetDefFormtResp)(nil),     // 3: ArenaSetDefFormtResp
+	(*ArenaMatcheReq)(nil),           // 4: ArenaMatcheReq
+	(*ArenaMatcheResp)(nil),          // 5: ArenaMatcheResp
+	(*ArenaChallengeReq)(nil),        // 6: ArenaChallengeReq
+	(*ArenaChallengeResp)(nil),       // 7: ArenaChallengeResp
+	(*ArenaChallengeRewardReq)(nil),  // 8: ArenaChallengeRewardReq
+	(*ArenaChallengeRewardResp)(nil), // 9: ArenaChallengeRewardResp
+	(*ArenaRankReq)(nil),             // 10: ArenaRankReq
+	(*ArenaRankResp)(nil),            // 11: ArenaRankResp
+	(*DBArenaUser)(nil),              // 12: DBArenaUser
+	(*ArenaPlayer)(nil),              // 13: ArenaPlayer
+	(*BattleFormation)(nil),          // 14: BattleFormation
+	(ErrorCode)(0),                   // 15: ErrorCode
+	(*BattleInfo)(nil),               // 16: BattleInfo
+	(*BattleReport)(nil),             // 17: BattleReport
 }
 var file_arena_arena_msg_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+	12, // 0: ArenaInfoResp.info:type_name -> DBArenaUser
+	13, // 1: ArenaMatcheResp.players:type_name -> ArenaPlayer
+	14, // 2: ArenaChallengeReq.battle:type_name -> BattleFormation
+	15, // 3: ArenaChallengeResp.code:type_name -> ErrorCode
+	16, // 4: ArenaChallengeResp.info:type_name -> BattleInfo
+	17, // 5: ArenaChallengeRewardReq.report:type_name -> BattleReport
+	6,  // [6:6] is the sub-list for method output_type
+	6,  // [6:6] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_arena_arena_msg_proto_init() }
@@ -385,6 +684,9 @@ func file_arena_arena_msg_proto_init() {
 	if File_arena_arena_msg_proto != nil {
 		return
 	}
+	file_arena_arena_db_proto_init()
+	file_battle_battle_msg_proto_init()
+	file_errorcode_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_arena_arena_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ArenaInfoReq); i {
@@ -411,7 +713,7 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArenaMatcheReq); i {
+			switch v := v.(*ArenaSetDefFormtReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -423,7 +725,7 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArenaMatcheResp); i {
+			switch v := v.(*ArenaSetDefFormtResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -435,7 +737,7 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArenaChallengeReq); i {
+			switch v := v.(*ArenaMatcheReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -447,7 +749,7 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArenaChallengeResp); i {
+			switch v := v.(*ArenaMatcheResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -459,7 +761,7 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArenaRankReq); i {
+			switch v := v.(*ArenaChallengeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -471,6 +773,54 @@ func file_arena_arena_msg_proto_init() {
 			}
 		}
 		file_arena_arena_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaChallengeResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaChallengeRewardReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaChallengeRewardResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ArenaRankReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_arena_arena_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ArenaRankResp); i {
 			case 0:
 				return &v.state
@@ -489,7 +839,7 @@ func file_arena_arena_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_arena_arena_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go
index bf7f69922..95e051d19 100644
--- a/pb/friend_db.pb.go
+++ b/pb/friend_db.pb.go
@@ -25,18 +25,18 @@ type DBFriend struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid          string           `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                              //用户ID
-	FriendIds    []string         `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds" bson:"friendIds"`            //好友ID
-	ApplyIds     []string         `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds" bson:"applyIds"`               //申请用户ID
-	BlackIds     []string         `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"`               //黑名单ID
-	ZanIds       []string         `protobuf:"bytes,5,rep,name=zanIds,proto3" json:"zanIds" bson:"zanIds"`                     //点赞好友ID
-	GetZandIds   []string         `protobuf:"bytes,6,rep,name=getZandIds,proto3" json:"getZandIds" bson:"getZandIds"`         //已接收赞好友ID
-	AssistHeroId string           `protobuf:"bytes,7,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"`   //助战英雄ID
-	Received     int32            `protobuf:"varint,8,opt,name=received,proto3" json:"received" bson:"received"`              //领取奖励状态0未领1可领2已领
-	UpdateTime   int64            `protobuf:"varint,9,opt,name=updateTime,proto3" json:"updateTime" bson:"updateTime"`        // 更新时间
-	Hero         *DBHero          `protobuf:"bytes,10,opt,name=hero,proto3" json:"hero" bson:"hero"`                          //助战英雄副本
-	ZhuzhanScore int32            `protobuf:"varint,11,opt,name=zhuzhanScore,proto3" json:"zhuzhanScore" bson:"zhuzhanScore"` //助战分数合计
-	Record       []*ZhuZhanRecord `protobuf:"bytes,12,rep,name=record,proto3" json:"record" bson:"record"`                    // 助战记录
+	Uid          string          `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                            //用户ID
+	FriendIds    []string        `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds" bson:"friendIds"`          //好友ID
+	ApplyIds     []string        `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds" bson:"applyIds"`             //申请用户ID
+	BlackIds     []string        `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"`             //黑名单ID
+	ZanIds       []string        `protobuf:"bytes,5,rep,name=zanIds,proto3" json:"zanIds" bson:"zanIds"`                   //点赞好友ID
+	GetZandIds   []string        `protobuf:"bytes,6,rep,name=getZandIds,proto3" json:"getZandIds" bson:"getZandIds"`       //已接收赞好友ID
+	AssistHeroId string          `protobuf:"bytes,7,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"` //助战英雄ID
+	Received     int32           `protobuf:"varint,8,opt,name=received,proto3" json:"received" bson:"received"`            //领取奖励状态0未领1可领2已领
+	UpdateTime   int64           `protobuf:"varint,9,opt,name=updateTime,proto3" json:"updateTime" bson:"updateTime"`      // 更新时间
+	Hero         *DBHero         `protobuf:"bytes,10,opt,name=hero,proto3" json:"hero" bson:"hero"`                        //助战英雄副本
+	AssistScore  int32           `protobuf:"varint,11,opt,name=assistScore,proto3" json:"assistScore" bson:"zhuzhanScore"` //助战分数合计
+	Record       []*AssistRecord `protobuf:"bytes,12,rep,name=record,proto3" json:"record" bson:"record"`                  // 助战记录
 }
 
 func (x *DBFriend) Reset() {
@@ -141,14 +141,14 @@ func (x *DBFriend) GetHero() *DBHero {
 	return nil
 }
 
-func (x *DBFriend) GetZhuzhanScore() int32 {
+func (x *DBFriend) GetAssistScore() int32 {
 	if x != nil {
-		return x.ZhuzhanScore
+		return x.AssistScore
 	}
 	return 0
 }
 
-func (x *DBFriend) GetRecord() []*ZhuZhanRecord {
+func (x *DBFriend) GetRecord() []*AssistRecord {
 	if x != nil {
 		return x.Record
 	}
@@ -156,17 +156,18 @@ func (x *DBFriend) GetRecord() []*ZhuZhanRecord {
 }
 
 //助战记录
-type ZhuZhanRecord struct {
+type AssistRecord struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid         string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                          //好友Id
-	Zhuzhantime int64  `protobuf:"varint,2,opt,name=zhuzhantime,proto3" json:"zhuzhantime" bson:"zhuzhanTime"` //上次助战时间
+	Uid          string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                            //好友Id
+	AssistTime   int64  `protobuf:"varint,2,opt,name=assistTime,proto3" json:"assistTime" bson:"zhuzhanTime"`     //上次助战时间
+	AssistHeroId string `protobuf:"bytes,3,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"` //助战英雄
 }
 
-func (x *ZhuZhanRecord) Reset() {
-	*x = ZhuZhanRecord{}
+func (x *AssistRecord) Reset() {
+	*x = AssistRecord{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_db_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -174,13 +175,13 @@ func (x *ZhuZhanRecord) Reset() {
 	}
 }
 
-func (x *ZhuZhanRecord) String() string {
+func (x *AssistRecord) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ZhuZhanRecord) ProtoMessage() {}
+func (*AssistRecord) ProtoMessage() {}
 
-func (x *ZhuZhanRecord) ProtoReflect() protoreflect.Message {
+func (x *AssistRecord) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_db_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -192,31 +193,38 @@ func (x *ZhuZhanRecord) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ZhuZhanRecord.ProtoReflect.Descriptor instead.
-func (*ZhuZhanRecord) Descriptor() ([]byte, []int) {
+// Deprecated: Use AssistRecord.ProtoReflect.Descriptor instead.
+func (*AssistRecord) Descriptor() ([]byte, []int) {
 	return file_friend_friend_db_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ZhuZhanRecord) GetUid() string {
+func (x *AssistRecord) GetUid() string {
 	if x != nil {
 		return x.Uid
 	}
 	return ""
 }
 
-func (x *ZhuZhanRecord) GetZhuzhantime() int64 {
+func (x *AssistRecord) GetAssistTime() int64 {
 	if x != nil {
-		return x.Zhuzhantime
+		return x.AssistTime
 	}
 	return 0
 }
 
+func (x *AssistRecord) GetAssistHeroId() string {
+	if x != nil {
+		return x.AssistHeroId
+	}
+	return ""
+}
+
 var File_friend_friend_db_proto protoreflect.FileDescriptor
 
 var file_friend_friend_db_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 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, 0xf3, 0x02, 0x0a,
+	0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf0, 0x02, 0x0a,
 	0x08, 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66,
 	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
@@ -235,17 +243,19 @@ var file_friend_friend_db_proto_rawDesc = []byte{
 	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75,
 	0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72,
 	0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
-	0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x7a, 0x68, 0x75, 0x7a, 0x68, 0x61,
-	0x6e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x7a, 0x68,
-	0x75, 0x7a, 0x68, 0x61, 0x6e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x5a, 0x68, 0x75,
-	0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x5a, 0x68, 0x75, 0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63,
-	0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x7a, 0x68, 0x75, 0x7a, 0x68, 0x61, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x7a, 0x68, 0x75, 0x7a,
-	0x68, 0x61, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74,
+	0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x73, 0x73,
+	0x69, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f,
+	0x72, 0x64, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22,
+	0x64, 0x0a, 0x0c, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x54, 0x69, 0x6d,
+	0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49,
+	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
+	0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -262,13 +272,13 @@ func file_friend_friend_db_proto_rawDescGZIP() []byte {
 
 var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_friend_friend_db_proto_goTypes = []interface{}{
-	(*DBFriend)(nil),      // 0: DBFriend
-	(*ZhuZhanRecord)(nil), // 1: ZhuZhanRecord
-	(*DBHero)(nil),        // 2: DBHero
+	(*DBFriend)(nil),     // 0: DBFriend
+	(*AssistRecord)(nil), // 1: AssistRecord
+	(*DBHero)(nil),       // 2: DBHero
 }
 var file_friend_friend_db_proto_depIdxs = []int32{
 	2, // 0: DBFriend.hero:type_name -> DBHero
-	1, // 1: DBFriend.record:type_name -> ZhuZhanRecord
+	1, // 1: DBFriend.record:type_name -> AssistRecord
 	2, // [2:2] is the sub-list for method output_type
 	2, // [2:2] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
@@ -296,7 +306,7 @@ func file_friend_friend_db_proto_init() {
 			}
 		}
 		file_friend_friend_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ZhuZhanRecord); i {
+			switch v := v.(*AssistRecord); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 51bd3a031..d242e8104 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -37,6 +37,7 @@ type FriendBase struct {
 	IsGetZaned  bool   `protobuf:"varint,10,opt,name=isGetZaned,proto3" json:"isGetZaned"`  //是否已获赞
 	HeroObjId   string `protobuf:"bytes,11,opt,name=heroObjId,proto3" json:"heroObjId"`     //助战英雄ID
 	Score       int32  `protobuf:"varint,12,opt,name=score,proto3" json:"score"`            //助战分数
+	UpdateTime  int64  `protobuf:"varint,13,opt,name=updateTime,proto3" json:"updateTime"`  //更新时间
 }
 
 func (x *FriendBase) Reset() {
@@ -155,6 +156,13 @@ func (x *FriendBase) GetScore() int32 {
 	return 0
 }
 
+func (x *FriendBase) GetUpdateTime() int64 {
+	if x != nil {
+		return x.UpdateTime
+	}
+	return 0
+}
+
 //好友列表
 type FriendListReq struct {
 	state         protoimpl.MessageState
@@ -1722,9 +1730,9 @@ type FriendAssistlistResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	List      []*FriendBase    `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`           //好友助战排行
-	HeroObjId string           `protobuf:"bytes,2,opt,name=heroObjId,proto3" json:"heroObjId"` //助战英雄
-	Record    []*ZhuZhanRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"`       //我的助战记录
+	List      []*FriendBase   `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`           //好友助战排行
+	HeroObjId string          `protobuf:"bytes,2,opt,name=heroObjId,proto3" json:"heroObjId"` //助战英雄
+	Record    []*AssistRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"`       //我的助战记录
 }
 
 func (x *FriendAssistlistResp) Reset() {
@@ -1773,7 +1781,7 @@ func (x *FriendAssistlistResp) GetHeroObjId() string {
 	return ""
 }
 
-func (x *FriendAssistlistResp) GetRecord() []*ZhuZhanRecord {
+func (x *FriendAssistlistResp) GetRecord() []*AssistRecord {
 	if x != nil {
 		return x.Record
 	}
@@ -1866,17 +1874,17 @@ func (x *FriendGetrewardResp) GetReceived() int32 {
 	return 0
 }
 
-// 助战英雄列表推送
-type FriendAssistHeroListPush struct {
+// 助战英雄更新推送
+type FriendAssistHeroUpdatePush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"` //好友列表
+	Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"` //好友
 }
 
-func (x *FriendAssistHeroListPush) Reset() {
-	*x = FriendAssistHeroListPush{}
+func (x *FriendAssistHeroUpdatePush) Reset() {
+	*x = FriendAssistHeroUpdatePush{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1884,13 +1892,13 @@ func (x *FriendAssistHeroListPush) Reset() {
 	}
 }
 
-func (x *FriendAssistHeroListPush) String() string {
+func (x *FriendAssistHeroUpdatePush) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendAssistHeroListPush) ProtoMessage() {}
+func (*FriendAssistHeroUpdatePush) ProtoMessage() {}
 
-func (x *FriendAssistHeroListPush) ProtoReflect() protoreflect.Message {
+func (x *FriendAssistHeroUpdatePush) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1902,12 +1910,98 @@ func (x *FriendAssistHeroListPush) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendAssistHeroListPush.ProtoReflect.Descriptor instead.
-func (*FriendAssistHeroListPush) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAssistHeroUpdatePush.ProtoReflect.Descriptor instead.
+func (*FriendAssistHeroUpdatePush) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{37}
 }
 
-func (x *FriendAssistHeroListPush) GetFriends() []*FriendBase {
+func (x *FriendAssistHeroUpdatePush) GetFriend() *FriendBase {
+	if x != nil {
+		return x.Friend
+	}
+	return nil
+}
+
+//好友助战英雄列表
+type FriendAssistHeroListReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *FriendAssistHeroListReq) Reset() {
+	*x = FriendAssistHeroListReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[38]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendAssistHeroListReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendAssistHeroListReq) ProtoMessage() {}
+
+func (x *FriendAssistHeroListReq) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[38]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FriendAssistHeroListReq.ProtoReflect.Descriptor instead.
+func (*FriendAssistHeroListReq) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{38}
+}
+
+type FriendAssistHeroListResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"`
+}
+
+func (x *FriendAssistHeroListResp) Reset() {
+	*x = FriendAssistHeroListResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[39]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendAssistHeroListResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendAssistHeroListResp) ProtoMessage() {}
+
+func (x *FriendAssistHeroListResp) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[39]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FriendAssistHeroListResp.ProtoReflect.Descriptor instead.
+func (*FriendAssistHeroListResp) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{39}
+}
+
+func (x *FriendAssistHeroListResp) GetFriends() []*FriendBase {
 	if x != nil {
 		return x.Friends
 	}
@@ -1920,7 +2014,7 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x0a, 0x17, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
 	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e,
 	0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xd4, 0x02, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
+	0x6f, 0x22, 0xf4, 0x02, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
 	0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b,
 	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b,
@@ -1941,7 +2035,9 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x61, 0x6e, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
 	0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
 	0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
+	0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
 	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69,
 	0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c,
 	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65,
@@ -2040,25 +2136,31 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65,
 	0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65,
 	0x69, 0x76, 0x65, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73,
-	0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7d, 0x0a, 0x14, 0x46,
+	0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7c, 0x0a, 0x14, 0x46,
 	0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
 	0x6c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
-	0x49, 0x64, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x5a, 0x68, 0x75, 0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71,
-	0x22, 0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69,
-	0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69,
-	0x76, 0x65, 0x64, 0x22, 0x41, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73,
-	0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12,
-	0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
+	0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x64, 0x22, 0x41, 0x0a, 0x1a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
+	0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
+	0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x22, 0x41, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74,
+	0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2073,47 +2175,49 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 	return file_friend_friend_msg_proto_rawDescData
 }
 
-var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
+var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
-	(*FriendBase)(nil),               // 0: FriendBase
-	(*FriendListReq)(nil),            // 1: FriendListReq
-	(*FriendListResp)(nil),           // 2: FriendListResp
-	(*FriendRandlistReq)(nil),        // 3: FriendRandlistReq
-	(*FriendRandlistResp)(nil),       // 4: FriendRandlistResp
-	(*FriendApplyReq)(nil),           // 5: FriendApplyReq
-	(*FriendApplyResp)(nil),          // 6: FriendApplyResp
-	(*FriendDelReq)(nil),             // 7: FriendDelReq
-	(*FriendDelResp)(nil),            // 8: FriendDelResp
-	(*FriendAgreeReq)(nil),           // 9: FriendAgreeReq
-	(*FriendAgreeResp)(nil),          // 10: FriendAgreeResp
-	(*FriendRefuseReq)(nil),          // 11: FriendRefuseReq
-	(*FriendRefuseResp)(nil),         // 12: FriendRefuseResp
-	(*FriendApplyListReq)(nil),       // 13: FriendApplyListReq
-	(*FriendApplyListResp)(nil),      // 14: FriendApplyListResp
-	(*FriendSearchReq)(nil),          // 15: FriendSearchReq
-	(*FriendSearchResp)(nil),         // 16: FriendSearchResp
-	(*FriendBlackListReq)(nil),       // 17: FriendBlackListReq
-	(*FriendBlackListResp)(nil),      // 18: FriendBlackListResp
-	(*FriendAddBlackReq)(nil),        // 19: FriendAddBlackReq
-	(*FriendAddBlackResp)(nil),       // 20: FriendAddBlackResp
-	(*FriendDelBlackReq)(nil),        // 21: FriendDelBlackReq
-	(*FriendDelBlackResp)(nil),       // 22: FriendDelBlackResp
-	(*FriendTotalReq)(nil),           // 23: FriendTotalReq
-	(*FriendTotalResp)(nil),          // 24: FriendTotalResp
-	(*FriendZanlistReq)(nil),         // 25: FriendZanlistReq
-	(*FriendZanlistResp)(nil),        // 26: FriendZanlistResp
-	(*FriendZanReq)(nil),             // 27: FriendZanReq
-	(*FriendZanResp)(nil),            // 28: FriendZanResp
-	(*FriendZanreceiveReq)(nil),      // 29: FriendZanreceiveReq
-	(*FriendZanreceiveResp)(nil),     // 30: FriendZanreceiveResp
-	(*FriendAssistheroReq)(nil),      // 31: FriendAssistheroReq
-	(*FriendAssistheroResp)(nil),     // 32: FriendAssistheroResp
-	(*FriendAssistlistReq)(nil),      // 33: FriendAssistlistReq
-	(*FriendAssistlistResp)(nil),     // 34: FriendAssistlistResp
-	(*FriendGetrewardReq)(nil),       // 35: FriendGetrewardReq
-	(*FriendGetrewardResp)(nil),      // 36: FriendGetrewardResp
-	(*FriendAssistHeroListPush)(nil), // 37: FriendAssistHeroListPush
-	(*ZhuZhanRecord)(nil),            // 38: ZhuZhanRecord
+	(*FriendBase)(nil),                 // 0: FriendBase
+	(*FriendListReq)(nil),              // 1: FriendListReq
+	(*FriendListResp)(nil),             // 2: FriendListResp
+	(*FriendRandlistReq)(nil),          // 3: FriendRandlistReq
+	(*FriendRandlistResp)(nil),         // 4: FriendRandlistResp
+	(*FriendApplyReq)(nil),             // 5: FriendApplyReq
+	(*FriendApplyResp)(nil),            // 6: FriendApplyResp
+	(*FriendDelReq)(nil),               // 7: FriendDelReq
+	(*FriendDelResp)(nil),              // 8: FriendDelResp
+	(*FriendAgreeReq)(nil),             // 9: FriendAgreeReq
+	(*FriendAgreeResp)(nil),            // 10: FriendAgreeResp
+	(*FriendRefuseReq)(nil),            // 11: FriendRefuseReq
+	(*FriendRefuseResp)(nil),           // 12: FriendRefuseResp
+	(*FriendApplyListReq)(nil),         // 13: FriendApplyListReq
+	(*FriendApplyListResp)(nil),        // 14: FriendApplyListResp
+	(*FriendSearchReq)(nil),            // 15: FriendSearchReq
+	(*FriendSearchResp)(nil),           // 16: FriendSearchResp
+	(*FriendBlackListReq)(nil),         // 17: FriendBlackListReq
+	(*FriendBlackListResp)(nil),        // 18: FriendBlackListResp
+	(*FriendAddBlackReq)(nil),          // 19: FriendAddBlackReq
+	(*FriendAddBlackResp)(nil),         // 20: FriendAddBlackResp
+	(*FriendDelBlackReq)(nil),          // 21: FriendDelBlackReq
+	(*FriendDelBlackResp)(nil),         // 22: FriendDelBlackResp
+	(*FriendTotalReq)(nil),             // 23: FriendTotalReq
+	(*FriendTotalResp)(nil),            // 24: FriendTotalResp
+	(*FriendZanlistReq)(nil),           // 25: FriendZanlistReq
+	(*FriendZanlistResp)(nil),          // 26: FriendZanlistResp
+	(*FriendZanReq)(nil),               // 27: FriendZanReq
+	(*FriendZanResp)(nil),              // 28: FriendZanResp
+	(*FriendZanreceiveReq)(nil),        // 29: FriendZanreceiveReq
+	(*FriendZanreceiveResp)(nil),       // 30: FriendZanreceiveResp
+	(*FriendAssistheroReq)(nil),        // 31: FriendAssistheroReq
+	(*FriendAssistheroResp)(nil),       // 32: FriendAssistheroResp
+	(*FriendAssistlistReq)(nil),        // 33: FriendAssistlistReq
+	(*FriendAssistlistResp)(nil),       // 34: FriendAssistlistResp
+	(*FriendGetrewardReq)(nil),         // 35: FriendGetrewardReq
+	(*FriendGetrewardResp)(nil),        // 36: FriendGetrewardResp
+	(*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush
+	(*FriendAssistHeroListReq)(nil),    // 38: FriendAssistHeroListReq
+	(*FriendAssistHeroListResp)(nil),   // 39: FriendAssistHeroListResp
+	(*AssistRecord)(nil),               // 40: AssistRecord
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 0: FriendListResp.list:type_name -> FriendBase
@@ -2123,13 +2227,14 @@ var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 4: FriendBlackListResp.friends:type_name -> FriendBase
 	0,  // 5: FriendZanlistResp.list:type_name -> FriendBase
 	0,  // 6: FriendAssistlistResp.list:type_name -> FriendBase
-	38, // 7: FriendAssistlistResp.record:type_name -> ZhuZhanRecord
-	0,  // 8: FriendAssistHeroListPush.friends:type_name -> FriendBase
-	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
+	40, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
+	0,  // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
+	0,  // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
 }
 
 func init() { file_friend_friend_msg_proto_init() }
@@ -2584,7 +2689,31 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendAssistHeroListPush); i {
+			switch v := v.(*FriendAssistHeroUpdatePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_friend_friend_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendAssistHeroListReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_friend_friend_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendAssistHeroListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2602,7 +2731,7 @@ func file_friend_friend_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_friend_friend_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   38,
+			NumMessages:   40,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/moonfantasy_msg.pb.go b/pb/moonfantasy_msg.pb.go
index c69e25d43..5110fd990 100644
--- a/pb/moonfantasy_msg.pb.go
+++ b/pb/moonfantasy_msg.pb.go
@@ -296,9 +296,8 @@ type MoonfantasyBattleReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Mid     string   `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"`          //唯一id
-	Leadpos int32    `protobuf:"varint,2,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
-	Teamids []string `protobuf:"bytes,3,rep,name=teamids,proto3" json:"teamids"`  //阵容信息
+	Mid    string           `protobuf:"bytes,1,opt,name=mid,proto3" json:"mid"`       //唯一id
+	Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型
 }
 
 func (x *MoonfantasyBattleReq) Reset() {
@@ -340,16 +339,9 @@ func (x *MoonfantasyBattleReq) GetMid() string {
 	return ""
 }
 
-func (x *MoonfantasyBattleReq) GetLeadpos() int32 {
+func (x *MoonfantasyBattleReq) GetBattle() *BattleFormation {
 	if x != nil {
-		return x.Leadpos
-	}
-	return 0
-}
-
-func (x *MoonfantasyBattleReq) GetTeamids() []string {
-	if x != nil {
-		return x.Teamids
+		return x.Battle
 	}
 	return nil
 }
@@ -666,37 +658,37 @@ var file_moonfantasy_moonfantasy_msg_proto_rawDesc = []byte{
 	0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64,
 	0x65, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52,
-	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5c, 0x0a, 0x14, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x52, 0x0a, 0x14, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
 	0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
 	0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 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, 0x6a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61,
-	0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
-	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03,
-	0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x1f,
-	0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
-	0x62, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65,
-	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 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, 0x30, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61,
-	0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
-	0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69,
-	0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x2b, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
-	0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75,
-	0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e,
-	0x75, 0x6d, 0x22, 0x4a, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
-	0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x42, 0x06,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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, 0x6a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f,
+	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f,
+	0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6d, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x62, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
+	0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10,
+	0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64,
+	0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d,
+	0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 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, 0x30, 0x0a, 0x16, 0x4d, 0x6f, 0x6f,
+	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x2b, 0x0a, 0x11, 0x4d,
+	0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71,
+	0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x4a, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e,
+	0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x4e, 0x75, 0x6d, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -726,21 +718,23 @@ var file_moonfantasy_moonfantasy_msg_proto_goTypes = []interface{}{
 	(*MoonfantasyBuyResp)(nil),     // 10: MoonfantasyBuyResp
 	(*DBMoonFantasy)(nil),          // 11: DBMoonFantasy
 	(ErrorCode)(0),                 // 12: ErrorCode
-	(*BattleInfo)(nil),             // 13: BattleInfo
-	(*BattleReport)(nil),           // 14: BattleReport
+	(*BattleFormation)(nil),        // 13: BattleFormation
+	(*BattleInfo)(nil),             // 14: BattleInfo
+	(*BattleReport)(nil),           // 15: BattleReport
 }
 var file_moonfantasy_moonfantasy_msg_proto_depIdxs = []int32{
 	11, // 0: MoonfantasyGetListResp.dfantasys:type_name -> DBMoonFantasy
 	12, // 1: MoonfantasyAskResp.code:type_name -> ErrorCode
 	11, // 2: MoonfantasyAskResp.info:type_name -> DBMoonFantasy
-	12, // 3: MoonfantasyBattleResp.code:type_name -> ErrorCode
-	13, // 4: MoonfantasyBattleResp.info:type_name -> BattleInfo
-	14, // 5: MoonfantasyReceiveReq.report:type_name -> BattleReport
-	6,  // [6:6] is the sub-list for method output_type
-	6,  // [6:6] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension type_name
-	6,  // [6:6] is the sub-list for extension extendee
-	0,  // [0:6] is the sub-list for field type_name
+	13, // 3: MoonfantasyBattleReq.battle:type_name -> BattleFormation
+	12, // 4: MoonfantasyBattleResp.code:type_name -> ErrorCode
+	14, // 5: MoonfantasyBattleResp.info:type_name -> BattleInfo
+	15, // 6: MoonfantasyReceiveReq.report:type_name -> BattleReport
+	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_moonfantasy_moonfantasy_msg_proto_init() }