From 2f21e01d5d09dfb2d3b0800e4cbb91d380a2b162 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 14 Nov 2022 11:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BC=96=E8=AF=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/combat_db.pb.go | 171 +++++ pb/combat_msg.pb.go | 643 ++++++++++++++++++ pb/worldtask_msg.pb.go | 125 +++- sys/configure/structs/Game.CombatLevel.go | 42 ++ sys/configure/structs/Game.CombatLevelData.go | 110 +++ sys/configure/structs/Game.CombatManster.go | 42 ++ .../structs/Game.CombatMansterData.go | 65 ++ 7 files changed, 1170 insertions(+), 28 deletions(-) create mode 100644 pb/combat_db.pb.go create mode 100644 pb/combat_msg.pb.go create mode 100644 sys/configure/structs/Game.CombatLevel.go create mode 100644 sys/configure/structs/Game.CombatLevelData.go create mode 100644 sys/configure/structs/Game.CombatManster.go create mode 100644 sys/configure/structs/Game.CombatMansterData.go diff --git a/pb/combat_db.pb.go b/pb/combat_db.pb.go new file mode 100644 index 000000000..490b48cea --- /dev/null +++ b/pb/combat_db.pb.go @@ -0,0 +1,171 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: combat/combat_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DBCombatUser struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //uid + Currlevel int32 `protobuf:"varint,2,opt,name=currlevel,proto3" json:"currlevel"` //当前所在关卡 + Passmanster []int32 `protobuf:"varint,3,rep,packed,name=passmanster,proto3" json:"passmanster"` //通关怪物列表 + Passdrop []int32 `protobuf:"varint,4,rep,packed,name=passdrop,proto3" json:"passdrop"` //通关宝箱列表 +} + +func (x *DBCombatUser) Reset() { + *x = DBCombatUser{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBCombatUser) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBCombatUser) ProtoMessage() {} + +func (x *DBCombatUser) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_db_proto_msgTypes[0] + 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 DBCombatUser.ProtoReflect.Descriptor instead. +func (*DBCombatUser) Descriptor() ([]byte, []int) { + return file_combat_combat_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBCombatUser) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBCombatUser) GetCurrlevel() int32 { + if x != nil { + return x.Currlevel + } + return 0 +} + +func (x *DBCombatUser) GetPassmanster() []int32 { + if x != nil { + return x.Passmanster + } + return nil +} + +func (x *DBCombatUser) GetPassdrop() []int32 { + if x != nil { + return x.Passdrop + } + return nil +} + +var File_combat_combat_db_proto protoreflect.FileDescriptor + +var file_combat_combat_db_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x5f, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7c, 0x0a, 0x0c, 0x44, 0x42, 0x43, 0x6f, + 0x6d, 0x62, 0x61, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, + 0x72, 0x72, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, + 0x75, 0x72, 0x72, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, + 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, + 0x61, 0x73, 0x73, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, + 0x73, 0x73, 0x64, 0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, + 0x73, 0x73, 0x64, 0x72, 0x6f, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_combat_combat_db_proto_rawDescOnce sync.Once + file_combat_combat_db_proto_rawDescData = file_combat_combat_db_proto_rawDesc +) + +func file_combat_combat_db_proto_rawDescGZIP() []byte { + file_combat_combat_db_proto_rawDescOnce.Do(func() { + file_combat_combat_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_combat_combat_db_proto_rawDescData) + }) + return file_combat_combat_db_proto_rawDescData +} + +var file_combat_combat_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_combat_combat_db_proto_goTypes = []interface{}{ + (*DBCombatUser)(nil), // 0: DBCombatUser +} +var file_combat_combat_db_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_combat_combat_db_proto_init() } +func file_combat_combat_db_proto_init() { + if File_combat_combat_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_combat_combat_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBCombatUser); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_combat_combat_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_combat_combat_db_proto_goTypes, + DependencyIndexes: file_combat_combat_db_proto_depIdxs, + MessageInfos: file_combat_combat_db_proto_msgTypes, + }.Build() + File_combat_combat_db_proto = out.File + file_combat_combat_db_proto_rawDesc = nil + file_combat_combat_db_proto_goTypes = nil + file_combat_combat_db_proto_depIdxs = nil +} diff --git a/pb/combat_msg.pb.go b/pb/combat_msg.pb.go new file mode 100644 index 000000000..89a8ec2db --- /dev/null +++ b/pb/combat_msg.pb.go @@ -0,0 +1,643 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: combat/combat_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//关卡进入请求 +type CombatInReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id +} + +func (x *CombatInReq) Reset() { + *x = CombatInReq{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatInReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatInReq) ProtoMessage() {} + +func (x *CombatInReq) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[0] + 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 CombatInReq.ProtoReflect.Descriptor instead. +func (*CombatInReq) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{0} +} + +func (x *CombatInReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//关卡进入请求 +type CombatInResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id +} + +func (x *CombatInResp) Reset() { + *x = CombatInResp{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatInResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatInResp) ProtoMessage() {} + +func (x *CombatInResp) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CombatInResp.ProtoReflect.Descriptor instead. +func (*CombatInResp) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *CombatInResp) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//关卡离开请求 +type CombatOutReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id +} + +func (x *CombatOutReq) Reset() { + *x = CombatOutReq{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatOutReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatOutReq) ProtoMessage() {} + +func (x *CombatOutReq) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_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 CombatOutReq.ProtoReflect.Descriptor instead. +func (*CombatOutReq) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *CombatOutReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//关卡离开请求 回应 +type CombatOutResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` //关卡id +} + +func (x *CombatOutResp) Reset() { + *x = CombatOutResp{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatOutResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatOutResp) ProtoMessage() {} + +func (x *CombatOutResp) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CombatOutResp.ProtoReflect.Descriptor instead. +func (*CombatOutResp) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *CombatOutResp) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//战斗请求 +type CombatChallengeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Manster int32 `protobuf:"varint,1,opt,name=manster,proto3" json:"manster"` //怪物id + Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //布阵信息 +} + +func (x *CombatChallengeReq) Reset() { + *x = CombatChallengeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatChallengeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatChallengeReq) ProtoMessage() {} + +func (x *CombatChallengeReq) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[4] + 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 CombatChallengeReq.ProtoReflect.Descriptor instead. +func (*CombatChallengeReq) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *CombatChallengeReq) GetManster() int32 { + if x != nil { + return x.Manster + } + return 0 +} + +func (x *CombatChallengeReq) GetBattle() *BattleFormation { + if x != nil { + return x.Battle + } + return nil +} + +//战斗请求 回应 +type CombatChallengeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 + Manster int32 `protobuf:"varint,2,opt,name=manster,proto3" json:"manster"` + Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` +} + +func (x *CombatChallengeResp) Reset() { + *x = CombatChallengeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatChallengeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatChallengeResp) ProtoMessage() {} + +func (x *CombatChallengeResp) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[5] + 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 CombatChallengeResp.ProtoReflect.Descriptor instead. +func (*CombatChallengeResp) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *CombatChallengeResp) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_Success +} + +func (x *CombatChallengeResp) GetManster() int32 { + if x != nil { + return x.Manster + } + return 0 +} + +func (x *CombatChallengeResp) GetInfo() *BattleInfo { + if x != nil { + return x.Info + } + return nil +} + +//宝箱获取请求 +type CombatDropReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Drop int32 `protobuf:"varint,1,opt,name=drop,proto3" json:"drop"` //宝箱id +} + +func (x *CombatDropReq) Reset() { + *x = CombatDropReq{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatDropReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatDropReq) ProtoMessage() {} + +func (x *CombatDropReq) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CombatDropReq.ProtoReflect.Descriptor instead. +func (*CombatDropReq) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *CombatDropReq) GetDrop() int32 { + if x != nil { + return x.Drop + } + return 0 +} + +//宝箱获取请求 +type CombatDropResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功 + Atns []*UserAssets `protobuf:"bytes,2,rep,name=atns,proto3" json:"atns"` //获取物品 +} + +func (x *CombatDropResp) Reset() { + *x = CombatDropResp{} + if protoimpl.UnsafeEnabled { + mi := &file_combat_combat_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CombatDropResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CombatDropResp) ProtoMessage() {} + +func (x *CombatDropResp) ProtoReflect() protoreflect.Message { + mi := &file_combat_combat_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 CombatDropResp.ProtoReflect.Descriptor instead. +func (*CombatDropResp) Descriptor() ([]byte, []int) { + return file_combat_combat_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *CombatDropResp) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_Success +} + +func (x *CombatDropResp) GetAtns() []*UserAssets { + if x != nil { + return x.Atns + } + return nil +} + +var File_combat_combat_msg_proto protoreflect.FileDescriptor + +var file_combat_combat_msg_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x5f, + 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0x1d, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1e, + 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x49, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1e, + 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1f, + 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x4f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, + 0x58, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, + 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, + 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x70, 0x0a, 0x13, 0x43, 0x6f, 0x6d, + 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, + 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, + 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, + 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x64, 0x72, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, + 0x22, 0x51, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, + 0x74, 0x6e, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_combat_combat_msg_proto_rawDescOnce sync.Once + file_combat_combat_msg_proto_rawDescData = file_combat_combat_msg_proto_rawDesc +) + +func file_combat_combat_msg_proto_rawDescGZIP() []byte { + file_combat_combat_msg_proto_rawDescOnce.Do(func() { + file_combat_combat_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_combat_combat_msg_proto_rawDescData) + }) + return file_combat_combat_msg_proto_rawDescData +} + +var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_combat_combat_msg_proto_goTypes = []interface{}{ + (*CombatInReq)(nil), // 0: CombatInReq + (*CombatInResp)(nil), // 1: CombatInResp + (*CombatOutReq)(nil), // 2: CombatOutReq + (*CombatOutResp)(nil), // 3: CombatOutResp + (*CombatChallengeReq)(nil), // 4: CombatChallengeReq + (*CombatChallengeResp)(nil), // 5: CombatChallengeResp + (*CombatDropReq)(nil), // 6: CombatDropReq + (*CombatDropResp)(nil), // 7: CombatDropResp + (*BattleFormation)(nil), // 8: BattleFormation + (ErrorCode)(0), // 9: ErrorCode + (*BattleInfo)(nil), // 10: BattleInfo + (*UserAssets)(nil), // 11: UserAssets +} +var file_combat_combat_msg_proto_depIdxs = []int32{ + 8, // 0: CombatChallengeReq.battle:type_name -> BattleFormation + 9, // 1: CombatChallengeResp.code:type_name -> ErrorCode + 10, // 2: CombatChallengeResp.info:type_name -> BattleInfo + 9, // 3: CombatDropResp.code:type_name -> ErrorCode + 11, // 4: CombatDropResp.atns:type_name -> UserAssets + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name +} + +func init() { file_combat_combat_msg_proto_init() } +func file_combat_combat_msg_proto_init() { + if File_combat_combat_msg_proto != nil { + return + } + file_errorcode_proto_init() + file_comm_proto_init() + file_battle_battle_msg_proto_init() + if !protoimpl.UnsafeEnabled { + file_combat_combat_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatInReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatInResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatOutReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatOutResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatChallengeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatChallengeResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatDropReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_combat_combat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CombatDropResp); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_combat_combat_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 8, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_combat_combat_msg_proto_goTypes, + DependencyIndexes: file_combat_combat_msg_proto_depIdxs, + MessageInfos: file_combat_combat_msg_proto_msgTypes, + }.Build() + File_combat_combat_msg_proto = out.File + file_combat_combat_msg_proto_rawDesc = nil + file_combat_combat_msg_proto_goTypes = nil + file_combat_combat_msg_proto_depIdxs = nil +} diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go index a60416c96..ce40485c2 100644 --- a/pb/worldtask_msg.pb.go +++ b/pb/worldtask_msg.pb.go @@ -488,18 +488,65 @@ func (x *WorldtaskBattleFinishResp) GetTaskId() int32 { } // 当前完成的任务列表推送 +type WorldtaskList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskId []int32 `protobuf:"varint,1,rep,packed,name=taskId,proto3" json:"taskId"` //任务ID +} + +func (x *WorldtaskList) Reset() { + *x = WorldtaskList{} + if protoimpl.UnsafeEnabled { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WorldtaskList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WorldtaskList) ProtoMessage() {} + +func (x *WorldtaskList) ProtoReflect() protoreflect.Message { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WorldtaskList.ProtoReflect.Descriptor instead. +func (*WorldtaskList) Descriptor() ([]byte, []int) { + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9} +} + +func (x *WorldtaskList) GetTaskId() []int32 { + if x != nil { + return x.TaskId + } + return nil +} + type WorldtaskFinishIdsPush struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TaskList []*Worldtask `protobuf:"bytes,1,rep,name=taskList,proto3" json:"taskList"` //完成的任务 key:groupId val:任务ID + Tasks map[int32]*WorldtaskList `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //完成的任务 key:groupId val:任务ID } func (x *WorldtaskFinishIdsPush) Reset() { *x = WorldtaskFinishIdsPush{} if protoimpl.UnsafeEnabled { - mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] + mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -512,7 +559,7 @@ func (x *WorldtaskFinishIdsPush) String() string { func (*WorldtaskFinishIdsPush) ProtoMessage() {} func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message { - mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] + mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -525,12 +572,12 @@ func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message { // Deprecated: Use WorldtaskFinishIdsPush.ProtoReflect.Descriptor instead. func (*WorldtaskFinishIdsPush) Descriptor() ([]byte, []int) { - return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9} + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{10} } -func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask { +func (x *WorldtaskFinishIdsPush) GetTasks() map[int32]*WorldtaskList { if x != nil { - return x.TaskList + return x.Tasks } return nil } @@ -583,12 +630,20 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, - 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x27, 0x0a, 0x0d, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x9c, 0x01, 0x0a, 0x16, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x38, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x54, 0x61, 0x73, 0x6b, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x1a, 0x48, 0x0a, + 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -603,7 +658,7 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte { return file_worldtask_worldtask_msg_proto_rawDescData } -var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp @@ -614,22 +669,24 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskBattleStartResp)(nil), // 6: WorldtaskBattleStartResp (*WorldtaskBattleFinishReq)(nil), // 7: WorldtaskBattleFinishReq (*WorldtaskBattleFinishResp)(nil), // 8: WorldtaskBattleFinishResp - (*WorldtaskFinishIdsPush)(nil), // 9: WorldtaskFinishIdsPush - (*DBWorldtask)(nil), // 10: DBWorldtask - (*BattleInfo)(nil), // 11: BattleInfo - (*BattleReport)(nil), // 12: BattleReport - (*Worldtask)(nil), // 13: Worldtask + (*WorldtaskList)(nil), // 9: WorldtaskList + (*WorldtaskFinishIdsPush)(nil), // 10: WorldtaskFinishIdsPush + nil, // 11: WorldtaskFinishIdsPush.TasksEntry + (*DBWorldtask)(nil), // 12: DBWorldtask + (*BattleInfo)(nil), // 13: BattleInfo + (*BattleReport)(nil), // 14: BattleReport } var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ - 10, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask - 11, // 1: WorldtaskBattleStartResp.info:type_name -> BattleInfo - 12, // 2: WorldtaskBattleFinishReq.report:type_name -> BattleReport - 13, // 3: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 12, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask + 13, // 1: WorldtaskBattleStartResp.info:type_name -> BattleInfo + 14, // 2: WorldtaskBattleFinishReq.report:type_name -> BattleReport + 11, // 3: WorldtaskFinishIdsPush.tasks:type_name -> WorldtaskFinishIdsPush.TasksEntry + 9, // 4: WorldtaskFinishIdsPush.TasksEntry.value:type_name -> WorldtaskList + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_worldtask_worldtask_msg_proto_init() } @@ -749,6 +806,18 @@ func file_worldtask_worldtask_msg_proto_init() { } } file_worldtask_worldtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WorldtaskList); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_worldtask_worldtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WorldtaskFinishIdsPush); i { case 0: return &v.state @@ -767,7 +836,7 @@ func file_worldtask_worldtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 12, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.CombatLevel.go b/sys/configure/structs/Game.CombatLevel.go new file mode 100644 index 000000000..421a52cce --- /dev/null +++ b/sys/configure/structs/Game.CombatLevel.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameCombatLevel struct { + _dataMap map[int32]*GameCombatLevelData + _dataList []*GameCombatLevelData +} + +func NewGameCombatLevel(_buf []map[string]interface{}) (*GameCombatLevel, error) { + _dataList := make([]*GameCombatLevelData, 0, len(_buf)) + dataMap := make(map[int32]*GameCombatLevelData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameCombatLevelData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameCombatLevel{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameCombatLevel) GetDataMap() map[int32]*GameCombatLevelData { + return table._dataMap +} + +func (table *GameCombatLevel) GetDataList() []*GameCombatLevelData { + return table._dataList +} + +func (table *GameCombatLevel) Get(key int32) *GameCombatLevelData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go new file mode 100644 index 000000000..532ddd9fd --- /dev/null +++ b/sys/configure/structs/Game.CombatLevelData.go @@ -0,0 +1,110 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameCombatLevelData struct { + Id int32 + FormatList []int32 + Droplist []int32 + PassformatList []int32 + Passdroplist []int32 + Award []*Gameatn +} + +const TypeId_GameCombatLevelData = 1556955838 + +func (*GameCombatLevelData) GetTypeId() int32 { + return 1556955838 +} + +func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["formatList"].([]interface{}); !_ok_ { err = errors.New("formatList error"); return } + + _v.FormatList = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.FormatList = append(_v.FormatList, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["droplist"].([]interface{}); !_ok_ { err = errors.New("droplist error"); return } + + _v.Droplist = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Droplist = append(_v.Droplist, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["passformatList"].([]interface{}); !_ok_ { err = errors.New("passformatList error"); return } + + _v.PassformatList = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.PassformatList = append(_v.PassformatList, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["passdroplist"].([]interface{}); !_ok_ { err = errors.New("passdroplist error"); return } + + _v.Passdroplist = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Passdroplist = append(_v.Passdroplist, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return } + + _v.Award = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Award = append(_v.Award, _list_v_) + } + } + + return +} + +func DeserializeGameCombatLevelData(_buf map[string]interface{}) (*GameCombatLevelData, error) { + v := &GameCombatLevelData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.CombatManster.go b/sys/configure/structs/Game.CombatManster.go new file mode 100644 index 000000000..c43408358 --- /dev/null +++ b/sys/configure/structs/Game.CombatManster.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameCombatManster struct { + _dataMap map[int32]*GameCombatMansterData + _dataList []*GameCombatMansterData +} + +func NewGameCombatManster(_buf []map[string]interface{}) (*GameCombatManster, error) { + _dataList := make([]*GameCombatMansterData, 0, len(_buf)) + dataMap := make(map[int32]*GameCombatMansterData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameCombatMansterData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameCombatManster{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameCombatManster) GetDataMap() map[int32]*GameCombatMansterData { + return table._dataMap +} + +func (table *GameCombatManster) GetDataList() []*GameCombatMansterData { + return table._dataList +} + +func (table *GameCombatManster) Get(key int32) *GameCombatMansterData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.CombatMansterData.go b/sys/configure/structs/Game.CombatMansterData.go new file mode 100644 index 000000000..f059cb9c5 --- /dev/null +++ b/sys/configure/structs/Game.CombatMansterData.go @@ -0,0 +1,65 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameCombatMansterData struct { + Id int32 + FormatList []int32 + Award []*Gameatn +} + +const TypeId_GameCombatMansterData = 248449122 + +func (*GameCombatMansterData) GetTypeId() int32 { + return 248449122 +} + +func (_v *GameCombatMansterData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["formatList"].([]interface{}); !_ok_ { err = errors.New("formatList error"); return } + + _v.FormatList = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.FormatList = append(_v.FormatList, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return } + + _v.Award = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Award = append(_v.Award, _list_v_) + } + } + + return +} + +func DeserializeGameCombatMansterData(_buf map[string]interface{}) (*GameCombatMansterData, error) { + v := &GameCombatMansterData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +}