From 5ef98fecd32afa2516a795dd38feab178cc5b884 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 28 Oct 2022 11:56:52 +0800 Subject: [PATCH] =?UTF-8?q?pb=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/arena_db.pb.go | 81 ----------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/pb/arena_db.pb.go b/pb/arena_db.pb.go index 71ce13c70..d9db3e2c8 100644 --- a/pb/arena_db.pb.go +++ b/pb/arena_db.pb.go @@ -465,7 +465,6 @@ type DBArenaUser struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields -<<<<<<< HEAD Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //玩家名称 Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 @@ -489,31 +488,6 @@ type DBArenaUser struct { Loc []float64 `protobuf:"fixed64,21,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 Isdef bool `protobuf:"varint,22,opt,name=isdef,proto3" json:"isdef"` //是否设置防守 Npc map[int32]*DBNpc `protobuf:"bytes,23,rep,name=npc,proto3" json:"npc" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // npc Cd -======= - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //玩家名称 - Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 - Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 - Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分 - Ticket int32 `protobuf:"varint,6,opt,name=ticket,proto3" json:"ticket"` //挑战券 - Dan int32 `protobuf:"varint,7,opt,name=dan,proto3" json:"dan"` //段位 - Attack *DBPlayerBattleFormt `protobuf:"bytes,8,opt,name=attack,proto3" json:"attack"` //进攻阵型 - Defend *DBPlayerBattleFormt `protobuf:"bytes,9,opt,name=defend,proto3" json:"defend"` //防守阵型 - Streak int32 `protobuf:"varint,10,opt,name=streak,proto3" json:"streak"` //连胜 - Attackrate int32 `protobuf:"varint,11,opt,name=attackrate,proto3" json:"attackrate"` //进攻胜率 - Defendrate int32 `protobuf:"varint,12,opt,name=defendrate,proto3" json:"defendrate"` //防守胜率 - Rank int32 `protobuf:"varint,13,opt,name=rank,proto3" json:"rank"` //排名 - Buynum int32 `protobuf:"varint,14,opt,name=buynum,proto3" json:"buynum"` //购买次数 - Record []*DBArenaBattleRecord `protobuf:"bytes,15,rep,name=record,proto3" json:"record"` //战斗记录 - Lastrtickettime int64 `protobuf:"varint,16,opt,name=lastrtickettime,proto3" json:"lastrtickettime"` //最后领劵时间 - Attackwinuum int32 `protobuf:"varint,17,opt,name=attackwinuum,proto3" json:"attackwinuum"` //进攻胜利次数 - Attacktotaluum int32 `protobuf:"varint,18,opt,name=attacktotaluum,proto3" json:"attacktotaluum"` //进攻总次数 - Defendwinuum int32 `protobuf:"varint,19,opt,name=defendwinuum,proto3" json:"defendwinuum"` //防守胜利 - Defendtotaluum int32 `protobuf:"varint,20,opt,name=defendtotaluum,proto3" json:"defendtotaluum"` //防守总 - Loc []float64 `protobuf:"fixed64,21,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 - Isdef bool `protobuf:"varint,22,opt,name=isdef,proto3" json:"isdef"` //是否设置防守 - Npc map[int32]int64 `protobuf:"bytes,23,rep,name=npc,proto3" json:"npc" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // npc Cd ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f } func (x *DBArenaUser) Reset() { @@ -702,18 +676,13 @@ func (x *DBArenaUser) GetIsdef() bool { return false } -<<<<<<< HEAD func (x *DBArenaUser) GetNpc() map[int32]*DBNpc { -======= -func (x *DBArenaUser) GetNpc() map[int32]int64 { ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f if x != nil { return x.Npc } return nil } -<<<<<<< HEAD // npc数据 type DBNpc struct { state protoimpl.MessageState @@ -778,8 +747,6 @@ func (x *DBNpc) GetIndex() int32 { return 0 } -======= ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f var File_arena_arena_db_proto protoreflect.FileDescriptor var file_arena_arena_db_proto_rawDesc = []byte{ @@ -833,11 +800,7 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, -<<<<<<< HEAD 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x82, 0x06, 0x0a, 0x0b, 0x44, 0x42, -======= - 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0xfa, 0x05, 0x0a, 0x0b, 0x44, 0x42, ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, @@ -881,7 +844,6 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x14, 0x0a, 0x05, 0x69, 0x73, 0x64, 0x65, 0x66, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x64, 0x65, 0x66, 0x12, 0x27, 0x0a, 0x03, 0x6e, 0x70, 0x63, 0x18, 0x17, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, -<<<<<<< HEAD 0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, 0x3e, 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, @@ -902,24 +864,6 @@ var file_arena_arena_db_proto_rawDesc = []byte{ 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -======= - 0x2e, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6e, 0x70, 0x63, 0x1a, 0x36, - 0x0a, 0x08, 0x4e, 0x70, 0x63, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x9f, 0x01, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x41, - 0x74, 0x74, 0x61, 0x63, 0x6b, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, - 0x65, 0x66, 0x65, 0x6e, 0x64, 0x6b, 0x57, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x44, - 0x65, 0x66, 0x65, 0x6e, 0x64, 0x4c, 0x6f, 0x73, 0x74, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x57, - 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x10, 0x04, 0x12, - 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, - 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x52, 0x65, 0x76, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x63, - 0x63, 0x65, 0x65, 0x64, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x76, 0x65, - 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f } var ( @@ -935,11 +879,7 @@ func file_arena_arena_db_proto_rawDescGZIP() []byte { } var file_arena_arena_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -<<<<<<< HEAD var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -======= -var file_arena_arena_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6) ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f var file_arena_arena_db_proto_goTypes = []interface{}{ (BattleRecordState)(0), // 0: BattleRecordState (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt @@ -947,27 +887,18 @@ var file_arena_arena_db_proto_goTypes = []interface{}{ (*DBHeroBase)(nil), // 3: DBHeroBase (*DBArenaBattleRecord)(nil), // 4: DBArenaBattleRecord (*DBArenaUser)(nil), // 5: DBArenaUser -<<<<<<< HEAD (*DBNpc)(nil), // 6: DBNpc nil, // 7: DBArenaUser.NpcEntry (*DBHero)(nil), // 8: DBHero } var file_arena_arena_db_proto_depIdxs = []int32{ 8, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero -======= - nil, // 6: DBArenaUser.NpcEntry - (*DBHero)(nil), // 7: DBHero -} -var file_arena_arena_db_proto_depIdxs = []int32{ - 7, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f 1, // 1: ArenaPlayer.defend:type_name -> DBPlayerBattleFormt 3, // 2: DBArenaBattleRecord.formt:type_name -> DBHeroBase 0, // 3: DBArenaBattleRecord.State:type_name -> BattleRecordState 1, // 4: DBArenaUser.attack:type_name -> DBPlayerBattleFormt 1, // 5: DBArenaUser.defend:type_name -> DBPlayerBattleFormt 4, // 6: DBArenaUser.record:type_name -> DBArenaBattleRecord -<<<<<<< HEAD 7, // 7: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry 6, // 8: DBArenaUser.NpcEntry.value:type_name -> DBNpc 9, // [9:9] is the sub-list for method output_type @@ -975,14 +906,6 @@ var file_arena_arena_db_proto_depIdxs = []int32{ 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 -======= - 6, // 7: DBArenaUser.npc:type_name -> DBArenaUser.NpcEntry - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f } func init() { file_arena_arena_db_proto_init() } @@ -1071,11 +994,7 @@ func file_arena_arena_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_arena_arena_db_proto_rawDesc, NumEnums: 1, -<<<<<<< HEAD NumMessages: 7, -======= - NumMessages: 6, ->>>>>>> f0f849c1f3a6380ace601d5616a83a616ad30b7f NumExtensions: 0, NumServices: 0, },