diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go index e2f2ec99e..d9320a332 100644 --- a/modules/moonfantasy/api_ask.go +++ b/modules/moonfantasy/api_ask.go @@ -94,7 +94,16 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) ( } return } - mdata.Join = append(mdata.Join, &pb.UserInfo{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv}) + mdata.Join = append(mdata.Join, &pb.BaseUserInfo{ + Uid: user.Uid, + Sid: user.Sid, + Name: user.Name, + Gender: user.Gender, + Skin: user.CurSkin, + Aframe: user.Curaframe, + Title: user.Curtitle, + Lv: user.Lv, + }) this.module.modelDream.ChangeList("", mdata.Id, map[string]interface{}{ "join": mdata.Join, }) diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 3cf739b81..db5c5cf67 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -66,13 +66,13 @@ func (this *modelDreamComp) querymfantasys(uid string) (result []*pb.DBMoonFanta } // /添加月之秘境记录 -func (this *modelDreamComp) addDreamData(user *pb.UserInfo, boss *cfg.GameDreamlandBoosData) (result *pb.DBMoonFantasy, err error) { +func (this *modelDreamComp) addDreamData(user *pb.BaseUserInfo, boss *cfg.GameDreamlandBoosData) (result *pb.DBMoonFantasy, err error) { result = &pb.DBMoonFantasy{ Id: primitive.NewObjectID().Hex(), Uid: user.Uid, Monster: boss.Bossid, Ctime: configure.Now().Unix(), - Join: []*pb.UserInfo{user}, + Join: []*pb.BaseUserInfo{user}, Numup: boss.Challengenum, Unitmup: boss.Fightnum, Expir: configure.Now().Add(time.Second * time.Duration(boss.DreamlandLimit)).Unix(), @@ -114,7 +114,16 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { return } - if mdata, err = this.module.modelDream.addDreamData(&pb.UserInfo{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv}, boss); err != nil { + if mdata, err = this.module.modelDream.addDreamData(&pb.BaseUserInfo{ + Uid: user.Uid, + Sid: user.Sid, + Name: user.Name, + Gender: user.Gender, + Skin: user.CurSkin, + Aframe: user.Curaframe, + Title: user.Curtitle, + Lv: user.Lv, + }, boss); err != nil { return } // umfantasy.Mfantasys = append(umfantasy.Mfantasys, mdata.Id) @@ -166,7 +175,16 @@ func (this *modelDreamComp) triggerbyid(session comm.IUserSession, boosid string return } - if mdata, err = this.module.modelDream.addDreamData(&pb.UserInfo{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv}, boss); err != nil { + if mdata, err = this.module.modelDream.addDreamData(&pb.BaseUserInfo{ + Uid: user.Uid, + Sid: user.Sid, + Name: user.Name, + Gender: user.Gender, + Skin: user.CurSkin, + Aframe: user.Curaframe, + Title: user.Curtitle, + Lv: user.Lv, + }, boss); err != nil { return } // umfantasy.Mfantasys = append(umfantasy.Mfantasys, mdata.Id) diff --git a/pb/moonfantasy_db.pb.go b/pb/moonfantasy_db.pb.go index 30ddc79c1..ed53f187b 100644 --- a/pb/moonfantasy_db.pb.go +++ b/pb/moonfantasy_db.pb.go @@ -20,77 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type UserInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //昵称 - Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` // 头像 - Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级 -} - -func (x *UserInfo) Reset() { - *x = UserInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UserInfo) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UserInfo) ProtoMessage() {} - -func (x *UserInfo) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_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 UserInfo.ProtoReflect.Descriptor instead. -func (*UserInfo) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{0} -} - -func (x *UserInfo) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *UserInfo) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *UserInfo) GetAvatar() string { - if x != nil { - return x.Avatar - } - return "" -} - -func (x *UserInfo) GetLv() int32 { - if x != nil { - return x.Lv - } - return 0 -} - //月之秘境 type DBMoonFantasy struct { state protoimpl.MessageState @@ -101,7 +30,7 @@ type DBMoonFantasy struct { Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id Monster string `protobuf:"bytes,3,opt,name=monster,proto3" json:"monster"` //怪物id Ctime int64 `protobuf:"varint,4,opt,name=ctime,proto3" json:"ctime"` //创建时间 - Join []*UserInfo `protobuf:"bytes,5,rep,name=join,proto3" json:"join"` //参与人数 + Join []*BaseUserInfo `protobuf:"bytes,5,rep,name=join,proto3" json:"join"` //参与人数 Numup int32 `protobuf:"varint,6,opt,name=numup,proto3" json:"numup"` //人数上限 Unitmup int32 `protobuf:"varint,7,opt,name=unitmup,proto3" json:"unitmup"` //单人可挑战次数 Expir int64 `protobuf:"varint,8,opt,name=expir,proto3" json:"expir"` //过期时间 @@ -111,7 +40,7 @@ type DBMoonFantasy struct { func (x *DBMoonFantasy) Reset() { *x = DBMoonFantasy{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -124,7 +53,7 @@ func (x *DBMoonFantasy) String() string { func (*DBMoonFantasy) ProtoMessage() {} func (x *DBMoonFantasy) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -137,7 +66,7 @@ func (x *DBMoonFantasy) ProtoReflect() protoreflect.Message { // Deprecated: Use DBMoonFantasy.ProtoReflect.Descriptor instead. func (*DBMoonFantasy) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{1} + return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{0} } func (x *DBMoonFantasy) GetId() string { @@ -168,7 +97,7 @@ func (x *DBMoonFantasy) GetCtime() int64 { return 0 } -func (x *DBMoonFantasy) GetJoin() []*UserInfo { +func (x *DBMoonFantasy) GetJoin() []*BaseUserInfo { if x != nil { return x.Join } @@ -221,7 +150,7 @@ type DBUserMFantasy struct { func (x *DBUserMFantasy) Reset() { *x = DBUserMFantasy{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -234,7 +163,7 @@ func (x *DBUserMFantasy) String() string { func (*DBUserMFantasy) ProtoMessage() {} func (x *DBUserMFantasy) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -247,7 +176,7 @@ func (x *DBUserMFantasy) ProtoReflect() protoreflect.Message { // Deprecated: Use DBUserMFantasy.ProtoReflect.Descriptor instead. func (*DBUserMFantasy) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{2} + return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{1} } func (x *DBUserMFantasy) GetId() string { @@ -305,7 +234,7 @@ type RPCTargetMFReq struct { func (x *RPCTargetMFReq) Reset() { *x = RPCTargetMFReq{} if protoimpl.UnsafeEnabled { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[3] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -318,7 +247,7 @@ func (x *RPCTargetMFReq) String() string { func (*RPCTargetMFReq) ProtoMessage() {} func (x *RPCTargetMFReq) ProtoReflect() protoreflect.Message { - mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[3] + mi := &file_moonfantasy_moonfantasy_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -331,7 +260,7 @@ func (x *RPCTargetMFReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCTargetMFReq.ProtoReflect.Descriptor instead. func (*RPCTargetMFReq) Descriptor() ([]byte, []int) { - return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{3} + return file_moonfantasy_moonfantasy_db_proto_rawDescGZIP(), []int{2} } func (x *RPCTargetMFReq) GetUid() string { @@ -353,48 +282,43 @@ var File_moonfantasy_moonfantasy_db_proto protoreflect.FileDescriptor var file_moonfantasy_moonfantasy_db_proto_rawDesc = []byte{ 0x0a, 0x20, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2f, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x58, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, - 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xb5, 0x02, 0x0a, - 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 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, 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, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x12, 0x1d, 0x0a, 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x12, - 0x14, 0x0a, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, 0x12, - 0x14, 0x0a, 0x05, 0x65, 0x78, 0x70, 0x69, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x65, 0x78, 0x70, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, - 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0xb6, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x4d, - 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 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, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, - 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, - 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, - 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x69, 0x67, - 0x67, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, - 0x73, 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x3a, 0x0a, - 0x0e, 0x52, 0x50, 0x43, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x46, 0x52, 0x65, 0x71, 0x12, - 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb9, + 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 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, 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, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, + 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x04, 0x6a, 0x6f, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x75, 0x6d, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x75, + 0x6e, 0x69, 0x74, 0x6d, 0x75, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x6e, + 0x69, 0x74, 0x6d, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x78, 0x70, 0x69, 0x72, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x78, 0x70, 0x69, 0x72, 0x12, 0x32, 0x0a, 0x06, 0x72, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, + 0x4d, 0x6f, 0x6f, 0x6e, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, + 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x22, 0xb6, 0x01, 0x0a, 0x0e, 0x44, + 0x42, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x46, 0x61, 0x6e, 0x74, 0x61, 0x73, 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, + 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, + 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, + 0x73, 0x74, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, + 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x74, + 0x69, 0x6d, 0x65, 0x22, 0x3a, 0x0a, 0x0e, 0x52, 0x50, 0x43, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x4d, 0x46, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -409,17 +333,17 @@ func file_moonfantasy_moonfantasy_db_proto_rawDescGZIP() []byte { return file_moonfantasy_moonfantasy_db_proto_rawDescData } -var file_moonfantasy_moonfantasy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_moonfantasy_moonfantasy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_moonfantasy_moonfantasy_db_proto_goTypes = []interface{}{ - (*UserInfo)(nil), // 0: UserInfo - (*DBMoonFantasy)(nil), // 1: DBMoonFantasy - (*DBUserMFantasy)(nil), // 2: DBUserMFantasy - (*RPCTargetMFReq)(nil), // 3: RPCTargetMFReq - nil, // 4: DBMoonFantasy.RecordEntry + (*DBMoonFantasy)(nil), // 0: DBMoonFantasy + (*DBUserMFantasy)(nil), // 1: DBUserMFantasy + (*RPCTargetMFReq)(nil), // 2: RPCTargetMFReq + nil, // 3: DBMoonFantasy.RecordEntry + (*BaseUserInfo)(nil), // 4: BaseUserInfo } var file_moonfantasy_moonfantasy_db_proto_depIdxs = []int32{ - 0, // 0: DBMoonFantasy.join:type_name -> UserInfo - 4, // 1: DBMoonFantasy.record:type_name -> DBMoonFantasy.RecordEntry + 4, // 0: DBMoonFantasy.join:type_name -> BaseUserInfo + 3, // 1: DBMoonFantasy.record:type_name -> DBMoonFantasy.RecordEntry 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 @@ -432,20 +356,9 @@ func file_moonfantasy_moonfantasy_db_proto_init() { if File_moonfantasy_moonfantasy_db_proto != nil { return } + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_moonfantasy_moonfantasy_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_moonfantasy_moonfantasy_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBMoonFantasy); i { case 0: return &v.state @@ -457,7 +370,7 @@ func file_moonfantasy_moonfantasy_db_proto_init() { return nil } } - file_moonfantasy_moonfantasy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBUserMFantasy); i { case 0: return &v.state @@ -469,7 +382,7 @@ func file_moonfantasy_moonfantasy_db_proto_init() { return nil } } - file_moonfantasy_moonfantasy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_moonfantasy_moonfantasy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RPCTargetMFReq); i { case 0: return &v.state @@ -488,7 +401,7 @@ func file_moonfantasy_moonfantasy_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_moonfantasy_moonfantasy_db_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 4, NumExtensions: 0, NumServices: 0, },