上传道具分解

pb/friend_msg.pb.go

@@ -2008,109 +2008,6 @@ func (x *FriendAssistHeroListResp) GetFriends() []*FriendBase {
 	return nil
 }
 
-// 查询是否已申请目标玩家为好友或目标玩家是否已是好友
-type FriendGetRelationReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` //目标玩家ID
-}
-
-func (x *FriendGetRelationReq) Reset() {
-	*x = FriendGetRelationReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_friend_friend_msg_proto_msgTypes[40]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FriendGetRelationReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FriendGetRelationReq) ProtoMessage() {}
-
-func (x *FriendGetRelationReq) ProtoReflect() protoreflect.Message {
-	mi := &file_friend_friend_msg_proto_msgTypes[40]
-	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 FriendGetRelationReq.ProtoReflect.Descriptor instead.
-func (*FriendGetRelationReq) Descriptor() ([]byte, []int) {
-	return file_friend_friend_msg_proto_rawDescGZIP(), []int{40}
-}
-
-func (x *FriendGetRelationReq) GetTargetUid() string {
-	if x != nil {
-		return x.TargetUid
-	}
-	return ""
-}
-
-type FriendGetRelationResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"`
-	Status    bool   `protobuf:"varint,2,opt,name=status,proto3" json:"status"` //已是好友或已申请返回true
-}
-
-func (x *FriendGetRelationResp) Reset() {
-	*x = FriendGetRelationResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_friend_friend_msg_proto_msgTypes[41]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FriendGetRelationResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FriendGetRelationResp) ProtoMessage() {}
-
-func (x *FriendGetRelationResp) ProtoReflect() protoreflect.Message {
-	mi := &file_friend_friend_msg_proto_msgTypes[41]
-	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 FriendGetRelationResp.ProtoReflect.Descriptor instead.
-func (*FriendGetRelationResp) Descriptor() ([]byte, []int) {
-	return file_friend_friend_msg_proto_rawDescGZIP(), []int{41}
-}
-
-func (x *FriendGetRelationResp) GetTargetUid() string {
-	if x != nil {
-		return x.TargetUid
-	}
-	return ""
-}
-
-func (x *FriendGetRelationResp) GetStatus() bool {
-	if x != nil {
-		return x.Status
-	}
-	return false
-}
-
 var File_friend_friend_msg_proto protoreflect.FileDescriptor
 
 var file_friend_friend_msg_proto_rawDesc = []byte{
@@ -2262,16 +2159,8 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07,
 	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
 	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74,
+	0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x74,
+	0x74, 0x6f, 0x33,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x15, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64,
-	0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2286,7 +2175,7 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 	return file_friend_friend_msg_proto_rawDescData
 }
 
-var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
+var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendBase)(nil),                 // 0: FriendBase
 	(*FriendListReq)(nil),              // 1: FriendListReq
@@ -2328,9 +2217,7 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush
 	(*FriendAssistHeroListReq)(nil),    // 38: FriendAssistHeroListReq
 	(*FriendAssistHeroListResp)(nil),   // 39: FriendAssistHeroListResp
-	(*FriendGetRelationReq)(nil),       // 40: FriendGetRelationReq
+	(*AssistRecord)(nil),               // 40: AssistRecord
-	(*FriendGetRelationResp)(nil),      // 41: FriendGetRelationResp
-	(*AssistRecord)(nil),               // 42: AssistRecord
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 0: FriendListResp.list:type_name -> FriendBase
@@ -2340,7 +2227,7 @@ var file_friend_friend_msg_proto_depIdxs = []int32{
 	0,  // 4: FriendBlackListResp.friends:type_name -> FriendBase
 	0,  // 5: FriendZanlistResp.list:type_name -> FriendBase
 	0,  // 6: FriendAssistlistResp.list:type_name -> FriendBase
-	42, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
+	40, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
 	0,  // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
 	0,  // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase
 	10, // [10:10] is the sub-list for method output_type
@@ -2837,30 +2724,6 @@ func file_friend_friend_msg_proto_init() {
 				return nil
 			}
 		}
-		file_friend_friend_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendGetRelationReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_friend_friend_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FriendGetRelationResp); 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{
@@ -2868,7 +2731,7 @@ func file_friend_friend_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_friend_friend_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   42,
+			NumMessages:   40,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/items_msg.pb.go

@@ -420,6 +420,134 @@ func (x *ItemsSellItemResp) GetIssucc() bool {
 	return false
 }
 
+//分解道具 请求
+type ItemsDecomposeReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId"`  //格子Id
+	ItemId string `protobuf:"bytes,2,opt,name=ItemId,proto3" json:"ItemId"`  //物品Id
+	Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量
+}
+
+func (x *ItemsDecomposeReq) Reset() {
+	*x = ItemsDecomposeReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_items_items_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ItemsDecomposeReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ItemsDecomposeReq) ProtoMessage() {}
+
+func (x *ItemsDecomposeReq) ProtoReflect() protoreflect.Message {
+	mi := &file_items_items_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 ItemsDecomposeReq.ProtoReflect.Descriptor instead.
+func (*ItemsDecomposeReq) Descriptor() ([]byte, []int) {
+	return file_items_items_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ItemsDecomposeReq) GetGridId() string {
+	if x != nil {
+		return x.GridId
+	}
+	return ""
+}
+
+func (x *ItemsDecomposeReq) GetItemId() string {
+	if x != nil {
+		return x.ItemId
+	}
+	return ""
+}
+
+func (x *ItemsDecomposeReq) GetAmount() uint32 {
+	if x != nil {
+		return x.Amount
+	}
+	return 0
+}
+
+//分解道具 请求回应
+type ItemsDecomposeResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId"`  //格子Id
+	Amount uint32 `protobuf:"varint,2,opt,name=Amount,proto3" json:"Amount"` //使用数量
+	Issucc bool   `protobuf:"varint,3,opt,name=issucc,proto3" json:"issucc"` //是否成功
+}
+
+func (x *ItemsDecomposeResp) Reset() {
+	*x = ItemsDecomposeResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_items_items_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ItemsDecomposeResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ItemsDecomposeResp) ProtoMessage() {}
+
+func (x *ItemsDecomposeResp) ProtoReflect() protoreflect.Message {
+	mi := &file_items_items_msg_proto_msgTypes[8]
+	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 ItemsDecomposeResp.ProtoReflect.Descriptor instead.
+func (*ItemsDecomposeResp) Descriptor() ([]byte, []int) {
+	return file_items_items_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *ItemsDecomposeResp) GetGridId() string {
+	if x != nil {
+		return x.GridId
+	}
+	return ""
+}
+
+func (x *ItemsDecomposeResp) GetAmount() uint32 {
+	if x != nil {
+		return x.Amount
+	}
+	return 0
+}
+
+func (x *ItemsDecomposeResp) GetIssucc() bool {
+	if x != nil {
+		return x.Issucc
+	}
+	return false
+}
+
 var File_items_items_msg_proto protoreflect.FileDescriptor
 
 var file_items_items_msg_proto_rawDesc = []byte{
@@ -458,8 +586,20 @@ var file_items_items_msg_proto_rawDesc = []byte{
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a,
 	0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41,
 	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5b, 0x0a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x44, 0x65, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74,
+	0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5c, 0x0a, 0x12, 0x49, 0x74,
+	0x65, 0x6d, 0x73, 0x44, 0x65, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75,
+	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -474,20 +614,22 @@ func file_items_items_msg_proto_rawDescGZIP() []byte {
 	return file_items_items_msg_proto_rawDescData
 }
 
-var file_items_items_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_items_items_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_items_items_msg_proto_goTypes = []interface{}{
-	(*ItemsGetlistReq)(nil),   // 0: ItemsGetlistReq
+	(*ItemsGetlistReq)(nil),    // 0: ItemsGetlistReq
-	(*ItemsGetlistResp)(nil),  // 1: ItemsGetlistResp
+	(*ItemsGetlistResp)(nil),   // 1: ItemsGetlistResp
-	(*ItemsChangePush)(nil),   // 2: ItemsChangePush
+	(*ItemsChangePush)(nil),    // 2: ItemsChangePush
-	(*ItemsUseItemReq)(nil),   // 3: ItemsUseItemReq
+	(*ItemsUseItemReq)(nil),    // 3: ItemsUseItemReq
-	(*ItemsUseItemResp)(nil),  // 4: ItemsUseItemResp
+	(*ItemsUseItemResp)(nil),   // 4: ItemsUseItemResp
-	(*ItemsSellItemReq)(nil),  // 5: ItemsSellItemReq
+	(*ItemsSellItemReq)(nil),   // 5: ItemsSellItemReq
-	(*ItemsSellItemResp)(nil), // 6: ItemsSellItemResp
+	(*ItemsSellItemResp)(nil),  // 6: ItemsSellItemResp
-	(*DB_UserItemData)(nil),   // 7: DB_UserItemData
+	(*ItemsDecomposeReq)(nil),  // 7: ItemsDecomposeReq
+	(*ItemsDecomposeResp)(nil), // 8: ItemsDecomposeResp
+	(*DB_UserItemData)(nil),    // 9: DB_UserItemData
 }
 var file_items_items_msg_proto_depIdxs = []int32{
-	7, // 0: ItemsGetlistResp.Grids:type_name -> DB_UserItemData
+	9, // 0: ItemsGetlistResp.Grids:type_name -> DB_UserItemData
-	7, // 1: ItemsChangePush.Grids:type_name -> DB_UserItemData
+	9, // 1: ItemsChangePush.Grids:type_name -> DB_UserItemData
 	2, // [2:2] is the sub-list for method output_type
 	2, // [2:2] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
@@ -586,6 +728,30 @@ func file_items_items_msg_proto_init() {
 				return nil
 			}
 		}
+		file_items_items_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ItemsDecomposeReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_items_items_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ItemsDecomposeResp); 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{
@@ -593,7 +759,7 @@ func file_items_items_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_items_items_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   0,
 		},