diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index f20ff4854..61131ee8f 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -133,7 +133,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession, source *pb.Battle AppendStr: mdata.Id, } this.module.modelDream.noticeuserfriend(session, mdata.Id, chat) - session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerResp{Issucc: true, Mid: mdata.Id, Monster: mdata.Monster}) + session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerPush{Issucc: true, Mid: mdata.Id, Monster: mdata.Monster}) return } diff --git a/pb/moonfantasy_msg.pb.go b/pb/moonfantasy_msg.pb.go index 44b91a99d..cc5a57674 100644 --- a/pb/moonfantasy_msg.pb.go +++ b/pb/moonfantasy_msg.pb.go @@ -116,18 +116,18 @@ func (x *MoonfantasyGetListResp) GetDfantasys() []*DBMoonFantasy { } ///触发秘境 -type MoonfantasyTriggerReq struct { +type MoonfantasyTriggerPush struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 - Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 - Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 + Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"` //是否成功 + Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //唯一id //挑战时需要传递的数据 + Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //怪物id } -func (x *MoonfantasyTriggerReq) Reset() { - *x = MoonfantasyTriggerReq{} +func (x *MoonfantasyTriggerPush) Reset() { + *x = MoonfantasyTriggerPush{} if protoimpl.UnsafeEnabled { mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -135,13 +135,13 @@ func (x *MoonfantasyTriggerReq) Reset() { } } -func (x *MoonfantasyTriggerReq) String() string { +func (x *MoonfantasyTriggerPush) String() string { return protoimpl.X.MessageStringOf(x) } -func (*MoonfantasyTriggerReq) ProtoMessage() {} +func (*MoonfantasyTriggerPush) ProtoMessage() {} -func (x *MoonfantasyTriggerReq) ProtoReflect() protoreflect.Message { +func (x *MoonfantasyTriggerPush) ProtoReflect() protoreflect.Message { mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -153,90 +153,26 @@ func (x *MoonfantasyTriggerReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use MoonfantasyTriggerReq.ProtoReflect.Descriptor instead. -func (*MoonfantasyTriggerReq) Descriptor() ([]byte, []int) { +// Deprecated: Use MoonfantasyTriggerPush.ProtoReflect.Descriptor instead. +func (*MoonfantasyTriggerPush) Descriptor() ([]byte, []int) { return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{2} } -func (x *MoonfantasyTriggerReq) GetAvatar() string { - if x != nil { - return x.Avatar - } - return "" -} - -func (x *MoonfantasyTriggerReq) GetUname() string { - if x != nil { - return x.Uname - } - return "" -} - -func (x *MoonfantasyTriggerReq) GetUlv() int32 { - if x != nil { - return x.Ulv - } - return 0 -} - -///触发秘境 -type MoonfantasyTriggerResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"` //是否成功 - Mid string `protobuf:"bytes,2,opt,name=mid,proto3" json:"mid"` //唯一id //挑战时需要传递的数据 - Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //怪物id -} - -func (x *MoonfantasyTriggerResp) Reset() { - *x = MoonfantasyTriggerResp{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MoonfantasyTriggerResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MoonfantasyTriggerResp) ProtoMessage() {} - -func (x *MoonfantasyTriggerResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_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 MoonfantasyTriggerResp.ProtoReflect.Descriptor instead. -func (*MoonfantasyTriggerResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{3} -} - -func (x *MoonfantasyTriggerResp) GetIssucc() bool { +func (x *MoonfantasyTriggerPush) GetIssucc() bool { if x != nil { return x.Issucc } return false } -func (x *MoonfantasyTriggerResp) GetMid() string { +func (x *MoonfantasyTriggerPush) GetMid() string { if x != nil { return x.Mid } return "" } -func (x *MoonfantasyTriggerResp) GetMonster() string { +func (x *MoonfantasyTriggerPush) GetMonster() string { if x != nil { return x.Monster } @@ -255,7 +191,7 @@ type MoonfantasyAskReq struct { func (x *MoonfantasyAskReq) Reset() { *x = MoonfantasyAskReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -268,7 +204,7 @@ func (x *MoonfantasyAskReq) String() string { func (*MoonfantasyAskReq) ProtoMessage() {} func (x *MoonfantasyAskReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -281,7 +217,7 @@ func (x *MoonfantasyAskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyAskReq.ProtoReflect.Descriptor instead. func (*MoonfantasyAskReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{4} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{3} } func (x *MoonfantasyAskReq) GetMid() string { @@ -303,7 +239,7 @@ type MoonfantasyAskResp struct { func (x *MoonfantasyAskResp) Reset() { *x = MoonfantasyAskResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -316,7 +252,7 @@ func (x *MoonfantasyAskResp) String() string { func (*MoonfantasyAskResp) ProtoMessage() {} func (x *MoonfantasyAskResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -329,7 +265,7 @@ func (x *MoonfantasyAskResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyAskResp.ProtoReflect.Descriptor instead. func (*MoonfantasyAskResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{5} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{4} } func (x *MoonfantasyAskResp) GetCode() ErrorCode { @@ -360,7 +296,7 @@ type MoonfantasyBattleReq struct { func (x *MoonfantasyBattleReq) Reset() { *x = MoonfantasyBattleReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -373,7 +309,7 @@ func (x *MoonfantasyBattleReq) String() string { func (*MoonfantasyBattleReq) ProtoMessage() {} func (x *MoonfantasyBattleReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -386,7 +322,7 @@ func (x *MoonfantasyBattleReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBattleReq.ProtoReflect.Descriptor instead. func (*MoonfantasyBattleReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{6} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{5} } func (x *MoonfantasyBattleReq) GetMid() string { @@ -423,7 +359,7 @@ type MoonfantasyBattleResp struct { func (x *MoonfantasyBattleResp) Reset() { *x = MoonfantasyBattleResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -436,7 +372,7 @@ func (x *MoonfantasyBattleResp) String() string { func (*MoonfantasyBattleResp) ProtoMessage() {} func (x *MoonfantasyBattleResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -449,7 +385,7 @@ func (x *MoonfantasyBattleResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBattleResp.ProtoReflect.Descriptor instead. func (*MoonfantasyBattleResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{7} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{6} } func (x *MoonfantasyBattleResp) GetCode() ErrorCode { @@ -487,7 +423,7 @@ type MoonfantasyReceiveReq struct { func (x *MoonfantasyReceiveReq) Reset() { *x = MoonfantasyReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -500,7 +436,7 @@ func (x *MoonfantasyReceiveReq) String() string { func (*MoonfantasyReceiveReq) ProtoMessage() {} func (x *MoonfantasyReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -513,7 +449,7 @@ func (x *MoonfantasyReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyReceiveReq.ProtoReflect.Descriptor instead. func (*MoonfantasyReceiveReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{8} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{7} } func (x *MoonfantasyReceiveReq) GetBid() string { @@ -549,7 +485,7 @@ type MoonfantasyReceiveResp struct { func (x *MoonfantasyReceiveResp) Reset() { *x = MoonfantasyReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -562,7 +498,7 @@ func (x *MoonfantasyReceiveResp) String() string { func (*MoonfantasyReceiveResp) ProtoMessage() {} func (x *MoonfantasyReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -575,7 +511,7 @@ func (x *MoonfantasyReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyReceiveResp.ProtoReflect.Descriptor instead. func (*MoonfantasyReceiveResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{9} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{8} } func (x *MoonfantasyReceiveResp) GetIssucc() bool { @@ -597,7 +533,7 @@ type MoonfantasyBuyReq struct { func (x *MoonfantasyBuyReq) Reset() { *x = MoonfantasyBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[10] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -610,7 +546,7 @@ func (x *MoonfantasyBuyReq) String() string { func (*MoonfantasyBuyReq) ProtoMessage() {} func (x *MoonfantasyBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[10] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -623,7 +559,7 @@ func (x *MoonfantasyBuyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBuyReq.ProtoReflect.Descriptor instead. func (*MoonfantasyBuyReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{10} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{9} } func (x *MoonfantasyBuyReq) GetBuyNum() int32 { @@ -646,7 +582,7 @@ type MoonfantasyBuyResp struct { func (x *MoonfantasyBuyResp) Reset() { *x = MoonfantasyBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[11] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -659,7 +595,7 @@ func (x *MoonfantasyBuyResp) String() string { func (*MoonfantasyBuyResp) ProtoMessage() {} func (x *MoonfantasyBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[11] + mi := &file_moonfantasy_moonfantasy_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -672,7 +608,7 @@ func (x *MoonfantasyBuyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MoonfantasyBuyResp.ProtoReflect.Descriptor instead. func (*MoonfantasyBuyResp) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{11} + return file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP(), []int{10} } func (x *MoonfantasyBuyResp) GetIssucc() bool { @@ -706,57 +642,52 @@ var file_moonfantasy_moonfantasy_msg_proto_rawDesc = []byte{ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x52, 0x09, 0x64, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, 0x22, 0x57, - 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, - 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, - 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x22, 0x5c, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, - 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 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, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, - 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, - 0x6e, 0x73, 0x74, 0x65, 0x72, 0x22, 0x25, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, - 0x74, 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x12, + 0x61, 0x73, 0x79, 0x52, 0x09, 0x64, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x73, 0x22, 0x5c, + 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x54, 0x72, 0x69, + 0x67, 0x67, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, + 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, + 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, + 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x22, 0x25, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x41, 0x73, 0x6b, 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, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5c, 0x0a, 0x14, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, - 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, - 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, - 0x6d, 0x69, 0x64, 0x73, 0x22, 0x6a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 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, 0x10, 0x0a, - 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 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, 0x62, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, - 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x25, 0x0a, - 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, - 0x70, 0x6f, 0x72, 0x74, 0x22, 0x30, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 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, 0x22, 0x2b, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x42, - 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, - 0x4e, 0x75, 0x6d, 0x22, 0x4a, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, - 0x73, 0x79, 0x42, 0x75, 0x79, 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, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6d, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x41, 0x73, 0x6b, 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, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, + 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5c, 0x0a, + 0x14, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, + 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, + 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x6a, 0x0a, 0x15, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 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, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6d, 0x69, 0x64, 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, 0x62, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, + 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, + 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6d, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x30, 0x0a, 0x16, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 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, 0x22, 0x2b, 0x0a, + 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 0x52, + 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x4a, 0x0a, 0x12, 0x4d, 0x6f, + 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x75, 0x79, 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, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x4e, 0x75, 0x6d, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -771,32 +702,31 @@ func file_moonfantasy_moonfantasy_msg_proto_rawDescGZIP() []byte { return file_moonfantasy_moonfantasy_msg_proto_rawDescData } -var file_moonfantasy_moonfantasy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_moonfantasy_moonfantasy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_moonfantasy_moonfantasy_msg_proto_goTypes = []interface{}{ (*MoonfantasyGetListReq)(nil), // 0: MoonfantasyGetListReq (*MoonfantasyGetListResp)(nil), // 1: MoonfantasyGetListResp - (*MoonfantasyTriggerReq)(nil), // 2: MoonfantasyTriggerReq - (*MoonfantasyTriggerResp)(nil), // 3: MoonfantasyTriggerResp - (*MoonfantasyAskReq)(nil), // 4: MoonfantasyAskReq - (*MoonfantasyAskResp)(nil), // 5: MoonfantasyAskResp - (*MoonfantasyBattleReq)(nil), // 6: MoonfantasyBattleReq - (*MoonfantasyBattleResp)(nil), // 7: MoonfantasyBattleResp - (*MoonfantasyReceiveReq)(nil), // 8: MoonfantasyReceiveReq - (*MoonfantasyReceiveResp)(nil), // 9: MoonfantasyReceiveResp - (*MoonfantasyBuyReq)(nil), // 10: MoonfantasyBuyReq - (*MoonfantasyBuyResp)(nil), // 11: MoonfantasyBuyResp - (*DBMoonFantasy)(nil), // 12: DBMoonFantasy - (ErrorCode)(0), // 13: ErrorCode - (*BattleInfo)(nil), // 14: BattleInfo - (*BattleReport)(nil), // 15: BattleReport + (*MoonfantasyTriggerPush)(nil), // 2: MoonfantasyTriggerPush + (*MoonfantasyAskReq)(nil), // 3: MoonfantasyAskReq + (*MoonfantasyAskResp)(nil), // 4: MoonfantasyAskResp + (*MoonfantasyBattleReq)(nil), // 5: MoonfantasyBattleReq + (*MoonfantasyBattleResp)(nil), // 6: MoonfantasyBattleResp + (*MoonfantasyReceiveReq)(nil), // 7: MoonfantasyReceiveReq + (*MoonfantasyReceiveResp)(nil), // 8: MoonfantasyReceiveResp + (*MoonfantasyBuyReq)(nil), // 9: MoonfantasyBuyReq + (*MoonfantasyBuyResp)(nil), // 10: MoonfantasyBuyResp + (*DBMoonFantasy)(nil), // 11: DBMoonFantasy + (ErrorCode)(0), // 12: ErrorCode + (*BattleInfo)(nil), // 13: BattleInfo + (*BattleReport)(nil), // 14: BattleReport } var file_moonfantasy_moonfantasy_msg_proto_depIdxs = []int32{ - 12, // 0: MoonfantasyGetListResp.dfantasys:type_name -> DBMoonFantasy - 13, // 1: MoonfantasyAskResp.code:type_name -> ErrorCode - 12, // 2: MoonfantasyAskResp.info:type_name -> DBMoonFantasy - 13, // 3: MoonfantasyBattleResp.code:type_name -> ErrorCode - 14, // 4: MoonfantasyBattleResp.info:type_name -> BattleInfo - 15, // 5: MoonfantasyReceiveReq.report:type_name -> BattleReport + 11, // 0: MoonfantasyGetListResp.dfantasys:type_name -> DBMoonFantasy + 12, // 1: MoonfantasyAskResp.code:type_name -> ErrorCode + 11, // 2: MoonfantasyAskResp.info:type_name -> DBMoonFantasy + 12, // 3: MoonfantasyBattleResp.code:type_name -> ErrorCode + 13, // 4: MoonfantasyBattleResp.info:type_name -> BattleInfo + 14, // 5: MoonfantasyReceiveReq.report:type_name -> BattleReport 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 @@ -838,7 +768,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { } } file_moonfantasy_moonfantasy_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MoonfantasyTriggerReq); i { + switch v := v.(*MoonfantasyTriggerPush); i { case 0: return &v.state case 1: @@ -850,18 +780,6 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { } } file_moonfantasy_moonfantasy_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MoonfantasyTriggerResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyAskReq); i { case 0: return &v.state @@ -873,7 +791,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyAskResp); i { case 0: return &v.state @@ -885,7 +803,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBattleReq); i { case 0: return &v.state @@ -897,7 +815,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBattleResp); i { case 0: return &v.state @@ -909,7 +827,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyReceiveReq); i { case 0: return &v.state @@ -921,7 +839,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyReceiveResp); i { case 0: return &v.state @@ -933,7 +851,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBuyReq); i { case 0: return &v.state @@ -945,7 +863,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { return nil } } - file_moonfantasy_moonfantasy_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoonfantasyBuyResp); i { case 0: return &v.state @@ -964,7 +882,7 @@ func file_moonfantasy_moonfantasy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_moonfantasy_moonfantasy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 12, + NumMessages: 11, NumExtensions: 0, NumServices: 0, },