From 8c81fb620dbefa0653fd70ac024e43ef02348df3 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 19 Jan 2024 15:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=89=AB=E8=8D=A1=E6=B6=88?= =?UTF-8?q?=E8=80=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/viking/api_sweep.go | 8 +- pb/chat_msg.pb.go | 398 +++++++----------------------------- 2 files changed, 78 insertions(+), 328 deletions(-) diff --git a/modules/viking/api_sweep.go b/modules/viking/api_sweep.go index c5ed1d50a..2732d9aed 100644 --- a/modules/viking/api_sweep.go +++ b/modules/viking/api_sweep.go @@ -28,6 +28,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e infos []*pb.BattleInfo runresp *pb.BattleRunResp conf *cfg.GameSweepData + vikingCfg *cfg.GameVikingBossData user *pb.DBUser bWin bool // 战斗是否胜利 atno []*pb.UserAtno // atno 类型 @@ -58,7 +59,7 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e return } - vikingCfg, err := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty) + vikingCfg, err = this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -188,6 +189,11 @@ func (this *apiComp) Sweep(session comm.IUserSession, req *pb.VikingSweepReq) (e } reward = append(reward, heroupaward...) } + //消耗资源 + if errdata = this.module.ConsumeRes(session, consume, true); errdata != nil { + return + } + //发放资源 if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil { return } diff --git a/pb/chat_msg.pb.go b/pb/chat_msg.pb.go index 96125cd28..55486f7b5 100644 --- a/pb/chat_msg.pb.go +++ b/pb/chat_msg.pb.go @@ -68,197 +68,6 @@ func (x *ChatMessagePush) GetChat() *DBChat { return nil } -//申请跨服频道号 -type ChatCrossChannelReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ChatCrossChannelReq) Reset() { - *x = ChatCrossChannelReq{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatCrossChannelReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatCrossChannelReq) ProtoMessage() {} - -func (x *ChatCrossChannelReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_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 ChatCrossChannelReq.ProtoReflect.Descriptor instead. -func (*ChatCrossChannelReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{1} -} - -//申请跨服频道号 回应 -type ChatCrossChannelResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ChannelId int32 `protobuf:"varint,1,opt,name=channelId,proto3" json:"channelId"` -} - -func (x *ChatCrossChannelResp) Reset() { - *x = ChatCrossChannelResp{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatCrossChannelResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatCrossChannelResp) ProtoMessage() {} - -func (x *ChatCrossChannelResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_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 ChatCrossChannelResp.ProtoReflect.Descriptor instead. -func (*ChatCrossChannelResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{2} -} - -func (x *ChatCrossChannelResp) GetChannelId() int32 { - if x != nil { - return x.ChannelId - } - return 0 -} - -//申请切换频道 -type ChatChanageChannelReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ChannelId int32 `protobuf:"varint,1,opt,name=channelId,proto3" json:"channelId"` -} - -func (x *ChatChanageChannelReq) Reset() { - *x = ChatChanageChannelReq{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatChanageChannelReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatChanageChannelReq) ProtoMessage() {} - -func (x *ChatChanageChannelReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_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 ChatChanageChannelReq.ProtoReflect.Descriptor instead. -func (*ChatChanageChannelReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{3} -} - -func (x *ChatChanageChannelReq) GetChannelId() int32 { - if x != nil { - return x.ChannelId - } - return 0 -} - -//申请切换频道 回应 -type ChatChanageChannelResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ChannelId int32 `protobuf:"varint,1,opt,name=channelId,proto3" json:"channelId"` - IsSucc bool `protobuf:"varint,2,opt,name=isSucc,proto3" json:"isSucc"` -} - -func (x *ChatChanageChannelResp) Reset() { - *x = ChatChanageChannelResp{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatChanageChannelResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatChanageChannelResp) ProtoMessage() {} - -func (x *ChatChanageChannelResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_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 ChatChanageChannelResp.ProtoReflect.Descriptor instead. -func (*ChatChanageChannelResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{4} -} - -func (x *ChatChanageChannelResp) GetChannelId() int32 { - if x != nil { - return x.ChannelId - } - return 0 -} - -func (x *ChatChanageChannelResp) GetIsSucc() bool { - if x != nil { - return x.IsSucc - } - return false -} - //请求聊天消息 type ChatGetListReq struct { state protoimpl.MessageState @@ -273,7 +82,7 @@ type ChatGetListReq struct { func (x *ChatGetListReq) Reset() { *x = ChatGetListReq{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[5] + mi := &file_chat_chat_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -286,7 +95,7 @@ func (x *ChatGetListReq) String() string { func (*ChatGetListReq) ProtoMessage() {} func (x *ChatGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[5] + mi := &file_chat_chat_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -299,7 +108,7 @@ func (x *ChatGetListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatGetListReq.ProtoReflect.Descriptor instead. func (*ChatGetListReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{5} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{1} } func (x *ChatGetListReq) GetChannel() ChatChannel { @@ -335,7 +144,7 @@ type ChatGetListResp struct { func (x *ChatGetListResp) Reset() { *x = ChatGetListResp{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[6] + mi := &file_chat_chat_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -348,7 +157,7 @@ func (x *ChatGetListResp) String() string { func (*ChatGetListResp) ProtoMessage() {} func (x *ChatGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[6] + mi := &file_chat_chat_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -361,7 +170,7 @@ func (x *ChatGetListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatGetListResp.ProtoReflect.Descriptor instead. func (*ChatGetListResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{6} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{2} } func (x *ChatGetListResp) GetChats() []*DBChat { @@ -391,7 +200,7 @@ type ChatSendReq struct { func (x *ChatSendReq) Reset() { *x = ChatSendReq{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[7] + mi := &file_chat_chat_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -404,7 +213,7 @@ func (x *ChatSendReq) String() string { func (*ChatSendReq) ProtoMessage() {} func (x *ChatSendReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[7] + mi := &file_chat_chat_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -417,7 +226,7 @@ func (x *ChatSendReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatSendReq.ProtoReflect.Descriptor instead. func (*ChatSendReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{7} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{3} } func (x *ChatSendReq) GetSuser() *BaseUserInfo { @@ -495,7 +304,7 @@ type ChatSendResp struct { func (x *ChatSendResp) Reset() { *x = ChatSendResp{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[8] + mi := &file_chat_chat_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -508,7 +317,7 @@ func (x *ChatSendResp) String() string { func (*ChatSendResp) ProtoMessage() {} func (x *ChatSendResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[8] + mi := &file_chat_chat_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -521,7 +330,7 @@ func (x *ChatSendResp) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatSendResp.ProtoReflect.Descriptor instead. func (*ChatSendResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{8} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{4} } func (x *ChatSendResp) GetIssucc() bool { @@ -540,53 +349,40 @@ var file_chat_chat_msg_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2e, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x63, 0x68, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x43, 0x68, 0x61, 0x74, 0x52, - 0x04, 0x63, 0x68, 0x61, 0x74, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x68, 0x61, 0x74, 0x43, 0x72, 0x6f, - 0x73, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, - 0x43, 0x68, 0x61, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, - 0x49, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x61, 0x67, - 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x16, 0x43, 0x68, 0x61, - 0x74, 0x43, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x70, 0x0a, 0x0e, 0x43, 0x68, 0x61, - 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x07, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, - 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, - 0x6e, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, - 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x0f, 0x43, - 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, - 0x0a, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x44, 0x42, 0x43, 0x68, 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xaf, 0x02, - 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x23, 0x0a, - 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, - 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x73, 0x75, 0x73, - 0x65, 0x72, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, - 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, - 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, - 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, - 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x12, - 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, - 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x20, 0x0a, - 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, - 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 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, + 0x04, 0x63, 0x68, 0x61, 0x74, 0x22, 0x70, 0x0a, 0x0e, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, + 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, + 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, + 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x74, 0x47, + 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x63, 0x68, + 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x43, 0x68, + 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xaf, 0x02, 0x0a, 0x0b, 0x43, 0x68, + 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x75, 0x73, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, + 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x73, 0x75, 0x73, 0x65, 0x72, 0x12, 0x26, + 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, + 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, + 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, + 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, + 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, + 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, + 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, + 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, + 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x0c, 0x43, + 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, + 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 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 ( @@ -601,34 +397,30 @@ func file_chat_chat_msg_proto_rawDescGZIP() []byte { return file_chat_chat_msg_proto_rawDescData } -var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_chat_chat_msg_proto_goTypes = []interface{}{ - (*ChatMessagePush)(nil), // 0: ChatMessagePush - (*ChatCrossChannelReq)(nil), // 1: ChatCrossChannelReq - (*ChatCrossChannelResp)(nil), // 2: ChatCrossChannelResp - (*ChatChanageChannelReq)(nil), // 3: ChatChanageChannelReq - (*ChatChanageChannelResp)(nil), // 4: ChatChanageChannelResp - (*ChatGetListReq)(nil), // 5: ChatGetListReq - (*ChatGetListResp)(nil), // 6: ChatGetListResp - (*ChatSendReq)(nil), // 7: ChatSendReq - (*ChatSendResp)(nil), // 8: ChatSendResp - (*DBChat)(nil), // 9: DBChat - (ChatChannel)(0), // 10: ChatChannel - (*BaseUserInfo)(nil), // 11: BaseUserInfo - (ChatType)(0), // 12: ChatType + (*ChatMessagePush)(nil), // 0: ChatMessagePush + (*ChatGetListReq)(nil), // 1: ChatGetListReq + (*ChatGetListResp)(nil), // 2: ChatGetListResp + (*ChatSendReq)(nil), // 3: ChatSendReq + (*ChatSendResp)(nil), // 4: ChatSendResp + (*DBChat)(nil), // 5: DBChat + (ChatChannel)(0), // 6: ChatChannel + (*BaseUserInfo)(nil), // 7: BaseUserInfo + (ChatType)(0), // 8: ChatType } var file_chat_chat_msg_proto_depIdxs = []int32{ - 9, // 0: ChatMessagePush.chat:type_name -> DBChat - 10, // 1: ChatGetListReq.channel:type_name -> ChatChannel - 9, // 2: ChatGetListResp.chats:type_name -> DBChat - 11, // 3: ChatSendReq.suser:type_name -> BaseUserInfo - 10, // 4: ChatSendReq.channel:type_name -> ChatChannel - 12, // 5: ChatSendReq.ctype:type_name -> ChatType - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 5, // 0: ChatMessagePush.chat:type_name -> DBChat + 6, // 1: ChatGetListReq.channel:type_name -> ChatChannel + 5, // 2: ChatGetListResp.chats:type_name -> DBChat + 7, // 3: ChatSendReq.suser:type_name -> BaseUserInfo + 6, // 4: ChatSendReq.channel:type_name -> ChatChannel + 8, // 5: ChatSendReq.ctype:type_name -> ChatType + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_chat_chat_msg_proto_init() } @@ -652,54 +444,6 @@ func file_chat_chat_msg_proto_init() { } } file_chat_chat_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatCrossChannelReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatCrossChannelResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatChanageChannelReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatChanageChannelResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatGetListReq); i { case 0: return &v.state @@ -711,7 +455,7 @@ func file_chat_chat_msg_proto_init() { return nil } } - file_chat_chat_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_chat_chat_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatGetListResp); i { case 0: return &v.state @@ -723,7 +467,7 @@ func file_chat_chat_msg_proto_init() { return nil } } - file_chat_chat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_chat_chat_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatSendReq); i { case 0: return &v.state @@ -735,7 +479,7 @@ func file_chat_chat_msg_proto_init() { return nil } } - file_chat_chat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_chat_chat_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatSendResp); i { case 0: return &v.state @@ -754,7 +498,7 @@ func file_chat_chat_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_chat_chat_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 5, NumExtensions: 0, NumServices: 0, },