上传pvb代码

modules/battle/modelBattle.go

@@ -261,6 +261,92 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
 	return
 }
 
+//创建pve 战斗记录
+func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVBReq) (record *pb.DBBattleRecord, code pb.ErrorCode) {
+	record = &pb.DBBattleRecord{
+		Id:         primitive.NewObjectID().Hex(),
+		Title:      req.Title,
+		Btype:      btype,
+		Ptype:      req.Ptype,
+		State:      pb.BBattleState_in,
+		RedCompId:  session.GetUserId(),
+		Redflist:   make([]*pb.DBBattleFormt, len(req.Format)),
+		BlueCompId: "",
+		Buleflist:  make([]*pb.DBBattleFormt, len(req.Mformat)),
+	}
+	for ii, v := range req.Format {
+		record.Redflist[ii] = &pb.DBBattleFormt{
+			Leadpos: v.Leadpos,
+			Team:    make([]*pb.BattleRole, len(v.Format)),
+		}
+		model := db.NewDBModel(comm.TableHero, time.Hour, conn)
+		//自己的英雄阵营
+		for i, v := range v.Format {
+			if v != "" {
+				hero := &pb.DBHero{}
+				if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
+					code = pb.ErrorCode_HeroNoExist
+					return
+				}
+				tid := 100 + i
+				if record.Redflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+					return
+				}
+			} else {
+				record.Redflist[ii].Team[i] = nil
+			}
+		}
+		//好友的英雄阵营
+		for i, v := range v.Friendformat {
+			if v != "" {
+				var (
+					hero *pb.DBHero
+					err  error
+				)
+				// 获取好友英雄信息
+				if this.module.IsCross() {
+					if hero, err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
+						this.module.Errorln(err)
+						code = pb.ErrorCode_HeroNoExist
+						return
+					}
+				} else { //获取跨服数据
+					hero = &pb.DBHero{}
+					if err = this.module.service.AcrossClusterRpcCall(
+						context.Background(),
+						this.module.GetCrossTag(),
+						comm.Service_Worker,
+						string(comm.Rpc_ModuleFriendUseAssitHero),
+						pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: v},
+						hero); err != nil {
+						this.module.Errorln(err)
+					}
+				}
+				tid := 100 + i
+				if record.Redflist[ii].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
+					return
+				}
+				record.Redflist[ii].Team[i].Ishelp = true
+			}
+		}
+	}
+
+	var (
+		captain int32
+		masters []*pb.BattleRole
+	)
+	for i, v := range req.Mformat {
+		if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success {
+			return
+		}
+		record.Buleflist[i] = &pb.DBBattleFormt{
+			Leadpos: captain,
+			Team:    masters,
+		}
+	}
+	return
+}
+
 //创建pvp 战斗请求
 func (this *modelBattleComp) createpvp(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVPReq) (record *pb.DBBattleRecord, code pb.ErrorCode) {
 	record = &pb.DBBattleRecord{

modules/battle/module.go

@@ -143,7 +143,7 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
 }
 
 //创建pve战斗
-func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
+func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
 	var (
 		conn *db.DBConn
 		err  error
@@ -158,11 +158,11 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVE
 		this.Errorf("session:%v err:", session, err)
 		return
 	}
-	if req.Format == nil || req.Format.Format == nil || len(req.Format.Format) != 5 {
+	if req.Format == nil || len(req.Format) == 0 {
 		code = pb.ErrorCode_ReqParameterError
 		return
 	}
-	if record, code = this.modelBattle.createpve(session, conn, pb.BattleType_pvb, req); code != pb.ErrorCode_Success {
+	if record, code = this.modelBattle.createpvb(session, conn, pb.BattleType_pvb, req); code != pb.ErrorCode_Success {
 		return
 	}
 	return

modules/moonfantasy/api_battle.go

@@ -113,7 +113,7 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 		mdata.Record[session.GetUserId()] = 1
 	}
 
-	cd, record = this.module.battle.CreatePvbBattle(session, &pb.BattlePVEReq{
+	cd, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
 		Ptype:   pb.PlayType_moonfantasy,
 		Format:  req.Battle,
 		Mformat: boss.Monsterformatid,

pb/battle_msg.pb.go

@@ -444,6 +444,78 @@ func (x *BattlePVPReq) GetBuleformat() *PVPFormation {
 	return nil
 }
 
+// pvb 战斗创建请求       (工会boos战专用)
+type BattlePVBReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Ptype   PlayType           `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
+	Title   string             `protobuf:"bytes,2,opt,name=title,proto3" json:"title"`                //战斗标题
+	Format  []*BattleFormation `protobuf:"bytes,4,rep,name=format,proto3" json:"format"`              //布阵信息
+	Mformat []int32            `protobuf:"varint,5,rep,packed,name=mformat,proto3" json:"mformat"`    //敌方增容信息
+}
+
+func (x *BattlePVBReq) Reset() {
+	*x = BattlePVBReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_battle_battle_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BattlePVBReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BattlePVBReq) ProtoMessage() {}
+
+func (x *BattlePVBReq) ProtoReflect() protoreflect.Message {
+	mi := &file_battle_battle_msg_proto_msgTypes[6]
+	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 BattlePVBReq.ProtoReflect.Descriptor instead.
+func (*BattlePVBReq) Descriptor() ([]byte, []int) {
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *BattlePVBReq) GetPtype() PlayType {
+	if x != nil {
+		return x.Ptype
+	}
+	return PlayType_null
+}
+
+func (x *BattlePVBReq) GetTitle() string {
+	if x != nil {
+		return x.Title
+	}
+	return ""
+}
+
+func (x *BattlePVBReq) GetFormat() []*BattleFormation {
+	if x != nil {
+		return x.Format
+	}
+	return nil
+}
+
+func (x *BattlePVBReq) GetMformat() []int32 {
+	if x != nil {
+		return x.Mformat
+	}
+	return nil
+}
+
 //战斗开始推送
 type BattleInfo struct {
 	state         protoimpl.MessageState
@@ -465,7 +537,7 @@ type BattleInfo struct {
 func (x *BattleInfo) Reset() {
 	*x = BattleInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[6]
+		mi := &file_battle_battle_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -478,7 +550,7 @@ func (x *BattleInfo) String() string {
 func (*BattleInfo) ProtoMessage() {}
 
 func (x *BattleInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[6]
+	mi := &file_battle_battle_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -491,7 +563,7 @@ func (x *BattleInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleInfo.ProtoReflect.Descriptor instead.
 func (*BattleInfo) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{6}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *BattleInfo) GetId() string {
@@ -576,7 +648,7 @@ type BattleCmd struct {
 func (x *BattleCmd) Reset() {
 	*x = BattleCmd{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[7]
+		mi := &file_battle_battle_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -589,7 +661,7 @@ func (x *BattleCmd) String() string {
 func (*BattleCmd) ProtoMessage() {}
 
 func (x *BattleCmd) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[7]
+	mi := &file_battle_battle_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -602,7 +674,7 @@ func (x *BattleCmd) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleCmd.ProtoReflect.Descriptor instead.
 func (*BattleCmd) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{7}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *BattleCmd) GetCmdtype() string {
@@ -632,13 +704,13 @@ type BattleReport struct {
 	Completetask []int32      `protobuf:"varint,5,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务
 	Death        int32        `protobuf:"varint,6,opt,name=death,proto3" json:"death"`                      // 死亡人数
 	Round        int32        `protobuf:"varint,7,opt,name=round,proto3" json:"round"`                      // 回合数
-	Integral     int32        `protobuf:"varint,8,opt,name=integral,proto3" json:"integral"`                //战斗积分
+	Harm         int32        `protobuf:"varint,8,opt,name=harm,proto3" json:"harm"`                        //伤害积分
 }
 
 func (x *BattleReport) Reset() {
 	*x = BattleReport{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[8]
+		mi := &file_battle_battle_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -651,7 +723,7 @@ func (x *BattleReport) String() string {
 func (*BattleReport) ProtoMessage() {}
 
 func (x *BattleReport) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[8]
+	mi := &file_battle_battle_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -664,7 +736,7 @@ func (x *BattleReport) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleReport.ProtoReflect.Descriptor instead.
 func (*BattleReport) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{8}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *BattleReport) GetInfo() *BattleInfo {
@@ -716,9 +788,9 @@ func (x *BattleReport) GetRound() int32 {
 	return 0
 }
 
-func (x *BattleReport) GetIntegral() int32 {
+func (x *BattleReport) GetHarm() int32 {
 	if x != nil {
-		return x.Integral
+		return x.Harm
 	}
 	return 0
 }
@@ -737,7 +809,7 @@ type BattleRpcMessage struct {
 func (x *BattleRpcMessage) Reset() {
 	*x = BattleRpcMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[9]
+		mi := &file_battle_battle_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -750,7 +822,7 @@ func (x *BattleRpcMessage) String() string {
 func (*BattleRpcMessage) ProtoMessage() {}
 
 func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[9]
+	mi := &file_battle_battle_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -763,7 +835,7 @@ func (x *BattleRpcMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleRpcMessage.ProtoReflect.Descriptor instead.
 func (*BattleRpcMessage) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{9}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *BattleRpcMessage) GetRid() uint64 {
@@ -799,7 +871,7 @@ type BattleCheckResults struct {
 func (x *BattleCheckResults) Reset() {
 	*x = BattleCheckResults{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_battle_battle_msg_proto_msgTypes[10]
+		mi := &file_battle_battle_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -812,7 +884,7 @@ func (x *BattleCheckResults) String() string {
 func (*BattleCheckResults) ProtoMessage() {}
 
 func (x *BattleCheckResults) ProtoReflect() protoreflect.Message {
-	mi := &file_battle_battle_msg_proto_msgTypes[10]
+	mi := &file_battle_battle_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -825,7 +897,7 @@ func (x *BattleCheckResults) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BattleCheckResults.ProtoReflect.Descriptor instead.
 func (*BattleCheckResults) Descriptor() ([]byte, []int) {
-	return file_battle_battle_msg_proto_rawDescGZIP(), []int{10}
+	return file_battle_battle_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *BattleCheckResults) GetIscheck() bool {
@@ -892,57 +964,65 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
 	0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2d, 0x0a, 0x0a, 0x62,
 	0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
-	0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xba, 0x02, 0x0a, 0x0a, 0x42,
+	0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x42, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61,
-	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
+	0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74,
-	0x73, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04,
+	0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x03,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
-	0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
+	0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d,
-	0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xba, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65,
+	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02,
-	0x69, 0x73, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73,
-	0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c,
+	0x63, 0x65, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e,
-	0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49,
+	0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e,
-	0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d,
+	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62,
-	0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74,
+	0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20,
-	0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05,
-	0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73,
+	0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05,
+	0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d,
-	0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3b, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18,
-	0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14,
+	0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76,
+	0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20,
-	0x61, 0x6c, 0x75, 0x65, 0x22, 0xfd, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12,
-	0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+	0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x09, 0x20, 0x03,
-	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
-	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69,
+	0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69,
+	0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61,
-	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x73, 0x6b, 0x73, 0x22, 0x3b, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
-	0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69,
+	0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04,
+	0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70,
+	0x22, 0xf5, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72,
-	0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c,
+	0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05,
+	0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
-	0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61,
+	0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
-	0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x20,
-	0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65,
+	0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64,
-	0x67, 0x72, 0x61, 0x6c, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70,
+	0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
-	0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
+	0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75,
-	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65,
+	0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68,
+	0x74, 0x61, 0x73, 0x6b, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70,
-	0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74,
-	0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14,
-	0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12,
+	0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x6f, 0x75, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x08, 0x20, 0x01,
-	0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20,
+	0x28, 0x05, 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04,
+	0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03,
-	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16,
+	0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63,
+	0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -957,7 +1037,7 @@ func file_battle_battle_msg_proto_rawDescGZIP() []byte {
 	return file_battle_battle_msg_proto_rawDescData
 }
 
-var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_battle_battle_msg_proto_goTypes = []interface{}{
 	(*LineUp)(nil),             // 0: LineUp
 	(*BattleFormation)(nil),    // 1: BattleFormation
@@ -965,39 +1045,42 @@ var file_battle_battle_msg_proto_goTypes = []interface{}{
 	(*BattlePVEReq)(nil),       // 3: BattlePVEReq
 	(*PVPFormation)(nil),       // 4: PVPFormation
 	(*BattlePVPReq)(nil),       // 5: BattlePVPReq
-	(*BattleInfo)(nil),         // 6: BattleInfo
+	(*BattlePVBReq)(nil),       // 6: BattlePVBReq
-	(*BattleCmd)(nil),          // 7: BattleCmd
+	(*BattleInfo)(nil),         // 7: BattleInfo
-	(*BattleReport)(nil),       // 8: BattleReport
+	(*BattleCmd)(nil),          // 8: BattleCmd
-	(*BattleRpcMessage)(nil),   // 9: BattleRpcMessage
+	(*BattleReport)(nil),       // 9: BattleReport
-	(*BattleCheckResults)(nil), // 10: BattleCheckResults
+	(*BattleRpcMessage)(nil),   // 10: BattleRpcMessage
-	(PlayType)(0),              // 11: PlayType
+	(*BattleCheckResults)(nil), // 11: BattleCheckResults
-	(*DBHero)(nil),             // 12: DBHero
+	(PlayType)(0),              // 12: PlayType
-	(BattleType)(0),            // 13: BattleType
+	(*DBHero)(nil),             // 13: DBHero
-	(*DBBattleFormt)(nil),      // 14: DBBattleFormt
+	(BattleType)(0),            // 14: BattleType
-	(*anypb.Any)(nil),          // 15: google.protobuf.Any
+	(*DBBattleFormt)(nil),      // 15: DBBattleFormt
+	(*anypb.Any)(nil),          // 16: google.protobuf.Any
 }
 var file_battle_battle_msg_proto_depIdxs = []int32{
-	11, // 0: BattleEVEReq.ptype:type_name -> PlayType
+	12, // 0: BattleEVEReq.ptype:type_name -> PlayType
 	1,  // 1: BattleEVEReq.format:type_name -> BattleFormation
-	11, // 2: BattlePVEReq.ptype:type_name -> PlayType
+	12, // 2: BattlePVEReq.ptype:type_name -> PlayType
 	1,  // 3: BattlePVEReq.format:type_name -> BattleFormation
-	12, // 4: PVPFormation.format:type_name -> DBHero
+	13, // 4: PVPFormation.format:type_name -> DBHero
-	11, // 5: BattlePVPReq.ptype:type_name -> PlayType
+	12, // 5: BattlePVPReq.ptype:type_name -> PlayType
 	4,  // 6: BattlePVPReq.redformat:type_name -> PVPFormation
 	4,  // 7: BattlePVPReq.buleformat:type_name -> PVPFormation
-	13, // 8: BattleInfo.btype:type_name -> BattleType
+	12, // 8: BattlePVBReq.ptype:type_name -> PlayType
-	11, // 9: BattleInfo.ptype:type_name -> PlayType
+	1,  // 9: BattlePVBReq.format:type_name -> BattleFormation
-	14, // 10: BattleInfo.redflist:type_name -> DBBattleFormt
+	14, // 10: BattleInfo.btype:type_name -> BattleType
-	14, // 11: BattleInfo.buleflist:type_name -> DBBattleFormt
+	12, // 11: BattleInfo.ptype:type_name -> PlayType
-	6,  // 12: BattleReport.info:type_name -> BattleInfo
+	15, // 12: BattleInfo.redflist:type_name -> DBBattleFormt
-	7,  // 13: BattleReport.incmd:type_name -> BattleCmd
+	15, // 13: BattleInfo.buleflist:type_name -> DBBattleFormt
-	7,  // 14: BattleReport.outcmd:type_name -> BattleCmd
+	7,  // 14: BattleReport.info:type_name -> BattleInfo
-	15, // 15: BattleRpcMessage.data:type_name -> google.protobuf.Any
+	8,  // 15: BattleReport.incmd:type_name -> BattleCmd
-	16, // [16:16] is the sub-list for method output_type
+	8,  // 16: BattleReport.outcmd:type_name -> BattleCmd
-	16, // [16:16] is the sub-list for method input_type
+	16, // 17: BattleRpcMessage.data:type_name -> google.protobuf.Any
-	16, // [16:16] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for extension extendee
+	18, // [18:18] is the sub-list for method input_type
-	0,  // [0:16] is the sub-list for field type_name
+	18, // [18:18] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for extension extendee
+	0,  // [0:18] is the sub-list for field type_name
 }
 
 func init() { file_battle_battle_msg_proto_init() }
@@ -1081,7 +1164,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleInfo); i {
+			switch v := v.(*BattlePVBReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1093,7 +1176,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleCmd); i {
+			switch v := v.(*BattleInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1105,7 +1188,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleReport); i {
+			switch v := v.(*BattleCmd); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1117,7 +1200,7 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BattleRpcMessage); i {
+			switch v := v.(*BattleReport); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1129,6 +1212,18 @@ func file_battle_battle_msg_proto_init() {
 			}
 		}
 		file_battle_battle_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BattleRpcMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_battle_battle_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BattleCheckResults); i {
 			case 0:
 				return &v.state
@@ -1147,7 +1242,7 @@ func file_battle_battle_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_battle_battle_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   11,
+			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},