liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
meixiongfeng 2023-02-14 11:42:29 +08:00
parent d25cd3bd92
commit 5711441b48
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules/smithyv2/api_getlist.go → modules/smithy/api_getstoveinfo.go
View File

0
modules/smithy/model_smithy.go → modules/smithy/model_smithyv2.go
View File

1
modules/smithyv2/model_smithy.go
View File

@ -35,7 +35,6 @@ func (this *modelSmithy) getSmithyStoveList(uid string) (result *pb.DBStove, err
result = &pb.DBStove{}
if err = this.Get(uid, result); err != nil {
if redis.RedisNil != err { // 没有数据直接创建新的数据
result.Id = primitive.NewObjectID().Hex()
result.Uid = uid
result.Data = make(map[int32]int32, 0)

38
pb/smithy_db.pb.go
View File

@ -259,7 +259,7 @@ type DBTujian 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
Tujian map[int32]*EquipData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
Tujian map[int32]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息
Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度
}
@ -309,7 +309,7 @@ func (x *DBTujian) GetUid() string {
return ""
}
func (x *DBTujian) GetTujian() map[int32]*EquipData {
func (x *DBTujian) GetTujian() map[int32]*ForgeData {
if x != nil {
return x.Tujian
}
@ -323,7 +323,7 @@ func (x *DBTujian) GetSlider() int32 {
return 0
}
type EquipData struct {
type ForgeData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
@ -333,8 +333,8 @@ type EquipData struct {
Quality int32 `protobuf:"varint,3,opt,name=quality,proto3" json:"quality"`
}
func (x *EquipData) Reset() {
*x = EquipData{}
func (x *ForgeData) Reset() {
*x = ForgeData{}
if protoimpl.UnsafeEnabled {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -342,13 +342,13 @@ func (x *EquipData) Reset() {
}
}
func (x *EquipData) String() string {
func (x *ForgeData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EquipData) ProtoMessage() {}
func (*ForgeData) ProtoMessage() {}
func (x *EquipData) ProtoReflect() protoreflect.Message {
func (x *ForgeData) ProtoReflect() protoreflect.Message {
mi := &file_smithy_smithy_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -360,26 +360,26 @@ func (x *EquipData) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use EquipData.ProtoReflect.Descriptor instead.
func (*EquipData) Descriptor() ([]byte, []int) {
// Deprecated: Use ForgeData.ProtoReflect.Descriptor instead.
func (*ForgeData) Descriptor() ([]byte, []int) {
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
}
func (x *EquipData) GetForgeCount() int32 {
func (x *ForgeData) GetForgeCount() int32 {
if x != nil {
return x.ForgeCount
}
return 0
}
func (x *EquipData) GetLv() int32 {
func (x *ForgeData) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
func (x *EquipData) GetQuality() int32 {
func (x *ForgeData) GetQuality() int32 {
if x != nil {
return x.Quality
}
@ -701,9 +701,9 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b,
0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45,
0x71, 0x75, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46,
0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61,
0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74,
0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
@ -773,7 +773,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{
(*DBBusiness)(nil), // 1: DBBusiness
(*DBBusinessData)(nil), // 2: DBBusinessData
(*DBTujian)(nil), // 3: DBTujian
(*EquipData)(nil), // 4: EquipData
(*ForgeData)(nil), // 4: ForgeData
(*Clang)(nil), // 5: Clang
(*OrderClang)(nil), // 6: OrderClang
(*DBSmithy)(nil), // 7: DBSmithy
@ -796,7 +796,7 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{
14, // 7: DBSmithy.items:type_name -> UserAssets
12, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
13, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
4, // 10: DBTujian.TujianEntry.value:type_name -> EquipData
4, // 10: DBTujian.TujianEntry.value:type_name -> ForgeData
11, // [11:11] is the sub-list for method output_type
11, // [11:11] is the sub-list for method input_type
11, // [11:11] is the sub-list for extension type_name
@ -860,7 +860,7 @@ func file_smithy_smithy_db_proto_init() {
}
}
file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EquipData); i {
switch v := v.(*ForgeData); i {
case 0:
return &v.state
case 1: