From bda90f33cca7d323978377412f3e37f4043e1dc3 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 30 Dec 2022 14:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=81=93=E5=85=B7=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E6=8E=A5=E5=8F=A3=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/items/api_decompose.go | 8 ++++---- modules/items/api_sellItem.go | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index 37d71d452..2a38d49c9 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) { +func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode) { if req.GridId == "" || req.Amount <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,14 +17,14 @@ func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellI } //出售道具 -func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data proto.Message) { var ( err error item *pb.DB_UserItemData itemcf *cfg.GameItemData sale []*cfg.Gameatn ) - if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { + if code = this.DecomposeCheck(session, req); code != pb.ErrorCode_Success { return } if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil { @@ -73,6 +73,6 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { return } - session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true}) + session.SendMsg(string(this.module.GetType()), "decompose", &pb.ItemsDecomposeResp{GridId: req.GridId, Amount: req.Amount, Issucc: true}) return } diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index 57ce30d2c..4cb1cb8a8 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -9,22 +9,22 @@ import ( ) //参数校验 -func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode) { +func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) { if req.GridId == "" || req.Amount <= 0 { code = pb.ErrorCode_ReqParameterError } return } -//出售道具 -func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data proto.Message) { +//分解道具 +func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data proto.Message) { var ( err error item *pb.DB_UserItemData itemcf *cfg.GameItemData sale []*cfg.Gameatn ) - if code = this.DecomposeCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { return } if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil { @@ -44,7 +44,7 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose this.module.Errorf("SellItemCheck over all amount:[%d:%d]", req.Amount, item.Amount) return } - sale = make([]*cfg.Gameatn, len(itemcf.Sale)) + sale = make([]*cfg.Gameatn, len(itemcf.DecomposeDeplete)) for i, v := range itemcf.Sale { temp := *v sale[i] = &temp