diff --git a/cmd/v2/service/connService.go b/cmd/v2/service/connService.go index f259db2c4..23dce5984 100644 --- a/cmd/v2/service/connService.go +++ b/cmd/v2/service/connService.go @@ -153,7 +153,7 @@ func (c *ConnServiceImpl) ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessa return } - if code = c.handleNotify(msg); errdata != nil { + if errdata = c.handleNotify(msg); errdata != nil { return } diff --git a/modules/academy/api_info.go b/modules/academy/api_info.go index 27572ff5f..72ed4723d 100644 --- a/modules/academy/api_info.go +++ b/modules/academy/api_info.go @@ -17,11 +17,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (er info *pb.DBAcademy err error ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index 0d1ad12e6..d10c0fb82 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -21,7 +21,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe // group []*cfg.GameTeachingData err error ) - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { @@ -29,7 +29,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe } if iswin { if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -37,7 +41,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe return } if level, err = this.module.configure.getGameTeaching(req.Level); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -53,7 +61,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe info.Level[req.Level] = true } if err = this.module.modelAcademy.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index d4861d4f9..f587219f5 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -21,7 +21,7 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT info *pb.DBAcademy err error ) - if code = this.TeachingReceiveCheck(session, req); errdata != nil { + if errdata = this.TeachingReceiveCheck(session, req); errdata != nil { return } if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { @@ -29,7 +29,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT } if iswin { if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -37,7 +41,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT return } if level, err = this.module.configure.getGameHeroTeaching(req.HeroId); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -56,7 +64,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT info.Hero[req.HeroId] = true } if err = this.module.modelAcademy.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index 1d15d4653..231bf99ca 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -1,7 +1,6 @@ package arena import ( - "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" @@ -29,26 +28,22 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat maxbuy, vipbuy int32 err error ) - if code = this.BuyCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), - Message: fmt.Sprintf("请求参数:%+v", req), - } + if errdata = this.BuyCheck(session, req); errdata != nil { return } if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil { - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(), } return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_CacheReadError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_CacheReadError.ToString(), Message: err.Error(), } return @@ -56,9 +51,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat this.module.modelArena.recoverTicket(session, info) if maxbuy, err = this.module.ModuleTools.GetPriceGroupLen(comm.ArenaBuyType); err != nil { - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_CacheReadError.ToString(), Message: err.Error(), } return @@ -67,33 +62,36 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat need = make([]*cfg.Gameatn, 0) for i := int32(0); i < req.BuyNum; i++ { if info.Buynum+i+1 > maxbuy+vipbuy { - code = pb.ErrorCode_ArenaTicketBuyUp + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ArenaTicketBuyUp, + Title: pb.ErrorCode_ArenaTicketBuyUp.ToString(), + } return } if res, err := this.module.ModuleTools.GetPriceGroupCost(comm.ArenaBuyType, info.Buynum+i+1); len(res) > 0 { need = append(need, res...) } else { - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return } } - if code = this.module.ConsumeRes(session, need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } info.Buynum += req.BuyNum - if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil { return } // info.Ticket += req.BuyNum if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return diff --git a/modules/arena/api_challenge.go b/modules/arena/api_challenge.go index 0fddb5ab0..01585a46e 100644 --- a/modules/arena/api_challenge.go +++ b/modules/arena/api_challenge.go @@ -24,43 +24,22 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge bule *pb.ArenaPlayer heros []*pb.DBHero record *pb.DBBattleRecord - cd pb.ErrorCode change bool err error ) - defer func() { - if cd == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Code: cd, Info: &pb.BattleInfo{ - Id: record.Id, - Title: record.Title, - Rulesid: 105, - Btype: record.Btype, - Ptype: record.Ptype, - RedCompId: record.RedCompId, - Redflist: record.Redflist, - BlueCompId: record.BlueCompId, - Buleflist: record.Buleflist, - Tasks: record.Tasks, - }}) - // this.module.ModuleRtask.SendToRtask(session, comm.Rtype130, 1) - go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype130, 1)) - } else { - session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Code: cd, Info: nil}) - } - }() - if cd = this.ChallengeCheck(session, req); cd != pb.ErrorCode_Success { + if errdata = this.ChallengeCheck(session, req); errdata != nil { return } if red, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - cd = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return } this.module.modelArena.recoverTicket(session, red) - if cd = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.ModuleTools.GetGlobalConf().ArenaTicketCos}, true); cd != pb.ErrorCode_Success { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.ModuleTools.GetGlobalConf().ArenaTicketCos}, true); errdata != nil { return } if red.Attack != nil { @@ -75,9 +54,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge if red.Defend == nil || change { if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Battle.Format); err != nil { - code = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return @@ -99,18 +78,18 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge if !req.Isai { if bule, err = this.module.modelArena.queryArenaPlayer(req.Playerid); err != nil { - cd = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return } } else { if bule, err = this.module.modelArena.getAI(req.MformatId); err != nil { - cd = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return @@ -129,17 +108,32 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge red.Integral = redplay.Integral red.Prededuction = -1 * redplay.Changeintegral if err = this.module.modelArena.updateArenaUserInfo(red); err != nil { - code = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return } - cd, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{ + if errdata, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{ Ptype: pb.PlayType_arena, Redformat: &pb.PVPFormation{Uid: red.Uid, Leadpos: red.Attack.Leadpos, Format: red.Attack.Formt}, Buleformat: &pb.PVPFormation{Uid: bule.Uid, Leadpos: bule.Defend.Leadpos, Format: bule.Defend.Formt}, - }) + }); errdata != nil { + return + } + + session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Info: &pb.BattleInfo{ + Id: record.Id, + Title: record.Title, + Rulesid: 105, + Btype: record.Btype, + Ptype: record.Ptype, + RedCompId: record.RedCompId, + Redflist: record.Redflist, + BlueCompId: record.BlueCompId, + Buleflist: record.Buleflist, + Tasks: record.Tasks, + }}) return } diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 6233b5a8d..e3242a1ba 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -27,36 +27,40 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha err error iswin bool ) - if code = this.ChallengeRewardCheck(session, req); errdata != nil { + if errdata = this.ChallengeRewardCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return } if req.Iswin { - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { + if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if !iswin { - code = pb.ErrorCode_BattleValidationFailed - return - } - info.Streak++ - if reward, err = this.module.configure.getActiveRewardById(info.Dan); err != nil { - code = pb.ErrorCode_ConfigNoFound - this.module.Errorln(err) - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_BattleValidationFailed, + Title: pb.ErrorCode_BattleValidationFailed.ToString(), Message: err.Error(), } return } - if code = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil { + info.Streak++ + if reward, err = this.module.configure.getActiveRewardById(info.Dan); err != nil { + this.module.Errorln(err) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if errdata = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil { return } if req.Revengeid != "" { @@ -104,7 +108,11 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha if !req.Isai { if rival, err = this.module.modelArena.queryPlayerInfo(req.Report.Info.BlueCompId); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } bule = &pb.ArenaPlayer{ @@ -206,10 +214,20 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha } rival.Record = append(rival.Record, buleRecord) if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return } if err = this.module.modelArena.updateArenaUserInfo(rival); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return } } else { this.module.modelRank.updateArenaRank(red) @@ -261,13 +279,16 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha } info.Record = append(info.Record, redrecord) if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return } } session.SendMsg(string(this.module.GetType()), "challengereward", &pb.ArenaChallengeRewardResp{Issucc: true, Integral: info.Integral, Dan: info.Dan}) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype128, red.Integral), comm.GetBuriedParam(comm.Rtype129, red.Dan)) - // this.module.ModuleRtask.SendToRtask(session, comm.Rtype128, red.Integral) - // this.module.ModuleRtask.SendToRtask(session, comm.Rtype129, red.Dan) return } diff --git a/modules/arena/api_delreward.go b/modules/arena/api_delreward.go index 381323b73..70ce67dc4 100644 --- a/modules/arena/api_delreward.go +++ b/modules/arena/api_delreward.go @@ -23,11 +23,15 @@ func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelReward info *pb.DBArenaUser err error ) - if code = this.DelRewardCheck(session, req); errdata != nil { + if errdata = this.DelRewardCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if info.Record != nil { @@ -39,7 +43,11 @@ func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelReward } } if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "delreward", &pb.ArenaDelRewardResp{Issucc: true, Bid: req.Bid}) diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index ba9256aba..0aa23308d 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -26,22 +26,32 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd err error ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } if model, err = this.module.GetDBNodule(session, comm.TableUser, time.Hour); err != nil { - code = pb.ErrorCode_DBError - this.module.Errorln(err) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } user = &pb.DBUser{} if err = model.Get(session.GetUserId(), user); err != nil { - code = pb.ErrorCode_DBError - this.module.Errorln(err) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if err == mgo.MongodbNil { @@ -59,7 +69,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd Npc: make(map[int32]*pb.DBNpc), } if info.Dan, err = this.module.modelArena.computedan(info.Integral); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } info.Loc = []float64{float64(info.Dan), float64(rand.Int31n(100)) / 1000.0} @@ -70,7 +84,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd info.Lv = user.Lv this.module.modelArena.recoverTicket(session, info) if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/arena/api_matche.go b/modules/arena/api_matche.go index 6a0fab630..8e63ed4f2 100644 --- a/modules/arena/api_matche.go +++ b/modules/arena/api_matche.go @@ -22,11 +22,15 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) ( ai []*pb.ArenaPlayer err error ) - if code = this.MatcheCheck(session, req); errdata != nil { + if errdata = this.MatcheCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if active, err = this.module.configure.getActiveReward(info.Integral); err != nil { @@ -34,13 +38,21 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) ( return } if players, err = this.module.modelArena.matchePlayer(info.Uid, info.Dan, active.HumanNum); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if len(players) < 5 { num := 5 - len(players) if ai, err = this.module.modelArena.matcheAI(info.Dan, int32(num)); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } players = append(players, ai...) diff --git a/modules/arena/api_otherinfo.go b/modules/arena/api_otherinfo.go index a460499b2..f02e86ae2 100644 --- a/modules/arena/api_otherinfo.go +++ b/modules/arena/api_otherinfo.go @@ -23,11 +23,15 @@ func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfo info *pb.DBArenaUser err error ) - if code = this.OtherInfoCheck(session, req); errdata != nil { + if errdata = this.OtherInfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(req.OtherId); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/arena/api_plot.go b/modules/arena/api_plot.go index eeacdc683..1aa20b05f 100644 --- a/modules/arena/api_plot.go +++ b/modules/arena/api_plot.go @@ -21,30 +21,8 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd info *pb.DBArenaUser record *pb.DBBattleRecord index int32 - cd pb.ErrorCode err error ) - defer func() { - if cd == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{ - Code: cd, - Pid: req.Pid, - Info: &pb.BattleInfo{ - Id: record.Id, - Title: record.Title, - Rulesid: npc.BattleReadyID, - Btype: record.Btype, - Ptype: record.Ptype, - RedCompId: record.RedCompId, - Redflist: record.Redflist, - BlueCompId: record.BlueCompId, - Buleflist: record.Buleflist, - }, - }) - } else { - session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{Code: cd}) - } - }() if cd = this.PlotCheck(session, req); cd != pb.ErrorCode_Success { return } @@ -91,12 +69,32 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd Mformat: []int32{npc.MonsterformatId[index]}, }); cd == pb.ErrorCode_Success { if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), } return } } + + session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{ + Pid: req.Pid, + Info: &pb.BattleInfo{ + Id: record.Id, + Title: record.Title, + Rulesid: npc.BattleReadyID, + Btype: record.Btype, + Ptype: record.Ptype, + RedCompId: record.RedCompId, + Redflist: record.Redflist, + BlueCompId: record.BlueCompId, + Buleflist: record.Buleflist, + }, + }) + return } diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index df53161b7..54a9b36f0 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -28,11 +28,15 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa err error ) - if code = this.PlotRewardCheck(session, req); errdata != nil { + if errdata = this.PlotRewardCheck(session, req); errdata != nil { return } if npc, err = this.module.configure.getChallengenpc(req.Pid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -51,7 +55,11 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -72,7 +80,11 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa "npc": info.Npc, }); err != nil { this.module.Errorln(err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/arena/api_rank.go b/modules/arena/api_rank.go index 3be6fc033..778b932c9 100644 --- a/modules/arena/api_rank.go +++ b/modules/arena/api_rank.go @@ -21,11 +21,15 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd err error ) - if code = this.RankCheck(session, req); errdata != nil { + if errdata = this.RankCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -33,7 +37,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd return } if uids, err = this.module.modelRank.queryRankUser(); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -41,7 +49,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd return } if ranks, err = this.module.modelArena.queryPlayers(uids); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -64,7 +76,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd if session.GetUserId() == v.Uid && info.Rank != v.Rank { info.Rank = v.Rank if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } } } diff --git a/modules/arena/api_setdattformt.go b/modules/arena/api_setdattformt.go index f65d230e4..3e47f7049 100644 --- a/modules/arena/api_setdattformt.go +++ b/modules/arena/api_setdattformt.go @@ -18,11 +18,15 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF heros []*pb.DBHero err error ) - if code = this.SetAttFormtCheck(session, req); errdata != nil { + if errdata = this.SetAttFormtCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -30,7 +34,11 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF return } if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -43,7 +51,11 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF } if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/arena/api_setdefformt.go b/modules/arena/api_setdefformt.go index ce7e7e593..47aaa8ed3 100644 --- a/modules/arena/api_setdefformt.go +++ b/modules/arena/api_setdefformt.go @@ -18,11 +18,15 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF heros []*pb.DBHero err error ) - if code = this.SetDefFormtCheck(session, req); errdata != nil { + if errdata = this.SetDefFormtCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -31,7 +35,11 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF } if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -44,7 +52,11 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF } info.Isdef = true if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index e3f4baa0d..01f5876b1 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -404,7 +404,11 @@ func (this *modelArena) recoverTicket(session comm.IUserSession, info *pb.DBAren ) if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil { - // code = pb.ErrorCode_ConfigNoFound + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // data = &pb.ErrorData{ // Title: code.ToString(), // Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(), @@ -449,7 +453,11 @@ func (this *modelArena) reddot(session comm.IUserSession) bool { return false } if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil { - // code = pb.ErrorCode_ConfigNoFound + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // data = &pb.ErrorData{ // Title: code.ToString(), // Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(), diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index 1db7a1c3e..0d0bf314b 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -706,7 +706,11 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro } if hero.SuiteId != 0 { //主套装 if suit, err := this.module.configure.Getequipsuit(hero.SuiteId); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { role.MainSuitSkill = suit.Skill @@ -714,7 +718,11 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro } if hero.SuiteExtId != 0 { //副套装 if suit, err := this.module.configure.Getequipsuit(hero.SuiteExtId); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { role.SubSuitSkill = suit.Skill @@ -730,7 +738,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt err error ) if result, err = this.module.configure.GetMonsterFormat(fid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } captain = -1 @@ -741,7 +753,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt captain = int32(i) } // if monst, err := this.module.configure.GetMonster(v.Monster); err != nil { - // code = pb.ErrorCode_ConfigNoFound + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // } else { hero := &pb.DBHero{} if hero = this.module.ModuleHero.CreateMonster(fmt.Sprintf("%d", v.Heroid), v.Star, v.Lv); hero == nil { @@ -786,7 +802,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt } if v.Equip4 != 0 { if suit, err := this.module.configure.Getequipsuit(v.Equip4); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { roles[i].MainSuitSkill = suit.Skill @@ -794,7 +814,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt } if v.Equip2 != 0 { if suit, err := this.module.configure.Getequipsuit(v.Equip2); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { roles[i].SubSuitSkill = suit.Skill diff --git a/modules/battle/module.go b/modules/battle/module.go index 4ecc0f67c..f6cde7082 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -102,7 +102,11 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE conn, err = db.ServerDBConn(session.GetServiecTag()) } if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.Errorf("session:%v err:", session, err) return } @@ -125,7 +129,11 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE conn, err = db.ServerDBConn(session.GetServiecTag()) } if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.Errorf("session:%v err:", session, err) return } @@ -171,7 +179,11 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB conn, err = db.ServerDBConn(session.GetServiecTag()) } if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.Errorf("session:%v err:", session, err) return } @@ -200,7 +212,11 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP conn, err = db.ServerDBConn(session.GetServiecTag()) } if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.Errorf("session:%v err:", session, err) return } @@ -222,11 +238,19 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error return } if redmodel, err = this.GetDBModelByUid(req.RedCompId, comm.TableHero); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if bluemodel, err = this.GetDBModelByUid(req.BlueCompId, comm.TableHero); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if record, code = this.modelBattle.creatertpvp(redmodel, bluemodel, pb.BattleType_rtpvp, req); errdata != nil { @@ -247,7 +271,11 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP conn, err = db.ServerDBConn(session.GetServiecTag()) } if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.Errorf("session:%v err:", session, err) return } diff --git a/modules/buried/api_send.go b/modules/buried/api_send.go index e28d2721a..80c21829b 100644 --- a/modules/buried/api_send.go +++ b/modules/buried/api_send.go @@ -23,13 +23,17 @@ func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedIn condis []*pb.ConIProgress err error ) - if code = this.SendCheck(session, req); errdata != nil { + if errdata = this.SendCheck(session, req); errdata != nil { return } if condis, err = this.module.CheckCondition(session.GetUserId(), req.Conditions...); err != nil { this.module.Error("查询埋点进度错误!", log.Field{Key: "err", Value: err.Error()}) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/caravan/api_ranklist.go b/modules/caravan/api_ranklist.go index 7c6fd7898..96b6accd4 100644 --- a/modules/caravan/api_ranklist.go +++ b/modules/caravan/api_ranklist.go @@ -17,7 +17,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankList rankid int32 ) resp := &pb.CaravanRankListResp{} - if code = this.RankListCheck(session, req); errdata != nil { + if errdata = this.RankListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId()) diff --git a/modules/caravan/api_refreshcity.go b/modules/caravan/api_refreshcity.go index 03fb555b3..be0f8b32a 100644 --- a/modules/caravan/api_refreshcity.go +++ b/modules/caravan/api_refreshcity.go @@ -17,7 +17,7 @@ func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefre resp *pb.CaravanRefreshCityResp ) resp = &pb.CaravanRefreshCityResp{} - if code = this.RefreshCityCheck(session, req); errdata != nil { + if errdata = this.RefreshCityCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) diff --git a/modules/chat/api_chanagechannel.go b/modules/chat/api_chanagechannel.go index 6b03e02c7..c2e3492cf 100644 --- a/modules/chat/api_chanagechannel.go +++ b/modules/chat/api_chanagechannel.go @@ -24,7 +24,11 @@ func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChana ) if err, ok = this.module.modelChat.chanageChannel(session, req.ChannelId); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -33,7 +37,11 @@ func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChana } if ok { if err = this.module.modelChat.removeCrossChannelMember(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/chat/api_crosschannel.go b/modules/chat/api_crosschannel.go index d2d6f2073..ac24d5262 100644 --- a/modules/chat/api_crosschannel.go +++ b/modules/chat/api_crosschannel.go @@ -17,11 +17,15 @@ func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossCh channel int32 err error ) - if code = this.CrossChannelCheck(session, req); errdata != nil { + if errdata = this.CrossChannelCheck(session, req); errdata != nil { return } if channel, err = this.module.modelChat.addCrossChannelMember(session); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index e9ed5f754..ae18e9d6a 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -25,14 +25,18 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) list []*pb.DBChat ) - if code = this.GetListCheck(session, req); errdata != nil { + if errdata = this.GetListCheck(session, req); errdata != nil { return } switch req.Channel { case pb.ChatChannel_World: if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -42,7 +46,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) break case pb.ChatChannel_Union: if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), req.UnionId, 0); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -52,7 +60,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) break case pb.ChatChannel_Private: if list, err = this.module.modelChat.queryUserMsg(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -63,7 +75,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) case pb.ChatChannel_CrossServer: if result, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { this.module.Errorf("err:%v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -82,7 +98,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) return } if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", req.ChannelId); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -92,7 +112,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) break case pb.ChatChannel_System: if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 0d3b475e1..96ee4ebe2 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -30,7 +30,7 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda userexpand *pb.DBUserExpand max_chat int32 ) - if code = this.SendCheck(session, req); errdata != nil { + if errdata = this.SendCheck(session, req); errdata != nil { return } @@ -52,7 +52,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda } if max_chat, err = this.module.configure.GetChannelRecordMax(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -98,7 +102,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda } msg.Ruid = req.TargetId if err = this.module.modelChat.sendChatToPrivate(msg); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg}) @@ -108,7 +116,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda msg.Content = wordfilter.Replace(msg.Content, '*') } if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } msg.ChannelId = userexpand.Chatchannel //指定频道 diff --git a/modules/chat/modelChat.go b/modules/chat/modelChat.go index 15c379832..0515b4baf 100644 --- a/modules/chat/modelChat.go +++ b/modules/chat/modelChat.go @@ -241,11 +241,19 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) { // max int32 // ) // if max, err = this.module.configure.GetChannelRecordMax(); err != nil { -// code = pb.ErrorCode_ConfigNoFound +// errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // return // } // if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s", worldchatkey, msg.Stag), int64(max), msg); err != nil { -// code = pb.ErrorCode_DBError +// errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // return // } // data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg}) diff --git a/modules/chat/module.go b/modules/chat/module.go index 672a75e48..a70c43c20 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -141,7 +141,11 @@ func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) { err error ) if max_chat, err = this.configure.GetChannelRecordMax(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } this.Errorln(err) return } @@ -172,7 +176,11 @@ func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) { err error ) if max_chat, err = this.configure.GetChannelRecordMax(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } this.Errorln(err) return } @@ -215,7 +223,11 @@ func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) { } } else { if err = this.modelChat.saveUserMsg(msg); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index a928b9c05..6d6f91932 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -24,16 +24,24 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda ok bool err error ) - if code = this.AskCheck(session, req); errdata != nil { + if errdata = this.AskCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -133,7 +141,11 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda info.Level[req.Level] = level if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } pitem.Progress = level.Progress diff --git a/modules/combat/api_challenge.go b/modules/combat/api_challenge.go index 3e5cea0cb..4166f1cee 100644 --- a/modules/combat/api_challenge.go +++ b/modules/combat/api_challenge.go @@ -19,7 +19,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng record *pb.DBBattleRecord err error ) - if code = this.ChallengeCheck(session, req); errdata != nil { + if errdata = this.ChallengeCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -28,7 +28,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng } if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index 485c63821..cdaa7d564 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -25,7 +25,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC err error ) - if code = this.ChallengeReceiveCheck(session, req); errdata != nil { + if errdata = this.ChallengeReceiveCheck(session, req); errdata != nil { return } if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { @@ -33,7 +33,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC } if iswin { if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -54,7 +58,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC return } if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -77,7 +85,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC lv.Passmanster = append(lv.Passmanster, req.Manster) if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), @@ -95,7 +107,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC } } if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: err.Error(), diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index c596f7502..a0f6e3bd4 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -22,12 +22,16 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err ok bool err error ) - if code = this.DropCheck(session, req); errdata != nil { + if errdata = this.DropCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if lv, ok = info.Level[req.Level]; !ok { @@ -40,7 +44,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err } if box, err = this.module.configure.getGameCombatbox(req.Drop); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } for _, v := range lv.Passdrop { @@ -55,7 +63,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err lv.Passdrop = append(lv.Passdrop, req.Drop) if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } reward := this.module.configure.GetDropReward(box.Drop) @@ -69,7 +81,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err } } if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index 4dcc0e5db..1056d2b3e 100644 --- a/modules/combat/api_in.go +++ b/modules/combat/api_in.go @@ -19,11 +19,15 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata ok bool err error ) - if code = this.InCheck(session, req); errdata != nil { + if errdata = this.InCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if level, ok = info.Level[req.Level]; !ok { @@ -37,7 +41,11 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata info.Level[req.Level] = level if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/combat/api_updatelevel.go b/modules/combat/api_updatelevel.go index bb9301b6b..90a50de38 100644 --- a/modules/combat/api_updatelevel.go +++ b/modules/combat/api_updatelevel.go @@ -19,11 +19,15 @@ func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdate ok bool err error ) - if code = this.UpdateLevelCheck(session, req); errdata != nil { + if errdata = this.UpdateLevelCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if level, ok = info.Level[req.Level]; !ok { @@ -36,7 +40,11 @@ func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdate } level.Data = req.Data if err = this.module.modelCombat.updateInfo(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "updatelevel", &pb.CombatUpdateLevelResp{Level: req.Level}) diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go index bf2e4845b..a5a2b5fed 100644 --- a/modules/dispatch/api_do.go +++ b/modules/dispatch/api_do.go @@ -32,7 +32,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (err } func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) { - if code = this.DoCheck(session, req); errdata != nil { + if errdata = this.DoCheck(session, req); errdata != nil { return } @@ -43,7 +43,11 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda } if dConf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -61,7 +65,7 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda //校验门票 ticketAtn := this.module.ModuleTools.GetGlobalConf().DispatchNumtools - if code = this.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); errdata != nil { + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); errdata != nil { code = pb.ErrorCode_DispatchTicketNoEnough return } @@ -73,7 +77,11 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda if errors.As(err, &errCustom) { code = errCustom.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 09fd32f52..103a34405 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -45,7 +45,11 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( "nb": nb, } if err := a.module.modelDispatch.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } d.Nb = nb diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index 676a5f19a..fd04f0fb8 100644 --- a/modules/dispatch/api_receive.go +++ b/modules/dispatch/api_receive.go @@ -19,7 +19,7 @@ func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiv } func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) { - if code = a.ReceiveCheck(session, req); errdata != nil { + if errdata = a.ReceiveCheck(session, req); errdata != nil { return } d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) diff --git a/modules/dispatch/api_refresh.go b/modules/dispatch/api_refresh.go index a5475c863..1f686d6b9 100644 --- a/modules/dispatch/api_refresh.go +++ b/modules/dispatch/api_refresh.go @@ -29,7 +29,11 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) if errors.As(err, &customer) { code = customer.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } return } @@ -41,15 +45,19 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) } //消耗金币 money := a.module.ModuleTools.GetGlobalConf().DispatchCheckmoney - if code = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil { + if errdata = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil { return } - if code = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil { + if errdata = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil { return } if err := a.module.modelDispatch.updateRefreshCount(session.GetUserId(), d.Nb); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index 27a9bc24f..63c40476d 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -16,7 +16,7 @@ func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWee } func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) { - if code = a.WeekreciveCheck(session, req); errdata != nil { + if errdata = a.WeekreciveCheck(session, req); errdata != nil { return } rsp := &pb.DispatchWeekReciveResp{} @@ -34,7 +34,11 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci if d.Nb.WeekCount >= v.N { //更新周任务状态 if err := a.module.modelDispatch.updateWeekstatus(session.GetUserId(), req.Idx, d.Nb); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } a.module.DispenseRes(session, v.G, true) diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go index 3efe8bc89..83ac5ffa1 100644 --- a/modules/equipment/api_ench.go +++ b/modules/equipment/api_ench.go @@ -89,21 +89,15 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( if equip.HeroId != "" { equipments = make([]*pb.DB_Equipment, 8) if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); errdata != nil { - this.module.Errorf("Upgrade code:%d", code) - data = &pb.ErrorData{ - Title: code.ToString(), - Message: fmt.Sprintf("英雄唯一 id:%s", equip.HeroId), - } return } for i, v := range hero.EquipID { if v != "" { if v != equip.Id { if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { - log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_EquipmentOnFoundEquipment - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), Message: fmt.Sprintf("装备唯一 id:%s", v), } return @@ -113,7 +107,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( } } } - if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { + if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { return } } diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 2d9c3eb6d..8a980cfba 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -38,11 +38,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) - if code = this.EquipCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.EquipCheck(session, req); errdata != nil { return } //校验数据 @@ -50,11 +46,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) //获取英雄数据 - if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), req.HeroCardId); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: fmt.Sprintf("获取英雄数据失败:%s", req.HeroCardId), - } + if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), req.HeroCardId); errdata != nil { return } @@ -63,13 +55,16 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) equipNum++ if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_EquipmentOnFoundEquipment + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), + } return } if equipments[i].HeroId != "" && hero.Id != equipments[i].HeroId { //装备已经有宿主了 - code = pb.ErrorCode_EquipmentIsWorn - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentIsWorn, + Title: pb.ErrorCode_EquipmentIsWorn.ToString(), Message: fmt.Sprintf("装备已穿戴 装备id:%s 英雄id:%s", hero.Id, equipments[i].HeroId), } return @@ -80,9 +75,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) // equipLv[equipments[i].Lv]++ if confs[i], err = this.module.configure.GetEquipmentConfigureById(equipments[i].CId); err != nil { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return @@ -119,9 +114,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) if equipments[i] != nil && v != equipments[i].Id { if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -132,9 +127,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } else if equipments[i] == nil { if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -155,7 +150,11 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) if v != nil { if i != int(confs[i].Pos) { this.module.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i) - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } hero.EquipID[i] = v.Id @@ -196,20 +195,16 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) hero.Suite2Lv = 0 } //更新装备数据加成 - if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { - this.module.Errorf("Equip ModuleHero UpdateEquipment code%v", code) - data = &pb.ErrorData{ - Title: code.ToString(), - Message: comm.NewExternalModuleErr("ModuleHero", "UpdateEquipment", code).Error(), - } + if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { + this.module.Errorf("Equip ModuleHero UpdateEquipment code%v", errdata) return } //同步数据 if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { this.module.Errorf("Equip err%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index f0b9d9d5a..5b890dee6 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -26,17 +26,13 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) ( reward []*pb.UserAssets err error ) - if code = this.ForgCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.ForgCheck(session, req); errdata != nil { return } if conf, err = this.module.configure.GetEquipCompose(req.Forgid); err != nil { - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return @@ -59,11 +55,11 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) ( index := comm.GetRandW(conf.Probability) equis[conf.Equip[index]]++ } - if code = this.module.ConsumeRes(session, need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } - if _, code = this.module.AddNewEquipments(session, equis, true); errdata != nil { + if _, errdata = this.module.AddNewEquipments(session, equis, true); errdata != nil { return } diff --git a/modules/equipment/api_getlist.go b/modules/equipment/api_getlist.go index b14692ca3..e8496aa69 100644 --- a/modules/equipment/api_getlist.go +++ b/modules/equipment/api_getlist.go @@ -19,9 +19,9 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetList ) if items, err = this.module.modelEquipment.QueryUserEquipments(session.GetUserId()); err != nil { this.module.Errorf("QueryUserPackReq err:%v", err) - code = pb.ErrorCode_CacheReadError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_CacheReadError, + Title: pb.ErrorCode_CacheReadError.ToString(), Message: err.Error(), } return diff --git a/modules/equipment/api_lock.go b/modules/equipment/api_lock.go index f91e8a0e6..1a3cb0068 100644 --- a/modules/equipment/api_lock.go +++ b/modules/equipment/api_lock.go @@ -22,14 +22,14 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) ( err error equipment *pb.DB_Equipment ) - if code = this.LockCheck(session, req); errdata != nil { + if errdata = this.LockCheck(session, req); errdata != nil { return } if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { this.module.Errorln(err) - code = pb.ErrorCode_EquipmentOnFoundEquipment - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), Message: err.Error(), } return @@ -39,9 +39,9 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) ( "islock": equipment.Islock, }); err != nil { this.module.Errorln(err) - code = pb.ErrorCode_DBError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), Message: err.Error(), } return diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 13199f5ea..cd5b24794 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -27,16 +27,13 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( confs []*cfg.GameEquipData sale [][]*cfg.Gameatn ) - if code = this.SellCheck(session, req); errdata != nil { + if errdata = this.SellCheck(session, req); errdata != nil { return } if equipments, err = this.module.modelEquipment.QueryUserEquipmentsByIds(session.GetUserId(), req.EquipIds); err != nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - } - data = &pb.ErrorData{ - Title: code.ToString(), + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), Message: err.Error(), } return @@ -45,27 +42,27 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( sale = make([][]*cfg.Gameatn, len(equipments)) for i, v := range equipments { if v.HeroId != "" || v.Islock { - code = pb.ErrorCode_EquipmentNoCanSell this.module.Errorf("NoCanSell %v", v) - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentNoCanSell, + Title: pb.ErrorCode_EquipmentNoCanSell.ToString(), Message: fmt.Sprintf("装备已锁定! 装备id:%s", v), } return } if confs[i], err = this.module.configure.GetEquipmentConfigureById(v.CId); err != nil { this.module.Errorln(err) - code = pb.ErrorCode_EquipmentOnFoundEquipment - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), Message: err.Error(), } return } if confs[i].Sale == nil || len(confs[i].Sale) == 0 { - code = pb.ErrorCode_EquipmentNoCanSell - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentNoCanSell, + Title: pb.ErrorCode_EquipmentNoCanSell.ToString(), Message: fmt.Sprintf("装备出售配置为空! 装备id:%s", confs[i].Id), } return @@ -85,10 +82,10 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( for _, v := range sale { sales = append(sales, v...) } - if code = this.module.DispenseRes(session, sales, true); errdata != nil { + if errdata = this.module.DispenseRes(session, sales, true); errdata != nil { return } - if code = this.module.DelEquipments(session, req.EquipIds, true); errdata != nil { + if errdata = this.module.DelEquipments(session, req.EquipIds, true); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true}) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index aceb2d869..14768b4e2 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -2,6 +2,7 @@ package equipment import ( "crypto/rand" + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" @@ -40,27 +41,23 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade user *pb.DBUser tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) - if code = this.UpgradeCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.UpgradeCheck(session, req); errdata != nil { return } if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_EquipmentOnFoundEquipment - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), Message: err.Error(), } return } if conf, err = this.module.configure.GetEquipmentConfigureById(equipment.CId); err != nil { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_EquipmentOnFoundEquipment - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), Message: err.Error(), } return @@ -68,14 +65,14 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade //找到下一个等级的相关配置 if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Star, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_EquipmentLvlimitReached - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentLvlimitReached, + Title: pb.ErrorCode_EquipmentLvlimitReached.ToString(), Message: err.Error(), } return } - if code = this.module.ConsumeRes(session, intensify.Need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, intensify.Need, true); errdata != nil { return } if equipment.KeepFailNum >= intensify.Num { //没有达到保底次数 根据概率随机成功失败 @@ -92,9 +89,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade "keepFailNum": equipment.KeepFailNum, }); err != nil { log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -111,9 +108,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade "heroId": "", }); err != nil { this.module.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -125,9 +122,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade equipment.OverlayNum = 1 modifyequipments = append(modifyequipments, equipment) if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } this.module.Errorf("Upgrade err:%v", err) @@ -135,9 +132,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade } if err = this.module.modelEquipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { this.module.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -146,10 +143,10 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade equipment.IsInitialState = false modifyequipments = append(modifyequipments, equipment) if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { - code = pb.ErrorCode_SystemError this.module.Errorf("Upgrade err:%v", err) - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -163,9 +160,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade "isInitialState": false, }); err != nil { log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -175,18 +172,14 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade confs = make([]*cfg.GameEquipData, 8) //已装备 重新计算属性 if equipment.HeroId != "" { - if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equipment.HeroId); errdata != nil { - this.module.Errorf("Upgrade code:%d", code) - data = &pb.ErrorData{ - Title: code.ToString(), - } + if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equipment.HeroId); errdata != nil { return } if conf.Pos >= 8 { - code = pb.ErrorCode_ConfigurationException - this.module.Errorf("Upgrade equipment Pos:%d", conf.Pos) - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigurationException, + Title: pb.ErrorCode_ConfigurationException.ToString(), + Message: fmt.Sprintf("装备配置异常 id:%s pos:%d", conf.Id, conf.Pos), } return } @@ -195,8 +188,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade if v != "" { if v != equipment.Id { if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { - log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_EquipmentOnFoundEquipment + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), + Message: fmt.Sprintf("未找到装备 uid:%s id:%d", session.GetUserId(), v), + } return } confs[i], _ = this.module.configure.GetEquipmentConfigureById(equipments[i].CId) @@ -229,7 +225,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteExtId, suite2Lv)) tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Star, hero.SuiteExtId, hero.Suite2Lv)) } - code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments) + if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil { + return + } } //随机任务触发 tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv)) diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index e2e4a122a..984f64609 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -28,33 +28,29 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( adverbEntry []*pb.EquipmentAttributeEntry err error ) - if code = this.WashCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.WashCheck(session, req); errdata != nil { return } if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil { this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return } if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil { this.module.Errorf("Equip_Check err:%v", err) - code = pb.ErrorCode_ConfigNoFound - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return } gole := this.module.ModuleTools.GetGlobalConf().EquipmentConsumption[conf.Color-1] - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil { return } diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go index 8dd1e0803..a4e010666 100644 --- a/modules/equipment/api_washconfirm.go +++ b/modules/equipment/api_washconfirm.go @@ -25,18 +25,14 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas attrlibrary *cfg.GameEquipAttrlibrarySData err error ) - if code = this.WashConfirmCheck(session, req); errdata != nil { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.WashConfirmCheck(session, req); errdata != nil { return } if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil { this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -46,17 +42,14 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), } - data = &pb.ErrorData{ - Title: code.ToString(), - } return } for i, v := range equip.AdverbEntry { if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil { - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return @@ -74,9 +67,9 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas "adverbEntry": equip.AdverbEntry, }); err != nil { log.Errorf("Upgrade err:%v", err) - code = pb.ErrorCode_SystemError - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), Message: err.Error(), } return diff --git a/modules/equipment/module.go b/modules/equipment/module.go index ee052b262..cf5c3d902 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -1,6 +1,7 @@ package equipment import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/event" @@ -87,9 +88,17 @@ func (this *Equipment) QueryEquipment(uid string, id string) (equipment *pb.DB_E } if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, id); err != nil { if err == redis.Nil { - code = pb.ErrorCode_EquipmentOnFoundEquipment + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentOnFoundEquipment, + Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(), + Message: fmt.Sprintf("未找到装备 uid:%s id:%s", uid, id), + } } else { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } } } return @@ -107,10 +116,12 @@ func (this *Equipment) QueryEquipments(uid string) (equipment []*pb.DB_Equipment return } if equipment, err = this.modelEquipment.QueryUserEquipments(uid); err != nil { - if err == redis.Nil { - code = pb.ErrorCode_EquipmentOnFoundEquipment - } else { - code = pb.ErrorCode_SystemError + if err != redis.Nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } } } return @@ -129,7 +140,11 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri ) if change, err = this.modelEquipment.AddEquipments(session, cIds); err != nil { this.Errorf("err%v", err) - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } if len(change) > 0 && bPush { @@ -145,14 +160,18 @@ func (this *Equipment) AddAllEquipments(session comm.IUserSession) (errdata *pb. err error ) if configure, err = this.configure.GetEquipmentConfigure(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } cIds = make(map[string]uint32) for _, v := range configure.GetDataList() { cIds[v.Id] = 1 } - _, code = this.AddNewEquipments(session, cIds, true) + _, errdata = this.AddNewEquipments(session, cIds, true) return } @@ -164,7 +183,11 @@ func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []strin ) if change, err = this.modelEquipment.DelEquipments(session.GetUserId(), equipIds); err != nil { this.Errorf("err%v", err) - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } if len(change) > 0 && bPush { @@ -180,11 +203,19 @@ func (this *Equipment) NewEquipment(uid, cid string) (errdata *pb.ErrorData, equ err error ) if conf, err = this.configure.GetEquipmentConfigureById(cid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if equip, err = this.modelEquipment.newEquipment(uid, conf, nil); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } return @@ -197,11 +228,19 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi configure *cfg.GameEquipData ) if err = this.modelEquipment.addEquipment(equip); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if configure, err = this.configure.GetEquipmentConfigureById(equip.CId); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } tasks := make([]*pb.BuriedParam, 0) @@ -245,17 +284,29 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) sale = make([][]*cfg.Gameatn, len(equipments)) for i, v := range equipments { if v.HeroId != "" || v.Islock { - code = pb.ErrorCode_EquipmentNoCanSell + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentNoCanSell, + Title: pb.ErrorCode_EquipmentNoCanSell.ToString(), + Message: fmt.Sprintf("装备锁定或者穿戴状态下 不可售卖!"), + } this.Errorf("NoCanSell %v", v) return } if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil { this.Errorln(err) - code = pb.ErrorCode_EquipmentOnFoundEquipment + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if confs[i].Sale == nil || len(confs[i].Sale) == 0 { - code = pb.ErrorCode_EquipmentNoCanSell + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentNoCanSell, + Title: pb.ErrorCode_EquipmentNoCanSell.ToString(), + Message: err.Error(), + } return } sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale)) @@ -273,10 +324,10 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) for _, v := range sale { sales = append(sales, v...) } - if code, atno = this.DispenseAtno(session, sales, true); errdata != nil { + if errdata, atno = this.DispenseAtno(session, sales, true); errdata != nil { return } - if code = this.DelEquipments(session, equs, true); errdata != nil { + if errdata = this.DelEquipments(session, equs, true); errdata != nil { return } return @@ -302,22 +353,35 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin sale = make([][]*cfg.Gameatn, len(equipments)) for i, v := range equipments { if v.HeroId != "" || v.Islock { - code = pb.ErrorCode_EquipmentNoCanSell + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } this.Errorf("NoCanSell %v", v) return } if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil { this.Errorln(err) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + } return } if confs[i].SmithySale == nil || len(confs[i].SmithySale) == 0 { - code = pb.ErrorCode_EquipmentNoCanSell + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentNoCanSell, + Title: pb.ErrorCode_EquipmentNoCanSell.ToString(), + } return } if sellconf, err = this.configure.getSellcoefficient(int32(len(v.AdverbEntry) + 1)); err != nil { this.Errorln(err) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale)) @@ -335,10 +399,10 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin for _, v := range sale { sales = append(sales, v...) } - if code, atno = this.DispenseAtno(session, sales, true); errdata != nil { + if errdata, atno = this.DispenseAtno(session, sales, true); errdata != nil { return } - if code = this.DelEquipments(session, equs, true); errdata != nil { + if errdata = this.DelEquipments(session, equs, true); errdata != nil { return } return @@ -399,23 +463,34 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p err error ) if configures, err = this.configure.GetSuitEquipmentConfigure(suiteId); err != nil { - code = pb.ErrorCode_EquipmentSuiteNotFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_EquipmentSuiteNotFound, + Title: pb.ErrorCode_EquipmentSuiteNotFound.ToString(), + Message: err.Error(), + } return } if pos != -1 { for _, v := range configures { if v.Pos == pos && v.Star == lv { if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), v, dyweight); err == nil { - code = pb.ErrorCode_Success this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip}) return } this.Errorf("err%v", err) - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } } - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { lvs = make([]*cfg.GameEquipData, 0) @@ -425,18 +500,24 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p } } if len(lvs) == 0 { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + } return } r := rand.New(rand.NewSource(time.Now().Unix())) index := r.Perm(len(lvs))[0] if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), lvs[index], dyweight); err == nil { - code = pb.ErrorCode_Success this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip}) return } this.Errorf("err%v", err) - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/forum/api_getlist.go b/modules/forum/api_getlist.go index 2319a8b19..72240ab28 100644 --- a/modules/forum/api_getlist.go +++ b/modules/forum/api_getlist.go @@ -22,11 +22,15 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) err error list []*pb.DBComment ) - if code = this.GetListCheck(session, req); errdata != nil { + if errdata = this.GetListCheck(session, req); errdata != nil { return } if list, err = this.module.modelForum.getComment(req.Herocid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "getlist", &pb.ForumGetListResp{Comment: list}) diff --git a/modules/forum/api_like.go b/modules/forum/api_like.go index 10d6e6e6e..89e591f39 100644 --- a/modules/forum/api_like.go +++ b/modules/forum/api_like.go @@ -23,7 +23,11 @@ func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (errd ) if _, err = this.module.modelForum.like(req.Herocid, req.Cid, req.Islike); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } session.SendMsg(string(this.module.GetType()), "like", &pb.ForumLikeResp{Cid: req.Cid, Islike: req.Islike, Issucc: true}) diff --git a/modules/forum/api_releasecomment.go b/modules/forum/api_releasecomment.go index dc7bd2dca..87c2e3777 100644 --- a/modules/forum/api_releasecomment.go +++ b/modules/forum/api_releasecomment.go @@ -25,7 +25,7 @@ func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumRele err error comment *pb.DBComment ) - if code = this.ReleaseCommentCheck(session, req); errdata != nil { + if errdata = this.ReleaseCommentCheck(session, req); errdata != nil { return } comment = &pb.DBComment{ @@ -41,7 +41,11 @@ func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumRele Content: req.Content, } if err = this.module.modelForum.releaseComment(comment); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "releasecomment", &pb.ForumReleaseCommentResp{Comment: comment}) diff --git a/modules/forum/api_watchhero.go b/modules/forum/api_watchhero.go index d84658481..4599277e1 100644 --- a/modules/forum/api_watchhero.go +++ b/modules/forum/api_watchhero.go @@ -23,7 +23,7 @@ func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHero err error equip []*pb.DB_Equipment ) - if code = this.WatchHeroCheck(session, req); errdata != nil { + if errdata = this.WatchHeroCheck(session, req); errdata != nil { return } if hero, err = this.module.modelForum.watchHero(req.Stag, req.Uid, req.HerocId); err != nil { diff --git a/modules/friend/api_cross_accept.go b/modules/friend/api_cross_accept.go index e12a64387..22e49ff6c 100644 --- a/modules/friend/api_cross_accept.go +++ b/modules/friend/api_cross_accept.go @@ -20,7 +20,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAccept } func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) { - if code = this.AcceptCheck(session, req); errdata != nil { + if errdata = this.AcceptCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_addblack.go b/modules/friend/api_cross_addblack.go index d9f79a50c..0e0cb0f2a 100644 --- a/modules/friend/api_cross_addblack.go +++ b/modules/friend/api_cross_addblack.go @@ -21,7 +21,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB } func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) { - if code = this.AddblackCheck(session, req); errdata != nil { + if errdata = this.AddblackCheck(session, req); errdata != nil { return } @@ -81,7 +81,11 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR "friendIds": friendIds, }) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("加入黑名单", log.Field{Key: "uid", Value: uid}, log.Field{Key: "目标人", Value: req.FriendId}, diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go index cb3b43878..d57beee7c 100644 --- a/modules/friend/api_cross_agree.go +++ b/modules/friend/api_cross_agree.go @@ -22,7 +22,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe } func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) { - if code = this.AgreeCheck(session, req); errdata != nil { + if errdata = this.AgreeCheck(session, req); errdata != nil { return } var ( @@ -102,7 +102,11 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e if err = this.module.modelFriend.Change(target.Uid, map[string]interface{}{ "friendIds": target.FriendIds, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("好友审批同意", log.Field{Key: "uid", Value: uid}, log.Field{Key: "params", Value: req.FriendIds}, @@ -131,7 +135,11 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e "friendIds": self.FriendIds, }) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index 51d49b557..9a2edcfc6 100644 --- a/modules/friend/api_cross_apply.go +++ b/modules/friend/api_cross_apply.go @@ -21,7 +21,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe } func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) { - if code = this.ApplyCheck(session, req); errdata != nil { + if errdata = this.ApplyCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_assisthero.go b/modules/friend/api_cross_assisthero.go index 20a708364..e7f098387 100644 --- a/modules/friend/api_cross_assisthero.go +++ b/modules/friend/api_cross_assisthero.go @@ -21,14 +21,18 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs } func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) { - if code = this.AssistheroCheck(session, req); errdata != nil { + if errdata = this.AssistheroCheck(session, req); errdata != nil { return } uid := session.GetUserId() // 获取英雄 hero, err := this.module.ModuleHero.QueryCrossHeroinfo(req.HeroObjId) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("查询英雄数据 QueryCrossHeroinfo", log.Field{Key: "uid", Value: uid}, log.Field{Key: "params", Value: req.HeroObjId}, diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index c7075c197..2c6359657 100644 --- a/modules/friend/api_cross_del.go +++ b/modules/friend/api_cross_del.go @@ -20,7 +20,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) ( } func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) { - if code = this.DelCheck(session, req); errdata != nil { + if errdata = this.DelCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index 5bc44ea8e..e484e2d72 100644 --- a/modules/friend/api_cross_delblack.go +++ b/modules/friend/api_cross_delblack.go @@ -20,7 +20,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB } func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) { - if code = this.DelblackCheck(session, req); errdata != nil { + if errdata = this.DelblackCheck(session, req); errdata != nil { return } var ( @@ -40,7 +40,11 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR if err = this.module.modelFriend.Change(self.Uid, map[string]interface{}{ "blackIds": self.BlackIds, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("删除黑名单", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}, diff --git a/modules/friend/api_cross_getrelation.go b/modules/friend/api_cross_getrelation.go index 2c5b8c2ff..de1ab4ace 100644 --- a/modules/friend/api_cross_getrelation.go +++ b/modules/friend/api_cross_getrelation.go @@ -20,7 +20,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG } func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) { - if code = this.GetRelationCheck(session, req); errdata != nil { + if errdata = this.GetRelationCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index 1155ad6fb..5877d436a 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -39,7 +39,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar } globalConf := this.module.ModuleTools.GetGlobalConf() - if code = this.module.DispenseRes(session, globalConf.FriendPeize, true); errdata != nil { + if errdata = this.module.DispenseRes(session, globalConf.FriendPeize, true); errdata != nil { this.module.Error("好友领奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "reward", Value: globalConf.FriendPeize}, diff --git a/modules/friend/api_cross_qiecuo.go b/modules/friend/api_cross_qiecuo.go index a92127d28..c51a58a83 100644 --- a/modules/friend/api_cross_qiecuo.go +++ b/modules/friend/api_cross_qiecuo.go @@ -18,7 +18,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuo } func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) { - if code = this.QiecuoCheck(session, req); errdata != nil { + if errdata = this.QiecuoCheck(session, req); errdata != nil { return } @@ -34,7 +34,11 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) if errors.As(err, &customErr) { code = customErr.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } return } diff --git a/modules/friend/api_cross_randlist.go b/modules/friend/api_cross_randlist.go index f29df6301..089a51241 100644 --- a/modules/friend/api_cross_randlist.go +++ b/modules/friend/api_cross_randlist.go @@ -25,7 +25,11 @@ func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistR //在线玩家列表 cuList, err := this.module.ModuleUser.UserOnlineList() if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index e44a797bd..4b7670413 100644 --- a/modules/friend/api_cross_refuse.go +++ b/modules/friend/api_cross_refuse.go @@ -22,7 +22,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse // 单个/批量拒绝 func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) { - if code = this.RefuseCheck(session, req); errdata != nil { + if errdata = this.RefuseCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -57,7 +57,11 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) if err := this.module.modelFriend.Change(self.Uid, map[string]interface{}{ "applyIds": self.ApplyIds, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("好友审批拒绝", log.Field{Key: "uid", Value: uid}, log.Field{Key: "params", Value: req}, diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index f20235a3f..0763dade9 100644 --- a/modules/friend/api_cross_search.go +++ b/modules/friend/api_cross_search.go @@ -18,7 +18,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch } func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) { - if code = this.SearchCheck(session, req); errdata != nil { + if errdata = this.SearchCheck(session, req); errdata != nil { return } @@ -27,7 +27,11 @@ func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) users, err := this.module.ModuleUser.SearchRmoteUser(req.NickName) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("搜索玩家", log.Field{Key: "uid", Value: uid}, log.Field{Key: "params", Value: req.NickName}, diff --git a/modules/friend/api_cross_stop.go b/modules/friend/api_cross_stop.go index d308628a3..2cfa422ef 100644 --- a/modules/friend/api_cross_stop.go +++ b/modules/friend/api_cross_stop.go @@ -11,7 +11,7 @@ func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) } func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) { - if code = this.StopCheck(session, req); errdata != nil { + if errdata = this.StopCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index bb8c7feb9..c7ace6790 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -20,7 +20,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) ( } func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) { - if code = this.ZanCheck(session, req); errdata != nil { + if errdata = this.ZanCheck(session, req); errdata != nil { return } @@ -61,7 +61,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda "zanIds": target.ZanIds, "getZandIds": target.GetZandIds, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("点赞", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}, @@ -74,7 +78,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda //设置友情值 ue, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -88,7 +96,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda "friendPointOD": ue.FriendPointOD + pointTotal, } if err := this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/friend/api_cross_zanlist.go b/modules/friend/api_cross_zanlist.go index de3218cbf..4aa605773 100644 --- a/modules/friend/api_cross_zanlist.go +++ b/modules/friend/api_cross_zanlist.go @@ -12,7 +12,7 @@ func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanli // Deprecated: func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) { - if code = this.ZanlistCheck(session, req); errdata != nil { + if errdata = this.ZanlistCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_zanreceive.go b/modules/friend/api_cross_zanreceive.go index 49e3423e8..4f57986ad 100644 --- a/modules/friend/api_cross_zanreceive.go +++ b/modules/friend/api_cross_zanreceive.go @@ -21,7 +21,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa } func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) { - if code = this.ZanreceiveCheck(session, req); errdata != nil { + if errdata = this.ZanreceiveCheck(session, req); errdata != nil { return } @@ -52,14 +52,22 @@ func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanrece if err = this.module.modelFriend.Change(self.Uid, map[string]interface{}{ "getZandIds": self.GetZandIds, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } //设置自己的友情值 ue, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -74,7 +82,11 @@ func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanrece "friendPointID": ue.FriendPointID + pointTotal, } if err := this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/gm/module.go b/modules/gm/module.go index d34c115dc..7230c5165 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -193,7 +193,11 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er log.Field{Key: "0", Value: datas[0]}, ) } else if len(datas) == 2 && (datas[0] == "season") { // 赛季塔跳转 - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else if len(datas) == 1 && (datas[0] == "viking") { // 解锁远征所有难度 module1, err := this.service.GetModule(comm.ModuleViking) @@ -374,7 +378,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } for i := 0; i < num; i++ { - if code = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil { + if errdata = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil { return } } @@ -390,7 +394,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } - if code = module1.(comm.IItems).CleanItems(session); errdata != nil { + if errdata = module1.(comm.IItems).CleanItems(session); errdata != nil { return } @@ -404,7 +408,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } - if code = module1.(comm.IEquipment).AddAllEquipments(session); errdata != nil { + if errdata = module1.(comm.IEquipment).AddAllEquipments(session); errdata != nil { return } @@ -422,7 +426,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er // return // } if module, err := this.service.GetModule(comm.ModuleChat); err == nil { - if code = module.(comm.IChat).SendSysChatToWorld(comm.ChatSystem10, nil, 5, 0, "xxx", "25001"); errdata != nil { + if errdata = module.(comm.IChat).SendSysChatToWorld(comm.ChatSystem10, nil, 5, 0, "xxx", "25001"); errdata != nil { return } } @@ -455,7 +459,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er T: v.Id, N: int32(num2), } - if code = this.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { + if errdata = this.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { this.Debugf("DispenseRes err :uid = %s,code = %d", datas[0], code) } } diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index d3597c801..7d653b885 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -18,14 +18,18 @@ func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.Growtask } func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (errdata *pb.ErrorData) { - if code = this.AdvreceiveCheck(session, req); errdata != nil { + if errdata = this.AdvreceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() gt, err := this.module.modelGrowtask.getUserGrowtask(uid) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if gt.Uid == "" { @@ -52,11 +56,19 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe //发奖 rewardCnf, err := this.module.configure.getGrowrewardCfg() if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if rewardCnf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -65,7 +77,11 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe "advReceive": req.TaskType, } if err := this.module.modelGrowtask.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index b8f652d91..4e918c408 100644 --- a/modules/growtask/api_receive.go +++ b/modules/growtask/api_receive.go @@ -18,7 +18,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskRec } func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (errdata *pb.ErrorData) { - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } @@ -33,11 +33,19 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR //发奖 ggt, err := this.module.configure.getGrowtaskCfg() if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if ggt == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index e78c68b6d..2d3592813 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -44,7 +44,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e awakenData, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -52,7 +56,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e return } if len(awakenData.Phasebonus) < 2 { // 配置校验 - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -69,7 +77,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e // 加属性 awakenData if len(awakenData.Phasebonus) != 2 { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } _hero.JuexingLv += 1 @@ -149,7 +161,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e } } else { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index 8309b4377..c35d8894c 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -35,7 +35,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) update = make(map[string]interface{}) - if code = this.BuyCheck(session, req); errdata != nil { + if errdata = this.BuyCheck(session, req); errdata != nil { return } if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil { @@ -44,7 +44,11 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata } if conf, err = this.module.configure.GetShopItemsConfigureByGroups(req.BuyType, udata); err != nil { // 找配置 - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -98,7 +102,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata } } // 消耗 - if code = this.module.ConsumeRes(session, need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } give = make([]*cfg.Gameatn, len(conf.Iteminfo)) @@ -110,7 +114,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata } } // 获得的道具 - if code = this.module.DispenseRes(session, give, true); errdata != nil { + if errdata = this.module.DispenseRes(session, give, true); errdata != nil { return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index ab0def74b..351f646a0 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -271,7 +271,11 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq _data, err := this.module.configure.GetPollByType(strPool[index]) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/hero/api_fusion.go b/modules/hero/api_fusion.go index 6365a8271..75f8f9f5c 100644 --- a/modules/hero/api_fusion.go +++ b/modules/hero/api_fusion.go @@ -28,12 +28,16 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e ChangeList = make([]*pb.DBHero, 0) _costMaphero = make(map[string]*pb.DBHero, 0) mapHero = make(map[string]int32) - if code = this.FusionCheck(session, req); errdata != nil { + if errdata = this.FusionCheck(session, req); errdata != nil { return } conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId) if err != nil { - code = pb.ErrorCode_ConfigNoFound // 配置没找到 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // 配置没找到 data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -94,7 +98,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e T: conf.Hero, N: 1, } - if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil { this.module.Errorf("err:%v,create hero:%s,uid,%ss", code, conf.Hero, session.GetUserId()) code = pb.ErrorCode_HeroCreate // 创建新英雄失败 diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index c2d2ac0d2..563a3a7a3 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -24,7 +24,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (errda uid string ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } rsp := &pb.HeroInfoResp{} diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 2a1ec810c..1d85072d6 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -39,7 +39,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt // 查询配置表 找出原始品质 heroCfg, err := this.module.configure.GetHeroConfig(_hero.HeroID) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -69,7 +73,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt } // 检查消耗 - if code = this.module.CheckRes(session, cost); errdata != nil { + if errdata = this.module.CheckRes(session, cost); errdata != nil { return } for i := 0; i < int(lvUpCount); i++ { // 升级技能 @@ -80,7 +84,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt if skill.SkillLv < skillMaxLv { // 找到没有满级的技能id skillData, err := this.module.configure.GetHeroSkillUpConfig(skill.SkillID) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index cfd4926b1..a659aed3e 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -38,7 +38,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr // 校验指定英雄 starConf, err = this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -47,7 +51,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr } heroConf, err := this.module.configure.GetHeroConfig(_hero.HeroID) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -60,13 +68,13 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr return } - if code = this.module.ConsumeRes(session, starConf.Needrace, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, starConf.Needrace, true); errdata != nil { return } // 加对应的天赋点数 if len(starConf.Starup) > 0 { - if code = this.module.DispenseRes(session, starConf.Starup, true); errdata != nil { // 加天赋点{ + if errdata = this.module.DispenseRes(session, starConf.Starup, true); errdata != nil { // 加天赋点{ this.module.Errorf("DispenseRes err:uid:%s,res:%v", session.GetUserId(), starConf.Starup) } } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 3621caa01..aa922a247 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -51,7 +51,11 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren addExp += expConf.Exp * v costGold += expConf.Needgold * v } else { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -65,7 +69,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren N: costGold, }) // 金币消耗判断 - if code = this.module.CheckRes(session, cost); errdata != nil { + if errdata = this.module.CheckRes(session, cost); errdata != nil { return } @@ -84,7 +88,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren return } // 消耗金币 - if code = this.module.ConsumeRes(session, cost, true); errdata != nil { //道具扣除 + if errdata = this.module.ConsumeRes(session, cost, true); errdata != nil { //道具扣除 code = pb.ErrorCode_ItemsNoEnough return } diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index f221ce017..0c11f0c69 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -29,7 +29,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe ) chanegCard = make([]*pb.DBHero, 0) - if code = this.TalentLearnCheck(session, req); errdata != nil { + if errdata = this.TalentLearnCheck(session, req); errdata != nil { return } if req.ObjId != "" { @@ -68,7 +68,11 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe talentConf, err := this.module.configure.GetHeroTalent(req.TalentID) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -119,7 +123,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe T: generaltp.T, N: leftCount, } - if code = this.module.CheckRes(session, []*cfg.Gameatn{fp}); errdata != nil { + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{fp}); errdata != nil { code = pb.ErrorCode_ItemsNoEnough return } @@ -134,7 +138,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe res = append(res, point) } } - if code = this.module.ConsumeRes(session, res, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, res, true); errdata != nil { return } diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index d1298492b..5f468022c 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -23,7 +23,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe chanegCard []*pb.DBHero // 推送属性变化 talentPoint int32 // 已经消耗的天赋点数 ) - if code = this.TalentResetCheck(session, req); errdata != nil { + if errdata = this.TalentResetCheck(session, req); errdata != nil { return } @@ -40,7 +40,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe chanegCard = make([]*pb.DBHero, 0) // 检查消耗够不够 - if code = this.module.ConsumeRes(session, this.module.ModuleTools.GetGlobalConf().TalentReset, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, this.module.ModuleTools.GetGlobalConf().TalentReset, true); errdata != nil { return } @@ -48,7 +48,11 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe if conf, err := this.module.configure.GetHeroTalent(k); err == nil { talentPoint += conf.Point // 获取当前英雄的天赋点数 } else { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -63,7 +67,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe N: talentPoint, } this.module.Debugf("返还天赋的点数%d,itemID=%s", talentPoint, t) - if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { this.module.Errorf("DispenseRes err,uid:%s,item:%v", session.GetUserId(), res) } // 返还升级的天赋点数 } diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go index 699d90c1f..4b4d7622f 100644 --- a/modules/horoscope/api_info.go +++ b/modules/horoscope/api_info.go @@ -17,11 +17,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) ( info *pb.DBHoroscope err error ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "info", &pb.HoroscopeInfoResp{Info: info}) diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index e8fac62de..e0ae22880 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -21,11 +21,15 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) conf *cfg.GameGlobalData err error ) - if code = this.ResetCheck(session, req); errdata != nil { + if errdata = this.ResetCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } conf = this.module.ModuleTools.GetGlobalConf() @@ -36,13 +40,17 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) } } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); errdata != nil { return } info.Nodes = make(map[int32]int32) info.Lastrest = configure.Now().Unix() if err = this.module.modelHoroscope.updateInfo(session, info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "reset", &pb.HoroscopeResetResp{Issucc: true, Info: info}) diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index 923383419..a98268e5e 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -20,22 +20,34 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade front *cfg.GameHoroscopeData err error ) - if code = this.UpgradeCheck(session, req); errdata != nil { + if errdata = this.UpgradeCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if conf, err = this.module.configure.getHoroscope(req.Nid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if conf.CostItem != nil && len(conf.CostItem) > 0 { //可有升级 for _, _front := range conf.Front { if _front > 0 { if front, err = this.module.configure.getHoroscope(_front); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if v, ok := info.Nodes[front.NodeId]; !ok || v < front.Lv { @@ -51,7 +63,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade } return } - if code = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil { return } info.Nodes[conf.NodeId] = conf.Lv + 1 @@ -59,7 +71,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype173, 1)) } if err = this.module.modelHoroscope.updateInfo(session, info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "upgrade", &pb.HoroscopeUpgradeResp{Nid: conf.NodeId, Lv: conf.Lv + 1}) diff --git a/modules/horoscope/modelhoroscope.go b/modules/horoscope/modelhoroscope.go index 19a583de7..4945d6280 100644 --- a/modules/horoscope/modelhoroscope.go +++ b/modules/horoscope/modelhoroscope.go @@ -155,7 +155,7 @@ func (this *modelHoroscope) reddot(session comm.IUserSession) bool { for _, v := range horoscope.GetDataList() { if lv, ok := info.Nodes[v.NodeId]; !ok && v.Lv > lv { - if code = this.module.CheckRes(session, v.CostItem); code == pb.ErrorCode_Success { + if errdata = this.module.CheckRes(session, v.CostItem); code == pb.ErrorCode_Success { return true } } diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index d199d86be..687220910 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -35,7 +35,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen } cfgData, err := this.module.configure.GetHuntingBossConfigData(req.BossType, req.Difficulty) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -44,7 +48,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen } if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 { - if code = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 + if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 return } @@ -64,7 +68,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen T: "ps", N: ps, } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } @@ -75,7 +79,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen "ps": hunting.Ps, }) } - // if code = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { + // if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { // if req.AutoBuy { // 不够的时候看是否能自动购买 // var count int32 // for _, v := range cfgData.PsConsume { @@ -83,7 +87,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen // count += v.N // } // } - // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { + // if errdata = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { // return // } // } else { diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 9b8b9fe50..be1768d8b 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -45,7 +45,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha } cfgHunting, err := this.module.configure.GetHuntingBossConfigData(req.BossType, req.Difficulty) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -76,12 +80,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha } mapData["boss"] = hunting.Boss code, bWin = this.module.battle.CheckBattleReport(session, req.Report) - // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { + // if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } if !bWin { // 战斗失败了 直接返回 if v, ok := hunting.Ps[req.BossType]; ok && v > 0 { - if code = this.module.DispenseRes(session, cfgHunting.PsConsume, true); errdata != nil { // 返还预扣体力 + if errdata = this.module.DispenseRes(session, cfgHunting.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -91,13 +95,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{Data: hunting}) return } - // if code = this.module.ConsumeRes(session, cfgHunting.PsConsume, true); errdata != nil { + // if errdata = this.module.ConsumeRes(session, cfgHunting.PsConsume, true); errdata != nil { // return // } key := strconv.Itoa(int(req.BossType)) + "_" + strconv.Itoa(int(req.Difficulty)) if hunting.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 mapData["boss"] = hunting.Boss - if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { + if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { return } } @@ -136,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha return } if newChallenge && bWin { // 新关卡挑战通过 发放首通奖励 - if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { + if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { return } hunting.Boss[req.BossType] += 1 diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go index d27ad55d2..0e3c4a7c8 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -18,7 +18,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe return // 参数校验失败直接返回 } // 刷新挑战卷 - // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { + // if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } list, _ := this.module.modelHunting.getHuntingList(session.GetUserId()) diff --git a/modules/items/module.go b/modules/items/module.go index 822502d34..22f859e1f 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -172,13 +172,29 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil { this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err) if err == ItemNotEnoughError { - code = pb.ErrorCode_ItemsNoEnough + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ItemsNoEnough, + Title: pb.ErrorCode_ItemsNoEnough.ToString(), + Message: err.Error(), + } } else if err == PackGridNumUpper { - code = pb.ErrorCode_ItemsGridNumUpper + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ItemsGridNumUpper, + Title: pb.ErrorCode_ItemsGridNumUpper.ToString(), + Message: err.Error(), + } } else if err == NoFoundItemConfig { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } } else { - code = pb.ErrorCode_Unknown + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_Unknown, + Title: pb.ErrorCode_Unknown.ToString(), + Message: err.Error(), + } } return } diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index 17f1136c0..48a62ab3e 100644 --- a/modules/library/api_getfetterlist.go +++ b/modules/library/api_getfetterlist.go @@ -15,7 +15,7 @@ func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.Libra func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (errdata *pb.ErrorData) { - if code = this.GetFetterListCheck(session, req); errdata != nil { + if errdata = this.GetFetterListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } rsp := &pb.LibraryGetFetterListResp{} diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 8a7de1d59..7f448c70b 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -41,7 +41,11 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe } favorConf, err := this.module.configure.GetFavorability(_heroFetter.Heroid, 1) // 取1级的就可以 if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -76,7 +80,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe } if len(res) > 0 { - if code = this.module.DispenseRes(session, res, true); errdata != nil { + if errdata = this.module.DispenseRes(session, res, true); errdata != nil { return } } else { diff --git a/modules/library/api_lvup.go b/modules/library/api_lvup.go index 1e7029987..5b7e890e5 100644 --- a/modules/library/api_lvup.go +++ b/modules/library/api_lvup.go @@ -43,7 +43,11 @@ func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetter fetter.Fidlv += 1 conf, e := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv) if e != nil || len(conf) == 0 { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: e.Error(), diff --git a/modules/library/api_maintask.go b/modules/library/api_maintask.go index 794d40ed0..13b9b7439 100644 --- a/modules/library/api_maintask.go +++ b/modules/library/api_maintask.go @@ -19,7 +19,7 @@ func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.Lib } func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (errdata *pb.ErrorData) { - if code = this.FetterstoryTaskCheck(session, req); errdata != nil { + if errdata = this.FetterstoryTaskCheck(session, req); errdata != nil { return } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 94e96c446..5855fb5aa 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -44,7 +44,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe _exp, err := this.module.configure.GetFavorabilityExp(_heroObj.Heroid) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -79,7 +83,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe // 校验是否是自己喜欢的食物 _c, err := this.module.configure.GetFavorability(_heroObj.Heroid, _heroObj.Favorlv) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -109,13 +117,17 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe N: req.Counts, }) - if code = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回 + if errdata = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回 return } itemConf, err1 := this.module.configure.GetItemConfigureData(req.Items) // 获取食物的 if err1 != nil { this.module.Errorf("赠送菜品配置没找到：%s", req.Items) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } addExp *= itemConf.SpecialType @@ -135,7 +147,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe break } } - if code = this.module.ConsumeRes(session, res, true); errdata != nil { //真正消耗 + if errdata = this.module.ConsumeRes(session, res, true); errdata != nil { //真正消耗 return } // 修改信息 @@ -165,7 +177,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe "race": rst.Race, }) } else { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index bbd8300ca..a7a95f605 100644 --- a/modules/linestory/api_maintask.go +++ b/modules/linestory/api_maintask.go @@ -19,7 +19,7 @@ func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryM } func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (errdata *pb.ErrorData) { - if code = this.MaintaskCheck(session, req); errdata != nil { + if errdata = this.MaintaskCheck(session, req); errdata != nil { return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index d2adbe2b4..93b7f7d41 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -21,14 +21,18 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryRe } func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (errdata *pb.ErrorData) { - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() conf := this.module.configure.getChapterCfgById(req.ChapterId) if conf == nil { this.module.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -37,14 +41,18 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive if errors.As(err, &customErr) { code = customErr.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } this.module.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code}) return } //发奖 - if code = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { this.module.Error("奖励发放失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "reward", Value: conf.Reward}, ) diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index c01e1fa28..5a62550d4 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -40,7 +40,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma } res = append(res, d) } - if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success { // 修改状态 this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID) mail.Reward = true @@ -89,7 +89,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai fj = append(fj, v1) res = append(res, d) } - if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success { this.module.modelMail.MailUpdateMailAttachmentState(v.ObjId) v.Reward = true v.Check = true diff --git a/modules/mline/api_challenge.go b/modules/mline/api_challenge.go index b64305dd8..0fc774641 100644 --- a/modules/mline/api_challenge.go +++ b/modules/mline/api_challenge.go @@ -28,7 +28,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge stageConf *cfg.GameMainStageData ) - if code = this.ChallengeCheck(session, req); errdata != nil { + if errdata = this.ChallengeCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } if stageConf = this.module.configure.GetMainStageConf(req.StageId); stageConf == nil { // 配置文件校验 @@ -77,7 +77,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge } if v1, ok := curChapter.Ps[req.StageId]; ok && v1 == 0 { - if code = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点 + if errdata = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点 return } } else { @@ -96,7 +96,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge T: "ps", N: ps, } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index 0b43953e1..5a95be172 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -62,7 +62,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall if !isWin { // 战斗失败返还扣除的体力 if v, ok := curChapter.Ps[req.StageId]; ok && v > 0 { - if code = this.module.DispenseRes(session, stageConf.PsConsume, true); errdata != nil { // 返还预扣体力 + if errdata = this.module.DispenseRes(session, stageConf.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -77,7 +77,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall // 评星规则 if len(stageConf.Star) != len(stageConf.StarType) || len(stageConf.Star) != len(stageConf.StarValue) || len(stageConf.StarValue) != len(stageConf.StarType) { this.module.Errorf("配置错误, 参数数量不一致,StageId: %d", req.StageId) - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -148,7 +152,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall }) } - if code = this.module.DispenseRes(session, stageConf.Firstaward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, stageConf.Firstaward, true); errdata != nil { this.module.Debugf("Mline first DispenseRes err:+%v", stageConf.Firstaward) } for _, v := range stageConf.Firstaward { @@ -159,7 +163,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall }) } } else { - if code = this.module.DispenseRes(session, stageConf.Commonaward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, stageConf.Commonaward, true); errdata != nil { this.module.Debugf("Mline Commonaward DispenseRes err:+%v", stageConf.Commonaward) } for _, v := range stageConf.Commonaward { diff --git a/modules/mline/api_cleanstage.go b/modules/mline/api_cleanstage.go index 411d017f8..138e922e1 100644 --- a/modules/mline/api_cleanstage.go +++ b/modules/mline/api_cleanstage.go @@ -25,7 +25,7 @@ func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanSta rsp *pb.MlineCleanStageResp ) rsp = &pb.MlineCleanStageResp{} - if code = this.CleanStageCheck(session, req); errdata != nil { + if errdata = this.CleanStageCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } if stageConf = this.module.configure.GetMainStageConf(req.StageId); stageConf == nil { // 配置文件校验 @@ -48,7 +48,7 @@ func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanSta code = pb.ErrorCode_MainlineNoEnoughStar return } - if code = this.module.DispenseRes(session, stageConf.Commonaward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, stageConf.Commonaward, true); errdata != nil { this.module.Debugf("Mline Clean DispenseRes err:+%v", stageConf.Commonaward) return } diff --git a/modules/mline/api_getReward.go b/modules/mline/api_getReward.go index 9f6db1fa4..35b52a000 100644 --- a/modules/mline/api_getReward.go +++ b/modules/mline/api_getReward.go @@ -25,13 +25,17 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetReward ) rsp = &pb.MlineGetRewardResp{} update = make(map[string]interface{}) - if code = this.GetRewardCheck(session, req); errdata != nil { + if errdata = this.GetRewardCheck(session, req); errdata != nil { return } mLineConf := this.module.configure.GetMainChapterConf(req.CId) if mLineConf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } list, _ := this.module.modelMline.getMainlineList(session.GetUserId()) @@ -55,7 +59,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetReward awardConf := this.module.configure.GetMainStarRewardConf(mLineConf.Starreward) for _, v := range awardConf { if v.Starnum == req.Star { - if code = this.module.DispenseRes(session, v.Reward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, v.Reward, true); errdata != nil { return } for _, v := range v.Reward { diff --git a/modules/mline/api_getlist.go b/modules/mline/api_getlist.go index 38d56ce6b..dca97ddf3 100644 --- a/modules/mline/api_getlist.go +++ b/modules/mline/api_getlist.go @@ -58,7 +58,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) this.module.modelMline.addNewChapter(session.GetUserId(), newData) } } else { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go index fa8c2e045..6bd74c113 100644 --- a/modules/moonfantasy/api_ask.go +++ b/modules/moonfantasy/api_ask.go @@ -73,7 +73,11 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) ( // }) if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil { this.module.Errorf("no found uer:%d", session.GetUserId()) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } mdata.Join = append(mdata.Join, &pb.UserInfo{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv}) diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index 5ea4f6996..bc0e032fc 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -28,12 +28,16 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( maxbuy, vipbuy int err error ) - if code = this.BuyCheck(session, req); errdata != nil { + if errdata = this.BuyCheck(session, req); errdata != nil { return } if ticketitem = this.module.ModuleTools.GetGlobalConf().CopsBuyGet; ticketitem == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: code.ToString(), Message: comm.NewNotFoundConfErr(modelName, "global.json", "CopsBuyGet").Error(), @@ -47,7 +51,11 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( } this.module.modelUserMF.recoverTicket(session, info) if maxbuy, err = this.module.configure.GetchallengeDataCount(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } vipbuy = int(this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType6)) @@ -60,18 +68,22 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( return } if challengeD, err = this.module.configure.GetchallengeData(info.BuyNum + i + 1); err != nil || challengeD == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } need = append(need, challengeD.Need...) } - if code = this.module.ConsumeRes(session, need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } info.BuyNum += req.BuyNum // info.Ticket += req.BuyNum - if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil { return } this.module.modelUserMF.Change(session.GetUserId(), map[string]interface{}{ diff --git a/modules/moonfantasy/api_getlist.go b/modules/moonfantasy/api_getlist.go index e8e9eede0..bb22ad7b6 100644 --- a/modules/moonfantasy/api_getlist.go +++ b/modules/moonfantasy/api_getlist.go @@ -25,7 +25,11 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.MoonfantasyGetLi } // this.module.modelUserMF.recoverTicket(session, info) // if err = this.module.modelUserMF.updateUserInfo(info); err != nil { - // code = pb.ErrorCode_DBError + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // return // } this.module.ModuleItems.RecoverTicket(session) diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go index 2cabeaa03..f2078a997 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -25,23 +25,27 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei err error ) - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } if boss, err = this.module.configure.GetMonsterById(req.Mid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if !iswin { - if code = this.module.ConsumeRes(session, boss.PsMg, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, boss.PsMg, true); errdata != nil { return } return } else { - if code = this.module.ConsumeRes(session, boss.PsConsume, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, boss.PsConsume, true); errdata != nil { return } this.module.DispenseRes(session, boss.Prize, true) diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index cd631a44a..b6073585a 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -201,7 +201,11 @@ func (this *modelDreamComp) noticeuserfriend(session comm.IUserSession, mid stri friend []string ) // if model, err = this.module.GetDBNodule(session, comm.TableFriend, 0); err != nil { - // code = pb.ErrorCode_DBError + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // this.module.Errorf("session:%v err:%v", session, err) // return // } diff --git a/modules/notify/api_getlist.go b/modules/notify/api_getlist.go index ec4a277d7..bc335fabf 100644 --- a/modules/notify/api_getlist.go +++ b/modules/notify/api_getlist.go @@ -20,12 +20,20 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.NotifyGetListReq notify []*pb.DBSystemNotify ) if notify, err = this.module.modelNotify.GetFullNotify(); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if session.GetUserId() != "" { if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } else { diff --git a/modules/oldtimes/api_receive.go b/modules/oldtimes/api_receive.go index b1cd35de7..ab3a1ea9a 100644 --- a/modules/oldtimes/api_receive.go +++ b/modules/oldtimes/api_receive.go @@ -16,7 +16,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.OldtimesRec } func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveReq) (errdata *pb.ErrorData) { - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index c3cf41714..23d57ea2c 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -26,7 +26,11 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar if pagoda, err := this.module.modelPagoda.getPagodaList(session.GetUserId()); err != nil { _cfg := this.module.configure.GetPagodaRewardconfig(req.Id) if _cfg == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } // 校验是否能领取 @@ -43,7 +47,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar pagoda.Reward = make(map[int32]bool, 0) } // 发奖励 - if code = this.module.DispenseRes(session, _cfg.Reward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, _cfg.Reward, true); errdata != nil { return } pagoda.Reward[req.Id] = true diff --git a/modules/pagoda/api_warorder.go b/modules/pagoda/api_warorder.go index 0577a0888..604046656 100644 --- a/modules/pagoda/api_warorder.go +++ b/modules/pagoda/api_warorder.go @@ -101,7 +101,7 @@ func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderR } } if len(totalRes) > 0 { - if code = this.module.DispenseRes(session, totalRes, true); errdata != nil { // 发放奖励 + if errdata = this.module.DispenseRes(session, totalRes, true); errdata != nil { // 发放奖励 return } } diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go index b96a91066..67438f578 100644 --- a/modules/parkour/api_Info.go +++ b/modules/parkour/api_Info.go @@ -18,18 +18,26 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er recommend []*pb.DBRaceMember err error ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } // isopen = this.module.configure.isopen() isopen = true if isopen { if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if recommend, err = this.module.parkourComp.getrusers(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/parkour/api_avoid.go b/modules/parkour/api_avoid.go index f2c69b272..9d201bbdd 100644 --- a/modules/parkour/api_avoid.go +++ b/modules/parkour/api_avoid.go @@ -15,7 +15,7 @@ func (this *apiComp) Avoid(session comm.IUserSession, req *pb.ParkourAvoidReq) ( var ( ok bool ) - if code = this.AvoidCheck(session, req); errdata != nil { + if errdata = this.AvoidCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/parkour/api_changemts.go b/modules/parkour/api_changemts.go index 4a80668cd..b45f82c7e 100644 --- a/modules/parkour/api_changemts.go +++ b/modules/parkour/api_changemts.go @@ -19,11 +19,15 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM mount *cfg.GameBuzkashiMountData err error ) - if code = this.ChangeMtsCheck(session, req); errdata != nil { + if errdata = this.ChangeMtsCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if _, ok := info.Mounts[req.Mtsid]; !ok { @@ -36,7 +40,11 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM info.Dfmount = req.Mtsid if info.Captainid != "" { if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if info.Captainid == session.GetUserId() { @@ -50,12 +58,20 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM "dfmount": info.Dfmount, "member": info.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } else { if team, err = this.module.parkourComp.queryinfo(info.Captainid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } for _, v := range team.Member { @@ -67,7 +83,11 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{ "member": team.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } @@ -75,7 +95,11 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ "dfmount": info.Dfmount, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/parkour/api_getreward.go b/modules/parkour/api_getreward.go index f9cdf8465..d506bcf92 100644 --- a/modules/parkour/api_getreward.go +++ b/modules/parkour/api_getreward.go @@ -16,16 +16,24 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewa info *pb.DBParkour err error ) - if code = this.GetRewardCheck(session, req); errdata != nil { + if errdata = this.GetRewardCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } _conf := this.module.configure.getGameBuzkashiReward(req.Rid) if _conf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if _conf.Schedule <= info.Integral && (info.Reward+1 == req.Rid) { @@ -33,7 +41,11 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewa if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ "reward": info.Reward, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go index d779cd986..2ea6f7170 100644 --- a/modules/parkour/api_invite.go +++ b/modules/parkour/api_invite.go @@ -31,11 +31,15 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) ok bool err error ) - if code = this.InviteCheck(session, req); errdata != nil { + if errdata = this.InviteCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if info.Captainid != "" && info.Captainid != session.GetUserId() { //自己不是队长 无权邀请他人 @@ -54,7 +58,11 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) return } if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -69,7 +77,11 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } if tinfo, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if tuser = this.module.ModuleUser.GetUser(req.Uid); tuser == nil { @@ -77,7 +89,11 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) return } if mount, err = this.module.configure.getGameBuzkashiMount(tinfo.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -117,7 +133,11 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) "invite": info.Invite, "member": info.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "invite", &pb.ParkourInviteResp{Issucc: true, Team: info}) diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index 6b7d91fad..813a0f1f4 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -26,16 +26,24 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi index int32 err error ) - if code = this.InviteHandleCheck(session, req); errdata != nil { + if errdata = this.InviteHandleCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if len(tean.Member) >= 3 { @@ -61,7 +69,11 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi users[i] = v.Uid } if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } users = append(users, invite.Uid) @@ -73,7 +85,11 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi "captainid": tean.Captainid, "state": tean.State, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if err = this.module.parkourComp.Change(tean.Captainid, map[string]interface{}{ @@ -82,7 +98,11 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi "captainid": tean.Captainid, "member": tean.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice", diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go index 27421ebac..7c59c0baa 100644 --- a/modules/parkour/api_jointeam.go +++ b/modules/parkour/api_jointeam.go @@ -29,11 +29,15 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam err error ) - if code = this.JoinTeamCheck(session, req); errdata != nil { + if errdata = this.JoinTeamCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } // 状态校验 @@ -47,7 +51,11 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam return } if tean, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -62,7 +70,11 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam if tean.Captainid == "" { user := this.module.ModuleUser.GetUser(tean.Uid) if mount, err = this.module.configure.getGameBuzkashiMount(tean.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: mount.Hp} @@ -74,7 +86,11 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam users = append(users, session.GetUserId()) if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } user := this.module.ModuleUser.GetUser(session.GetUserId()) @@ -84,7 +100,11 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam "state": tean.State, "captainid": tean.Captainid, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if err = this.module.parkourComp.Change(tean.Captainid, map[string]interface{}{ @@ -92,7 +112,11 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam "captainid": tean.Captainid, "member": tean.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice", diff --git a/modules/parkour/api_quitteam.go b/modules/parkour/api_quitteam.go index 4a1d37319..31cf62f81 100644 --- a/modules/parkour/api_quitteam.go +++ b/modules/parkour/api_quitteam.go @@ -20,11 +20,15 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam ok bool err error ) - if code = this.QuitTeamCheck(session, req); errdata != nil { + if errdata = this.QuitTeamCheck(session, req); errdata != nil { return } if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } for i, v := range tean.Member { @@ -48,7 +52,11 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam for i, v := range users { if i == 0 { if ntean, err = this.module.parkourComp.queryinfo(v); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } else { ntean.Captainid = users[0] @@ -57,7 +65,11 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam "captainid": v, "member": tean.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } @@ -65,7 +77,11 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam if err = this.module.parkourComp.Change(v, map[string]interface{}{ "captainid": users[0], }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } @@ -82,7 +98,11 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam "invite": tean.Invite, "member": tean.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -91,13 +111,21 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam "state": pb.RaceTeamState_resting, "captainid": "", }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if err = this.module.parkourComp.Change(req.Captainid, map[string]interface{}{ "member": tean.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if len(users) > 0 { diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go index 1d158c063..33234a71b 100644 --- a/modules/parkour/api_racematch.go +++ b/modules/parkour/api_racematch.go @@ -26,11 +26,15 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat users []string err error ) - if code = this.RaceMatchCheck(session, req); errdata != nil { + if errdata = this.RaceMatchCheck(session, req); errdata != nil { return } if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if team.Captainid != "" && team.Captainid != session.GetUserId() { @@ -48,7 +52,11 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat return } if mount, err = this.module.configure.getGameBuzkashiMount(team.Dfmount); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Maxhp: mount.Hp}) @@ -57,13 +65,21 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat "captainid": team.Captainid, "member": team.Member, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } if err = this.module.match(team); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -74,7 +90,11 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{ "state": pb.RaceTeamState_matching, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/parkour/api_racematchcancel.go b/modules/parkour/api_racematchcancel.go index 4efb17665..57f3f82d6 100644 --- a/modules/parkour/api_racematchcancel.go +++ b/modules/parkour/api_racematchcancel.go @@ -23,11 +23,15 @@ func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourR users []string err error ) - if code = this.RaceMatchCancelCheck(session, req); errdata != nil { + if errdata = this.RaceMatchCancelCheck(session, req); errdata != nil { return } if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if team.Captainid != session.GetUserId() { @@ -39,7 +43,11 @@ func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourR } if err = this.module.match(team); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } users = make([]string, len(team.Member)) @@ -49,7 +57,11 @@ func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourR if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{ "state": pb.RaceTeamState_matching, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/parkour/api_ready.go b/modules/parkour/api_ready.go index 767e1d7c0..dbcfe642a 100644 --- a/modules/parkour/api_ready.go +++ b/modules/parkour/api_ready.go @@ -17,7 +17,7 @@ func (this *apiComp) Ready(session comm.IUserSession, req *pb.ParkourReadyReq) ( ok bool isready bool ) - if code = this.ReadyCheck(session, req); errdata != nil { + if errdata = this.ReadyCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/parkour/api_recoverhp.go b/modules/parkour/api_recoverhp.go index 8972658e6..2a32b39e3 100644 --- a/modules/parkour/api_recoverhp.go +++ b/modules/parkour/api_recoverhp.go @@ -17,7 +17,7 @@ func (this *apiComp) RecoverHp(session comm.IUserSession, req *pb.ParkourRecover users []string ok bool ) - if code = this.RecoverHpCheck(session, req); errdata != nil { + if errdata = this.RecoverHpCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/parkour/api_shot.go b/modules/parkour/api_shot.go index 3e2b69b06..6f24ac3e2 100644 --- a/modules/parkour/api_shot.go +++ b/modules/parkour/api_shot.go @@ -15,7 +15,7 @@ func (this *apiComp) Shot(session comm.IUserSession, req *pb.ParkourShotReq) (er var ( ok bool ) - if code = this.ShotCheck(session, req); errdata != nil { + if errdata = this.ShotCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/parkour/api_viewplayer.go b/modules/parkour/api_viewplayer.go index 1b33e2be3..6bcd75b6d 100644 --- a/modules/parkour/api_viewplayer.go +++ b/modules/parkour/api_viewplayer.go @@ -15,7 +15,7 @@ func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPl var ( resp *pb.ParkourViewPlayerResp ) - if code = this.ViewPlayerCheck(session, req); errdata != nil { + if errdata = this.ViewPlayerCheck(session, req); errdata != nil { return } resp = &pb.ParkourViewPlayerResp{ diff --git a/modules/parkour/module.go b/modules/parkour/module.go index d7048fb6e..239456b91 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -76,7 +76,11 @@ func (this *Parkour) AddMounts(session comm.IUserSession, mounts map[string]int3 err error ) if result, err = this.parkourComp.addUserMounts(session.GetUserId(), mounts); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if bPush { diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index acf75703f..b56befc46 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -26,15 +26,23 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) items []*pb.UserAssets err error ) - if code = this.DailyBuyCheck(session, req); errdata != nil { + if errdata = this.DailyBuyCheck(session, req); errdata != nil { return } if conf, err = this.module.configure.getPayPackageData(req.Id); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if info, err = this.module.modelDaily.queryUserDaily(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if info.Items[conf.Id] != nil { @@ -45,7 +53,7 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) } if len(conf.Costitem) > 0 { - if code = this.module.ConsumeRes(session, conf.Costitem, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, conf.Costitem, true); errdata != nil { return } } diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index f2cc140d9..dd617c518 100644 --- a/modules/pay/api_delivery.go +++ b/modules/pay/api_delivery.go @@ -19,7 +19,7 @@ func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) var ( err error ) - if code = this.DeliveryCheck(session, req); errdata != nil { + if errdata = this.DeliveryCheck(session, req); errdata != nil { return } req.Orderid = primitive.NewObjectID().Hex() diff --git a/modules/pay/api_info.go b/modules/pay/api_info.go index 409c6ea4a..2ac0dde22 100644 --- a/modules/pay/api_info.go +++ b/modules/pay/api_info.go @@ -22,15 +22,23 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (errdat conf *cfg.GamePayPackageData err error ) - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelDaily.queryUserDaily(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if goods, err = this.module.configure.getPayPackageDatas(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } for _, v := range goods { @@ -46,7 +54,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (errdat for _, v := range info.Items { if configure.Now().Sub(time.Unix(v.Lastrefresh, 0)).Hours() > 24 { if conf, err = this.module.configure.getPayPackageData(v.Id); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } v.Buyunm = conf.BuyNum @@ -54,7 +66,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (errdat } } if err = this.module.modelDaily.updateUserDaily(info); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "info", &pb.PayInfoResp{Info: info}) diff --git a/modules/pay/api_record.go b/modules/pay/api_record.go index 368b122c4..d6dd7e5bd 100644 --- a/modules/pay/api_record.go +++ b/modules/pay/api_record.go @@ -17,11 +17,15 @@ func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (er info *pb.DBUserPay err error ) - if code = this.RecordCheck(session, req); errdata != nil { + if errdata = this.RecordCheck(session, req); errdata != nil { return } if info, err = this.module.modelPayUser.queryUserPay(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "record", &pb.PayRecordResp{Info: info}) diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index 7a8178155..b199962d2 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -65,11 +65,19 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (err err error ) if conf, err = this.module.configure.getPayPackageDataByPid(pid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if info, err = this.queryUserDaily(session.GetUserId()); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if info.Items[conf.Id] == nil { @@ -91,7 +99,7 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (err N: v.N, } } - if code = this.module.DispenseRes(session, conf.Item, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil { return } return diff --git a/modules/pay/module.go b/modules/pay/module.go index 4f73c0ae5..e51893e29 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -159,11 +159,19 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, ) if conf, err = this.configure.getGameRecharge(Productid); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if info, err = this.modelPayUser.queryUserPay(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if info.Record[Productid] > 0 { @@ -173,7 +181,7 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, } info.Record[Productid]++ - if code = this.DispenseRes(session, res, true); errdata != nil { + if errdata = this.DispenseRes(session, res, true); errdata != nil { return } orderid := primitive.NewObjectID().Hex() @@ -183,7 +191,11 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, Productid: Productid, Ctime: configure.Now().Unix(), }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } this.modelPayUser.updateUserPay(info) diff --git a/modules/practice/api_accept.go b/modules/practice/api_accept.go index 2dc31ecab..9c88aa84c 100644 --- a/modules/practice/api_accept.go +++ b/modules/practice/api_accept.go @@ -21,7 +21,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.PracticeAcce } func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq) (errdata *pb.ErrorData) { - if code = this.AcceptCheck(session, req); errdata != nil { + if errdata = this.AcceptCheck(session, req); errdata != nil { return } var ( @@ -33,11 +33,19 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq //校验切磋请求是否超时 if redRecord, err = this.module.modelQiecuo.queryQiecuo(req.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if blueRecord, err = this.module.modelQiecuo.queryQiecuo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if redRecord.Status == 1 { //已经在战斗中了 diff --git a/modules/practice/api_enrolled.go b/modules/practice/api_enrolled.go index 3bdcef164..c89f81279 100644 --- a/modules/practice/api_enrolled.go +++ b/modules/practice/api_enrolled.go @@ -21,11 +21,15 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if req.Group != 0 { - if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); errdata != nil { + if errdata = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); errdata != nil { return } for i := 0; i < len(req.Hero); i++ { @@ -41,7 +45,7 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle return } - if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); errdata != nil { + if errdata = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); errdata != nil { return } for _, v := range hero { diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index 2708a5ada..5b1ea5151 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -36,29 +36,49 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls ants2 []*cfg.Gameatn ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } pillar = room.Pillarf filed = "pillarf" if froom, err = this.module.modelPandata.queryUserMartialhall(pillar.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if pillarconfigure, err = this.module.configure.getGamePandamasMz(pillar.Lv); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if pillar.Teacher != "" { if tconfigure, err = this.module.configure.getGamePandamasJx(pillar.Teacher); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } } if pillar.Prop != "" { if pconfigure, err = this.module.configure.getGamePandamasJx(pillar.Prop); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } } @@ -179,7 +199,7 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); errdata != nil { return } - if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); errdata != nil { + if errdata = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); errdata != nil { return } diff --git a/modules/practice/api_friendromm.go b/modules/practice/api_friendromm.go index 02942d718..1d0294367 100644 --- a/modules/practice/api_friendromm.go +++ b/modules/practice/api_friendromm.go @@ -19,7 +19,11 @@ func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFrien Infos map[string]*pb.DBPracticeRoom ) if rooms, err = this.module.modelPandata.queryrooms(req.Fuid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } Infos = make(map[string]*pb.DBPracticeRoom) diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index aef2a9ad0..fa270afcd 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -21,11 +21,19 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy ) if mryl, err = this.module.configure.getPandamasMryl(req.Posture); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if buff, err = this.module.configure.getGamePandamasBuff(mryl.BuffGroup); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype185, 1)) diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go index 71a8321fd..e186cd3dd 100644 --- a/modules/practice/api_gyminfo.go +++ b/modules/practice/api_gyminfo.go @@ -20,7 +20,11 @@ func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoR room *pb.DBPracticeRoom ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if time.Unix(room.Lastrefresh, 0).Day() != configure.Now().Day() { diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 2608958f2..b461349e4 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -26,12 +26,20 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } refreshAtns = this.module.ModuleTools.GetGlobalConf().MrylFlushed if len(refreshAtns) == 0 { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if int(room.Gymrefresh) < len(refreshAtns) { @@ -40,11 +48,15 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe atn = refreshAtns[len(refreshAtns)-1] } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{atn}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{atn}, true); errdata != nil { return } if confs, err = this.module.configure.getGamePandamasMryls(); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } temp = make([]*cfg.GamePandamasMrylData, 0) diff --git a/modules/practice/api_info.go b/modules/practice/api_info.go index ce9a8f90b..2d16e6b90 100644 --- a/modules/practice/api_info.go +++ b/modules/practice/api_info.go @@ -21,7 +21,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (e update map[string]interface{} = make(map[string]interface{}) ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -46,7 +50,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (e if cd >= this.module.ModuleTools.GetGlobalConf().PandamasChallengeCd { if err = this.module.modelPandata.refreshnpc(room); err != nil { this.module.Errorln(err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } update["currnpc"] = room.Currnpc diff --git a/modules/practice/api_loot.go b/modules/practice/api_loot.go index 98df1db4c..762df7c56 100644 --- a/modules/practice/api_loot.go +++ b/modules/practice/api_loot.go @@ -26,11 +26,19 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e extra int32 = 0 ) if froom, err = this.module.modelPandata.queryUserMartialhall(req.Friend); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if froom.Pillarf.Hero != "" { @@ -40,10 +48,14 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e } } if pillarconfigure, err = this.module.configure.getGamePandamasMz(froom.Pillarf.Lv); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } - if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, req.Friend); errdata != nil { + if errdata = this.module.ModuleHero.KungFuHero(session, req.Hero, true, req.Friend); errdata != nil { return } if req.Teacher != "" { @@ -56,7 +68,11 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e } room.Knapsack[req.Teacher] = 1 if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } extra += tconfigure.Duration @@ -72,7 +88,11 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e } room.Knapsack[req.Prop] = 1 if pconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } extra += pconfigure.Duration diff --git a/modules/practice/api_npcbattkle.go b/modules/practice/api_npcbattkle.go index f9845f506..0aa11f686 100644 --- a/modules/practice/api_npcbattkle.go +++ b/modules/practice/api_npcbattkle.go @@ -19,7 +19,11 @@ func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBa record *pb.DBBattleRecord ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index f12e82430..bc6e06b09 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -21,7 +21,11 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic conf *cfg.GameDispatch_BattleData ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if room.Npcstate == 2 || room.Npcstate == 3 { @@ -39,10 +43,14 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic if req.Report.WinSide == 1 { room.Npcstate = 3 if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } - if code = this.module.DispenseRes(session, conf.Award, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Award, true); errdata != nil { return } room.Refresh = configure.Now().Unix() diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index c721c26f2..d47225675 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -19,7 +19,11 @@ func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDia // // conf *cfg.GameDispatch_BattleData // ) // if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - // code = pb.ErrorCode_DBError + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // return // } // if room.Npcstate != 2 { @@ -30,10 +34,14 @@ func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDia // return // } // // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { - // // code = pb.ErrorCode_ConfigNoFound + // // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // // return // // } - // // if code = this.module.DispenseRes(session, conf.StoryAward, true); errdata != nil { + // // if errdata = this.module.DispenseRes(session, conf.StoryAward, true); errdata != nil { // // return // // } // room.Npcstate = 3 diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go index f8c49bed3..ae1346bf7 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -27,7 +27,11 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic filed string ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -58,7 +62,11 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } if pillarconfigure, err = this.module.configure.getGamePandamasMz(pillar.Lv); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -72,7 +80,11 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } room.Knapsack[req.Teacher] = 1 if tconfigure, err = this.module.configure.getGamePandamasJx(req.Teacher); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } extra += tconfigure.Duration @@ -88,14 +100,18 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic } room.Knapsack[req.Prop] = 1 if pconfigure, err = this.module.configure.getGamePandamasJx(req.Prop); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } extra += pconfigure.Duration pillar.Prop = req.Prop } pillar.Hero = req.Hero - if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, ""); errdata != nil { + if errdata = this.module.ModuleHero.KungFuHero(session, req.Hero, true, ""); errdata != nil { return } pillar.Start = configure.Now().Unix() diff --git a/modules/practice/api_qiecuo.go b/modules/practice/api_qiecuo.go index b4da49f3c..03518f670 100644 --- a/modules/practice/api_qiecuo.go +++ b/modules/practice/api_qiecuo.go @@ -20,7 +20,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.PracticeQiec } func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq) (errdata *pb.ErrorData) { - if code = this.QiecuoCheck(session, req); errdata != nil { + if errdata = this.QiecuoCheck(session, req); errdata != nil { return } var ( @@ -34,11 +34,19 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq //切磋请求处理 if result, err = this.module.modelQiecuo.queryQiecuo(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if fresult, err = this.module.modelQiecuo.queryQiecuo(req.Fid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -71,7 +79,11 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq } if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 68d4739c3..09c0450ab 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -37,18 +37,30 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR ) if req.Friend != "" { if froom, err = this.module.modelPandata.queryUserMartialhall(req.Friend); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } pillar = froom.Pillarf filed = "pillarf" if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } else { if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } switch req.Index { @@ -75,23 +87,35 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR } if pillarconfigure, err = this.module.configure.getGamePandamasMz(pillar.Lv); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if pillar.Teacher != "" { if tconfigure, err = this.module.configure.getGamePandamasJx(pillar.Teacher); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } } if pillar.Prop != "" { if pconfigure, err = this.module.configure.getGamePandamasJx(pillar.Prop); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } } - if code = this.module.ModuleHero.KungFuHero(session, pillar.Hero, false, ""); errdata != nil { + if errdata = this.module.ModuleHero.KungFuHero(session, pillar.Hero, false, ""); errdata != nil { return } //计算经验收益 @@ -214,7 +238,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR if _, code = this.module.ModuleHero.AddHeroExp(session, pillar.Hero, exp1); errdata != nil { return } - if code = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil { + if errdata = this.module.DispenseRes(session, append(ants1, ants2...), true); errdata != nil { return } room.Knapsack[pillar.Teacher] = 0 diff --git a/modules/practice/api_refuse.go b/modules/practice/api_refuse.go index d03bc321e..ca3231036 100644 --- a/modules/practice/api_refuse.go +++ b/modules/practice/api_refuse.go @@ -12,7 +12,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.PracticeRefu //拒绝切磋 func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq) (errdata *pb.ErrorData) { - if code = this.RefuseCheck(session, req); errdata != nil { + if errdata = this.RefuseCheck(session, req); errdata != nil { return } var ( @@ -24,7 +24,11 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq //切磋请求处理 if result, err = this.module.modelQiecuo.queryQiecuo(req.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } keep = false @@ -48,7 +52,11 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq }) if room, err = this.module.modelPandata.queryUserMartialhall(req.Uid); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 7dd87d883..2c5dcdd90 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -20,7 +20,11 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq filed string ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } switch req.Index { @@ -53,10 +57,14 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq room.Pillarf.Isunlock = 2 } if pillarconfigure, err := this.module.configure.getGamePandamasMz(req.Index); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { - if code = this.module.DispenseRes(session, pillarconfigure.PhotoGuideUnlocking, true); errdata != nil { + if errdata = this.module.DispenseRes(session, pillarconfigure.PhotoGuideUnlocking, true); errdata != nil { return } } diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index c2207e4d7..8ed9a575e 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -22,7 +22,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR filed string ) if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } switch req.Index { @@ -55,7 +59,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR return } - if code = this.module.ConsumeRes(session, pillarconfigure.UpLvConsume, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, pillarconfigure.UpLvConsume, true); errdata != nil { return } pillar.Lv++ diff --git a/modules/practice/module.go b/modules/practice/module.go index cc1d288d2..872c00cc3 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -104,7 +104,11 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32 ) if this.IsCross() { if room, err = this.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } id = make([]string, 0) diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index 89ef7e6fd..5061f54ec 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -20,7 +20,7 @@ func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBu ///获取特权列表 func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (errdata *pb.ErrorData) { - if code = this.BuyGiftCheck(session, req); errdata != nil { + if errdata = this.BuyGiftCheck(session, req); errdata != nil { return } @@ -31,7 +31,11 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift } conf := this.module.configure.GetVipConfigureData(req.VipLv) if conf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } vip, err := this.module.modelVip.getVipList(session.GetUserId()) @@ -45,12 +49,12 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift } // 消耗检测 if conf.PriceDiscount.N > 0 { - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.PriceDiscount}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.PriceDiscount}, true); errdata != nil { return } } // 加资源 - if code = this.module.DispenseRes(session, conf.Giftinfo, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Giftinfo, true); errdata != nil { return } vip.Reward[req.VipLv] = true diff --git a/modules/privilege/api_buyyueka.go b/modules/privilege/api_buyyueka.go index 44bc3f2a6..b0ce987c3 100644 --- a/modules/privilege/api_buyyueka.go +++ b/modules/privilege/api_buyyueka.go @@ -19,7 +19,7 @@ func (this *apiComp) BuyYuekaCheck(session comm.IUserSession, req *pb.PrivilegeB ///获取特权列表 func (this *apiComp) BuyYueka(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (errdata *pb.ErrorData) { - if code = this.BuyYuekaCheck(session, req); errdata != nil { + if errdata = this.BuyYuekaCheck(session, req); errdata != nil { return } code, _ = this.module.Delivery(session, req.CID) diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 68c3f432d..70fadd764 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -73,13 +73,21 @@ func (this *Privilege) Delivery(session comm.IUserSession, cId string) (errdata conf, err := this.configure.GetPrivilegeCard(cId) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } // 是不是购买过 list, err := this.modelPrivilege.getPrivilegeList(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } for _, v := range list { @@ -166,7 +174,7 @@ func (this *Privilege) Delivery(session comm.IUserSession, cId string) (errdata this.SendDailyMail(session, cId, 1, conf.PType) } // 即使奖励 马上发送 - if code = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil { + if errdata = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil { return } for _, v := range conf.DisposableReward { @@ -200,7 +208,7 @@ func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string) mapData["eTime"] = v.ETime this.modelPrivilege.modifyPrivilegeData(session.GetUserId(), v.Id, mapData) // 发放奖励 - if code = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil { + if errdata = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil { break } session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeGetListResp{Data: list}) diff --git a/modules/pvp/api_activecancel.go b/modules/pvp/api_activecancel.go index 0428f8a78..779343a26 100644 --- a/modules/pvp/api_activecancel.go +++ b/modules/pvp/api_activecancel.go @@ -19,7 +19,7 @@ func (this *apiComp) ActiveCancel(session comm.IUserSession, req *pb.PvpActiveCa faiside int32 winside int32 ) - if code = this.ActiveCancelCheck(session, req); errdata != nil { + if errdata = this.ActiveCancelCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/pvp/api_formation.go b/modules/pvp/api_formation.go index 4bc45e603..0b0eadccb 100644 --- a/modules/pvp/api_formation.go +++ b/modules/pvp/api_formation.go @@ -17,7 +17,7 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.PvpFormationRe battle *BattleItem ok bool ) - if code = this.FormationCheck(session, req); errdata != nil { + if errdata = this.FormationCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/pvp/api_into.go b/modules/pvp/api_into.go index 274fe5d8a..7a6baee07 100644 --- a/modules/pvp/api_into.go +++ b/modules/pvp/api_into.go @@ -18,7 +18,7 @@ func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (errdat cd pb.ErrorCode ok bool ) - if code = this.IntoCheck(session, req); errdata != nil { + if errdata = this.IntoCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/pvp/api_list.go b/modules/pvp/api_list.go index 54c41fb87..89434177c 100644 --- a/modules/pvp/api_list.go +++ b/modules/pvp/api_list.go @@ -19,7 +19,7 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.PvpListReq) (errdat err error ) - if code = this.ListCheck(session, req); errdata != nil { + if errdata = this.ListCheck(session, req); errdata != nil { return } diff --git a/modules/pvp/api_loadcomplete.go b/modules/pvp/api_loadcomplete.go index a0204035b..364022e04 100644 --- a/modules/pvp/api_loadcomplete.go +++ b/modules/pvp/api_loadcomplete.go @@ -18,7 +18,7 @@ func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.PvpLoadComp side int32 ok bool ) - if code = this.LoadCompleteCheck(session, req); errdata != nil { + if errdata = this.LoadCompleteCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/pvp/module.go b/modules/pvp/module.go index 0e74a14ad..3a07c209f 100644 --- a/modules/pvp/module.go +++ b/modules/pvp/module.go @@ -153,7 +153,7 @@ func (this *Pvp) PvpOutCmdPush(out *pb.PvpOutCmdPush) { if battle.curroperate.Side == 1 && battle.RedOffline { //已经离线 battle.curroperate.Auto = true data, _ = proto.Marshal(battle.curroperate) - if code = this.battle.InCmdBattle(&pb.BattleInCmdReq{ + if errdata = this.battle.InCmdBattle(&pb.BattleInCmdReq{ Battleid: battle.Id, Side: battle.curroperate.Side, In: &pb.BattleCmd{ @@ -168,7 +168,7 @@ func (this *Pvp) PvpOutCmdPush(out *pb.PvpOutCmdPush) { if battle.curroperate.Side == 2 && battle.BlueOffline { //已经离线 battle.curroperate.Auto = true data, _ = proto.Marshal(battle.curroperate) - if code = this.battle.InCmdBattle(&pb.BattleInCmdReq{ + if errdata = this.battle.InCmdBattle(&pb.BattleInCmdReq{ Battleid: battle.Id, Side: battle.curroperate.Side, In: &pb.BattleCmd{ @@ -276,7 +276,7 @@ func (this *Pvp) operateTimeOut(task *timewheel.Task, args ...interface{}) { if ok && battle.State == pb.PvpState_battle { battle.curroperate.Auto = true data, _ = proto.Marshal(battle.curroperate) - if code = this.battle.InCmdBattle(&pb.BattleInCmdReq{ + if errdata = this.battle.InCmdBattle(&pb.BattleInCmdReq{ Battleid: battle.Id, Side: battle.curroperate.Side, In: &pb.BattleCmd{ @@ -329,7 +329,7 @@ func (this *Pvp) startBattle(battle *BattleItem) { BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, } - if code = this.battle.CreateBattleServer(info); errdata != nil { + if errdata = this.battle.CreateBattleServer(info); errdata != nil { this.lock.Lock() delete(this.battles, battle.Id) this.lock.Unlock() @@ -467,7 +467,7 @@ func (this *Pvp) trusteeship(ctx context.Context, req *pb.RPC_PVPTrusteeshipReq, } battle.curroperate.Auto = true data, _ = proto.Marshal(battle.curroperate) - if code = this.battle.InCmdBattle(&pb.BattleInCmdReq{ + if errdata = this.battle.InCmdBattle(&pb.BattleInCmdReq{ Battleid: battle.Id, Side: battle.curroperate.Side, In: &pb.BattleCmd{ diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index 5374459c6..17c898325 100644 --- a/modules/reddot/api_get.go +++ b/modules/reddot/api_get.go @@ -16,7 +16,7 @@ func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errda var ( reddot map[int32]bool = make(map[int32]bool) ) - if code = this.GetCheck(session, req); errdata != nil { + if errdata = this.GetCheck(session, req); errdata != nil { return } for _, rid := range req.Rids { diff --git a/modules/reddot/api_getall.go b/modules/reddot/api_getall.go index dd73d0995..64afa81f2 100644 --- a/modules/reddot/api_getall.go +++ b/modules/reddot/api_getall.go @@ -16,7 +16,7 @@ func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) var ( reddot map[int32]bool = make(map[int32]bool) ) - if code = this.GetAllCheck(session, req); errdata != nil { + if errdata = this.GetAllCheck(session, req); errdata != nil { return } for k, v := range this.module.ModuleTask.Reddot(session, comm.Reddot1, comm.Reddot2, comm.Reddot4, comm.Reddot27, diff --git a/modules/reputation/api_reset.go b/modules/reputation/api_reset.go index 6f7316d44..e909c0516 100644 --- a/modules/reputation/api_reset.go +++ b/modules/reputation/api_reset.go @@ -32,7 +32,11 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.ReputationTalentre } if err := this.module.modelReputation.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/reputation/api_upgrade.go b/modules/reputation/api_upgrade.go index 39ba1378d..5d24ab0f5 100644 --- a/modules/reputation/api_upgrade.go +++ b/modules/reputation/api_upgrade.go @@ -40,11 +40,15 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad talentCfg := this.module.configure.getTalentNodeCfgBy(req.NodeId, nodeLv) if talentCfg == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } - if code = this.module.CheckRes(session, talentCfg.IconCos); errdata != nil { + if errdata = this.module.CheckRes(session, talentCfg.IconCos); errdata != nil { return } diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go index 6605ba543..815933a7e 100644 --- a/modules/rtask/api_tasktest.go +++ b/modules/rtask/api_tasktest.go @@ -16,7 +16,7 @@ func (this *apiComp) RtestCheck(session comm.IUserSession, req *pb.RtaskTestReq) } func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (errdata *pb.ErrorData) { - if code = this.RtestCheck(session, req); errdata != nil { + if errdata = this.RtestCheck(session, req); errdata != nil { return } rsp := &pb.RtaskTestResp{Flag: true, RtaskType: req.RtaskType} diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 7160947a7..e58dac7af 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -298,7 +298,11 @@ func (this *ModuleRtask) processOneTask(session comm.IUserSession, record *pb.DB } if err := handle.update(uid, record, conf, params...); err != nil { log.Errorf("update task:%v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index e4504b205..1ba3692f1 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -31,7 +31,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata give []*cfg.Gameatn tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) - if code = this.BuyCheck(session, req); errdata != nil { + if errdata = this.BuyCheck(session, req); errdata != nil { return } @@ -40,7 +40,11 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata return } if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil { //没有购买记录 - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } need = make([]*cfg.Gameatn, len(conf.Need)) @@ -107,16 +111,16 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata return } record.Buy[req.GoodsId] += req.BuyNum - if code = this.module.ConsumeRes(session, need, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record}) if !conf.Preview { - if code = this.module.DispenseRes(session, give, true); errdata != nil { + if errdata = this.module.DispenseRes(session, give, true); errdata != nil { return } } else { - if code = this.module.equip.AddEquipment(session, record.Preview[req.GoodsId]); errdata != nil { + if errdata = this.module.equip.AddEquipment(session, record.Preview[req.GoodsId]); errdata != nil { return } } diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 8bfe9526c..d9eeecad1 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -35,15 +35,23 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) ltime time.Duration leftrefnum int32 ) - if code = this.GetlistCheck(session, req); errdata != nil { + if errdata = this.GetlistCheck(session, req); errdata != nil { return } if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil { @@ -135,7 +143,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) leftrefnum-- } - if code = this.module.ConsumeRes(session, shopconf.Rneed, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, shopconf.Rneed, true); errdata != nil { return } } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index cd3aa832c..d84925d94 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -79,12 +79,12 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq // 校验是不是装备定制打造 if req.SuiteId != 0 { if req.Position == -1 { - if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); errdata != nil { + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); errdata != nil { return } costRes = append(costRes, reelcfg.CustomizedCos1) } else { - if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); errdata != nil { + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); errdata != nil { return } costRes = append(costRes, reelcfg.CustomizedCos2) @@ -126,7 +126,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq T: exemption.T, N: exemption.N * req.Lava, } - if code = this.module.CheckRes(session, []*cfg.Gameatn{lava}); errdata != nil { + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{lava}); errdata != nil { return } } @@ -150,7 +150,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq _costRes = append(_costRes, subAtn...) } - if code = this.module.ConsumeRes(session, this.module.FormatRes(_costRes), true); errdata != nil { + if errdata = this.module.ConsumeRes(session, this.module.FormatRes(_costRes), true); errdata != nil { return } // 玩小游戏增加双倍产出校验 @@ -161,7 +161,11 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq for k, v := range req.Hit { confMake, err := this.module.configure.GetSmithyMake(k) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } this.module.Errorf("GetSmithyMake配置没找到:%d", k) data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), diff --git a/modules/smithy/api_getCustomer.go b/modules/smithy/api_getCustomer.go index 354ca4020..351adec85 100644 --- a/modules/smithy/api_getCustomer.go +++ b/modules/smithy/api_getCustomer.go @@ -15,7 +15,11 @@ func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCust func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerReq) (errdata *pb.ErrorData) { customerCount := this.module.ModuleTools.GetGlobalConf().SmithyMaxNpc if customerCount <= 0 { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId()) diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index 44517edb3..5b8d50b9f 100644 --- a/modules/smithy/api_receive.go +++ b/modules/smithy/api_receive.go @@ -15,7 +15,7 @@ func (this *apiComp) TaskAwardCheck(session comm.IUserSession, req *pb.SmithyTas } func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (errdata *pb.ErrorData) { - if code = this.TaskAwardCheck(session, req); errdata != nil { + if errdata = this.TaskAwardCheck(session, req); errdata != nil { return } @@ -36,14 +36,18 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwar TaskId: req.TaskId, } if conf, err := this.module.configure.GetSmithyTask(req.TaskId); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), } return } else { - if code = this.module.DispenseRes(session, conf.Reword, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Reword, true); errdata != nil { return } } diff --git a/modules/smithy/api_refuse.go b/modules/smithy/api_refuse.go index 269025d6e..2cbe5c01e 100644 --- a/modules/smithy/api_refuse.go +++ b/modules/smithy/api_refuse.go @@ -16,13 +16,17 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuse } func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (errdata *pb.ErrorData) { - if code = this.RefuseCheck(session, req); errdata != nil { + if errdata = this.RefuseCheck(session, req); errdata != nil { return } cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 65484c0b9..c8b59c83b 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -29,7 +29,11 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err } stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if conf, err := this.module.configure.GetSmithyStoveConf(stove.Lv); err == nil { @@ -49,7 +53,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err code = pb.ErrorCode_SmithyMaxTemperature return } - if code = this.module.ConsumeRes(session, cost, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, cost, true); errdata != nil { return } stove.Temperature += req.Count * raise_temperatureNum diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go index fe456d369..401554156 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -29,7 +29,11 @@ func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq } conf, err := this.module.configure.GetSmithyStoveConf(stove.Lv) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -45,7 +49,7 @@ func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq } return } - if code = this.module.ConsumeRes(session, conf.UpMaterial, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, conf.UpMaterial, true); errdata != nil { return } stove.Lv += 1 diff --git a/modules/smithy/api_tasklist.go b/modules/smithy/api_tasklist.go index d2676d4a0..2fb689dbc 100644 --- a/modules/smithy/api_tasklist.go +++ b/modules/smithy/api_tasklist.go @@ -12,7 +12,7 @@ func (a *apiComp) TasklistCheck(session comm.IUserSession, req *pb.SmithyTasklis } func (a *apiComp) Tasklist(session comm.IUserSession, req *pb.SmithyTasklistReq) (errdata *pb.ErrorData) { - if code = a.TasklistCheck(session, req); errdata != nil { + if errdata = a.TasklistCheck(session, req); errdata != nil { return } resp := &pb.SmithyTasklistResp{} diff --git a/modules/smithy/api_toolsup.go b/modules/smithy/api_toolsup.go index 24bc0002b..032a0c29c 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -51,7 +51,11 @@ func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq if conf.Preconditions != 0 { poreConf, err := this.module.configure.GetSmithyToolsData(conf.Preconditions) if err != nil { // 配置没找到 - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 128d0197c..c0aaf0362 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -18,7 +18,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) } func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (errdata *pb.ErrorData) { - if code = this.SellCheck(session, req); errdata != nil { + if errdata = this.SellCheck(session, req); errdata != nil { return } @@ -27,7 +27,11 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err // cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId()) // if err != nil { - // code = pb.ErrorCode_DBError + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // return // } @@ -35,13 +39,21 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err cus, err := this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } conf, err := this.module.configure.GetSmithyCustomerConf(req.CustomerId) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), diff --git a/modules/sociaty/api_cross_Formation.go b/modules/sociaty/api_cross_Formation.go index 3a15ba218..010079d60 100644 --- a/modules/sociaty/api_cross_Formation.go +++ b/modules/sociaty/api_cross_Formation.go @@ -12,7 +12,7 @@ func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.SociatyBF } func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (errdata *pb.ErrorData) { - if code = this.FormationCheck(session, req); errdata != nil { + if errdata = this.FormationCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -28,7 +28,11 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data.Title = code.ToString() return } @@ -57,7 +61,11 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat if err := this.module.modelSociatyBoss.setFormation(sociaty, uid, req.Teams); err != nil { this.module.Error("设置阵容", log.Field{Key: "uid", Value: uid}) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index 50c526baf..86015a5a0 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -14,7 +14,7 @@ func (this *apiComp) AccuseCheck(session comm.IUserSession, req *pb.SociatyAccus } func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (errdata *pb.ErrorData) { - if code = this.AccuseCheck(session, req); errdata != nil { + if errdata = this.AccuseCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -43,7 +43,11 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) if errors.As(err, &customErr) { code = customErr.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } data.Datastring = sociaty.Id this.module.Error("弹劾", diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 44d668667..9890ebda7 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -20,7 +20,7 @@ func (this *apiComp) ActivityreceiveCheck(session comm.IUserSession, req *pb.Soc } func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (errdata *pb.ErrorData) { - if code = this.ActivityreceiveCheck(session, req); errdata != nil { + if errdata = this.ActivityreceiveCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -46,7 +46,11 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA conf, ok := this.module.sociatyActivityConf.GetDataMap()[req.Id] if !ok { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -61,7 +65,11 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA // 活跃度领取 if err := this.module.modelSociatyTask.activityReceive(req.Id, sociaty.Id, uid); err != nil { this.module.Error("活跃度领取", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index ebef89e2e..c00f9f46e 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -21,7 +21,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.SociatyAgreeR } func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (errdata *pb.ErrorData) { - if code = this.AgreeCheck(session, req); errdata != nil { + if errdata = this.AgreeCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -51,7 +51,11 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( if errors.As(err, &customError) { code = customError.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } data.Title = code.ToString() data.Message = err.Error() diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index a970ca025..afbdf8c03 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -23,7 +23,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyR } func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (errdata *pb.ErrorData) { - if code = this.ApplyCheck(session, req); errdata != nil { + if errdata = this.ApplyCheck(session, req); errdata != nil { return } @@ -105,7 +105,11 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( if errors.As(err, &customError) { code = customError.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } data.Title = code.ToString() data.Message = err.Error() diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index c66b80e4c..d0fe40130 100644 --- a/modules/sociaty/api_cross_applycancel.go +++ b/modules/sociaty/api_cross_applycancel.go @@ -20,7 +20,7 @@ func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.Sociaty } func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (errdata *pb.ErrorData) { - if code = this.ApplyCancelCheck(session, req); errdata != nil { + if errdata = this.ApplyCancelCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -35,7 +35,11 @@ func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApply } if err := this.module.modelSociaty.applyCancel(uid, sociaty); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("申请撤销", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: req.SociatyId}, diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index 0c39ad680..2a959f0ce 100644 --- a/modules/sociaty/api_cross_applylist.go +++ b/modules/sociaty/api_cross_applylist.go @@ -20,7 +20,7 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyAp } func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (errdata *pb.ErrorData) { - if code = this.ApplyListCheck(session, req); errdata != nil { + if errdata = this.ApplyListCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index d8463c3c9..3faf17596 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -20,7 +20,7 @@ func (this *apiComp) AssignCheck(session comm.IUserSession, req *pb.SociatyAssig } func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) (errdata *pb.ErrorData) { - if code = this.AssignCheck(session, req); errdata != nil { + if errdata = this.AssignCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -55,7 +55,11 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) // 公会转让 if err := this.module.modelSociaty.assign(uid, req.TargetId, sociaty); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("公会转让", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, @@ -72,7 +76,11 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) if errors.As(err, &customErr) { code = customErr.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } this.module.Error("公会转让日志", log.Field{Key: "uid", Value: uid}, diff --git a/modules/sociaty/api_cross_bossmain.go b/modules/sociaty/api_cross_bossmain.go index b918c41a5..a27e62675 100644 --- a/modules/sociaty/api_cross_bossmain.go +++ b/modules/sociaty/api_cross_bossmain.go @@ -18,7 +18,11 @@ func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq data = &pb.ErrorData{} ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } userEx, err := this.module.ModuleUser.GetUserExpand(uid) @@ -42,7 +46,11 @@ func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq "sociatyTicket": userEx.SociatyTicket, } if err := this.module.ModuleUser.ChangeUserExpand(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } rsp.Ticket = userEx.SociatyTicket diff --git a/modules/sociaty/api_cross_bossrank.go b/modules/sociaty/api_cross_bossrank.go index cfa8331af..1fb5bbfbf 100644 --- a/modules/sociaty/api_cross_bossrank.go +++ b/modules/sociaty/api_cross_bossrank.go @@ -19,7 +19,7 @@ func (this *apiComp) BrankCheck(session comm.IUserSession, req *pb.SociatyBRankR } func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) (errdata *pb.ErrorData) { - if code = this.BrankCheck(session, req); errdata != nil { + if errdata = this.BrankCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_breceive.go b/modules/sociaty/api_cross_breceive.go index d0f9d56fe..003a27d1a 100644 --- a/modules/sociaty/api_cross_breceive.go +++ b/modules/sociaty/api_cross_breceive.go @@ -19,7 +19,7 @@ func (this *apiComp) BreceiveCheck(session comm.IUserSession, req *pb.SociatyBRe } func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceiveReq) (errdata *pb.ErrorData) { - if code = this.BreceiveCheck(session, req); errdata != nil { + if errdata = this.BreceiveCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -34,7 +34,11 @@ func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceive taskConf := this.module.configure.getBossTask(req.TaskId) if taskConf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -61,7 +65,11 @@ func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceive "tasks": dbr.Tasks, } if err := this.module.modelSociatyBoss.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index b6a31c733..f57cb2e84 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -18,13 +18,17 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.SociatyBuyReq) } func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errdata *pb.ErrorData) { - if code = this.BuyCheck(session, req); errdata != nil { + if errdata = this.BuyCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } uid := session.GetUserId() @@ -54,7 +58,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd T: req.Atn.T, N: req.Atn.N}, } - if code = this.module.CheckRes(session, atn); errdata != nil { + if errdata = this.module.CheckRes(session, atn); errdata != nil { return } @@ -79,7 +83,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd } //扣除资源 - if code = this.module.DispenseRes(session, atn, true); errdata != nil { + if errdata = this.module.DispenseRes(session, atn, true); errdata != nil { data.Title = code.ToString() return } diff --git a/modules/sociaty/api_cross_challengefinish.go b/modules/sociaty/api_cross_challengefinish.go index b3b590be0..3bd472860 100644 --- a/modules/sociaty/api_cross_challengefinish.go +++ b/modules/sociaty/api_cross_challengefinish.go @@ -12,7 +12,7 @@ func (this *apiComp) ChallengefinishCheck(session comm.IUserSession, req *pb.Soc } func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (errdata *pb.ErrorData) { - if code = this.ChallengefinishCheck(session, req); errdata != nil { + if errdata = this.ChallengefinishCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_challengestart.go b/modules/sociaty/api_cross_challengestart.go index 28140554e..cef5c7393 100644 --- a/modules/sociaty/api_cross_challengestart.go +++ b/modules/sociaty/api_cross_challengestart.go @@ -13,7 +13,7 @@ func (this *apiComp) ChallengestartCheck(session comm.IUserSession, req *pb.Soci } func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (errdata *pb.ErrorData) { - if code = this.ChallengestartCheck(session, req); errdata != nil { + if errdata = this.ChallengestartCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index c419b689e..7342e62e9 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -26,7 +26,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreat } func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (errdata *pb.ErrorData) { - if code = this.CreateCheck(session, req); errdata != nil { + if errdata = this.CreateCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -40,7 +40,11 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) userExpand, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data.Title = code.ToString() return } @@ -65,12 +69,16 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) code = customErr.Code return } - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } //检查钻石 - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.globalConf.GuildBuildCos}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.globalConf.GuildBuildCos}, true); errdata != nil { this.module.Warn("资源不足", log.Field{Key: "uid", Value: uid}, log.Field{Key: "res", Value: this.module.globalConf.GuildBuildCos}, @@ -115,7 +123,11 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) if customError.Code == pb.ErrorCode_SociatyNoFound { code = pb.ErrorCode_SociatyNoFound } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } } this.module.Error("创建公会", @@ -132,7 +144,11 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) } if err = this.module.ModuleUser.ChangeUserExpand(user.Uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("更新玩家公会ID", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 59f6dd7ef..96ac81e39 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -21,7 +21,7 @@ func (this *apiComp) DischargeCheck(session comm.IUserSession, req *pb.SociatyDi } func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischargeReq) (errdata *pb.ErrorData) { - if code = this.DischargeCheck(session, req); errdata != nil { + if errdata = this.DischargeCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -47,7 +47,11 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar if errors.As(err, &customError) { code = customError.Code } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } data.Title = code.ToString() data.Message = err.Error() @@ -76,7 +80,11 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar } if err := this.module.ModuleUser.ChangeUserExpand(req.TargetId, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Error("更新玩家公会ID", log.Field{Key: "uid", Value: uid}, log.Field{Key: "被踢人", Value: req.TargetId}, diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index 9b519ab6b..64bfaa613 100644 --- a/modules/sociaty/api_cross_dismiss.go +++ b/modules/sociaty/api_cross_dismiss.go @@ -21,7 +21,7 @@ func (this *apiComp) DismissCheck(session comm.IUserSession, req *pb.SociatyDism } func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissReq) (errdata *pb.ErrorData) { - if code = this.DismissCheck(session, req); errdata != nil { + if errdata = this.DismissCheck(session, req); errdata != nil { return } @@ -80,7 +80,11 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe if isUpdate { if err := this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go index bb7dc2ee1..29a05b63f 100644 --- a/modules/sociaty/api_cross_list.go +++ b/modules/sociaty/api_cross_list.go @@ -19,7 +19,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq } func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (errdata *pb.ErrorData) { - if code = this.ListCheck(session, req); errdata != nil { + if errdata = this.ListCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index 4c6d4ab88..bcae2868a 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -78,7 +78,11 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (er // 获取新的会长 master = this.module.modelSociaty.getMasterInfo(sociaty) } else { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data.Title = code.ToString() data.Message = err.Error() this.module.Error("会长弹劾", diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go index 99e0e28c6..c41162783 100644 --- a/modules/sociaty/api_cross_quit.go +++ b/modules/sociaty/api_cross_quit.go @@ -44,7 +44,11 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (er } if err := this.module.ModuleUser.ChangeUserExpand(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data.Title = code.ToString() data.Message = err.Error() this.module.Error("退出公会,更新玩家公会ID", diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index 73aa7d0c6..06020f1bd 100644 --- a/modules/sociaty/api_cross_receive.go +++ b/modules/sociaty/api_cross_receive.go @@ -20,7 +20,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.SociatyRece } func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveReq) (errdata *pb.ErrorData) { - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -62,7 +62,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveRe conf, ok := this.module.sociatyTaskConf.GetDataMap()[req.TaskId] if ok { // 发放个人奖励 - if code = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil { this.module.Error("发放公会个人奖励失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_recommend.go b/modules/sociaty/api_cross_recommend.go index 09920d858..1977cb1af 100644 --- a/modules/sociaty/api_cross_recommend.go +++ b/modules/sociaty/api_cross_recommend.go @@ -17,7 +17,7 @@ func (this *apiComp) RecommendCheck(session comm.IUserSession, req *pb.SociatyRe } func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (errdata *pb.ErrorData) { - if code = this.RecommendCheck(session, req); errdata != nil { + if errdata = this.RecommendCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_refuse.go b/modules/sociaty/api_cross_refuse.go index 112608cbb..89c92e9c7 100644 --- a/modules/sociaty/api_cross_refuse.go +++ b/modules/sociaty/api_cross_refuse.go @@ -20,7 +20,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SociatyRefus } func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) (errdata *pb.ErrorData) { - if code = this.RefuseCheck(session, req); errdata != nil { + if errdata = this.RefuseCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_search.go b/modules/sociaty/api_cross_search.go index 32fa6e06e..9e62f205e 100644 --- a/modules/sociaty/api_cross_search.go +++ b/modules/sociaty/api_cross_search.go @@ -19,7 +19,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.SociatySearc } func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) (errdata *pb.ErrorData) { - if code = this.SearchCheck(session, req); errdata != nil { + if errdata = this.SearchCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_setting.go b/modules/sociaty/api_cross_setting.go index d843c3d30..41fed86d7 100644 --- a/modules/sociaty/api_cross_setting.go +++ b/modules/sociaty/api_cross_setting.go @@ -20,7 +20,7 @@ func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySett } func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingReq) (errdata *pb.ErrorData) { - if code = this.SettingCheck(session, req); errdata != nil { + if errdata = this.SettingCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_settingjob.go b/modules/sociaty/api_cross_settingjob.go index de48ef94e..ffd56ff0e 100644 --- a/modules/sociaty/api_cross_settingjob.go +++ b/modules/sociaty/api_cross_settingjob.go @@ -19,7 +19,7 @@ func (this *apiComp) SettingJobCheck(session comm.IUserSession, req *pb.SociatyS } func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettingJobReq) (errdata *pb.ErrorData) { - if code = this.SettingJobCheck(session, req); errdata != nil { + if errdata = this.SettingJobCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index 2ea911517..36ad073e0 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -12,7 +12,7 @@ func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.SociatySignReq } func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (errdata *pb.ErrorData) { - if code = this.SignCheck(session, req); errdata != nil { + if errdata = this.SignCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -51,7 +51,7 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er for _, v := range this.module.sociatySignConf.GetDataList() { if lastSignCount >= v.Down && lastSignCount <= v.Up { // 发放签到奖励 - if code = this.module.DispenseRes(session, v.Reward, true); code == pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, v.Reward, true); code == pb.ErrorCode_Success { signCfgId = v.Id } else { log.Error("发放签到奖励失败", diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index 77325c005..2f34f74d9 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -42,7 +42,11 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList rsp.List = taskList if err := this.module.modelSociatyTask.updateTaskList(sociaty.Id, uid, taskList); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } data.Title = code.ToString() data.Message = err.Error() this.module.Error("更新公会任务列表失败", diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 635b8eaf1..bd986995b 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -14,7 +14,7 @@ func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActi } func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveListReq) (errdata *pb.ErrorData) { - if code = this.ActiveListCheck(session, req); errdata != nil { + if errdata = this.ActiveListCheck(session, req); errdata != nil { return } @@ -29,7 +29,11 @@ func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveLis // 获取玩家活跃度 expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 49df5f04a..8183b9122 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -18,14 +18,18 @@ func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskA } func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (errdata *pb.ErrorData) { - if code = this.ActiveReceiveCheck(session, req); errdata != nil { + if errdata = this.ActiveReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() ue, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -44,7 +48,11 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive if v.Received != 1 { conf := this.module.configure.getTaskActiveById(v.TaskId) if conf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -73,14 +81,18 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive if err := this.module.modelTaskActive.Change(session.GetUserId(), update); err != nil { this.module.Errorf("updateReceive err %v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } if len(rewards) > 0 { //派发奖励 - if code = this.module.DispenseRes(session, rewards, true); errdata != nil { + if errdata = this.module.DispenseRes(session, rewards, true); errdata != nil { this.module.Error("活跃度奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "rewards", Value: rewards}, diff --git a/modules/task/api_list.go b/modules/task/api_list.go index 9c05f6d0c..aad454ef5 100644 --- a/modules/task/api_list.go +++ b/modules/task/api_list.go @@ -15,7 +15,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.TaskListReq) ( } func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (errdata *pb.ErrorData) { - if code = this.ListCheck(session, req); errdata != nil { + if errdata = this.ListCheck(session, req); errdata != nil { return } rsp := &pb.TaskListResp{} diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 314305507..0a7507a47 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -19,7 +19,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceive } func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) (errdata *pb.ErrorData) { - if code = this.ReceiveCheck(session, req); errdata != nil { + if errdata = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -64,7 +64,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) // 待领取的任务配置 conf := this.module.configure.getTaskById(taskData.TaskId) if conf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } @@ -73,7 +77,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) //更新活跃度 ue, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } update := make(map[string]interface{}) @@ -96,7 +104,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) if v.Received != 1 { conf := this.module.configure.getTaskActiveById(v.TaskId) if conf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if ue.Activeweek < conf.Active { @@ -115,11 +127,15 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) if err := this.module.modelTaskActive.Change(session.GetUserId(), TaskActive); err != nil { this.module.Errorf("updateReceive err %v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } //派发奖励 - if code = this.module.DispenseRes(session, rewards, true); errdata != nil { + if errdata = this.module.DispenseRes(session, rewards, true); errdata != nil { this.module.Error("活跃度奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "rewards", Value: rewards}, @@ -141,14 +157,18 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) if len(update) > 0 { if err = this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } } //奖励 - if code = this.module.DispenseRes(session, conf.Reword, true); errdata != nil { + if errdata = this.module.DispenseRes(session, conf.Reword, true); errdata != nil { this.module.Error("发送奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "rewards", Value: conf.Reword}, @@ -175,7 +195,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) } if err := this.module.modelTask.Change(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } resp.TaskId = taskData.TaskId diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 3fe968bf7..696b873f3 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -118,7 +118,11 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e // } // if err := this.module.ModuleUser.ChangeUserExpand(uid, exUpdate); err != nil { - // code = pb.ErrorCode_DBError + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } // this.module.Error("更新玩家公会ID", // log.Field{Key: "uid", Value: uid}, // log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/user/api_getsetting.go b/modules/user/api_getsetting.go index 8011a5757..c34299b95 100644 --- a/modules/user/api_getsetting.go +++ b/modules/user/api_getsetting.go @@ -10,7 +10,7 @@ func (this *apiComp) GetsettingCheck(session comm.IUserSession, req *pb.UserGetS } func (this *apiComp) Getsetting(session comm.IUserSession, req *pb.UserGetSettingReq) (errdata *pb.ErrorData) { - if code = this.GetsettingCheck(session, req); errdata != nil { + if errdata = this.GetsettingCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go index 11aa90f09..42fc0b9bb 100644 --- a/modules/user/api_gettujian.go +++ b/modules/user/api_gettujian.go @@ -10,7 +10,7 @@ func (this *apiComp) GetTujianCheck(session comm.IUserSession, req *pb.UserGetTu } func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianReq) (errdata *pb.ErrorData) { - if code = this.GetTujianCheck(session, req); errdata != nil { + if errdata = this.GetTujianCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_info.go b/modules/user/api_info.go index c86838829..39a337c30 100644 --- a/modules/user/api_info.go +++ b/modules/user/api_info.go @@ -10,7 +10,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) ( } func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) { - if code = this.InfoCheck(session, req); errdata != nil { + if errdata = this.InfoCheck(session, req); errdata != nil { return } @@ -18,7 +18,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (errda ue, err := this.module.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/user/api_initdata.go b/modules/user/api_initdata.go index 5362455dd..23031d204 100644 --- a/modules/user/api_initdata.go +++ b/modules/user/api_initdata.go @@ -17,7 +17,7 @@ func (this *apiComp) InitdataCheck(session comm.IUserSession, req *pb.UserInitda } func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq) (errdata *pb.ErrorData) { - if code = this.InitdataCheck(session, req); errdata != nil { + if errdata = this.InitdataCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index aeee29388..45136b459 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -23,7 +23,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) //登录 func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { - if code = this.LoginCheck(session, req); errdata != nil { + if errdata = this.LoginCheck(session, req); errdata != nil { return } var ( @@ -113,7 +113,11 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err update := utils.StructToMap(user) //尽量不要更新整个数据 err = this.module.modelUser.Change(user.Uid, update) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -131,7 +135,11 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err // 查询玩家扩展数据 if expand, err := this.module.GetUserExpand(session.GetUserId()); err != nil { if err != mongo.ErrNoDocuments { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } else { diff --git a/modules/user/api_modifyavatar.go b/modules/user/api_modifyavatar.go index 34cc580a9..9b9292993 100644 --- a/modules/user/api_modifyavatar.go +++ b/modules/user/api_modifyavatar.go @@ -18,7 +18,7 @@ func (this *apiComp) ModifyavatarCheck(session comm.IUserSession, req *pb.UserMo } func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifyavatarReq) (errdata *pb.ErrorData) { - if code = this.ModifyavatarCheck(session, req); errdata != nil { + if errdata = this.ModifyavatarCheck(session, req); errdata != nil { return } @@ -34,7 +34,11 @@ func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifya } if err := this.module.modelUser.Change(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Errorf("更新头像失败 uid:%v avatarId:%v err:%v", session.GetUserId(), req.AvatarId, err) return } diff --git a/modules/user/api_modifybgp.go b/modules/user/api_modifybgp.go index 1a3d0c50e..ec97d8daa 100644 --- a/modules/user/api_modifybgp.go +++ b/modules/user/api_modifybgp.go @@ -16,7 +16,7 @@ func (this *apiComp) ModifybgpCheck(session comm.IUserSession, req *pb.UserModif } func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpReq) (errdata *pb.ErrorData) { - if code = this.ModifybgpCheck(session, req); errdata != nil { + if errdata = this.ModifybgpCheck(session, req); errdata != nil { return } @@ -32,7 +32,11 @@ func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpR } if err := this.module.modelUser.Change(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Errorf("更新背景失败 uid:%v bgpId:%v err:%v", session.GetUserId(), req.BgpId, err) return } diff --git a/modules/user/api_modifyfigure.go b/modules/user/api_modifyfigure.go index 8aa5dce20..36f90ab4f 100644 --- a/modules/user/api_modifyfigure.go +++ b/modules/user/api_modifyfigure.go @@ -16,7 +16,7 @@ func (this *apiComp) ModifyfigureCheck(session comm.IUserSession, req *pb.UserMo } func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyfigureReq) (errdata *pb.ErrorData) { - if code = this.ModifyfigureCheck(session, req); errdata != nil { + if errdata = this.ModifyfigureCheck(session, req); errdata != nil { return } @@ -32,7 +32,11 @@ func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyf } if err := this.module.modelUser.Change(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Errorf("更新形象失败 uid:%v figureId:%v err:%v", session.GetUserId(), req.FigureId, err) return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index d8cd366be..b1d0a7a5e 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -17,7 +17,7 @@ func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModi } func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (errdata *pb.ErrorData) { - if code = this.ModifynameCheck(session, req); errdata != nil { + if errdata = this.ModifynameCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -32,7 +32,11 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam expand, err := this.module.modelExpand.GetUserExpand(uid) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -54,13 +58,17 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam "modifynameCount": left, } if err := this.module.modelExpand.ChangeUserExpand(uid, mc); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Errorf("更新昵称失败 uid:%v name:%v err:%v", uid, req.Name, err) return } // 修改名称 - if code = this.module.modelUser.modifyName(uid, name); errdata != nil { + if errdata = this.module.modelUser.modifyName(uid, name); errdata != nil { return } diff --git a/modules/user/api_modifysign.go b/modules/user/api_modifysign.go index 88fdbe189..9da419ce2 100644 --- a/modules/user/api_modifysign.go +++ b/modules/user/api_modifysign.go @@ -18,7 +18,7 @@ func (this *apiComp) ModifysignCheck(session comm.IUserSession, req *pb.UserModi } func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysignReq) (errdata *pb.ErrorData) { - if code = this.ModifysignCheck(session, req); errdata != nil { + if errdata = this.ModifysignCheck(session, req); errdata != nil { return } @@ -26,7 +26,11 @@ func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysig expand, err := this.module.GetUserExpand(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -35,7 +39,11 @@ func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysig "sign": req.Sign, } if err := this.module.ChangeUserExpand(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } this.module.Errorf("更新签名失败 uid:%v sign:%v err:%v", session.GetUserId(), req.Sign, err) return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index 8ddb4ac05..56cedba75 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -19,7 +19,11 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw ) if sign, err = this.module.modelSign.GetUserSign(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if sign.Puzzle[req.Index] != 0 { @@ -31,7 +35,7 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw } _data := this.module.configure.GetSignConf(req.Index, sign.Group) if _data != nil { // 发奖 - if code = this.module.DispenseRes(session, _data.Gamegift, true); errdata != nil { + if errdata = this.module.DispenseRes(session, _data.Gamegift, true); errdata != nil { return } } @@ -40,7 +44,11 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw if err = this.module.modelSign.Change(session.GetUserId(), map[string]interface{}{ "puzzle": sign.Puzzle, }); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } session.SendMsg(string(this.module.GetType()), "puzzleaward", &pb.UserPuzzleAwardResp{ diff --git a/modules/user/api_sellres.go b/modules/user/api_sellres.go index 90dab7557..d362d3edf 100644 --- a/modules/user/api_sellres.go +++ b/modules/user/api_sellres.go @@ -24,7 +24,7 @@ func (this *apiComp) SellRes(session comm.IUserSession, req *pb.UserSellResReq) mapitem map[string]int32 ) mapitem = make(map[string]int32) - if code = this.SellResCheck(session, req); errdata != nil { + if errdata = this.SellResCheck(session, req); errdata != nil { return } for _, v := range req.Atno { diff --git a/modules/user/api_settingteam.go b/modules/user/api_settingteam.go index 8d39b0ece..5bdb7c74c 100644 --- a/modules/user/api_settingteam.go +++ b/modules/user/api_settingteam.go @@ -16,7 +16,7 @@ func (this *apiComp) SettingteamCheck(session comm.IUserSession, req *pb.UserSet } func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingteamReq) (errdata *pb.ErrorData) { - if code = this.SettingteamCheck(session, req); errdata != nil { + if errdata = this.SettingteamCheck(session, req); errdata != nil { return } @@ -30,7 +30,11 @@ func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingt "teamHeroIds": req.HeroObjIds, } if err := this.module.modelExpand.ChangeUserExpand(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } } diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index 1a40002b2..5b074679c 100644 --- a/modules/user/api_switchdefper.go +++ b/modules/user/api_switchdefper.go @@ -22,7 +22,7 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD keep bool ) - if code = this.SwitchDefPerCheck(session, req); errdata != nil { + if errdata = this.SwitchDefPerCheck(session, req); errdata != nil { return } @@ -30,7 +30,11 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD if req.CurSkin != "" { if conf, err = this.module.configure.GetPlayerOverview(req.CurSkin, user.Gender); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if conf.Type != 1 { @@ -60,7 +64,11 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD if req.CurAction != "" { if conf, err = this.module.configure.GetPlayerOverview(req.CurAction, user.Gender); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if conf.Type != 2 { @@ -88,7 +96,11 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD if req.CurBg != "" { if conf, err = this.module.configure.GetPlayerOverview(req.CurBg, user.Gender); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if conf.Type != 3 { @@ -114,7 +126,11 @@ func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchD change["curBg"] = req.CurBg } if err = this.module.modelUser.Change(session.GetUserId(), change); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/user/api_updatesetting.go b/modules/user/api_updatesetting.go index 9077ebb6a..0801914b4 100644 --- a/modules/user/api_updatesetting.go +++ b/modules/user/api_updatesetting.go @@ -17,7 +17,7 @@ func (this *apiComp) UpdatesettingCheck(session comm.IUserSession, req *pb.UserU } func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdateSettingReq) (errdata *pb.ErrorData) { - if code = this.UpdatesettingCheck(session, req); errdata != nil { + if errdata = this.UpdatesettingCheck(session, req); errdata != nil { return } @@ -27,7 +27,11 @@ func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdate update := utils.StructToMap(req.Setting) if err := this.module.modelSetting.UpdateSetting(session.GetUserId(), update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/user/api_vericode.go b/modules/user/api_vericode.go index b000c8a5b..ce4ad2499 100644 --- a/modules/user/api_vericode.go +++ b/modules/user/api_vericode.go @@ -12,7 +12,7 @@ func (this *apiComp) VericodeCheck(session comm.IUserSession, req *pb.UserVeriCo } func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq) (errdata *pb.ErrorData) { - if code = this.VericodeCheck(session, req); errdata != nil { + if errdata = this.VericodeCheck(session, req); errdata != nil { return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index c51875f86..dcd16a7eb 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -171,7 +171,11 @@ func (this *ModelUser) modifyName(uid string, newName string) (errdata *pb.Error } if err := this.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/user/module.go b/modules/user/module.go index a596257dd..8faa2e366 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -574,12 +574,20 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha if err := this.modelUser.updateUserAttr(uid, update); err != nil { this.Errorf("AddAttributeValue err:%v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } if err := this.modelExpand.ChangeUserExpand(uid, updateEx); err != nil { this.Errorf("AddAttributeValue ex err:%v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } return @@ -977,7 +985,11 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush if !iskeep { if user.CurSkin == "" || user.CurAction == "" || user.CurBg == "" { if conf, err = this.configure.GetPlayerOverview(k, user.Gender); err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } else { if user.CurSkin == "" && conf.Type == 1 { @@ -1004,7 +1016,11 @@ func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush user.Skins = append(user.Skins, adds...) change["skins"] = user.Skins if err = this.modelUser.Change(session.GetUserId(), change); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if bPush { diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 06e0c61a9..7bd796627 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -31,7 +31,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng cfgData, err := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -40,7 +44,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng } if v1, ok := viking.Ps[req.BossId]; ok && v1 == 0 { - if code = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 + if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 return } } else { @@ -59,7 +63,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng T: "ps", N: ps, } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } @@ -70,7 +74,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng }) } - // if code = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { + // if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { // if req.AutoBuy { // 不够的时候自动使用 // var count int32 // for _, v := range cfgData.PsConsume { @@ -78,7 +82,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng // count += v.N // } // } - // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { + // if errdata = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { // return // } // } else { diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 7f3f6166a..d57f60a1e 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -47,7 +47,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal vikingCfg, err := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty) if err != nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: err.Error(), @@ -80,12 +84,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData["boss"] = viking.Boss code, bWin = this.module.battle.CheckBattleReport(session, req.Report) - // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { + // if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } if !bWin { // 战斗失败了 直接返回 if v, ok := viking.Ps[req.BossId]; ok && v > 0 { - if code = this.module.DispenseRes(session, vikingCfg.PsConsume, true); errdata != nil { // 返还预扣体力 + if errdata = this.module.DispenseRes(session, vikingCfg.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -98,14 +102,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal return } - // if code = this.module.ConsumeRes(session, vikingCfg.PsConsume, true); errdata != nil { + // if errdata = this.module.ConsumeRes(session, vikingCfg.PsConsume, true); errdata != nil { // return // } key := strconv.Itoa(int(req.BossId)) + "_" + strconv.Itoa(int(req.Difficulty)) if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 mapData["boss"] = viking.Boss - if code = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { + if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { return } } diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 66fbc124f..0fb0f8be1 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -17,7 +17,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq return // 参数校验失败直接返回 } // 刷新挑战卷 - // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { + // if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } list, _ := this.module.modelViking.getVikingList(session.GetUserId()) diff --git a/modules/viking/module.go b/modules/viking/module.go index 9ff9bb479..eda8bec2e 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -56,7 +56,11 @@ func (this *Viking) OnInstallComp() { func (this *Viking) ModifyVikingData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelViking.modifyVikingDataByObjId(uid, data) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } } return } @@ -186,7 +190,11 @@ func (this *Viking) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r func (this *Viking) CompleteAllLevel(session comm.IUserSession) (errdata *pb.ErrorData) { list, err := this.modelViking.getVikingList(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } mapData := make(map[string]interface{}, 0) @@ -224,7 +232,11 @@ func (this *Viking) AutoBattleInfo(session comm.IUserSession, battle *pb.BattleF cfgData, _ := this.configure.GetVikingBossConfigData(bossId, difficulty) if cfgData == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } code, record := this.battle.CreatePveBattle(session, &pb.BattlePVEReq{ @@ -258,10 +270,14 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR tasks := make([]*pb.BuriedParam, 0) // costRes := this.ModuleTools.GetGlobalConf().VikingExpeditionCos // if costRes == nil { - // code = pb.ErrorCode_ConfigNoFound + // errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } // return // } - if code = this.ConsumeRes(session, conf.PsConsume, true); errdata != nil { + if errdata = this.ConsumeRes(session, conf.PsConsume, true); errdata != nil { return } viking, err := this.modelViking.getVikingList(session.GetUserId()) @@ -283,7 +299,11 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR mapData := make(map[string]interface{}, 0) vikingCfg, _ := this.configure.GetVikingBossConfigData(bossId, difficulty) if vikingCfg == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } key := strconv.Itoa(int(bossId)) + "_" + strconv.Itoa(int(difficulty)) diff --git a/modules/web/api_createnotify.go b/modules/web/api_createnotify.go index 9c8a68fb3..422f227d2 100644 --- a/modules/web/api_createnotify.go +++ b/modules/web/api_createnotify.go @@ -41,7 +41,11 @@ func (this *Api_Comp) CreateNotify(c *engine.Context) { } if err = this.module.modelNotify.CreateSystemNotify(&req.DBSystemNotify); err != nil { this.module.Errorf("LoginByCaptchaReq CreateSystemNotify err:%v", err) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } msg = pb.GetErrorCodeMsg(code) return }