From e084a71cc24c1bb11a03f8803eaf490b1c635721 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 1 Feb 2024 17:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=89=AB=E8=8D=A1=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hunting/api_sweep.go | 6 +- modules/viking/api_sweep.go | 6 +- pb/comm.pb.go | 165 ++++++++++++++++--- pb/hunting_msg.pb.go | 201 +++++------------------ pb/viking_msg.pb.go | 307 +++++++++++------------------------ 5 files changed, 281 insertions(+), 404 deletions(-) diff --git a/modules/hunting/api_sweep.go b/modules/hunting/api_sweep.go index d122ad050..7b6ec191e 100644 --- a/modules/hunting/api_sweep.go +++ b/modules/hunting/api_sweep.go @@ -40,7 +40,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.HuntingSweepReq) ( allconsume []*cfg.Gameatn err error - result []*pb.HuntingSweepResult + result []*pb.SweepResult ps int32 totalps int32 // 随机任务统计 @@ -151,7 +151,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.HuntingSweepReq) ( if errdata, rewardatno = this.module.DispenseAtno(session, reward, true); errdata != nil { return } - result = append(result, &pb.HuntingSweepResult{ + result = append(result, &pb.SweepResult{ Battleid: v.Info.Id, Iswin: false, Consume: consumeatns, @@ -221,7 +221,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.HuntingSweepReq) ( N: v.N, }) } - result = append(result, &pb.HuntingSweepResult{ + result = append(result, &pb.SweepResult{ Battleid: v.Info.Id, Iswin: true, Rounds: v.Round, diff --git a/modules/viking/api_sweep.go b/modules/viking/api_sweep.go index 2e7a868b3..05dcaa1f2 100644 --- a/modules/viking/api_sweep.go +++ b/modules/viking/api_sweep.go @@ -40,7 +40,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e allconsume []*cfg.Gameatn err error - result []*pb.VikingSweepResult + result []*pb.SweepResult ps int32 totalps int32 // 随机任务统计 @@ -151,7 +151,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e if errdata, rewardatno = this.module.DispenseAtno(session, reward, true); errdata != nil { return } - result = append(result, &pb.VikingSweepResult{ + result = append(result, &pb.SweepResult{ Battleid: v.Info.Id, Iswin: false, Consume: consumeatns, @@ -214,7 +214,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e N: v.N, }) } - result = append(result, &pb.VikingSweepResult{ + result = append(result, &pb.SweepResult{ Battleid: v.Info.Id, Iswin: true, Rounds: v.Round, diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 885c7db1f..8d5edd990 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -2419,6 +2419,94 @@ func (x *DBVector3) GetZ() float32 { return 0 } +//扫荡结果 +type SweepResult struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"` //战斗id + Iswin bool `protobuf:"varint,2,opt,name=iswin,proto3" json:"iswin"` //是否胜利 + Rounds int32 `protobuf:"varint,4,opt,name=rounds,proto3" json:"rounds"` //回合数 + Consume []*UserAssets `protobuf:"bytes,5,rep,name=consume,proto3" json:"consume"` //消耗材料 + Award []*UserAtno `protobuf:"bytes,6,rep,name=award,proto3" json:"award"` //奖励字段 + Heroexp map[string]int32 `protobuf:"bytes,7,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验 +} + +func (x *SweepResult) Reset() { + *x = SweepResult{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SweepResult) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SweepResult) ProtoMessage() {} + +func (x *SweepResult) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[35] + 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 SweepResult.ProtoReflect.Descriptor instead. +func (*SweepResult) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{35} +} + +func (x *SweepResult) GetBattleid() string { + if x != nil { + return x.Battleid + } + return "" +} + +func (x *SweepResult) GetIswin() bool { + if x != nil { + return x.Iswin + } + return false +} + +func (x *SweepResult) GetRounds() int32 { + if x != nil { + return x.Rounds + } + return 0 +} + +func (x *SweepResult) GetConsume() []*UserAssets { + if x != nil { + return x.Consume + } + return nil +} + +func (x *SweepResult) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + +func (x *SweepResult) GetHeroexp() map[string]int32 { + if x != nil { + return x.Heroexp + } + return nil +} + var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ @@ -2664,12 +2752,30 @@ var file_comm_proto_rawDesc = []byte{ 0x62, 0x61, 0x73, 0x65, 0x22, 0x35, 0x0a, 0x09, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x79, 0x12, 0x0c, 0x0a, - 0x01, 0x7a, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x7a, 0x2a, 0x43, 0x0a, 0x12, 0x48, - 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, - 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, - 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x7a, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x01, 0x7a, 0x22, 0x90, 0x02, 0x0a, 0x0b, + 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x16, 0x0a, + 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x12, 0x25, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, + 0x65, 0x74, 0x73, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a, + 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, + 0x2e, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x48, 0x65, 0x72, + 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, + 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x43, + 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, + 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, + 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, + 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2685,7 +2791,7 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 35) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 37) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*ErrorData)(nil), // 1: ErrorData @@ -2723,26 +2829,31 @@ var file_comm_proto_goTypes = []interface{}{ (*RPCRTaskReq)(nil), // 33: RPCRTaskReq (*ServiceDBInfo)(nil), // 34: ServiceDBInfo (*DBVector3)(nil), // 35: DBVector3 - (ErrorCode)(0), // 36: ErrorCode - (*anypb.Any)(nil), // 37: google.protobuf.Any + (*SweepResult)(nil), // 36: SweepResult + nil, // 37: SweepResult.HeroexpEntry + (ErrorCode)(0), // 38: ErrorCode + (*anypb.Any)(nil), // 39: google.protobuf.Any } var file_comm_proto_depIdxs = []int32{ - 36, // 0: ErrorData.code:type_name -> ErrorCode + 38, // 0: ErrorData.code:type_name -> ErrorCode 18, // 1: ErrorData.atn:type_name -> UserAssets 3, // 2: MessagePackage.messages:type_name -> UserMessage - 37, // 3: UserMessage.data:type_name -> google.protobuf.Any - 37, // 4: AgentMessage.Message:type_name -> google.protobuf.Any + 39, // 3: UserMessage.data:type_name -> google.protobuf.Any + 39, // 4: AgentMessage.Message:type_name -> google.protobuf.Any 1, // 5: RPCMessageReply.ErrorData:type_name -> ErrorData 3, // 6: RPCMessageReply.Reply:type_name -> UserMessage 3, // 7: AgentSendMessageReq.Reply:type_name -> UserMessage - 37, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any - 37, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any - 37, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any - 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 + 39, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any + 39, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any + 39, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 18, // 11: SweepResult.consume:type_name -> UserAssets + 19, // 12: SweepResult.award:type_name -> UserAtno + 37, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_comm_proto_init() } @@ -3172,6 +3283,18 @@ func file_comm_proto_init() { return nil } } + file_comm_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SweepResult); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3179,7 +3302,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 35, + NumMessages: 37, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/hunting_msg.pb.go b/pb/hunting_msg.pb.go index 9d01722d3..0c41f2273 100644 --- a/pb/hunting_msg.pb.go +++ b/pb/hunting_msg.pb.go @@ -677,107 +677,19 @@ func (x *HuntingSweepReq) GetSweepgroup() int32 { return 0 } -//扫荡结果 -type HuntingSweepResult struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"` //战斗id - Iswin bool `protobuf:"varint,2,opt,name=iswin,proto3" json:"iswin"` //是否胜利 - Rounds int32 `protobuf:"varint,4,opt,name=rounds,proto3" json:"rounds"` //回合数 - Consume []*UserAssets `protobuf:"bytes,5,rep,name=consume,proto3" json:"consume"` //消耗材料 - Award []*UserAtno `protobuf:"bytes,6,rep,name=award,proto3" json:"award"` //奖励字段 - Heroexp map[string]int32 `protobuf:"bytes,7,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验 -} - -func (x *HuntingSweepResult) Reset() { - *x = HuntingSweepResult{} - if protoimpl.UnsafeEnabled { - mi := &file_hunting_hunting_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HuntingSweepResult) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HuntingSweepResult) ProtoMessage() {} - -func (x *HuntingSweepResult) ProtoReflect() protoreflect.Message { - mi := &file_hunting_hunting_msg_proto_msgTypes[11] - 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 HuntingSweepResult.ProtoReflect.Descriptor instead. -func (*HuntingSweepResult) Descriptor() ([]byte, []int) { - return file_hunting_hunting_msg_proto_rawDescGZIP(), []int{11} -} - -func (x *HuntingSweepResult) GetBattleid() string { - if x != nil { - return x.Battleid - } - return "" -} - -func (x *HuntingSweepResult) GetIswin() bool { - if x != nil { - return x.Iswin - } - return false -} - -func (x *HuntingSweepResult) GetRounds() int32 { - if x != nil { - return x.Rounds - } - return 0 -} - -func (x *HuntingSweepResult) GetConsume() []*UserAssets { - if x != nil { - return x.Consume - } - return nil -} - -func (x *HuntingSweepResult) GetAward() []*UserAtno { - if x != nil { - return x.Award - } - return nil -} - -func (x *HuntingSweepResult) GetHeroexp() map[string]int32 { - if x != nil { - return x.Heroexp - } - return nil -} - // 扫荡 回应 type HuntingSweepResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Result []*HuntingSweepResult `protobuf:"bytes,1,rep,name=result,proto3" json:"result"` + Result []*SweepResult `protobuf:"bytes,1,rep,name=result,proto3" json:"result"` } func (x *HuntingSweepResp) Reset() { *x = HuntingSweepResp{} if protoimpl.UnsafeEnabled { - mi := &file_hunting_hunting_msg_proto_msgTypes[12] + mi := &file_hunting_hunting_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -790,7 +702,7 @@ func (x *HuntingSweepResp) String() string { func (*HuntingSweepResp) ProtoMessage() {} func (x *HuntingSweepResp) ProtoReflect() protoreflect.Message { - mi := &file_hunting_hunting_msg_proto_msgTypes[12] + mi := &file_hunting_hunting_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -803,10 +715,10 @@ func (x *HuntingSweepResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HuntingSweepResp.ProtoReflect.Descriptor instead. func (*HuntingSweepResp) Descriptor() ([]byte, []int) { - return file_hunting_hunting_msg_proto_rawDescGZIP(), []int{12} + return file_hunting_hunting_msg_proto_rawDescGZIP(), []int{11} } -func (x *HuntingSweepResp) GetResult() []*HuntingSweepResult { +func (x *HuntingSweepResp) GetResult() []*SweepResult { if x != nil { return x.Result } @@ -896,30 +808,12 @@ var file_hunting_hunting_msg_proto_rawDesc = []byte{ 0x73, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x6e, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x77, 0x65, 0x65, 0x70, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, - 0x77, 0x65, 0x65, 0x70, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x9e, 0x02, 0x0a, 0x12, 0x48, 0x75, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, - 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x12, 0x25, 0x0a, 0x07, 0x63, 0x6f, - 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, - 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, - 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x07, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, - 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, - 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f, 0x0a, 0x10, 0x48, 0x75, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, - 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x77, 0x65, 0x65, 0x70, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x38, 0x0a, 0x10, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, + 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -934,7 +828,7 @@ func file_hunting_hunting_msg_proto_rawDescGZIP() []byte { return file_hunting_hunting_msg_proto_rawDescData } -var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_hunting_hunting_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_hunting_hunting_msg_proto_goTypes = []interface{}{ (*HuntingGetListReq)(nil), // 0: HuntingGetListReq (*HuntingGetListResp)(nil), // 1: HuntingGetListResp @@ -947,39 +841,34 @@ var file_hunting_hunting_msg_proto_goTypes = []interface{}{ (*HuntingRankListReq)(nil), // 8: HuntingRankListReq (*HuntingRankListResp)(nil), // 9: HuntingRankListResp (*HuntingSweepReq)(nil), // 10: HuntingSweepReq - (*HuntingSweepResult)(nil), // 11: HuntingSweepResult - (*HuntingSweepResp)(nil), // 12: HuntingSweepResp - nil, // 13: HuntingChallengeOverResp.HeroexpEntry - nil, // 14: HuntingSweepResult.HeroexpEntry - (*DBHunting)(nil), // 15: DBHunting - (*BattleFormation)(nil), // 16: BattleFormation - (*BattleInfo)(nil), // 17: BattleInfo - (*BattleReport)(nil), // 18: BattleReport - (*UserAtno)(nil), // 19: UserAtno - (*DBHuntingRank)(nil), // 20: DBHuntingRank - (*UserAssets)(nil), // 21: UserAssets + (*HuntingSweepResp)(nil), // 11: HuntingSweepResp + nil, // 12: HuntingChallengeOverResp.HeroexpEntry + (*DBHunting)(nil), // 13: DBHunting + (*BattleFormation)(nil), // 14: BattleFormation + (*BattleInfo)(nil), // 15: BattleInfo + (*BattleReport)(nil), // 16: BattleReport + (*UserAtno)(nil), // 17: UserAtno + (*DBHuntingRank)(nil), // 18: DBHuntingRank + (*SweepResult)(nil), // 19: SweepResult } var file_hunting_hunting_msg_proto_depIdxs = []int32{ - 15, // 0: HuntingGetListResp.data:type_name -> DBHunting - 16, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation - 17, // 2: HuntingChallengeResp.info:type_name -> BattleInfo - 18, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport - 15, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting - 19, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno - 13, // 6: HuntingChallengeOverResp.heroexp:type_name -> HuntingChallengeOverResp.HeroexpEntry - 15, // 7: HuntingBuyResp.data:type_name -> DBHunting - 20, // 8: HuntingRankListResp.ranks:type_name -> DBHuntingRank - 20, // 9: HuntingRankListResp.franks:type_name -> DBHuntingRank - 16, // 10: HuntingSweepReq.battle:type_name -> BattleFormation - 21, // 11: HuntingSweepResult.consume:type_name -> UserAssets - 19, // 12: HuntingSweepResult.award:type_name -> UserAtno - 14, // 13: HuntingSweepResult.heroexp:type_name -> HuntingSweepResult.HeroexpEntry - 11, // 14: HuntingSweepResp.result:type_name -> HuntingSweepResult - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 13, // 0: HuntingGetListResp.data:type_name -> DBHunting + 14, // 1: HuntingChallengeReq.battle:type_name -> BattleFormation + 15, // 2: HuntingChallengeResp.info:type_name -> BattleInfo + 16, // 3: HuntingChallengeOverReq.report:type_name -> BattleReport + 13, // 4: HuntingChallengeOverResp.data:type_name -> DBHunting + 17, // 5: HuntingChallengeOverResp.asset:type_name -> UserAtno + 12, // 6: HuntingChallengeOverResp.heroexp:type_name -> HuntingChallengeOverResp.HeroexpEntry + 13, // 7: HuntingBuyResp.data:type_name -> DBHunting + 18, // 8: HuntingRankListResp.ranks:type_name -> DBHuntingRank + 18, // 9: HuntingRankListResp.franks:type_name -> DBHuntingRank + 14, // 10: HuntingSweepReq.battle:type_name -> BattleFormation + 19, // 11: HuntingSweepResp.result:type_name -> SweepResult + 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_hunting_hunting_msg_proto_init() } @@ -1124,18 +1013,6 @@ func file_hunting_hunting_msg_proto_init() { } } file_hunting_hunting_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HuntingSweepResult); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hunting_hunting_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HuntingSweepResp); i { case 0: return &v.state @@ -1154,7 +1031,7 @@ func file_hunting_hunting_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hunting_hunting_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 13, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go index 84e657c09..068305e60 100644 --- a/pb/viking_msg.pb.go +++ b/pb/viking_msg.pb.go @@ -479,107 +479,19 @@ func (x *VikingSweepReq) GetSweepgroup() int32 { return 0 } -//扫荡结果 -type VikingSweepResult struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Battleid string `protobuf:"bytes,1,opt,name=battleid,proto3" json:"battleid"` //战斗id - Iswin bool `protobuf:"varint,2,opt,name=iswin,proto3" json:"iswin"` //是否胜利 - Rounds int32 `protobuf:"varint,4,opt,name=rounds,proto3" json:"rounds"` //回合数 - Consume []*UserAssets `protobuf:"bytes,5,rep,name=consume,proto3" json:"consume"` //消耗材料 - Award []*UserAtno `protobuf:"bytes,6,rep,name=award,proto3" json:"award"` //奖励字段 - Heroexp map[string]int32 `protobuf:"bytes,7,rep,name=heroexp,proto3" json:"heroexp" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 英雄获得经验 -} - -func (x *VikingSweepResult) Reset() { - *x = VikingSweepResult{} - if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *VikingSweepResult) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*VikingSweepResult) ProtoMessage() {} - -func (x *VikingSweepResult) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[7] - 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 VikingSweepResult.ProtoReflect.Descriptor instead. -func (*VikingSweepResult) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{7} -} - -func (x *VikingSweepResult) GetBattleid() string { - if x != nil { - return x.Battleid - } - return "" -} - -func (x *VikingSweepResult) GetIswin() bool { - if x != nil { - return x.Iswin - } - return false -} - -func (x *VikingSweepResult) GetRounds() int32 { - if x != nil { - return x.Rounds - } - return 0 -} - -func (x *VikingSweepResult) GetConsume() []*UserAssets { - if x != nil { - return x.Consume - } - return nil -} - -func (x *VikingSweepResult) GetAward() []*UserAtno { - if x != nil { - return x.Award - } - return nil -} - -func (x *VikingSweepResult) GetHeroexp() map[string]int32 { - if x != nil { - return x.Heroexp - } - return nil -} - // 扫荡 回应 type VikingSweepResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Result []*VikingSweepResult `protobuf:"bytes,1,rep,name=result,proto3" json:"result"` + Result []*SweepResult `protobuf:"bytes,1,rep,name=result,proto3" json:"result"` } func (x *VikingSweepResp) Reset() { *x = VikingSweepResp{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[8] + mi := &file_viking_viking_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -592,7 +504,7 @@ func (x *VikingSweepResp) String() string { func (*VikingSweepResp) ProtoMessage() {} func (x *VikingSweepResp) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[8] + mi := &file_viking_viking_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -605,10 +517,10 @@ func (x *VikingSweepResp) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingSweepResp.ProtoReflect.Descriptor instead. func (*VikingSweepResp) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{8} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{7} } -func (x *VikingSweepResp) GetResult() []*VikingSweepResult { +func (x *VikingSweepResp) GetResult() []*SweepResult { if x != nil { return x.Result } @@ -627,7 +539,7 @@ type VikingBuyReq struct { func (x *VikingBuyReq) Reset() { *x = VikingBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[9] + mi := &file_viking_viking_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -640,7 +552,7 @@ func (x *VikingBuyReq) String() string { func (*VikingBuyReq) ProtoMessage() {} func (x *VikingBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[9] + mi := &file_viking_viking_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -653,7 +565,7 @@ func (x *VikingBuyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingBuyReq.ProtoReflect.Descriptor instead. func (*VikingBuyReq) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{9} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{8} } func (x *VikingBuyReq) GetCount() int32 { @@ -674,7 +586,7 @@ type VikingBuyResp struct { func (x *VikingBuyResp) Reset() { *x = VikingBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[10] + mi := &file_viking_viking_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -687,7 +599,7 @@ func (x *VikingBuyResp) String() string { func (*VikingBuyResp) ProtoMessage() {} func (x *VikingBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[10] + mi := &file_viking_viking_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -700,7 +612,7 @@ func (x *VikingBuyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingBuyResp.ProtoReflect.Descriptor instead. func (*VikingBuyResp) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{10} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{9} } func (x *VikingBuyResp) GetData() *DBViking { @@ -722,7 +634,7 @@ type VikingRankListReq struct { func (x *VikingRankListReq) Reset() { *x = VikingRankListReq{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[11] + mi := &file_viking_viking_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -735,7 +647,7 @@ func (x *VikingRankListReq) String() string { func (*VikingRankListReq) ProtoMessage() {} func (x *VikingRankListReq) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[11] + mi := &file_viking_viking_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -748,7 +660,7 @@ func (x *VikingRankListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingRankListReq.ProtoReflect.Descriptor instead. func (*VikingRankListReq) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{11} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{10} } func (x *VikingRankListReq) GetBoosType() int32 { @@ -770,7 +682,7 @@ type VikingRankListResp struct { func (x *VikingRankListResp) Reset() { *x = VikingRankListResp{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[12] + mi := &file_viking_viking_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -783,7 +695,7 @@ func (x *VikingRankListResp) String() string { func (*VikingRankListResp) ProtoMessage() {} func (x *VikingRankListResp) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[12] + mi := &file_viking_viking_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -796,7 +708,7 @@ func (x *VikingRankListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingRankListResp.ProtoReflect.Descriptor instead. func (*VikingRankListResp) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{12} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{11} } func (x *VikingRankListResp) GetRanks() []*DBVikingRank { @@ -825,7 +737,7 @@ type VikingSeasonRankReq struct { func (x *VikingSeasonRankReq) Reset() { *x = VikingSeasonRankReq{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[13] + mi := &file_viking_viking_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -838,7 +750,7 @@ func (x *VikingSeasonRankReq) String() string { func (*VikingSeasonRankReq) ProtoMessage() {} func (x *VikingSeasonRankReq) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[13] + mi := &file_viking_viking_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -851,7 +763,7 @@ func (x *VikingSeasonRankReq) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingSeasonRankReq.ProtoReflect.Descriptor instead. func (*VikingSeasonRankReq) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{13} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{12} } func (x *VikingSeasonRankReq) GetBoosType() int32 { @@ -873,7 +785,7 @@ type VikingSeasonRankResp struct { func (x *VikingSeasonRankResp) Reset() { *x = VikingSeasonRankResp{} if protoimpl.UnsafeEnabled { - mi := &file_viking_viking_msg_proto_msgTypes[14] + mi := &file_viking_viking_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -886,7 +798,7 @@ func (x *VikingSeasonRankResp) String() string { func (*VikingSeasonRankResp) ProtoMessage() {} func (x *VikingSeasonRankResp) ProtoReflect() protoreflect.Message { - mi := &file_viking_viking_msg_proto_msgTypes[14] + mi := &file_viking_viking_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -899,7 +811,7 @@ func (x *VikingSeasonRankResp) ProtoReflect() protoreflect.Message { // Deprecated: Use VikingSeasonRankResp.ProtoReflect.Descriptor instead. func (*VikingSeasonRankResp) Descriptor() ([]byte, []int) { - return file_viking_viking_msg_proto_rawDescGZIP(), []int{14} + return file_viking_viking_msg_proto_rawDescGZIP(), []int{13} } func (x *VikingSeasonRankResp) GetRanks() []*DBVikingSRank { @@ -983,52 +895,34 @@ var file_viking_viking_msg_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x6e, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x77, 0x65, 0x65, 0x70, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x77, 0x65, 0x65, 0x70, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, - 0x9c, 0x02, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, - 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x12, - 0x25, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x07, 0x63, - 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, - 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, - 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x39, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, - 0x78, 0x70, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x56, 0x69, 0x6b, 0x69, 0x6e, - 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x48, 0x65, 0x72, - 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, - 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3d, - 0x0a, 0x0f, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x2a, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x12, 0x2e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x0a, - 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, - 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, + 0x37, 0x0a, 0x0f, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x77, 0x65, 0x65, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, + 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, + 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, + 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x22, + 0x60, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, + 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x72, + 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, + 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x06, 0x66, 0x72, 0x61, 0x6e, 0x6b, + 0x73, 0x22, 0x31, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x61, 0x73, 0x6f, + 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, - 0x54, 0x79, 0x70, 0x65, 0x22, 0x60, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, - 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, - 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, - 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, - 0x25, 0x0a, 0x06, 0x66, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x06, - 0x66, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, - 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, - 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x56, 0x69, 0x6b, - 0x69, 0x6e, 0x67, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x24, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x52, 0x61, 0x6e, 0x6b, - 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x54, 0x79, 0x70, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x65, + 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x05, + 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, + 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, + 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1043,7 +937,7 @@ func file_viking_viking_msg_proto_rawDescGZIP() []byte { return file_viking_viking_msg_proto_rawDescData } -var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_viking_viking_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_viking_viking_msg_proto_goTypes = []interface{}{ (*VikingGetListReq)(nil), // 0: VikingGetListReq (*VikingGetListResp)(nil), // 1: VikingGetListResp @@ -1052,47 +946,42 @@ var file_viking_viking_msg_proto_goTypes = []interface{}{ (*VikingChallengeOverReq)(nil), // 4: VikingChallengeOverReq (*VikingChallengeOverResp)(nil), // 5: VikingChallengeOverResp (*VikingSweepReq)(nil), // 6: VikingSweepReq - (*VikingSweepResult)(nil), // 7: VikingSweepResult - (*VikingSweepResp)(nil), // 8: VikingSweepResp - (*VikingBuyReq)(nil), // 9: VikingBuyReq - (*VikingBuyResp)(nil), // 10: VikingBuyResp - (*VikingRankListReq)(nil), // 11: VikingRankListReq - (*VikingRankListResp)(nil), // 12: VikingRankListResp - (*VikingSeasonRankReq)(nil), // 13: VikingSeasonRankReq - (*VikingSeasonRankResp)(nil), // 14: VikingSeasonRankResp - nil, // 15: VikingChallengeOverResp.HeroexpEntry - nil, // 16: VikingSweepResult.HeroexpEntry - (*DBViking)(nil), // 17: DBViking - (*BattleFormation)(nil), // 18: BattleFormation - (*BattleInfo)(nil), // 19: BattleInfo - (*BattleReport)(nil), // 20: BattleReport - (*UserAtno)(nil), // 21: UserAtno - (*UserAssets)(nil), // 22: UserAssets - (*DBVikingRank)(nil), // 23: DBVikingRank - (*DBVikingSRank)(nil), // 24: DBVikingSRank + (*VikingSweepResp)(nil), // 7: VikingSweepResp + (*VikingBuyReq)(nil), // 8: VikingBuyReq + (*VikingBuyResp)(nil), // 9: VikingBuyResp + (*VikingRankListReq)(nil), // 10: VikingRankListReq + (*VikingRankListResp)(nil), // 11: VikingRankListResp + (*VikingSeasonRankReq)(nil), // 12: VikingSeasonRankReq + (*VikingSeasonRankResp)(nil), // 13: VikingSeasonRankResp + nil, // 14: VikingChallengeOverResp.HeroexpEntry + (*DBViking)(nil), // 15: DBViking + (*BattleFormation)(nil), // 16: BattleFormation + (*BattleInfo)(nil), // 17: BattleInfo + (*BattleReport)(nil), // 18: BattleReport + (*UserAtno)(nil), // 19: UserAtno + (*SweepResult)(nil), // 20: SweepResult + (*DBVikingRank)(nil), // 21: DBVikingRank + (*DBVikingSRank)(nil), // 22: DBVikingSRank } var file_viking_viking_msg_proto_depIdxs = []int32{ - 17, // 0: VikingGetListResp.data:type_name -> DBViking - 18, // 1: VikingChallengeReq.battle:type_name -> BattleFormation - 19, // 2: VikingChallengeResp.info:type_name -> BattleInfo - 20, // 3: VikingChallengeOverReq.report:type_name -> BattleReport - 17, // 4: VikingChallengeOverResp.data:type_name -> DBViking - 21, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno - 15, // 6: VikingChallengeOverResp.heroexp:type_name -> VikingChallengeOverResp.HeroexpEntry - 18, // 7: VikingSweepReq.battle:type_name -> BattleFormation - 22, // 8: VikingSweepResult.consume:type_name -> UserAssets - 21, // 9: VikingSweepResult.award:type_name -> UserAtno - 16, // 10: VikingSweepResult.heroexp:type_name -> VikingSweepResult.HeroexpEntry - 7, // 11: VikingSweepResp.result:type_name -> VikingSweepResult - 17, // 12: VikingBuyResp.data:type_name -> DBViking - 23, // 13: VikingRankListResp.ranks:type_name -> DBVikingRank - 23, // 14: VikingRankListResp.franks:type_name -> DBVikingRank - 24, // 15: VikingSeasonRankResp.ranks:type_name -> DBVikingSRank - 16, // [16:16] is the sub-list for method output_type - 16, // [16:16] is the sub-list for method input_type - 16, // [16:16] is the sub-list for extension type_name - 16, // [16:16] is the sub-list for extension extendee - 0, // [0:16] is the sub-list for field type_name + 15, // 0: VikingGetListResp.data:type_name -> DBViking + 16, // 1: VikingChallengeReq.battle:type_name -> BattleFormation + 17, // 2: VikingChallengeResp.info:type_name -> BattleInfo + 18, // 3: VikingChallengeOverReq.report:type_name -> BattleReport + 15, // 4: VikingChallengeOverResp.data:type_name -> DBViking + 19, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno + 14, // 6: VikingChallengeOverResp.heroexp:type_name -> VikingChallengeOverResp.HeroexpEntry + 16, // 7: VikingSweepReq.battle:type_name -> BattleFormation + 20, // 8: VikingSweepResp.result:type_name -> SweepResult + 15, // 9: VikingBuyResp.data:type_name -> DBViking + 21, // 10: VikingRankListResp.ranks:type_name -> DBVikingRank + 21, // 11: VikingRankListResp.franks:type_name -> DBVikingRank + 22, // 12: VikingSeasonRankResp.ranks:type_name -> DBVikingSRank + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_viking_viking_msg_proto_init() } @@ -1189,18 +1078,6 @@ func file_viking_viking_msg_proto_init() { } } file_viking_viking_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VikingSweepResult); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_viking_viking_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingSweepResp); i { case 0: return &v.state @@ -1212,7 +1089,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingBuyReq); i { case 0: return &v.state @@ -1224,7 +1101,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingBuyResp); i { case 0: return &v.state @@ -1236,7 +1113,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingRankListReq); i { case 0: return &v.state @@ -1248,7 +1125,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingRankListResp); i { case 0: return &v.state @@ -1260,7 +1137,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingSeasonRankReq); i { case 0: return &v.state @@ -1272,7 +1149,7 @@ func file_viking_viking_msg_proto_init() { return nil } } - file_viking_viking_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_viking_viking_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VikingSeasonRankResp); i { case 0: return &v.state @@ -1291,7 +1168,7 @@ func file_viking_viking_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_viking_viking_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 17, + NumMessages: 15, NumExtensions: 0, NumServices: 0, },