diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 3a98f96fc..84cc627e1 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -80,6 +80,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb filed = "allianceShop" record = shopData.AllianceShop break + default: + code = pb.ErrorCode_ReqParameterError + return } if record == nil { record = &pb.UserShopData{ diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index c3d910e58..de02abc66 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -71,6 +71,17 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) sdata = shopData.AllianceShop filed = "allianceShop" break + case pb.ShopType_HeroShop: + sdata = shopData.HeroShop + filed = "heroShop" + break + case pb.ShopType_SmithyShop: + sdata = shopData.SmithyShop + filed = "smithyShop" + break + default: + code = pb.ErrorCode_ReqParameterError + return } if sdata == nil { sdata = &pb.UserShopData{ diff --git a/pb/shop_db.pb.go b/pb/shop_db.pb.go index 545b102ce..65c5963f5 100644 --- a/pb/shop_db.pb.go +++ b/pb/shop_db.pb.go @@ -29,6 +29,8 @@ const ( ShopType_PVPShop ShopType = 3 ShopType_PVEShop ShopType = 4 ShopType_AllianceShop ShopType = 5 + ShopType_HeroShop ShopType = 6 + ShopType_SmithyShop ShopType = 7 ) // Enum value maps for ShopType. @@ -40,6 +42,8 @@ var ( 3: "PVPShop", 4: "PVEShop", 5: "AllianceShop", + 6: "HeroShop", + 7: "SmithyShop", } ShopType_value = map[string]int32{ "Null": 0, @@ -48,6 +52,8 @@ var ( "PVPShop": 3, "PVEShop": 4, "AllianceShop": 5, + "HeroShop": 6, + "SmithyShop": 7, } ) @@ -171,6 +177,8 @@ type DBShop struct { PvpShop *UserShopData `protobuf:"bytes,7,opt,name=pvpShop,proto3" json:"pvpShop" bson:"pvpShop"` //金币商店数据 PveShop *UserShopData `protobuf:"bytes,8,opt,name=pveShop,proto3" json:"pveShop" bson:"pveShop"` //金币商店数据 AllianceShop *UserShopData `protobuf:"bytes,9,opt,name=allianceShop,proto3" json:"allianceShop" bson:"allianceShop"` //金币商店数据 + HeroShop *UserShopData `protobuf:"bytes,10,opt,name=heroShop,proto3" json:"heroShop" bson:"heroShop"` //金币商店数据 + SmithyShop *UserShopData `protobuf:"bytes,11,opt,name=smithyShop,proto3" json:"smithyShop" bson:"smithyShop"` //金币商店数据 } func (x *DBShop) Reset() { @@ -268,6 +276,20 @@ func (x *DBShop) GetAllianceShop() *UserShopData { return nil } +func (x *DBShop) GetHeroShop() *UserShopData { + if x != nil { + return x.HeroShop + } + return nil +} + +func (x *DBShop) GetSmithyShop() *UserShopData { + if x != nil { + return x.SmithyShop + } + return nil +} + var File_shop_shop_db_proto protoreflect.FileDescriptor var file_shop_shop_db_proto_rawDesc = []byte{ @@ -296,7 +318,7 @@ var file_shop_shop_db_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0xed, 0x02, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, + 0x38, 0x01, 0x22, 0xc7, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 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, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, @@ -319,14 +341,21 @@ var file_shop_shop_db_proto_rawDesc = []byte{ 0x31, 0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, - 0x6f, 0x70, 0x2a, 0x5f, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, - 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, - 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, - 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, - 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, - 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, - 0x70, 0x10, 0x05, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6f, 0x70, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, + 0x61, 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2d, 0x0a, + 0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x2a, 0x7d, 0x0a, 0x08, + 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, + 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, + 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, + 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, + 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, + 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c, 0x0a, + 0x08, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x53, + 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -352,19 +381,21 @@ var file_shop_shop_db_proto_goTypes = []interface{}{ (*DB_Equipment)(nil), // 5: DB_Equipment } var file_shop_shop_db_proto_depIdxs = []int32{ - 3, // 0: UserShopData.buy:type_name -> UserShopData.BuyEntry - 4, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry - 1, // 2: DBShop.goldShop:type_name -> UserShopData - 1, // 3: DBShop.diamondShop:type_name -> UserShopData - 1, // 4: DBShop.pvpShop:type_name -> UserShopData - 1, // 5: DBShop.pveShop:type_name -> UserShopData - 1, // 6: DBShop.allianceShop:type_name -> UserShopData - 5, // 7: UserShopData.PreviewEntry.value:type_name -> DB_Equipment - 8, // [8:8] is the sub-list for method output_type - 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 + 3, // 0: UserShopData.buy:type_name -> UserShopData.BuyEntry + 4, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry + 1, // 2: DBShop.goldShop:type_name -> UserShopData + 1, // 3: DBShop.diamondShop:type_name -> UserShopData + 1, // 4: DBShop.pvpShop:type_name -> UserShopData + 1, // 5: DBShop.pveShop:type_name -> UserShopData + 1, // 6: DBShop.allianceShop:type_name -> UserShopData + 1, // 7: DBShop.heroShop:type_name -> UserShopData + 1, // 8: DBShop.smithyShop:type_name -> UserShopData + 5, // 9: UserShopData.PreviewEntry.value:type_name -> DB_Equipment + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_shop_shop_db_proto_init() } diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go index 00b5df048..edaede57a 100644 --- a/pb/worldtask_db.pb.go +++ b/pb/worldtask_db.pb.go @@ -25,9 +25,9 @@ type DBWorldtask struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID - LastTaskIds map[int32]*Worldtask `protobuf:"bytes,2,rep,name=lastTaskIds,proto3" json:"lastTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"lastTaskIds"` //上一次完成的任务 key:groupId val:任务ID - TaskList []*Worldtask `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表 + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID + LastTaskIds map[int32]*Worldtask `protobuf:"bytes,2,rep,name=lastTaskIds,proto3" json:"lastTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"lastTaskId"` //上一次完成的任务 key:groupId val:任务ID + TaskList []*Worldtask `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表 } func (x *DBWorldtask) Reset() {