好感度接口

comm/imodule.go

@@ -298,6 +298,9 @@ type (
 		QueryHeroFetter(uid string) (data []*pb.DBHeroFetter)                                         // 查询所有的羁绊信息
 		AddHeroFetterData(uid string, heroConfId string) (code pb.ErrorCode)                          // 创建一条羁绊信息
 		SendRpcAddHero(uid string, heroConfId string, serverTag string) (err error)
+
+		// 获取 某个阵营的羁绊数据
+		QueryFavorabilityByRace(uid string, race int32) int32
 	}
 	//月子秘境
 	IMoonFantasy interface {

modules/library/module.go

@@ -319,3 +319,11 @@ func (this *Library) TaskFinishNotify(uid string, taskId, fetterId int32) error
 	}
 	return nil
 }
+
+// 获取阵营的好感度
+func (this *Library) QueryFavorabilityByRace(uid string, race int32) int32 {
+	if rst, err := this.ModuleUser.GetUserExpand(uid); err == nil { // 统计主线进度
+		return rst.Race[race]
+	}
+	return 0
+}

pb/library_db.pb.go

@@ -28,7 +28,7 @@ type DBLibrary struct {
 	Id         string           `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                      //ID
 	Uid        string           `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                    //用户ID
 	Fid        int32            `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"`                                                                                              // 配置表id 羁绊id
-	Hero       map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`    // key: hid value: favorlv
+	Hero       map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`    // key: hid value: id
 	Prize      map[int32]int32  `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖  key 好感度等级
 	Fetterlv   int32            `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"`                                                                                    // 当前羁绊等级
 	Storyid    int32            `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"`                                                                                      // 故事id 用来判断是否领奖

pb/troll_db.pb.go

@@ -300,6 +300,180 @@ func (x *DBTrollRecord) GetTime() int64 {
 	return 0
 }
 
+type DBGoods struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`     //ID
+	Period    int32  `protobuf:"varint,2,opt,name=period,proto3" json:"period"`       // 变动周期
+	CurPeriod int32  `protobuf:"varint,3,opt,name=curPeriod,proto3" json:"curPeriod"` // 当前变动周期
+	Weight    int32  `protobuf:"varint,4,opt,name=weight,proto3" json:"weight"`       // 周期权重
+	Price     int32  `protobuf:"varint,5,opt,name=price,proto3" json:"price"`         // 当前价格
+	Time      int32  `protobuf:"varint,6,opt,name=time,proto3" json:"time"`           // 刷新时间
+}
+
+func (x *DBGoods) Reset() {
+	*x = DBGoods{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_troll_troll_db_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBGoods) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBGoods) ProtoMessage() {}
+
+func (x *DBGoods) ProtoReflect() protoreflect.Message {
+	mi := &file_troll_troll_db_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 DBGoods.ProtoReflect.Descriptor instead.
+func (*DBGoods) Descriptor() ([]byte, []int) {
+	return file_troll_troll_db_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DBGoods) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *DBGoods) GetPeriod() int32 {
+	if x != nil {
+		return x.Period
+	}
+	return 0
+}
+
+func (x *DBGoods) GetCurPeriod() int32 {
+	if x != nil {
+		return x.CurPeriod
+	}
+	return 0
+}
+
+func (x *DBGoods) GetWeight() int32 {
+	if x != nil {
+		return x.Weight
+	}
+	return 0
+}
+
+func (x *DBGoods) GetPrice() int32 {
+	if x != nil {
+		return x.Price
+	}
+	return 0
+}
+
+func (x *DBGoods) GetTime() int32 {
+	if x != nil {
+		return x.Time
+	}
+	return 0
+}
+
+type DBTroll struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id       string             `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                      //ID
+	Uid      string             `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                    //用户ID
+	UseCount int32              `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount"`                                                                                    // 当前背包使用的数量
+	Items    map[int32]int32    `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 背包数据
+	Goods    map[int32]*DBGoods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`  // 货物 key 货物ID
+	Lv       int32              `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"`                                                                                                // 商队等级
+}
+
+func (x *DBTroll) Reset() {
+	*x = DBTroll{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_troll_troll_db_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBTroll) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBTroll) ProtoMessage() {}
+
+func (x *DBTroll) ProtoReflect() protoreflect.Message {
+	mi := &file_troll_troll_db_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 DBTroll.ProtoReflect.Descriptor instead.
+func (*DBTroll) Descriptor() ([]byte, []int) {
+	return file_troll_troll_db_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DBTroll) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *DBTroll) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *DBTroll) GetUseCount() int32 {
+	if x != nil {
+		return x.UseCount
+	}
+	return 0
+}
+
+func (x *DBTroll) GetItems() map[int32]int32 {
+	if x != nil {
+		return x.Items
+	}
+	return nil
+}
+
+func (x *DBTroll) GetGoods() map[int32]*DBGoods {
+	if x != nil {
+		return x.Goods
+	}
+	return nil
+}
+
+func (x *DBTroll) GetLv() int32 {
+	if x != nil {
+		return x.Lv
+	}
+	return 0
+}
+
 var File_troll_troll_db_proto protoreflect.FileDescriptor
 
 var file_troll_troll_db_proto_rawDesc = []byte{
@@ -370,8 +544,36 @@ var file_troll_troll_db_proto_rawDesc = []byte{
 	0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f,
 	0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x03, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x47,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x09, 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xab, 0x02, 0x0a,
+	0x07, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 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, 0x1a, 0x0a, 0x08, 0x75, 0x73,
+	0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73,
+	0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e,
+	0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
+	0x73, 0x12, 0x29, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02,
+	0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x1a, 0x38, 0x0a, 0x0a,
+	0x49, 0x74, 0x65, 0x6d, 0x73, 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, 0x42, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x6f, 0x64, 0x73, 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,
 }
 
 var (
@@ -386,27 +588,34 @@ func file_troll_troll_db_proto_rawDescGZIP() []byte {
 	return file_troll_troll_db_proto_rawDescData
 }
 
-var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_troll_troll_db_proto_goTypes = []interface{}{
 	(*DBTrollTrain)(nil),  // 0: DBTrollTrain
 	(*DBTrollRecord)(nil), // 1: DBTrollRecord
-	nil,                   // 2: DBTrollTrain.ItemsEntry
+	(*DBGoods)(nil),       // 2: DBGoods
-	nil,                   // 3: DBTrollTrain.PriceEntry
+	(*DBTroll)(nil),       // 3: DBTroll
-	nil,                   // 4: DBTrollTrain.NpcRewardEntry
+	nil,                   // 4: DBTrollTrain.ItemsEntry
-	nil,                   // 5: DBTrollTrain.ShopEntry
+	nil,                   // 5: DBTrollTrain.PriceEntry
-	nil,                   // 6: DBTrollTrain.SurpriseIDEntry
+	nil,                   // 6: DBTrollTrain.NpcRewardEntry
+	nil,                   // 7: DBTrollTrain.ShopEntry
+	nil,                   // 8: DBTrollTrain.SurpriseIDEntry
+	nil,                   // 9: DBTroll.ItemsEntry
+	nil,                   // 10: DBTroll.GoodsEntry
 }
 var file_troll_troll_db_proto_depIdxs = []int32{
-	2, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry
+	4,  // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry
-	3, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry
+	5,  // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry
-	4, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry
+	6,  // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry
-	5, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry
+	7,  // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry
-	6, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry
+	8,  // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry
-	5, // [5:5] is the sub-list for method output_type
+	9,  // 5: DBTroll.items:type_name -> DBTroll.ItemsEntry
-	5, // [5:5] is the sub-list for method input_type
+	10, // 6: DBTroll.goods:type_name -> DBTroll.GoodsEntry
-	5, // [5:5] is the sub-list for extension type_name
+	2,  // 7: DBTroll.GoodsEntry.value:type_name -> DBGoods
-	5, // [5:5] is the sub-list for extension extendee
+	8,  // [8:8] is the sub-list for method output_type
-	0, // [0:5] is the sub-list for field type_name
+	8,  // [8:8] is the sub-list for method input_type
+	8,  // [8:8] is the sub-list for extension type_name
+	8,  // [8:8] is the sub-list for extension extendee
+	0,  // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_troll_troll_db_proto_init() }
@@ -439,6 +648,30 @@ func file_troll_troll_db_proto_init() {
 				return nil
 			}
 		}
+		file_troll_troll_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBGoods); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_troll_troll_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBTroll); 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{
@@ -446,7 +679,7 @@ func file_troll_troll_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_troll_troll_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/userexpand.pb.go

@@ -58,6 +58,7 @@ type DBUserExpand struct {
 	Mline                    map[int32]int32  `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID
 	SuiteId                  []int32          `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"`                                                                             // 套装Id
 	Globalbuff               int32            `protobuf:"varint,36,opt,name=globalbuff,proto3" json:"globalbuff" bson:"globalbuff"`                                                                           // 全局buff
+	Race                     map[int32]int32  `protobuf:"bytes,37,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`                // key 阵营ID 1~4 value 总好感度
 }
 
 func (x *DBUserExpand) Reset() {
@@ -316,11 +317,18 @@ func (x *DBUserExpand) GetGlobalbuff() int32 {
 	return 0
 }
 
+func (x *DBUserExpand) GetRace() map[int32]int32 {
+	if x != nil {
+		return x.Race
+	}
+	return nil
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
 	0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0xac, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
+	0x74, 0x6f, 0x22, 0x92, 0x0b, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
 	0x61, 0x6e, 0x64, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61,
@@ -395,16 +403,22 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03,
 	0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x67,
 	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x3a, 0x0a, 0x0c, 0x45,
+	0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x12, 0x2b, 0x0a, 0x04, 0x72,
-	0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x55, 0x73,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69,
+	0x74, 0x65, 0x6d, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 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, 0x37,
+	0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 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, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 0x65,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	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,
 }
 
 var (
@@ -419,20 +433,22 @@ func file_userexpand_proto_rawDescGZIP() []byte {
 	return file_userexpand_proto_rawDescData
 }
 
-var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_userexpand_proto_goTypes = []interface{}{
 	(*DBUserExpand)(nil), // 0: DBUserExpand
 	nil,                  // 1: DBUserExpand.ExpitemEntry
 	nil,                  // 2: DBUserExpand.MlineEntry
+	nil,                  // 3: DBUserExpand.RaceEntry
 }
 var file_userexpand_proto_depIdxs = []int32{
 	1, // 0: DBUserExpand.expitem:type_name -> DBUserExpand.ExpitemEntry
 	2, // 1: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry
-	2, // [2:2] is the sub-list for method output_type
+	3, // 2: DBUserExpand.race:type_name -> DBUserExpand.RaceEntry
-	2, // [2:2] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension extendee
+	3, // [3:3] is the sub-list for extension type_name
-	0, // [0:2] is the sub-list for field type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_userexpand_proto_init() }
@@ -460,7 +476,7 @@ func file_userexpand_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_userexpand_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},