From ada9d59d298925edf68996e8db8ed86b265fdee7 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 4 Nov 2022 14:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 +- modules/battle/modelBattle.go | 171 ++++++++++++----- modules/battle/module.go | 23 +++ modules/horoscope/modelhoroscope.go | 8 +- modules/horoscope/module.go | 4 +- pb/battle_db.pb.go | 32 ++-- pb/battle_msg.pb.go | 282 ++++++++++++++++++---------- 7 files changed, 358 insertions(+), 164 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index ab3b6ca78..be8c0deca 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -220,6 +220,6 @@ type ( //星座图 IHoroscope interface { //计算新作图属性 - ComputeHeroNumeric(hero *pb.DBHero) + ComputeHeroNumeric(uid string, hero ...*pb.DBHero) } ) diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index 246a71139..a12cb1fde 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -42,6 +42,81 @@ func (this *modelBattleComp) queryrecord(oid string) (record *pb.DBBattleRecord, return } +//创建pve 战斗记录 +func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattleEVEReq) (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.Redformat)), + BlueCompId: "", + Buleflist: make([]*pb.DBBattleFormt, len(req.Buleformat)), + } + + for i, v := range req.Redformat { + if mf, err := this.module.configure.GetMonsterFormat(v); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } else { + record.Buleflist[i] = &pb.DBBattleFormt{ + Leadpos: mf.CaptainId, + Team: make([]*pb.BattleRole, len(mf.MonsterList)), + } + for i1, v1 := range mf.MonsterList { + if v1 == -1 { + record.Buleflist[i].Team[i1] = nil + } else { + if monst, err := this.module.configure.GetMonster(v1); err != nil { + code = pb.ErrorCode_ConfigNoFound + } else { + hero := &pb.DBHero{} + if hero = this.module.ModuleHero.CreateMonster(monst.HeroId, monst.Star, mf.Lv); hero == nil { + log.Error("on found battle req data", log.Field{Key: "HeroId", Value: monst.HeroId}) + code = pb.ErrorCode_ReqParameterError + return + } else { + record.Buleflist[i].Team[i1] = &pb.BattleRole{ + Tid: int32(200 + i*10 + i1), + Oid: hero.Id, + HeroID: hero.HeroID, + Pos: int32(i1), + Star: hero.Star, + Lv: hero.Lv, + CaptainSkill: hero.CaptainSkill, + NormalSkill: hero.NormalSkill, + Property: hero.Property, + } + if monst.Equip4 != 0 { + if suit, err := this.module.configure.Getequipsuit(monst.Equip4); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } else { + record.Buleflist[i].Team[i1].MainSuitSkill = suit.Skill + } + } + if monst.Equip2 != 0 { + if suit, err := this.module.configure.Getequipsuit(monst.Equip2); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } else { + record.Buleflist[i].Team[i1].SubSuitSkill = suit.Skill + } + } + record.Buleflist[i].Team[i1].Property[comm.Hp] = int32(float32(record.Buleflist[i].Team[i1].Property[comm.Hp]) * mf.Hppro) + record.Buleflist[i].Team[i1].Property[comm.Atk] = int32(float32(record.Buleflist[i].Team[i1].Property[comm.Atk]) * mf.Atkpro) + record.Buleflist[i].Team[i1].Property[comm.Def] = int32(float32(record.Buleflist[i].Team[i1].Property[comm.Def]) * mf.Defpro) + } + } + } + } + } + } + return +} + //创建pve 战斗记录 func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq) (record *pb.DBBattleRecord, code pb.ErrorCode) { record = &pb.DBBattleRecord{ @@ -168,10 +243,52 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon } } } - // if err := this.Add(record.Id, record); err != nil { - // this.module.Errorln(err) - // return - // } + 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{ + Id: primitive.NewObjectID().Hex(), + Title: req.Title, + Btype: btype, + Ptype: req.Ptype, + State: pb.BBattleState_in, + RedCompId: req.Redformat.Uid, + Redflist: make([]*pb.DBBattleFormt, 1), + BlueCompId: req.Buleformat.Uid, + Buleflist: make([]*pb.DBBattleFormt, 1), + } + record.Redflist[0] = &pb.DBBattleFormt{ + Leadpos: req.Redformat.Leadpos, + Team: make([]*pb.BattleRole, len(req.Redformat.Format)), + } + //自己的英雄阵营 + for i, v := range req.Redformat.Format { + if v != nil { + tid := 100 + i + if record.Redflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { + return + } + } else { + record.Redflist[0].Team[i] = nil + } + } + record.Buleflist[0] = &pb.DBBattleFormt{ + Leadpos: req.Buleformat.Leadpos, + Team: make([]*pb.BattleRole, len(req.Buleformat.Format)), + } + //自己的英雄阵营 + for i, v := range req.Buleformat.Format { + if v != nil { + tid := 200 + i + if record.Buleflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { + return + } + } else { + record.Buleflist[0].Team[i] = nil + } + } return } @@ -224,49 +341,3 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro } 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{ - Id: primitive.NewObjectID().Hex(), - Title: req.Title, - Btype: btype, - Ptype: req.Ptype, - State: pb.BBattleState_in, - RedCompId: req.Redformat.Uid, - Redflist: make([]*pb.DBBattleFormt, 1), - BlueCompId: req.Buleformat.Uid, - Buleflist: make([]*pb.DBBattleFormt, 1), - } - record.Redflist[0] = &pb.DBBattleFormt{ - Leadpos: req.Redformat.Leadpos, - Team: make([]*pb.BattleRole, len(req.Redformat.Format)), - } - //自己的英雄阵营 - for i, v := range req.Redformat.Format { - if v != nil { - tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { - return - } - } else { - record.Redflist[0].Team[i] = nil - } - } - record.Buleflist[0] = &pb.DBBattleFormt{ - Leadpos: req.Buleformat.Leadpos, - Team: make([]*pb.BattleRole, len(req.Buleformat.Format)), - } - //自己的英雄阵营 - for i, v := range req.Buleformat.Format { - if v != nil { - tid := 200 + i - if record.Buleflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { - return - } - } else { - record.Buleflist[0].Team[i] = nil - } - } - return -} diff --git a/modules/battle/module.go b/modules/battle/module.go index e46b3c4df..0c377a019 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -72,6 +72,29 @@ func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb return } +//创建pve战斗 +func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { + var ( + conn *db.DBConn + err error + ) + if !this.IsCross() { + conn, err = db.Local() + } else { + conn, err = db.ServerDBConn(session.GetServiecTag()) + } + if err != nil { + code = pb.ErrorCode_DBError + this.Errorf("session:%v err:", session, err) + return + } + + if record, code = this.modelBattle.createeve(session, conn, pb.BattleType_pve, req); code != pb.ErrorCode_Success { + return + } + return +} + //创建pve战斗 func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { var ( diff --git a/modules/horoscope/modelhoroscope.go b/modules/horoscope/modelhoroscope.go index 02362b972..e73d50c64 100644 --- a/modules/horoscope/modelhoroscope.go +++ b/modules/horoscope/modelhoroscope.go @@ -72,14 +72,16 @@ func (this *modelHoroscope) updateInfo(info *pb.DBHoroscope) (err error) { } //计算英雄属性 -func (this *modelHoroscope) computeHeroNumeric(hero *pb.DBHero) (err error) { +func (this *modelHoroscope) computeHeroNumeric(uid string, hero ...*pb.DBHero) (err error) { var ( info *pb.DBHoroscope ) - if info, err = this.queryInfo(hero.Uid); err != nil { + if info, err = this.queryInfo(uid); err != nil { return } - err = this.compute(info, hero) + for _, v := range hero { + err = this.compute(info, v) + } return } diff --git a/modules/horoscope/module.go b/modules/horoscope/module.go index 508b049a6..65e4d6a00 100644 --- a/modules/horoscope/module.go +++ b/modules/horoscope/module.go @@ -53,7 +53,7 @@ func (this *Horoscope) OnInstallComp() { } //计算英雄数值 -func (this *Horoscope) ComputeHeroNumeric(hero *pb.DBHero) { - this.modelHoroscope.computeHeroNumeric(hero) +func (this *Horoscope) ComputeHeroNumeric(uid string, hero ...*pb.DBHero) { + this.modelHoroscope.computeHeroNumeric(uid, hero...) return } diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 5193b2131..bebbf72f8 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -27,6 +27,7 @@ const ( BattleType_pve BattleType = 1 BattleType_pvp BattleType = 2 BattleType_pvb BattleType = 3 + BattleType_eve BattleType = 4 ) // Enum value maps for BattleType. @@ -36,12 +37,14 @@ var ( 1: "pve", 2: "pvp", 3: "pvb", + 4: "eve", } BattleType_value = map[string]int32{ "nil": 0, "pve": 1, "pvp": 2, "pvb": 3, + "eve": 4, } ) @@ -635,22 +638,23 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2a, - 0x30, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, + 0x39, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, - 0x03, 0x2a, 0x6e, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, - 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, - 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, - 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, - 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, - 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, - 0x07, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, - 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, - 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, - 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a, 0x6e, 0x0a, 0x08, 0x50, 0x6c, + 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, + 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, + 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, + 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, + 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, + 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, + 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, + 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, + 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go index b432a7658..64bdc3f3e 100644 --- a/pb/battle_msg.pb.go +++ b/pb/battle_msg.pb.go @@ -147,6 +147,78 @@ func (x *BattleFormation) GetFriendformat() []string { return nil } +// pve 战斗创建请求 (此请求 为服务端间使用 客户端可忽略) +type BattleEVEReq 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"` //战斗标题 + Redformat []int32 `protobuf:"varint,3,rep,packed,name=redformat,proto3" json:"redformat"` //红方 + Buleformat []int32 `protobuf:"varint,4,rep,packed,name=buleformat,proto3" json:"buleformat"` //蓝方 +} + +func (x *BattleEVEReq) Reset() { + *x = BattleEVEReq{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *BattleEVEReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BattleEVEReq) ProtoMessage() {} + +func (x *BattleEVEReq) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_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 BattleEVEReq.ProtoReflect.Descriptor instead. +func (*BattleEVEReq) Descriptor() ([]byte, []int) { + return file_battle_battle_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *BattleEVEReq) GetPtype() PlayType { + if x != nil { + return x.Ptype + } + return PlayType_null +} + +func (x *BattleEVEReq) GetTitle() string { + if x != nil { + return x.Title + } + return "" +} + +func (x *BattleEVEReq) GetRedformat() []int32 { + if x != nil { + return x.Redformat + } + return nil +} + +func (x *BattleEVEReq) GetBuleformat() []int32 { + if x != nil { + return x.Buleformat + } + return nil +} + // pve 战斗创建请求 (此请求 为服务端间使用 客户端可忽略) type BattlePVEReq struct { state protoimpl.MessageState @@ -162,7 +234,7 @@ type BattlePVEReq struct { func (x *BattlePVEReq) Reset() { *x = BattlePVEReq{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_msg_proto_msgTypes[2] + mi := &file_battle_battle_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -175,7 +247,7 @@ func (x *BattlePVEReq) String() string { func (*BattlePVEReq) ProtoMessage() {} func (x *BattlePVEReq) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_msg_proto_msgTypes[2] + mi := &file_battle_battle_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -188,7 +260,7 @@ func (x *BattlePVEReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BattlePVEReq.ProtoReflect.Descriptor instead. func (*BattlePVEReq) Descriptor() ([]byte, []int) { - return file_battle_battle_msg_proto_rawDescGZIP(), []int{2} + return file_battle_battle_msg_proto_rawDescGZIP(), []int{3} } func (x *BattlePVEReq) GetPtype() PlayType { @@ -233,7 +305,7 @@ type PVPFormation struct { func (x *PVPFormation) Reset() { *x = PVPFormation{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_msg_proto_msgTypes[3] + mi := &file_battle_battle_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -246,7 +318,7 @@ func (x *PVPFormation) String() string { func (*PVPFormation) ProtoMessage() {} func (x *PVPFormation) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_msg_proto_msgTypes[3] + mi := &file_battle_battle_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -259,7 +331,7 @@ func (x *PVPFormation) ProtoReflect() protoreflect.Message { // Deprecated: Use PVPFormation.ProtoReflect.Descriptor instead. func (*PVPFormation) Descriptor() ([]byte, []int) { - return file_battle_battle_msg_proto_rawDescGZIP(), []int{3} + return file_battle_battle_msg_proto_rawDescGZIP(), []int{4} } func (x *PVPFormation) GetUid() string { @@ -298,7 +370,7 @@ type BattlePVPReq struct { func (x *BattlePVPReq) Reset() { *x = BattlePVPReq{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_msg_proto_msgTypes[4] + mi := &file_battle_battle_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -311,7 +383,7 @@ func (x *BattlePVPReq) String() string { func (*BattlePVPReq) ProtoMessage() {} func (x *BattlePVPReq) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_msg_proto_msgTypes[4] + mi := &file_battle_battle_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -324,7 +396,7 @@ func (x *BattlePVPReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BattlePVPReq.ProtoReflect.Descriptor instead. func (*BattlePVPReq) Descriptor() ([]byte, []int) { - return file_battle_battle_msg_proto_rawDescGZIP(), []int{4} + return file_battle_battle_msg_proto_rawDescGZIP(), []int{5} } func (x *BattlePVPReq) GetPtype() PlayType { @@ -374,7 +446,7 @@ type BattleInfo struct { func (x *BattleInfo) Reset() { *x = BattleInfo{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_msg_proto_msgTypes[5] + mi := &file_battle_battle_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -387,7 +459,7 @@ func (x *BattleInfo) String() string { func (*BattleInfo) ProtoMessage() {} func (x *BattleInfo) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_msg_proto_msgTypes[5] + mi := &file_battle_battle_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -400,7 +472,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{5} + return file_battle_battle_msg_proto_rawDescGZIP(), []int{6} } func (x *BattleInfo) GetId() string { @@ -473,7 +545,7 @@ type BattleReport struct { func (x *BattleReport) Reset() { *x = BattleReport{} 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) } @@ -486,7 +558,7 @@ func (x *BattleReport) String() string { func (*BattleReport) ProtoMessage() {} func (x *BattleReport) 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 { @@ -499,7 +571,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{6} + return file_battle_battle_msg_proto_rawDescGZIP(), []int{7} } func (x *BattleReport) GetInfo() *BattleInfo { @@ -540,57 +612,65 @@ var file_battle_battle_msg_proto_rawDesc = []byte{ 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x89, - 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, + 0x52, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x83, + 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x5b, 0x0a, 0x0c, 0x50, 0x56, - 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 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, 0x1f, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa1, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, - 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, - 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, - 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 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, 0x8e, 0x02, 0x0a, 0x0a, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, - 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, - 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, - 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, - 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, - 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, - 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, - 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x65, 0x0a, 0x0c, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, - 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, - 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, + 0x61, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, + 0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, + 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x22, 0x5b, 0x0a, 0x0c, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 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, 0x1f, 0x0a, 0x06, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa1, 0x01, + 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, + 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, + 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, + 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 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, 0x8e, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, + 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, + 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, + 0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, + 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, + 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, + 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, + 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, + 0x73, 0x74, 0x22, 0x65, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, + 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -605,37 +685,39 @@ 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, 7) +var file_battle_battle_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_battle_battle_msg_proto_goTypes = []interface{}{ (*LineUp)(nil), // 0: LineUp (*BattleFormation)(nil), // 1: BattleFormation - (*BattlePVEReq)(nil), // 2: BattlePVEReq - (*PVPFormation)(nil), // 3: PVPFormation - (*BattlePVPReq)(nil), // 4: BattlePVPReq - (*BattleInfo)(nil), // 5: BattleInfo - (*BattleReport)(nil), // 6: BattleReport - (PlayType)(0), // 7: PlayType - (*DBHero)(nil), // 8: DBHero - (BattleType)(0), // 9: BattleType - (*DBBattleFormt)(nil), // 10: DBBattleFormt + (*BattleEVEReq)(nil), // 2: BattleEVEReq + (*BattlePVEReq)(nil), // 3: BattlePVEReq + (*PVPFormation)(nil), // 4: PVPFormation + (*BattlePVPReq)(nil), // 5: BattlePVPReq + (*BattleInfo)(nil), // 6: BattleInfo + (*BattleReport)(nil), // 7: BattleReport + (PlayType)(0), // 8: PlayType + (*DBHero)(nil), // 9: DBHero + (BattleType)(0), // 10: BattleType + (*DBBattleFormt)(nil), // 11: DBBattleFormt } var file_battle_battle_msg_proto_depIdxs = []int32{ - 7, // 0: BattlePVEReq.ptype:type_name -> PlayType - 1, // 1: BattlePVEReq.format:type_name -> BattleFormation - 8, // 2: PVPFormation.format:type_name -> DBHero - 7, // 3: BattlePVPReq.ptype:type_name -> PlayType - 3, // 4: BattlePVPReq.redformat:type_name -> PVPFormation - 3, // 5: BattlePVPReq.buleformat:type_name -> PVPFormation - 9, // 6: BattleInfo.btype:type_name -> BattleType - 7, // 7: BattleInfo.ptype:type_name -> PlayType - 10, // 8: BattleInfo.redflist:type_name -> DBBattleFormt - 10, // 9: BattleInfo.buleflist:type_name -> DBBattleFormt - 5, // 10: BattleReport.info:type_name -> BattleInfo - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 11, // [11:11] is the sub-list for extension type_name - 11, // [11:11] is the sub-list for extension extendee - 0, // [0:11] is the sub-list for field type_name + 8, // 0: BattleEVEReq.ptype:type_name -> PlayType + 8, // 1: BattlePVEReq.ptype:type_name -> PlayType + 1, // 2: BattlePVEReq.format:type_name -> BattleFormation + 9, // 3: PVPFormation.format:type_name -> DBHero + 8, // 4: BattlePVPReq.ptype:type_name -> PlayType + 4, // 5: BattlePVPReq.redformat:type_name -> PVPFormation + 4, // 6: BattlePVPReq.buleformat:type_name -> PVPFormation + 10, // 7: BattleInfo.btype:type_name -> BattleType + 8, // 8: BattleInfo.ptype:type_name -> PlayType + 11, // 9: BattleInfo.redflist:type_name -> DBBattleFormt + 11, // 10: BattleInfo.buleflist:type_name -> DBBattleFormt + 6, // 11: BattleReport.info:type_name -> BattleInfo + 12, // [12:12] is the sub-list for method output_type + 12, // [12:12] is the sub-list for method input_type + 12, // [12:12] is the sub-list for extension type_name + 12, // [12:12] is the sub-list for extension extendee + 0, // [0:12] is the sub-list for field type_name } func init() { file_battle_battle_msg_proto_init() } @@ -671,7 +753,7 @@ func file_battle_battle_msg_proto_init() { } } file_battle_battle_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattlePVEReq); i { + switch v := v.(*BattleEVEReq); i { case 0: return &v.state case 1: @@ -683,7 +765,7 @@ func file_battle_battle_msg_proto_init() { } } file_battle_battle_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PVPFormation); i { + switch v := v.(*BattlePVEReq); i { case 0: return &v.state case 1: @@ -695,7 +777,7 @@ func file_battle_battle_msg_proto_init() { } } file_battle_battle_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattlePVPReq); i { + switch v := v.(*PVPFormation); i { case 0: return &v.state case 1: @@ -707,7 +789,7 @@ func file_battle_battle_msg_proto_init() { } } file_battle_battle_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleInfo); i { + switch v := v.(*BattlePVPReq); i { case 0: return &v.state case 1: @@ -719,6 +801,18 @@ 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 { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BattleReport); i { case 0: return &v.state @@ -737,7 +831,7 @@ func file_battle_battle_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, },