解决冲突
This commit is contained in:
parent
2b4abbac81
commit
6122c59d86
@ -599,6 +599,13 @@ func (x *ForgeData) GetScore() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *ForgeData) GetTime() int64 {
|
||||
if x != nil {
|
||||
return x.Time
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//玩家图鉴任务
|
||||
type DBTujianTask struct {
|
||||
state protoimpl.MessageState
|
||||
@ -613,11 +620,7 @@ type DBTujianTask struct {
|
||||
func (x *DBTujianTask) Reset() {
|
||||
*x = DBTujianTask{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -630,11 +633,7 @@ func (x *DBTujianTask) String() string {
|
||||
func (*DBTujianTask) ProtoMessage() {}
|
||||
|
||||
func (x *DBTujianTask) ProtoReflect() protoreflect.Message {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -647,11 +646,7 @@ func (x *DBTujianTask) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBTujianTask.ProtoReflect.Descriptor instead.
|
||||
func (*DBTujianTask) Descriptor() ([]byte, []int) {
|
||||
<<<<<<< HEAD
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8}
|
||||
=======
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6}
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
func (x *DBTujianTask) GetUid() string {
|
||||
@ -689,11 +684,7 @@ type Clang struct {
|
||||
func (x *Clang) Reset() {
|
||||
*x = Clang{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[9]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -706,11 +697,7 @@ func (x *Clang) String() string {
|
||||
func (*Clang) ProtoMessage() {}
|
||||
|
||||
func (x *Clang) ProtoReflect() protoreflect.Message {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[9]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -723,11 +710,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use Clang.ProtoReflect.Descriptor instead.
|
||||
func (*Clang) Descriptor() ([]byte, []int) {
|
||||
<<<<<<< HEAD
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{9}
|
||||
=======
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7}
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
func (x *Clang) GetDeskType() int32 {
|
||||
@ -764,11 +747,7 @@ type OrderClang struct {
|
||||
func (x *OrderClang) Reset() {
|
||||
*x = OrderClang{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[10]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -781,11 +760,7 @@ func (x *OrderClang) String() string {
|
||||
func (*OrderClang) ProtoMessage() {}
|
||||
|
||||
func (x *OrderClang) ProtoReflect() protoreflect.Message {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[10]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -798,11 +773,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use OrderClang.ProtoReflect.Descriptor instead.
|
||||
func (*OrderClang) Descriptor() ([]byte, []int) {
|
||||
<<<<<<< HEAD
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{10}
|
||||
=======
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8}
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
func (x *OrderClang) GetDeskType() int32 {
|
||||
@ -848,11 +819,7 @@ type DBSmithy struct {
|
||||
func (x *DBSmithy) Reset() {
|
||||
*x = DBSmithy{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[11]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[9]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -865,11 +832,7 @@ func (x *DBSmithy) String() string {
|
||||
func (*DBSmithy) ProtoMessage() {}
|
||||
|
||||
func (x *DBSmithy) ProtoReflect() protoreflect.Message {
|
||||
<<<<<<< HEAD
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[11]
|
||||
=======
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[9]
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -882,11 +845,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead.
|
||||
func (*DBSmithy) Descriptor() ([]byte, []int) {
|
||||
<<<<<<< HEAD
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{11}
|
||||
=======
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{9}
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
func (x *DBSmithy) GetId() string {
|
||||
@ -1030,7 +989,6 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
|
||||
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x29,
|
||||
0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
|
||||
0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74,
|
||||
<<<<<<< HEAD
|
||||
0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x63, 0x6f, 0x6c,
|
||||
0x6c, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x41,
|
||||
0x74, 0x6c, 0x61, 0x73, 0x2e, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x45, 0x6e, 0x74, 0x72,
|
||||
@ -1114,72 +1072,6 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 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,
|
||||
=======
|
||||
0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
|
||||
0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0a, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
|
||||
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x09, 0x46,
|
||||
0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67,
|
||||
0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f,
|
||||
0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c,
|
||||
0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69,
|
||||
0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x54, 0x0a, 0x0c, 0x44, 0x42, 0x54, 0x75,
|
||||
0x6a, 0x69, 0x61, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0x4f,
|
||||
0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54,
|
||||
0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54,
|
||||
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22,
|
||||
0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12,
|
||||
0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08,
|
||||
0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x63, 0x6c,
|
||||
0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e,
|
||||
0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65,
|
||||
0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a,
|
||||
0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
|
||||
0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
|
||||
0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73,
|
||||
0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43,
|
||||
0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f,
|
||||
0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18,
|
||||
0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
|
||||
0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
|
||||
0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74,
|
||||
0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f,
|
||||
0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74,
|
||||
0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c,
|
||||
0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 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,
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1194,18 +1086,13 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte {
|
||||
return file_smithy_smithy_db_proto_rawDescData
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
|
||||
=======
|
||||
var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
var file_smithy_smithy_db_proto_goTypes = []interface{}{
|
||||
(*Mastery)(nil), // 0: Mastery
|
||||
(*DBStove)(nil), // 1: DBStove
|
||||
(*CustomerInfo)(nil), // 2: CustomerInfo
|
||||
(*DBCustomer)(nil), // 3: DBCustomer
|
||||
(*DBAtlas)(nil), // 4: DBAtlas
|
||||
<<<<<<< HEAD
|
||||
(*CollectData)(nil), // 5: CollectData
|
||||
(*ForgeList)(nil), // 6: ForgeList
|
||||
(*ForgeData)(nil), // 7: ForgeData
|
||||
@ -1243,39 +1130,6 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{
|
||||
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
|
||||
=======
|
||||
(*ForgeData)(nil), // 5: ForgeData
|
||||
(*DBTujianTask)(nil), // 6: DBTujianTask
|
||||
(*Clang)(nil), // 7: Clang
|
||||
(*OrderClang)(nil), // 8: OrderClang
|
||||
(*DBSmithy)(nil), // 9: DBSmithy
|
||||
nil, // 10: DBStove.DataEntry
|
||||
nil, // 11: DBStove.SkillEntry
|
||||
nil, // 12: DBStove.ForgeEntry
|
||||
nil, // 13: DBAtlas.AtlasEntry
|
||||
nil, // 14: DBSmithy.SkillEntry
|
||||
nil, // 15: DBSmithy.DeskFloorEntry
|
||||
(*UserAssets)(nil), // 16: UserAssets
|
||||
}
|
||||
var file_smithy_smithy_db_proto_depIdxs = []int32{
|
||||
10, // 0: DBStove.data:type_name -> DBStove.DataEntry
|
||||
11, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
|
||||
12, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
|
||||
2, // 3: DBCustomer.customers:type_name -> CustomerInfo
|
||||
13, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry
|
||||
7, // 5: DBSmithy.clang:type_name -> Clang
|
||||
8, // 6: DBSmithy.orders:type_name -> OrderClang
|
||||
16, // 7: DBSmithy.items:type_name -> UserAssets
|
||||
14, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
|
||||
15, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
|
||||
0, // 10: DBStove.DataEntry.value:type_name -> Mastery
|
||||
5, // 11: DBAtlas.AtlasEntry.value:type_name -> ForgeData
|
||||
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
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
}
|
||||
|
||||
func init() { file_smithy_smithy_db_proto_init() }
|
||||
@ -1358,11 +1212,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
|
||||
<<<<<<< HEAD
|
||||
switch v := v.(*ForgeList); i {
|
||||
=======
|
||||
switch v := v.(*DBTujianTask); i {
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -1374,11 +1224,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
||||
<<<<<<< HEAD
|
||||
switch v := v.(*ForgeData); i {
|
||||
=======
|
||||
switch v := v.(*Clang); i {
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -1390,7 +1236,6 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
|
||||
<<<<<<< HEAD
|
||||
switch v := v.(*DBTujianTask); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -1415,8 +1260,6 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
|
||||
=======
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
switch v := v.(*OrderClang); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -1428,11 +1271,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
file_smithy_smithy_db_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
|
||||
=======
|
||||
file_smithy_smithy_db_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
switch v := v.(*DBSmithy); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -1451,11 +1290,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_smithy_smithy_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
<<<<<<< HEAD
|
||||
NumMessages: 19,
|
||||
=======
|
||||
NumMessages: 16,
|
||||
>>>>>>> d2a3af4dacaf0402aded4f648f7d2e2a9ddee5d3
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user