From 45e97a592707113c49f4dea89132257e5451b1b7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 21 Feb 2023 11:05:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/api_atlasaward.go | 55 +++++ modules/smithy/model_atlas.go | 7 +- pb/errorcode.pb.go | 15 +- pb/smithy_db.pb.go | 155 +++++++------ pb/smithy_msg.pb.go | 364 ++++++++++++++++++++----------- 5 files changed, 389 insertions(+), 207 deletions(-) create mode 100644 modules/smithy/api_atlasaward.go diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go new file mode 100644 index 000000000..af9bdd41a --- /dev/null +++ b/modules/smithy/api_atlasaward.go @@ -0,0 +1,55 @@ +package smithy + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode) { + + return +} + +// 获取铁匠铺图鉴信息 +func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data proto.Message) { + + code = this.AtlasAwardCheck(session, req) + if code != pb.ErrorCode_Success { + return // 参数校验失败直接返回 + } + atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + conf := this.module.configure.GetSmithyAtlasLvConf(atlas.Reward) + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + nexLv := this.module.configure.GetSmithyAtlasLvConf(atlas.Reward + 1) + if nexLv == nil { //满级 + code = pb.ErrorCode_SmithyAtlasMaxLv + return + } + // 校验能否领取奖励 + if atlas.Score < nexLv.AtlasLv { + code = pb.ErrorCode_SmithyAtlasLackLv + return + } + if code = this.module.DispenseRes(session, conf.ItemId, true); code != pb.ErrorCode_Success { + return + } + //修改数据 + atlas.Award += 1 + update := make(map[string]interface{}, 0) + update["award"] = atlas.Award + this.module.modelAtlas.modifySmithyAtlasList(session.GetUserId(), update) + + session.SendMsg(string(this.module.GetType()), "atlasaward", &pb.SmithyAtlasAwardResp{Data: atlas}) + return +} diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index f549c8e2b..2f84be35e 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -33,7 +33,8 @@ func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err if mongo.ErrNoDocuments == err { result.Id = primitive.NewObjectID().Hex() result.Uid = uid - result.Tujian = make(map[string]*pb.ForgeData, 0) + result.Atlas = make(map[string]*pb.ForgeData, 0) + result.Reward = 1 // 初始1级 this.Add(uid, result) err = nil } @@ -57,7 +58,7 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual if err != nil { return false } - for k, v := range list.Tujian { + for k, v := range list.Atlas { if k == id { // 找到相同的 校验 对应的分数 // 获取分数 scoreConf := this.module.configure.GetSmithyAtlasScoreConf(quality, lv) @@ -68,7 +69,7 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual v.Score = scoreConf.Score v.ForgeCount = forgeCount // 更新锻造次数 update := make(map[string]interface{}, 0) - update["tujian"] = list.Tujian + update["tujian"] = list.Atlas this.module.modelAtlas.modifySmithyAtlasList(uid, update) // 更新分数信息 } return true diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 22781d097..c8b741ba5 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -323,6 +323,8 @@ const ( ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足 ErrorCode_SmithyMaxTemperature ErrorCode = 4106 // 炉温达上限 ErrorCode_SmithyLackLava ErrorCode = 4107 // 缺少熔岩 + ErrorCode_SmithyAtlasMaxLv ErrorCode = 4108 // 图鉴奖励满级 + ErrorCode_SmithyAtlasLackLv ErrorCode = 4109 // 图鉴奖励等级不足 ) // Enum value maps for ErrorCode. @@ -596,6 +598,8 @@ var ( 4105: "SmithyCustomerEquipNoEnough", 4106: "SmithyMaxTemperature", 4107: "SmithyLackLava", + 4108: "SmithyAtlasMaxLv", + 4109: "SmithyAtlasLackLv", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -866,6 +870,8 @@ var ( "SmithyCustomerEquipNoEnough": 4105, "SmithyMaxTemperature": 4106, "SmithyLackLava": 4107, + "SmithyAtlasMaxLv": 4108, + "SmithyAtlasLackLv": 4109, } ) @@ -900,7 +906,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xc2, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xf1, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -1288,8 +1294,11 @@ var file_errorcode_proto_rawDesc = []byte{ 0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, - 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, + 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, + 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, + 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/smithy_db.pb.go b/pb/smithy_db.pb.go index 94ab82f9c..c27f346f4 100644 --- a/pb/smithy_db.pb.go +++ b/pb/smithy_db.pb.go @@ -327,11 +327,11 @@ type DBAtlas struct { 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 - Tujian map[string]*ForgeData `protobuf:"bytes,3,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息 - Slider int32 `protobuf:"varint,4,opt,name=slider,proto3" json:"slider"` // 进度 - Reward int32 `protobuf:"varint,5,opt,name=reward,proto3" json:"reward"` // 奖励进度 + 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 + Atlas map[string]*ForgeData `protobuf:"bytes,3,rep,name=atlas,proto3" json:"atlas" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 图鉴信息 + Score int32 `protobuf:"varint,4,opt,name=score,proto3" json:"score"` // 总积分 + Award int32 `protobuf:"varint,5,opt,name=award,proto3" json:"award"` // 奖励进度 } func (x *DBAtlas) Reset() { @@ -380,23 +380,23 @@ func (x *DBAtlas) GetUid() string { return "" } -func (x *DBAtlas) GetTujian() map[string]*ForgeData { +func (x *DBAtlas) GetAtlas() map[string]*ForgeData { if x != nil { - return x.Tujian + return x.Atlas } return nil } -func (x *DBAtlas) GetSlider() int32 { +func (x *DBAtlas) GetScore() int32 { if x != nil { - return x.Slider + return x.Score } return 0 } -func (x *DBAtlas) GetReward() int32 { +func (x *DBAtlas) GetAward() int32 { if x != nil { - return x.Reward + return x.Award } return 0 } @@ -786,71 +786,70 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{ 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0xd0, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x0e, 0x0a, 0x02, + 0x22, 0xc8, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 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, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, - 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, - 0x69, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, - 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, 0x6b, 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, - 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, - 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, - 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, - 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, - 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, - 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, - 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, - 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 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, 0x1c, 0x0a, 0x05, - 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, - 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, - 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, - 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, - 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, - 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, - 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 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, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, - 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x29, + 0x0a, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x2e, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x6c, 0x61, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, + 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x44, 0x0a, 0x0a, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 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, 0x6b, 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, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, + 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, + 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, + 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, + 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, + 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, + 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, + 0x68, 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, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, + 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, + 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, + 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, + 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, + 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, + 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, + 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, + 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, + 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, + 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, + 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x3c, 0x0a, 0x0e, + 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -879,7 +878,7 @@ var file_smithy_smithy_db_proto_goTypes = []interface{}{ nil, // 9: DBStove.DataEntry nil, // 10: DBStove.SkillEntry nil, // 11: DBStove.ForgeEntry - nil, // 12: DBAtlas.TujianEntry + nil, // 12: DBAtlas.AtlasEntry nil, // 13: DBSmithy.SkillEntry nil, // 14: DBSmithy.DeskFloorEntry (*UserAssets)(nil), // 15: UserAssets @@ -889,14 +888,14 @@ var file_smithy_smithy_db_proto_depIdxs = []int32{ 10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry 11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry 2, // 3: DBCustomer.customers:type_name -> CustomerInfo - 12, // 4: DBAtlas.tujian:type_name -> DBAtlas.TujianEntry + 12, // 4: DBAtlas.atlas:type_name -> DBAtlas.AtlasEntry 6, // 5: DBSmithy.clang:type_name -> Clang 7, // 6: DBSmithy.orders:type_name -> OrderClang 15, // 7: DBSmithy.items:type_name -> UserAssets 13, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry 14, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry 0, // 10: DBStove.DataEntry.value:type_name -> Mastery - 5, // 11: DBAtlas.TujianEntry.value:type_name -> ForgeData + 5, // 11: DBAtlas.AtlasEntry.value:type_name -> ForgeData 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index c9e6deaca..fe317c8de 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -919,6 +919,92 @@ func (x *SmithyAtlasListResp) GetData() *DBAtlas { return nil } +// 图鉴信息奖励任务领取 +type SmithyAtlasAwardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *SmithyAtlasAwardReq) Reset() { + *x = SmithyAtlasAwardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyAtlasAwardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyAtlasAwardReq) ProtoMessage() {} + +func (x *SmithyAtlasAwardReq) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[18] + 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 SmithyAtlasAwardReq.ProtoReflect.Descriptor instead. +func (*SmithyAtlasAwardReq) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} +} + +type SmithyAtlasAwardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBAtlas `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息 +} + +func (x *SmithyAtlasAwardResp) Reset() { + *x = SmithyAtlasAwardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyAtlasAwardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyAtlasAwardResp) ProtoMessage() {} + +func (x *SmithyAtlasAwardResp) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[19] + 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 SmithyAtlasAwardResp.ProtoReflect.Descriptor instead. +func (*SmithyAtlasAwardResp) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *SmithyAtlasAwardResp) GetData() *DBAtlas { + if x != nil { + return x.Data + } + return nil +} + ////////////////////////////////////////// // 创建订单 type SmithyCreateOrderReq struct { @@ -932,7 +1018,7 @@ type SmithyCreateOrderReq struct { func (x *SmithyCreateOrderReq) Reset() { *x = SmithyCreateOrderReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -945,7 +1031,7 @@ func (x *SmithyCreateOrderReq) String() string { func (*SmithyCreateOrderReq) ProtoMessage() {} func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[18] + mi := &file_smithy_smithy_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -958,7 +1044,7 @@ func (x *SmithyCreateOrderReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderReq.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{18} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} } func (x *SmithyCreateOrderReq) GetOrder() []*OrderClang { @@ -979,7 +1065,7 @@ type SmithyCreateOrderResp struct { func (x *SmithyCreateOrderResp) Reset() { *x = SmithyCreateOrderResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -992,7 +1078,7 @@ func (x *SmithyCreateOrderResp) String() string { func (*SmithyCreateOrderResp) ProtoMessage() {} func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[19] + mi := &file_smithy_smithy_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1005,7 +1091,7 @@ func (x *SmithyCreateOrderResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyCreateOrderResp.ProtoReflect.Descriptor instead. func (*SmithyCreateOrderResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{19} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} } func (x *SmithyCreateOrderResp) GetData() *DBSmithy { @@ -1025,7 +1111,7 @@ type SmithyGetRewardReq struct { func (x *SmithyGetRewardReq) Reset() { *x = SmithyGetRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1038,7 +1124,7 @@ func (x *SmithyGetRewardReq) String() string { func (*SmithyGetRewardReq) ProtoMessage() {} func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[20] + mi := &file_smithy_smithy_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1051,7 +1137,7 @@ func (x *SmithyGetRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardReq.ProtoReflect.Descriptor instead. func (*SmithyGetRewardReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{20} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} } type SmithyGetRewardResp struct { @@ -1065,7 +1151,7 @@ type SmithyGetRewardResp struct { func (x *SmithyGetRewardResp) Reset() { *x = SmithyGetRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1078,7 +1164,7 @@ func (x *SmithyGetRewardResp) String() string { func (*SmithyGetRewardResp) ProtoMessage() {} func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[21] + mi := &file_smithy_smithy_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1091,7 +1177,7 @@ func (x *SmithyGetRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRewardResp.ProtoReflect.Descriptor instead. func (*SmithyGetRewardResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{21} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} } func (x *SmithyGetRewardResp) GetData() *DBSmithy { @@ -1113,7 +1199,7 @@ type SmithyDeskSkillLvReq struct { func (x *SmithyDeskSkillLvReq) Reset() { *x = SmithyDeskSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1126,7 +1212,7 @@ func (x *SmithyDeskSkillLvReq) String() string { func (*SmithyDeskSkillLvReq) ProtoMessage() {} func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[22] + mi := &file_smithy_smithy_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1139,7 +1225,7 @@ func (x *SmithyDeskSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{22} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} } func (x *SmithyDeskSkillLvReq) GetDeskType() int32 { @@ -1160,7 +1246,7 @@ type SmithyDeskSkillLvResp struct { func (x *SmithyDeskSkillLvResp) Reset() { *x = SmithyDeskSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1173,7 +1259,7 @@ func (x *SmithyDeskSkillLvResp) String() string { func (*SmithyDeskSkillLvResp) ProtoMessage() {} func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[23] + mi := &file_smithy_smithy_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1186,7 +1272,7 @@ func (x *SmithyDeskSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyDeskSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyDeskSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{23} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} } func (x *SmithyDeskSkillLvResp) GetData() *DBSmithy { @@ -1206,7 +1292,7 @@ type SmithyStoveSkillLvReq struct { func (x *SmithyStoveSkillLvReq) Reset() { *x = SmithyStoveSkillLvReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1219,7 +1305,7 @@ func (x *SmithyStoveSkillLvReq) String() string { func (*SmithyStoveSkillLvReq) ProtoMessage() {} func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[24] + mi := &file_smithy_smithy_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1232,7 +1318,7 @@ func (x *SmithyStoveSkillLvReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvReq.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{24} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} } type SmithyStoveSkillLvResp struct { @@ -1246,7 +1332,7 @@ type SmithyStoveSkillLvResp struct { func (x *SmithyStoveSkillLvResp) Reset() { *x = SmithyStoveSkillLvResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1259,7 +1345,7 @@ func (x *SmithyStoveSkillLvResp) String() string { func (*SmithyStoveSkillLvResp) ProtoMessage() {} func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[25] + mi := &file_smithy_smithy_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1272,7 +1358,7 @@ func (x *SmithyStoveSkillLvResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyStoveSkillLvResp.ProtoReflect.Descriptor instead. func (*SmithyStoveSkillLvResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{25} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} } func (x *SmithyStoveSkillLvResp) GetData() *DBSmithy { @@ -1293,7 +1379,7 @@ type SmithyGetRandUserReq struct { func (x *SmithyGetRandUserReq) Reset() { *x = SmithyGetRandUserReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1306,7 +1392,7 @@ func (x *SmithyGetRandUserReq) String() string { func (*SmithyGetRandUserReq) ProtoMessage() {} func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[26] + mi := &file_smithy_smithy_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1319,7 +1405,7 @@ func (x *SmithyGetRandUserReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserReq.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{26} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28} } func (x *SmithyGetRandUserReq) GetPeople() int32 { @@ -1340,7 +1426,7 @@ type SmithyGetRandUserResp struct { func (x *SmithyGetRandUserResp) Reset() { *x = SmithyGetRandUserResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1353,7 +1439,7 @@ func (x *SmithyGetRandUserResp) String() string { func (*SmithyGetRandUserResp) ProtoMessage() {} func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[27] + mi := &file_smithy_smithy_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1366,7 +1452,7 @@ func (x *SmithyGetRandUserResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetRandUserResp.ProtoReflect.Descriptor instead. func (*SmithyGetRandUserResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{27} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29} } func (x *SmithyGetRandUserResp) GetUser() []*DBUser { @@ -1385,7 +1471,7 @@ type SmithyGetListReq struct { func (x *SmithyGetListReq) Reset() { *x = SmithyGetListReq{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[28] + mi := &file_smithy_smithy_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1398,7 +1484,7 @@ func (x *SmithyGetListReq) String() string { func (*SmithyGetListReq) ProtoMessage() {} func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[28] + mi := &file_smithy_smithy_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1411,7 +1497,7 @@ func (x *SmithyGetListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListReq.ProtoReflect.Descriptor instead. func (*SmithyGetListReq) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{30} } // 返回进度信息 @@ -1426,7 +1512,7 @@ type SmithyGetListResp struct { func (x *SmithyGetListResp) Reset() { *x = SmithyGetListResp{} if protoimpl.UnsafeEnabled { - mi := &file_smithy_smithy_msg_proto_msgTypes[29] + mi := &file_smithy_smithy_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1439,7 +1525,7 @@ func (x *SmithyGetListResp) String() string { func (*SmithyGetListResp) ProtoMessage() {} func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_smithy_smithy_msg_proto_msgTypes[29] + mi := &file_smithy_smithy_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1452,7 +1538,7 @@ func (x *SmithyGetListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SmithyGetListResp.ProtoReflect.Descriptor instead. func (*SmithyGetListResp) Descriptor() ([]byte, []int) { - return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29} + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{31} } func (x *SmithyGetListResp) GetData() *DBSmithy { @@ -1534,42 +1620,47 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, - 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, - 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, - 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, - 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, - 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, - 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, - 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, - 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, - 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, - 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, + 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, + 0x2e, 0x44, 0x42, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, + 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, + 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, + 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, + 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, + 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, + 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, + 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, + 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, + 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, + 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, + 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1584,7 +1675,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte { return file_smithy_smithy_msg_proto_rawDescData } -var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) +var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 32) var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp @@ -1604,46 +1695,49 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithySellResp)(nil), // 15: SmithySellResp (*SmithyAtlasListReq)(nil), // 16: SmithyAtlasListReq (*SmithyAtlasListResp)(nil), // 17: SmithyAtlasListResp - (*SmithyCreateOrderReq)(nil), // 18: SmithyCreateOrderReq - (*SmithyCreateOrderResp)(nil), // 19: SmithyCreateOrderResp - (*SmithyGetRewardReq)(nil), // 20: SmithyGetRewardReq - (*SmithyGetRewardResp)(nil), // 21: SmithyGetRewardResp - (*SmithyDeskSkillLvReq)(nil), // 22: SmithyDeskSkillLvReq - (*SmithyDeskSkillLvResp)(nil), // 23: SmithyDeskSkillLvResp - (*SmithyStoveSkillLvReq)(nil), // 24: SmithyStoveSkillLvReq - (*SmithyStoveSkillLvResp)(nil), // 25: SmithyStoveSkillLvResp - (*SmithyGetRandUserReq)(nil), // 26: SmithyGetRandUserReq - (*SmithyGetRandUserResp)(nil), // 27: SmithyGetRandUserResp - (*SmithyGetListReq)(nil), // 28: SmithyGetListReq - (*SmithyGetListResp)(nil), // 29: SmithyGetListResp - (*DBStove)(nil), // 30: DBStove - (*CustomerInfo)(nil), // 31: CustomerInfo - (*DBAtlas)(nil), // 32: DBAtlas - (*OrderClang)(nil), // 33: OrderClang - (*DBSmithy)(nil), // 34: DBSmithy - (*DBUser)(nil), // 35: DBUser + (*SmithyAtlasAwardReq)(nil), // 18: SmithyAtlasAwardReq + (*SmithyAtlasAwardResp)(nil), // 19: SmithyAtlasAwardResp + (*SmithyCreateOrderReq)(nil), // 20: SmithyCreateOrderReq + (*SmithyCreateOrderResp)(nil), // 21: SmithyCreateOrderResp + (*SmithyGetRewardReq)(nil), // 22: SmithyGetRewardReq + (*SmithyGetRewardResp)(nil), // 23: SmithyGetRewardResp + (*SmithyDeskSkillLvReq)(nil), // 24: SmithyDeskSkillLvReq + (*SmithyDeskSkillLvResp)(nil), // 25: SmithyDeskSkillLvResp + (*SmithyStoveSkillLvReq)(nil), // 26: SmithyStoveSkillLvReq + (*SmithyStoveSkillLvResp)(nil), // 27: SmithyStoveSkillLvResp + (*SmithyGetRandUserReq)(nil), // 28: SmithyGetRandUserReq + (*SmithyGetRandUserResp)(nil), // 29: SmithyGetRandUserResp + (*SmithyGetListReq)(nil), // 30: SmithyGetListReq + (*SmithyGetListResp)(nil), // 31: SmithyGetListResp + (*DBStove)(nil), // 32: DBStove + (*CustomerInfo)(nil), // 33: CustomerInfo + (*DBAtlas)(nil), // 34: DBAtlas + (*OrderClang)(nil), // 35: OrderClang + (*DBSmithy)(nil), // 36: DBSmithy + (*DBUser)(nil), // 37: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ - 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove - 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove - 30, // 2: SmithyOrderEquipResp.data:type_name -> DBStove - 30, // 3: SmithyStoveUpResp.data:type_name -> DBStove - 30, // 4: SmithyRiseResp.data:type_name -> DBStove - 30, // 5: SmithyToolsUpResp.data:type_name -> DBStove - 31, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo - 32, // 7: SmithyAtlasListResp.data:type_name -> DBAtlas - 33, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang - 34, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy - 34, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy - 34, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 34, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 35, // 13: SmithyGetRandUserResp.user:type_name -> DBUser - 34, // 14: SmithyGetListResp.data:type_name -> DBSmithy - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 32, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove + 32, // 1: SmithyForgeEquipResp.data:type_name -> DBStove + 32, // 2: SmithyOrderEquipResp.data:type_name -> DBStove + 32, // 3: SmithyStoveUpResp.data:type_name -> DBStove + 32, // 4: SmithyRiseResp.data:type_name -> DBStove + 32, // 5: SmithyToolsUpResp.data:type_name -> DBStove + 33, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo + 34, // 7: SmithyAtlasListResp.data:type_name -> DBAtlas + 34, // 8: SmithyAtlasAwardResp.data:type_name -> DBAtlas + 35, // 9: SmithyCreateOrderReq.order:type_name -> OrderClang + 36, // 10: SmithyCreateOrderResp.data:type_name -> DBSmithy + 36, // 11: SmithyGetRewardResp.data:type_name -> DBSmithy + 36, // 12: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 36, // 13: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 37, // 14: SmithyGetRandUserResp.user:type_name -> DBUser + 36, // 15: SmithyGetListResp.data:type_name -> DBSmithy + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_smithy_smithy_msg_proto_init() } @@ -1871,7 +1965,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyCreateOrderReq); i { + switch v := v.(*SmithyAtlasAwardReq); i { case 0: return &v.state case 1: @@ -1883,7 +1977,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyCreateOrderResp); i { + switch v := v.(*SmithyAtlasAwardResp); i { case 0: return &v.state case 1: @@ -1895,7 +1989,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRewardReq); i { + switch v := v.(*SmithyCreateOrderReq); i { case 0: return &v.state case 1: @@ -1907,7 +2001,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRewardResp); i { + switch v := v.(*SmithyCreateOrderResp); i { case 0: return &v.state case 1: @@ -1919,7 +2013,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyDeskSkillLvReq); i { + switch v := v.(*SmithyGetRewardReq); i { case 0: return &v.state case 1: @@ -1931,7 +2025,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyDeskSkillLvResp); i { + switch v := v.(*SmithyGetRewardResp); i { case 0: return &v.state case 1: @@ -1943,7 +2037,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyStoveSkillLvReq); i { + switch v := v.(*SmithyDeskSkillLvReq); i { case 0: return &v.state case 1: @@ -1955,7 +2049,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyStoveSkillLvResp); i { + switch v := v.(*SmithyDeskSkillLvResp); i { case 0: return &v.state case 1: @@ -1967,7 +2061,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRandUserReq); i { + switch v := v.(*SmithyStoveSkillLvReq); i { case 0: return &v.state case 1: @@ -1979,7 +2073,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetRandUserResp); i { + switch v := v.(*SmithyStoveSkillLvResp); i { case 0: return &v.state case 1: @@ -1991,7 +2085,7 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SmithyGetListReq); i { + switch v := v.(*SmithyGetRandUserReq); i { case 0: return &v.state case 1: @@ -2003,6 +2097,30 @@ func file_smithy_smithy_msg_proto_init() { } } file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyGetRandUserResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyGetListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SmithyGetListResp); i { case 0: return &v.state @@ -2021,7 +2139,7 @@ func file_smithy_smithy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 30, + NumMessages: 32, NumExtensions: 0, NumServices: 0, }, From d6a88333949603430fb5a35c6b54eb942452df96 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 21 Feb 2023 14:50:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 2 +- comm/imodule.go | 7 +++++++ modules/hero/configure_comp.go | 15 +++++++-------- modules/smithy/api_atlasaward.go | 4 ++-- modules/smithy/model_atlas.go | 2 +- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index a3892dfaa..c132def9a 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -6,7 +6,7 @@ "star": 3, "race": 1, "id": "35006", - "weight": 1000 + "weight": 10000 }, { "key": 2, diff --git a/comm/imodule.go b/comm/imodule.go index e6019a038..8dbb887ff 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -153,6 +153,13 @@ type ( GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment) //获取可用套装 （铁匠铺使用） GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32) + // 随机获得一件N级的装备装备 + /* + suiteId: 套装id + pos: 位置(-1 表示随机位置 大于0 表示获得指定位置 ) + lv: 装备等级 + */ + GetForgeEquip(suiteId int32, pos int32, lv int32) (eruip *pb.DB_Equipment, code pb.ErrorCode) } IMainline interface { ModifyMainlineDataByNanduID(uid string, nandu, id int32) (code pb.ErrorCode) diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 37baee464..5c9f96175 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -136,12 +136,9 @@ func (this *configureComp) SetHeroDrawConfig() { err error ) if v, err = this.GetConfigure(hero_drawcard); err == nil { - if _configure, ok := v.(*cfg.GameDrawCard); !ok { - err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) - return - } else { + if _configure, ok := v.(*cfg.GameDrawCard); ok { this.hlock.Lock() - defer this.hlock.Unlock() + this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0) for _, v := range _configure.GetDataList() { if _, ok := this.drawCardCfg[v.CardPoolType]; !ok { this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0) @@ -151,13 +148,15 @@ func (this *configureComp) SetHeroDrawConfig() { } this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v) } + this.hlock.Unlock() + this.module.Debug("update cfg.Game_drawCard over") + return } - } else { - err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) } - + err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) return } + func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GameDrawCardData { return this.drawCardCfg[poosType] } diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index af9bdd41a..118983fd6 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -26,12 +26,12 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw return } - conf := this.module.configure.GetSmithyAtlasLvConf(atlas.Reward) + conf := this.module.configure.GetSmithyAtlasLvConf(atlas.Award) if conf == nil { code = pb.ErrorCode_ConfigNoFound return } - nexLv := this.module.configure.GetSmithyAtlasLvConf(atlas.Reward + 1) + nexLv := this.module.configure.GetSmithyAtlasLvConf(atlas.Award + 1) if nexLv == nil { //满级 code = pb.ErrorCode_SmithyAtlasMaxLv return diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 2f84be35e..99f4530a7 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -34,7 +34,7 @@ func (this *modelAtlas) getSmithyAtlasList(uid string) (result *pb.DBAtlas, err result.Id = primitive.NewObjectID().Hex() result.Uid = uid result.Atlas = make(map[string]*pb.ForgeData, 0) - result.Reward = 1 // 初始1级 + result.Award = 1 // 初始1级 this.Add(uid, result) err = nil }