diff --git a/modules/items/configure.go b/modules/items/configure.go index 6aec4388f..728596e8f 100644 --- a/modules/items/configure.go +++ b/modules/items/configure.go @@ -63,7 +63,7 @@ func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.Game_itemData, } //获取指定类型的物品列表 -func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, usetype int32) (result []*pb.DB_UserItemData) { +func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtype int32) (result []*pb.DB_UserItemData) { result = make([]*pb.DB_UserItemData, 0, len(itmes)) var ( v interface{} @@ -79,7 +79,7 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, usetyp table = v.(*cfg.Game_item) for _, v := range itmes { if item, ok = table.GetDataMap()[v.ItemId]; ok { - if item.Usetype == usetype { + if item.Bagtype == bagtype { result = append(result, v) } } else { diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 1907922bb..cb8c40756 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -1,7 +1,6 @@ package shop import ( - "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" @@ -29,6 +28,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb shopitem *pb.DBShopItem need []*cfg.Game_atn ) + if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { + return + } + if conf, err = this.module.configure.GetShopItemsConfigure(req.GoodsId); err != nil { code = pb.ErrorCode_SystemError return @@ -68,8 +71,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb this.module.modelShopItems.AddList(session.GetUserId(), shopitem.Id, shopitem) } else { this.module.modelShopItems.ChangeList(session.GetUserId(), shopitem.Id, map[string]interface{}{ - fmt.Sprintf("buynum.%d", req.ShopType): shopitem.BuyNum, - fmt.Sprintf("lastbuytime.%d", req.ShopType): shopitem.LastBuyTime, + "buyNum": shopitem.BuyNum, + "lastBuyTime": shopitem.LastBuyTime, }) } session.SendMsg(string(this.module.GetType()), "buy", &pb.ShopBuyResp{IsSucc: true}) diff --git a/pb/shop_db.pb.go b/pb/shop_db.pb.go index 5fe8a5354..c3d928840 100644 --- a/pb/shop_db.pb.go +++ b/pb/shop_db.pb.go @@ -146,13 +146,13 @@ type DBShop 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 - GoldShop *UserShopData `protobuf:"bytes,3,opt,name=goldShop,proto3" json:"goldShop"` //@go_tags(`bson:"goldShop"`)金币商店数据 - DiamondShop *UserShopData `protobuf:"bytes,4,opt,name=diamondShop,proto3" json:"diamondShop"` //@go_tags(`bson:"diamondShop"`)金币商店数据 - PvpShop *UserShopData `protobuf:"bytes,5,opt,name=pvpShop,proto3" json:"pvpShop"` //@go_tags(`bson:"pvpShop"`)金币商店数据 - PveShop *UserShopData `protobuf:"bytes,6,opt,name=pveShop,proto3" json:"pveShop"` //@go_tags(`bson:"pveShop"`)金币商店数据 - AllianceShop *UserShopData `protobuf:"bytes,7,opt,name=allianceShop,proto3" json:"allianceShop"` //@go_tags(`bson:"allianceShop"`)金币商店数据 + 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 + GoldShop *UserShopData `protobuf:"bytes,3,opt,name=goldShop,proto3" json:"goldShop" bson:"goldShop"` //金币商店数据 + DiamondShop *UserShopData `protobuf:"bytes,4,opt,name=diamondShop,proto3" json:"diamondShop" bson:"diamondShop"` //金币商店数据 + PvpShop *UserShopData `protobuf:"bytes,5,opt,name=pvpShop,proto3" json:"pvpShop" bson:"pvpShop"` //金币商店数据 + PveShop *UserShopData `protobuf:"bytes,6,opt,name=pveShop,proto3" json:"pveShop" bson:"pveShop"` //金币商店数据 + AllianceShop *UserShopData `protobuf:"bytes,7,opt,name=allianceShop,proto3" json:"allianceShop" bson:"allianceShop"` //金币商店数据 } func (x *DBShop) Reset() { @@ -241,11 +241,11 @@ type DBShopItem 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 - GoodsId int32 `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId"` //@go_tags(`bson:"goodsId"`)商品Id - BuyNum map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //@go_tags(`bson:"buyNum"`)购买数量 - LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //@go_tags(`bson:"lastBuyTime"`)最后一次购买的时间 + 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 + GoodsId int32 `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId" bson:"goodsId"` //商品Id + BuyNum map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"buyNum"` //购买数量 + LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"lastBuyTime"` //最后一次购买的时间 } func (x *DBShopItem) Reset() {