diff --git a/cmd/v2/service/connService.go b/cmd/v2/service/connService.go index c71879feb..1efc02a4e 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); code != pb.ErrorCode_Success { + if code = c.handleNotify(msg); errdata != nil { return } diff --git a/cmd/v2/ui/mainwindow.go b/cmd/v2/ui/mainwindow.go index 1f6b26b99..ac03dc507 100644 --- a/cmd/v2/ui/mainwindow.go +++ b/cmd/v2/ui/mainwindow.go @@ -297,7 +297,7 @@ func (ui *MainWindowImpl) createLoginWin(sid, sname string) { ui.tb.toolbar.Hide() // call after ui.createWindowContainer ui.connService.ListenerPush() - if code := ui.pttService.Login(sid, account.Text); code != pb.ErrorCode_Success { + if code := ui.pttService.Login(sid, account.Text); errdata != nil { err := fmt.Errorf("login err: %v[%d]", code, int32(code)) dialog.ShowError(err, ui.w) } else { @@ -417,7 +417,7 @@ func (ui *MainWindowImpl) createRoleWindowPopUp() { d := dialog.NewForm(common.FORM_TITLE_CREATEROLE, common.BUTTON_OK, common.BUTTON_CANCEL, items, func(b bool) { if nickname.Text != "" { logrus.WithField("nickname", nickname.Text).Debug("submit crete role") - if code := ui.pttService.CreateRole(nickname.Text, gender, cast.ToInt32(figure.Text)); code != pb.ErrorCode_Success { + if code := ui.pttService.CreateRole(nickname.Text, gender, cast.ToInt32(figure.Text)); errdata != nil { err := fmt.Errorf("login err: %v[%d]", code, int32(code)) dialog.ShowError(err, ui.w) } else { diff --git a/modules/academy/api_info.go b/modules/academy/api_info.go index 80b889c1a..27572ff5f 100644 --- a/modules/academy/api_info.go +++ b/modules/academy/api_info.go @@ -17,7 +17,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (er info *pb.DBAcademy err error ) - if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil { diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index e2495f052..0d1ad12e6 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -21,10 +21,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe // group []*cfg.GameTeachingData err error ) - if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if iswin { diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index 338fdbb05..d4861d4f9 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -21,10 +21,10 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT info *pb.DBAcademy err error ) - if code = this.TeachingReceiveCheck(session, req); code != pb.ErrorCode_Success { + if code = this.TeachingReceiveCheck(session, req); errdata != nil { return } - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if iswin { diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index 61887fa82..1d15d4653 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -29,7 +29,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat maxbuy, vipbuy int32 err error ) - if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { + if code = this.BuyCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: pb.GetErrorCodeMsg(code), Message: fmt.Sprintf("请求参数:%+v", req), @@ -82,11 +82,11 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat } } - if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil { return } // info.Ticket += req.BuyNum diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 9a91d2df7..6233b5a8d 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -27,7 +27,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha err error iswin bool ) - if code = this.ChallengeRewardCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ChallengeRewardCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { @@ -39,7 +39,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha return } if req.Iswin { - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if !iswin { @@ -56,7 +56,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha } return } - if code = this.module.DispenseRes(session, reward.WinReward, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil { return } if req.Revengeid != "" { diff --git a/modules/arena/api_delreward.go b/modules/arena/api_delreward.go index 53e91fe41..381323b73 100644 --- a/modules/arena/api_delreward.go +++ b/modules/arena/api_delreward.go @@ -23,7 +23,7 @@ func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelReward info *pb.DBArenaUser err error ) - if code = this.DelRewardCheck(session, req); code != pb.ErrorCode_Success { + if code = this.DelRewardCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index afe251dcd..ba9256aba 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -26,7 +26,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd err error ) - if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } if model, err = this.module.GetDBNodule(session, comm.TableUser, time.Hour); err != nil { diff --git a/modules/arena/api_matche.go b/modules/arena/api_matche.go index 0e066675a..6a0fab630 100644 --- a/modules/arena/api_matche.go +++ b/modules/arena/api_matche.go @@ -22,7 +22,7 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) ( ai []*pb.ArenaPlayer err error ) - if code = this.MatcheCheck(session, req); code != pb.ErrorCode_Success { + if code = this.MatcheCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { diff --git a/modules/arena/api_otherinfo.go b/modules/arena/api_otherinfo.go index 4f302ee2a..a460499b2 100644 --- a/modules/arena/api_otherinfo.go +++ b/modules/arena/api_otherinfo.go @@ -23,7 +23,7 @@ func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfo info *pb.DBArenaUser err error ) - if code = this.OtherInfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.OtherInfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(req.OtherId); err != nil && err != mgo.MongodbNil { diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index 41ac57d46..df53161b7 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -28,7 +28,7 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa err error ) - if code = this.PlotRewardCheck(session, req); code != pb.ErrorCode_Success { + if code = this.PlotRewardCheck(session, req); errdata != nil { return } if npc, err = this.module.configure.getChallengenpc(req.Pid); err != nil { @@ -39,7 +39,7 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa } return } - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if !iswin { diff --git a/modules/arena/api_rank.go b/modules/arena/api_rank.go index 0576fa663..3be6fc033 100644 --- a/modules/arena/api_rank.go +++ b/modules/arena/api_rank.go @@ -21,7 +21,7 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd err error ) - if code = this.RankCheck(session, req); code != pb.ErrorCode_Success { + if code = this.RankCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { diff --git a/modules/arena/api_setdattformt.go b/modules/arena/api_setdattformt.go index ba226ec92..f65d230e4 100644 --- a/modules/arena/api_setdattformt.go +++ b/modules/arena/api_setdattformt.go @@ -18,7 +18,7 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF heros []*pb.DBHero err error ) - if code = this.SetAttFormtCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SetAttFormtCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { diff --git a/modules/arena/api_setdefformt.go b/modules/arena/api_setdefformt.go index 6e93f1d7f..ce7e7e593 100644 --- a/modules/arena/api_setdefformt.go +++ b/modules/arena/api_setdefformt.go @@ -18,7 +18,7 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF heros []*pb.DBHero err error ) - if code = this.SetDefFormtCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SetDefFormtCheck(session, req); errdata != nil { return } if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { diff --git a/modules/arena/module.go b/modules/arena/module.go index 3d047b661..ed54ee5f9 100644 --- a/modules/arena/module.go +++ b/modules/arena/module.go @@ -151,7 +151,7 @@ func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb. } if len(players) > 0 { captain = players[0].Defend.Leadpos - if rules, code = this.battle.CreateRolesByHeros(players[0].Defend.Formt); code != pb.ErrorCode_Success { + if rules, code = this.battle.CreateRolesByHeros(players[0].Defend.Formt); errdata != nil { err = fmt.Errorf("Player CreateRolesByHeros fail:%d", code) return } @@ -161,7 +161,7 @@ func (this *Arena) GetMatcheBattleRoles(uid string) (captain int32, rules []*pb. } if len(ais) > 0 { captain = ais[0].Defend.Leadpos - if rules, code = this.battle.CreateRolesByHeros(ais[0].Defend.Formt); code != pb.ErrorCode_Success { + if rules, code = this.battle.CreateRolesByHeros(ais[0].Defend.Formt); errdata != nil { err = fmt.Errorf("AI CreateRolesByHeros fail:%d", code) return } diff --git a/modules/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index 8d5f65c79..9ce39ad76 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -18,16 +18,15 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv // 激活图鉴信息 func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (errdata *pb.ErrorData) { - if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.ActivateCheck(session, req); errdata != nil { return } atlasConf, err := this.module.configure.GetPandoAtlasConf(req.Id) if err != nil { - code = pb.ErrorCode_ConfigNoFound // 返回错误码 - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), - Message: err.Error(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), } return } @@ -45,9 +44,15 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateRe }) return } else { - code = pb.ErrorCode_MartialhallAtlasError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_MartialhallAtlasError, + Title: pb.ErrorCode_MartialhallAtlasError.ToString(), + } } } - code = pb.ErrorCode_SmithyNoFoundAtlas + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SmithyNoFoundAtlas, + Title: pb.ErrorCode_SmithyNoFoundAtlas.ToString(), + } return } diff --git a/modules/atlas/api_atlasaward.go b/modules/atlas/api_atlasaward.go index 0b91215c4..3bc7cd4b1 100644 --- a/modules/atlas/api_atlasaward.go +++ b/modules/atlas/api_atlasaward.go @@ -32,12 +32,18 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (er res = append(res, conf.ItemId...) } if len(res) == 0 { // 没有奖励可领取 - code = pb.ErrorCode_MartialhallAtlasNoReward + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_MartialhallAtlasNoReward, + Title: pb.ErrorCode_MartialhallAtlasNoReward.ToString(), + } return } - if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { + + if errdata = this.module.DispenseRes(session, res, true); errdata != nil { buff, _ := json.Marshal(res) - data = &pb.ErrorData{Title: "图鉴奖励领取失败!", Datastring: string(buff)} + //data = &pb.ErrorData{Title: "图鉴奖励领取失败!", Datastring: string(buff)} + errdata.Title = "图鉴奖励领取失败!" + errdata.Datastring = string(buff) return } diff --git a/modules/atlas/api_getatlas.go b/modules/atlas/api_getatlas.go index 26960e3be..783fc5286 100644 --- a/modules/atlas/api_getatlas.go +++ b/modules/atlas/api_getatlas.go @@ -16,7 +16,10 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + } return } session.SendMsg(string(this.module.GetType()), "getlist", &pb.AtlasGetListResp{ diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index b6206b12d..29f580c69 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -82,7 +82,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon return } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); errdata != nil { return } if buff != nil { @@ -123,7 +123,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon } } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); errdata != nil { return } record.Redflist[0].Team[i].Ishelp = true @@ -141,7 +141,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon if v == 0 { continue } - if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(100, i, v); errdata != nil { return } record.Redflist[i].Systeam = masters @@ -164,7 +164,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon if v == 0 { continue } - if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(100, i, v); errdata != nil { return } record.Redflist[i].Backupteam = masters @@ -182,7 +182,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon } else { record.Redflist = make([]*pb.DBBattleFormt, len(req.Sysformat)) for i, v := range req.Sysformat { - if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(100, i, v); errdata != nil { return } record.Redflist[i] = &pb.DBBattleFormt{ @@ -201,7 +201,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon } if req.Backupformat != nil && len(req.Backupformat) > 0 { for i, v := range req.Backupformat { - if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(100, i, v); errdata != nil { return } record.Redflist[i].Backupteam = masters @@ -219,7 +219,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon } for i, v := range req.Buleformat { - if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(200, i, v); errdata != nil { return } record.Buleflist[i] = &pb.DBBattleFormt{ @@ -262,7 +262,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon return } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } if buff != nil { @@ -302,7 +302,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon } } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } record.Redflist[0].Team[i].Ishelp = true @@ -324,7 +324,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon masters []*pb.BattleRole ) for i, v := range req.Mformat { - if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(200, i, v); errdata != nil { return } record.Buleflist[i] = &pb.DBBattleFormt{ @@ -368,7 +368,7 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon return } tid := 100 + i - if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } if buff != nil { @@ -408,7 +408,7 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon } } tid := 100 + i - if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } record.Redflist[ii].Team[i].Ishelp = true @@ -432,7 +432,7 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon masters []*pb.BattleRole ) for i, v := range req.Mformat { - if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success { + if captain, masters, code = this.createMasterRoles(200, i, v); errdata != nil { return } record.Buleflist[i] = &pb.DBBattleFormt{ @@ -464,7 +464,7 @@ func (this *modelBattleComp) createpvp(session comm.IUserSession, conn *db.DBCon for i, v := range req.Redformat.Format { if v != nil { tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(v, tid, i); errdata != nil { return } } else { @@ -484,7 +484,7 @@ func (this *modelBattleComp) createpvp(session comm.IUserSession, conn *db.DBCon for i, v := range req.Buleformat.Format { if v != nil { tid := 200 + i - if record.Buleflist[0].Team[i], code = this.createBattleRole(v, tid, i); code != pb.ErrorCode_Success { + if record.Buleflist[0].Team[i], code = this.createBattleRole(v, tid, i); errdata != nil { return } } else { @@ -525,7 +525,7 @@ func (this *modelBattleComp) creatertpvp(redmodel, bluemodel *db.DBModel, btype return } tid := 100 + i - if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } } else { @@ -551,7 +551,7 @@ func (this *modelBattleComp) creatertpvp(redmodel, bluemodel *db.DBModel, btype return } tid := 200 + i - if record.Buleflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Buleflist[ii].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } } else { @@ -598,7 +598,7 @@ func (this *modelBattleComp) createlpve(session comm.IUserSession, conn *db.DBCo return } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } if buff != nil { @@ -638,7 +638,7 @@ func (this *modelBattleComp) createlpve(session comm.IUserSession, conn *db.DBCo } } tid := 100 + i - if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); code != pb.ErrorCode_Success { + if record.Redflist[0].Team[i], code = this.createBattleRole(heros[i], tid, i); errdata != nil { return } record.Redflist[0].Team[i].Ishelp = true diff --git a/modules/battle/module.go b/modules/battle/module.go index 6e69b438a..1bffa78ba 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -107,7 +107,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE return } - if record, code = this.modelBattle.createeve(session, conn, pb.BattleType_eve, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.createeve(session, conn, pb.BattleType_eve, req); errdata != nil { return } return @@ -150,7 +150,7 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE } } - if record, code = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); errdata != nil { return } if req.Format.Friendformat != nil { @@ -182,7 +182,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB } return } - if record, code = this.modelBattle.createpvb(session, conn, pb.BattleType_pvb, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.createpvb(session, conn, pb.BattleType_pvb, req); errdata != nil { return } return @@ -204,7 +204,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP this.Errorf("session:%v err:", session, err) return } - if record, code = this.modelBattle.createpvp(session, conn, pb.BattleType_pvp, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.createpvp(session, conn, pb.BattleType_pvp, req); errdata != nil { return } return @@ -229,7 +229,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error code = pb.ErrorCode_DBError return } - if record, code = this.modelBattle.creatertpvp(redmodel, bluemodel, pb.BattleType_rtpvp, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.creatertpvp(redmodel, bluemodel, pb.BattleType_rtpvp, req); errdata != nil { return } return @@ -272,7 +272,7 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP } } - if record, code = this.modelBattle.createlpve(session, conn, pb.BattleType_lpev, req); code != pb.ErrorCode_Success { + if record, code = this.modelBattle.createlpve(session, conn, pb.BattleType_lpev, req); errdata != nil { return } if req.Format.Friendformat != nil { @@ -292,7 +292,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo roles = make([]*pb.BattleRole, len(heros)) for i, v := range heros { if v != nil { - if roles[i], code = this.modelBattle.createBattleRole(v, 200+i, i); code != pb.ErrorCode_Success { + if roles[i], code = this.modelBattle.createBattleRole(v, 200+i, i); errdata != nil { return } } diff --git a/modules/buried/api_send.go b/modules/buried/api_send.go index 0920fd59c..e28d2721a 100644 --- a/modules/buried/api_send.go +++ b/modules/buried/api_send.go @@ -23,7 +23,7 @@ func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedIn condis []*pb.ConIProgress err error ) - if code = this.SendCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SendCheck(session, req); errdata != nil { return } diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 5823788c4..8079e0e35 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -27,25 +27,27 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe ) update = make(map[string]interface{}) - if code = this.BuyOrSellCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.BuyOrSellCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } caravan, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) - cityInfo, ok = caravan.City[req.City] - if !ok { - code = pb.ErrorCode_ConfigNoFound + if cityInfo, ok = caravan.City[req.City]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + } return } c, err := this.module.configure.GetCaravanLv(caravan.Lv) if err == nil { upperLimit = c.Bagtagnum // 获取单个格子堆叠数 } else { - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } - code = pb.ErrorCode_ConfigNoFound return } @@ -56,7 +58,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe // 校验背包数据够不够 caravan.Items[k].Count -= v if caravan.Items[k].Count < 0 { - code = pb.ErrorCode_TrollItemNoEnough // 道具数量不足 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollItemNoEnough, // 道具数量不足 + Title: pb.ErrorCode_TrollItemNoEnough.ToString(), + } return } items := caravan.Items[k] @@ -69,11 +74,11 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe price = cityConf.Specialnum * price / 1000 bFound = true } else { - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollItemNoEnough, // 道具数量不足 + Title: pb.ErrorCode_TrollItemNoEnough.ToString(), Message: err.Error(), } - code = pb.ErrorCode_ConfigNoFound return } break @@ -87,9 +92,9 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } } } else { - code = pb.ErrorCode_DataNotFound - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, // 道具数量不足 + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } } @@ -97,7 +102,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe addScore += price * v // 卖出收益 } if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 - code = pb.ErrorCode_TrollMaxItemCount + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollMaxItemCount, // 道具数量不足 + Title: pb.ErrorCode_TrollMaxItemCount.ToString(), + } return } // 统计 收益 @@ -112,19 +120,25 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe update["lv"] = curLv update["baglimit"] = c.Bagtop } else { - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, // 道具数量不足 + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } - code = pb.ErrorCode_ConfigNoFound return } } caravan.Lv = curLv } if len(lvReward) > 0 { - if reward := this.module.DispenseRes(session, lvReward, true); reward != pb.ErrorCode_Success { + if reward := this.module.DispenseRes(session, lvReward, true); reward != nil { this.module.Errorf("lv reward dispenseRes err:%v", lvReward) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, // 道具数量不足 + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return } } @@ -148,7 +162,10 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe } } if !bFound { - code = pb.ErrorCode_TrollCityUnSellItem // 城市不卖这个物品 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollCityUnSellItem, // 城市不卖这个物品 + Title: pb.ErrorCode_TrollCityUnSellItem.ToString(), + } return } caravan.Items[k].Count += v @@ -159,31 +176,37 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe cityInfo.Count[k] += v if itemConf, err := this.configure.GetCaravanGoods(k); err == nil { // 更新商店库存 if cityInfo.Count[k] > itemConf.Goodsnum { - code = pb.ErrorCode_TrollBuyMax // 商品数量不足 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollBuyMax, // 商品数量不足 + Title: pb.ErrorCode_TrollBuyMax.ToString(), + } return } update["city"] = caravan.City addScore -= price * v } else { - data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, // 商品数量不足 + Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } - code = pb.ErrorCode_ConfigNoFound return } } if this.module.ArrayBag(caravan, upperLimit) { // 背包满了 - code = pb.ErrorCode_TrollMaxItemCount + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_TrollMaxItemCount, + Title: pb.ErrorCode_TrollMaxItemCount.ToString(), + } return } } - if code = this.module.DispenseRes(session, []*cfg.Gameatn{{ + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{ A: "attr", T: "merchantmoney", N: addScore, - }}, true); code != pb.ErrorCode_Success { - this.module.Errorf("获得虚拟币失败:%d", code) + }}, true); errdata != nil { + this.module.Errorf("获得虚拟币失败:%v", errdata) } update["items"] = caravan.Items update["baglimit"] = caravan.Baglimit diff --git a/modules/caravan/api_getlist.go b/modules/caravan/api_getlist.go index 01e678045..c59063fd0 100644 --- a/modules/caravan/api_getlist.go +++ b/modules/caravan/api_getlist.go @@ -18,7 +18,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe resp *pb.CaravanGetListResp ) resp = &pb.CaravanGetListResp{} - if code = this.GetListCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } list, err := this.module.modelCaravan.getCaravanList(session.GetUserId()) @@ -34,7 +34,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.InitCaravanTicket(session, list.Lv); code != pb.ErrorCode_Success { + if code = this.module.InitCaravanTicket(session, list.Lv); errdata != nil { return } } diff --git a/modules/caravan/api_getstory.go b/modules/caravan/api_getstory.go index 9b814b5fc..4b3deee86 100644 --- a/modules/caravan/api_getstory.go +++ b/modules/caravan/api_getstory.go @@ -25,7 +25,7 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory ) resp = &pb.CaravanGetStoryResp{} update = make(map[string]interface{}) - if code = this.GetStoryCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetStoryCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index f29672420..c8aad7504 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -26,7 +26,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity ) resp = &pb.CaravanGotoCityResp{} bNewTask = false - if code = this.GotoCityCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GotoCityCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) @@ -89,7 +89,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{res}, true); code != pb.ErrorCode_Success { // 校验门票数量 + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{res}, true); errdata != nil { // 校验门票数量 return } diff --git a/modules/caravan/api_ranklist.go b/modules/caravan/api_ranklist.go index ecf7aaf08..7c6fd7898 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); code != pb.ErrorCode_Success { + if code = 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 c3f177e24..03fb555b3 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); code != pb.ErrorCode_Success { + if code = this.RefreshCityCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) diff --git a/modules/caravan/module.go b/modules/caravan/module.go index de380ac79..c80b1f69b 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -291,7 +291,7 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) { N: v.N, }) } - if code := this.ModuleBase.DispenseRes(session, conf.Reword, true); code != pb.ErrorCode_Success { + if code := this.ModuleBase.DispenseRes(session, conf.Reword, true); errdata != nil { this.Errorf("Caravan DispenseRes err:%v", conf.Reword) } session.SendMsg(string(this.GetType()), "taskcomplete", resp) diff --git a/modules/chat/api_crosschannel.go b/modules/chat/api_crosschannel.go index 99ec922b5..d2d6f2073 100644 --- a/modules/chat/api_crosschannel.go +++ b/modules/chat/api_crosschannel.go @@ -17,7 +17,7 @@ func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossCh channel int32 err error ) - if code = this.CrossChannelCheck(session, req); code != pb.ErrorCode_Success { + if code = this.CrossChannelCheck(session, req); errdata != nil { return } if channel, err = this.module.modelChat.addCrossChannelMember(session); err != nil { diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index e718ac2b1..e9ed5f754 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -25,7 +25,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) list []*pb.DBChat ) - if code = this.GetListCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetListCheck(session, req); errdata != nil { return } diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 668c65c13..0d3b475e1 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); code != pb.ErrorCode_Success { + if code = this.SendCheck(session, req); errdata != nil { return } diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index 48e7830ee..a928b9c05 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -24,7 +24,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda ok bool err error ) - if code = this.AskCheck(session, req); code != pb.ErrorCode_Success { + if code = this.AskCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { diff --git a/modules/combat/api_challenge.go b/modules/combat/api_challenge.go index a2051ac98..3e5cea0cb 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); code != pb.ErrorCode_Success { + if code = this.ChallengeCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -39,7 +39,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng Ptype: pb.PlayType_combat, Format: req.Battle, Mformat: manster.FormatList, - }); code != pb.ErrorCode_Success { + }); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index 37973dc22..485c63821 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -25,10 +25,10 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC err error ) - if code = this.ChallengeReceiveCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ChallengeReceiveCheck(session, req); errdata != nil { return } - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if iswin { diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index 40a2fc211..c596f7502 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -22,7 +22,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err ok bool err error ) - if code = this.DropCheck(session, req); code != pb.ErrorCode_Success { + if code = this.DropCheck(session, req); errdata != nil { return } diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index 639ccf67f..4dcc0e5db 100644 --- a/modules/combat/api_in.go +++ b/modules/combat/api_in.go @@ -19,7 +19,7 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata ok bool err error ) - if code = this.InCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { diff --git a/modules/combat/api_updatelevel.go b/modules/combat/api_updatelevel.go index e57112b3b..bb9301b6b 100644 --- a/modules/combat/api_updatelevel.go +++ b/modules/combat/api_updatelevel.go @@ -19,7 +19,7 @@ func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdate ok bool err error ) - if code = this.UpdateLevelCheck(session, req); code != pb.ErrorCode_Success { + if code = this.UpdateLevelCheck(session, req); errdata != nil { return } if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil { diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go index 3f407ff6a..bf2e4845b 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); code != pb.ErrorCode_Success { + if code = this.DoCheck(session, req); errdata != nil { return } @@ -61,7 +61,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}); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); errdata != nil { code = pb.ErrorCode_DispatchTicketNoEnough return } diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index e2f0ba9c5..676a5f19a 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); code != pb.ErrorCode_Success { + if code = 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 7a13508ca..a5475c863 100644 --- a/modules/dispatch/api_refresh.go +++ b/modules/dispatch/api_refresh.go @@ -41,11 +41,11 @@ 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}); code != pb.ErrorCode_Success { + if code = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil { return } - if code = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); code != pb.ErrorCode_Success { + if code = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil { return } if err := a.module.modelDispatch.updateRefreshCount(session.GetUserId(), d.Nb); err != nil { diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index 0cb789da8..27a9bc24f 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); code != pb.ErrorCode_Success { + if code = a.WeekreciveCheck(session, req); errdata != nil { return } rsp := &pb.DispatchWeekReciveResp{} diff --git a/modules/enchant/api_challenge.go b/modules/enchant/api_challenge.go index e21dca8e8..14e5fa8a5 100644 --- a/modules/enchant/api_challenge.go +++ b/modules/enchant/api_challenge.go @@ -22,7 +22,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantCh func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (errdata *pb.ErrorData) { code = this.ChallengeCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } enchant, err := this.module.modelEnchant.getEnchantList(session.GetUserId()) @@ -44,7 +44,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.CheckRes(session, cfgData[0].PsConsume); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, cfgData[0].PsConsume); errdata != nil { code = pb.ErrorCode_ItemsNoEnough return @@ -72,7 +72,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallen Mformat: format, }) - if code != pb.ErrorCode_Success { + if errdata != nil { return } session.SendMsg(string(this.module.GetType()), EnchantChallengeResp, &pb.EnchantChallengeResp{ diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 28b442d6a..0ed721d1e 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -27,7 +27,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha mapData = make(map[string]interface{}, 0) // reward = make([]*cfg.Gameatn, 0) code = this.ChallengeOverCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -49,18 +49,18 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha // check code, bWin = this.module.battle.CheckBattleReport(session, req.Report) - if code != pb.ErrorCode_Success { + if errdata != nil { return } if !bWin { // 战斗失败了 直接返回 - if code = this.module.ConsumeRes(session, cfgEnchant[0].PsMg, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, cfgEnchant[0].PsMg, true); errdata != nil { return } session.SendMsg(string(this.module.GetType()), EnchantChallengeOverResp, &pb.EnchantChallengeOverResp{Data: enchant}) return } - if code = this.module.ConsumeRes(session, cfgEnchant[0].PsConsume, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, cfgEnchant[0].PsConsume, true); errdata != nil { return } key := req.BossType @@ -77,7 +77,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha if score >= v.ScoreLow && score <= v.ScoreUp { for _, v1 := range v.RewardDrop { reward := this.module.configure.GetDropReward(v1) // 获取掉落奖励 - if code = this.module.DispenseRes(session, reward, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, reward, true); errdata != nil { return } } diff --git a/modules/enchant/api_getlist.go b/modules/enchant/api_getlist.go index 9f60aed96..f7269f94d 100644 --- a/modules/enchant/api_getlist.go +++ b/modules/enchant/api_getlist.go @@ -17,7 +17,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetL func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (errdata *pb.ErrorData) { // 刷新挑战卷 - if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success { + if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { return } diff --git a/modules/enchant/api_ranklist.go b/modules/enchant/api_ranklist.go index 69b14630f..0811b831c 100644 --- a/modules/enchant/api_ranklist.go +++ b/modules/enchant/api_ranklist.go @@ -23,7 +23,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankList rd *redis.StringSliceCmd ) code = this.RankListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } conn, _ := db.Local() diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go index 79eb712e9..4fca30574 100644 --- a/modules/equipment/api_ench.go +++ b/modules/equipment/api_ench.go @@ -31,7 +31,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( AttrValue int32 err error ) - if code = this.EnchCheck(session, req); code != pb.ErrorCode_Success { + if code = this.EnchCheck(session, req); errdata != nil { return } if conf, err = this.module.configure.getEquipenchanting(req.Itemid); err != nil { @@ -49,7 +49,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( T: req.Itemid, N: 1, }) - if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, need, true); errdata != nil { return } @@ -91,7 +91,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( } if equip.HeroId != "" { equipments = make([]*pb.DB_Equipment, 8) - if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); code != pb.ErrorCode_Success { + if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); errdata != nil { this.module.Errorf("Upgrade code:%d", code) data = &pb.ErrorData{ Title: code.ToString(), @@ -116,7 +116,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( } } } - if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); code != pb.ErrorCode_Success { + if code = 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 ba4768c9b..2d9c3eb6d 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -38,7 +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); code != pb.ErrorCode_Success { + if code = this.EquipCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -50,7 +50,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); code != pb.ErrorCode_Success { + 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), @@ -196,7 +196,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) hero.Suite2Lv = 0 } //更新装备数据加成 - if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); code != pb.ErrorCode_Success { + 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(), diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index 4dded0d7c..f0b9d9d5a 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -26,7 +26,7 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) ( reward []*pb.UserAssets err error ) - if code = this.ForgCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ForgCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -59,11 +59,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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, need, true); errdata != nil { return } - if _, code = this.module.AddNewEquipments(session, equis, true); code != pb.ErrorCode_Success { + if _, code = this.module.AddNewEquipments(session, equis, true); errdata != nil { return } diff --git a/modules/equipment/api_lock.go b/modules/equipment/api_lock.go index d4e3ada62..f91e8a0e6 100644 --- a/modules/equipment/api_lock.go +++ b/modules/equipment/api_lock.go @@ -22,7 +22,7 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) ( err error equipment *pb.DB_Equipment ) - if code = this.LockCheck(session, req); code != pb.ErrorCode_Success { + if code = this.LockCheck(session, req); errdata != nil { return } if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 2ec6bdc78..13199f5ea 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -27,7 +27,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( confs []*cfg.GameEquipData sale [][]*cfg.Gameatn ) - if code = this.SellCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SellCheck(session, req); errdata != nil { return } if equipments, err = this.module.modelEquipment.QueryUserEquipmentsByIds(session.GetUserId(), req.EquipIds); err != nil { @@ -85,10 +85,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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sales, true); errdata != nil { return } - if code = this.module.DelEquipments(session, req.EquipIds, true); code != pb.ErrorCode_Success { + if code = 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 fe30095c7..aceb2d869 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -40,7 +40,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.UpgradeCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -75,7 +75,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade } return } - if code = this.module.ConsumeRes(session, intensify.Need, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, intensify.Need, true); errdata != nil { return } if equipment.KeepFailNum >= intensify.Num { //没有达到保底次数 根据概率随机成功失败 @@ -175,7 +175,7 @@ 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); code != pb.ErrorCode_Success { + 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(), diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index c0a0ecf5a..e2e4a122a 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -28,7 +28,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( adverbEntry []*pb.EquipmentAttributeEntry err error ) - if code = this.WashCheck(session, req); code != pb.ErrorCode_Success { + if code = this.WashCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), @@ -54,7 +54,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( 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); code != pb.ErrorCode_Success { + if code = 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 c80b05542..8dd1e0803 100644 --- a/modules/equipment/api_washconfirm.go +++ b/modules/equipment/api_washconfirm.go @@ -25,7 +25,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas attrlibrary *cfg.GameEquipAttrlibrarySData err error ) - if code = this.WashConfirmCheck(session, req); code != pb.ErrorCode_Success { + if code = this.WashConfirmCheck(session, req); errdata != nil { data = &pb.ErrorData{ Title: code.ToString(), Message: req.String(), diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 5b5fb5269..891b8ac46 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -273,10 +273,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); code != pb.ErrorCode_Success { + if code, atno = this.DispenseAtno(session, sales, true); errdata != nil { return } - if code = this.DelEquipments(session, equs, true); code != pb.ErrorCode_Success { + if code = this.DelEquipments(session, equs, true); errdata != nil { return } return @@ -335,10 +335,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); code != pb.ErrorCode_Success { + if code, atno = this.DispenseAtno(session, sales, true); errdata != nil { return } - if code = this.DelEquipments(session, equs, true); code != pb.ErrorCode_Success { + if code = this.DelEquipments(session, equs, true); errdata != nil { return } return diff --git a/modules/forum/api_getlist.go b/modules/forum/api_getlist.go index b08323b48..2319a8b19 100644 --- a/modules/forum/api_getlist.go +++ b/modules/forum/api_getlist.go @@ -22,7 +22,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) err error list []*pb.DBComment ) - if code = this.GetListCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetListCheck(session, req); errdata != nil { return } if list, err = this.module.modelForum.getComment(req.Herocid); err != nil { diff --git a/modules/forum/api_releasecomment.go b/modules/forum/api_releasecomment.go index 6db12808f..dc7bd2dca 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); code != pb.ErrorCode_Success { + if code = this.ReleaseCommentCheck(session, req); errdata != nil { return } comment = &pb.DBComment{ diff --git a/modules/forum/api_watchhero.go b/modules/forum/api_watchhero.go index 0ec91a08f..d84658481 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); code != pb.ErrorCode_Success { + if code = 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 4d8e18f1c..e12a64387 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); code != pb.ErrorCode_Success { + if code = this.AcceptCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_addblack.go b/modules/friend/api_cross_addblack.go index 3a845a204..d9f79a50c 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); code != pb.ErrorCode_Success { + if code = this.AddblackCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go index 36932903b..cb3b43878 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); code != pb.ErrorCode_Success { + if code = this.AgreeCheck(session, req); errdata != nil { return } var ( diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index 3c9894df7..51d49b557 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); code != pb.ErrorCode_Success { + if code = this.ApplyCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_assisthero.go b/modules/friend/api_cross_assisthero.go index 07419bec2..20a708364 100644 --- a/modules/friend/api_cross_assisthero.go +++ b/modules/friend/api_cross_assisthero.go @@ -21,7 +21,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.AssistheroCheck(session, req); errdata != nil { return } uid := session.GetUserId() diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index 7ce7bb495..c7075c197 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); code != pb.ErrorCode_Success { + if code = this.DelCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index 346926d02..5bc44ea8e 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); code != pb.ErrorCode_Success { + if code = this.DelblackCheck(session, req); errdata != nil { return } var ( diff --git a/modules/friend/api_cross_getrelation.go b/modules/friend/api_cross_getrelation.go index 68fcc3101..2c5b8c2ff 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); code != pb.ErrorCode_Success { + if code = this.GetRelationCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index d3ee6c9d9..1155ad6fb 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); code != pb.ErrorCode_Success { + if code = 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 64dc1135d..a92127d28 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); code != pb.ErrorCode_Success { + if code = this.QiecuoCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index 29d49c2fa..e44a797bd 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); code != pb.ErrorCode_Success { + if code = this.RefuseCheck(session, req); errdata != nil { return } uid := session.GetUserId() diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index 554ac6ef9..f20235a3f 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); code != pb.ErrorCode_Success { + if code = this.SearchCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_stop.go b/modules/friend/api_cross_stop.go index 2ba0216b3..d308628a3 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); code != pb.ErrorCode_Success { + if code = this.StopCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index d42e213dd..bb8c7feb9 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); code != pb.ErrorCode_Success { + if code = this.ZanCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_zanlist.go b/modules/friend/api_cross_zanlist.go index 41006369e..de3218cbf 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); code != pb.ErrorCode_Success { + if code = this.ZanlistCheck(session, req); errdata != nil { return } diff --git a/modules/friend/api_cross_zanreceive.go b/modules/friend/api_cross_zanreceive.go index 4fc02ae03..49e3423e8 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); code != pb.ErrorCode_Success { + if code = this.ZanreceiveCheck(session, req); errdata != nil { return } diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index 63bb45f86..c3b7853cb 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -52,7 +52,7 @@ func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (errd ///解析GM 指令 func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) { - if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success { + if code = this.CmdCheck(session, req); errdata != nil { return } var ( diff --git a/modules/gm/module.go b/modules/gm/module.go index 29b64a64d..d34c115dc 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -147,7 +147,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er }) } code = this.DispenseRes(session, res, true) - if code != pb.ErrorCode_Success { + if errdata != nil { this.Errorf("资源发放失败,%v", code) } this.Debug("使用bingo命令", @@ -331,7 +331,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er } code = this.DispenseRes(session, res, true) - if code != pb.ErrorCode_Success { + if errdata != nil { this.Errorf("资源发放失败,%v", code) } this.Debug("使用bingo命令", @@ -374,7 +374,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); code != pb.ErrorCode_Success { + if code = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil { return } } @@ -390,7 +390,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } - if code = module1.(comm.IItems).CleanItems(session); code != pb.ErrorCode_Success { + if code = module1.(comm.IItems).CleanItems(session); errdata != nil { return } @@ -404,7 +404,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er return } - if code = module1.(comm.IEquipment).AddAllEquipments(session); code != pb.ErrorCode_Success { + if code = module1.(comm.IEquipment).AddAllEquipments(session); errdata != nil { return } @@ -422,7 +422,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"); code != pb.ErrorCode_Success { + if code = module.(comm.IChat).SendSysChatToWorld(comm.ChatSystem10, nil, 5, 0, "xxx", "25001"); errdata != nil { return } } @@ -455,7 +455,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); code != pb.ErrorCode_Success { + if code = this.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { this.Debugf("DispenseRes err :uid = %s,code = %d", datas[0], code) } } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 0259577a8..fdc4cd59e 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -21,7 +21,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) { code = this.ActivateAtlasCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } conf, err := this.configure.GetGrormetCookBookConf(req.Cid) diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index 9e7be8f51..9f7b6e40e 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -25,7 +25,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate bFirst bool // 是否首次获得 ) code = this.CreateFoodCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } conf, err := this.configure.GetGrormetCookBookConf(req.Cid) @@ -56,7 +56,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate return } // 构建消耗 - if code = this.module.CheckRes(session, res); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, res); errdata != nil { return } @@ -65,7 +65,7 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, res, true); errdata != nil { return } atn := &cfg.Gameatn{ diff --git a/modules/gourmet/api_getatlas.go b/modules/gourmet/api_getatlas.go index 0df9fae3c..bd41bd5ab 100644 --- a/modules/gourmet/api_getatlas.go +++ b/modules/gourmet/api_getatlas.go @@ -15,7 +15,7 @@ func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasR func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (errdata *pb.ErrorData) { code = this.AtlasCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } _gourmet, err := this.module.modelAtlas.getGourmetAtlasList(session.GetUserId()) diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go index ca0f88197..20598e303 100644 --- a/modules/gourmet/api_getranduser.go +++ b/modules/gourmet/api_getranduser.go @@ -33,7 +33,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRa ) mapUser = make(map[string]struct{}, 0) code = this.GetRandUserCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index 8729fde51..d3597c801 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -18,7 +18,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.AdvreceiveCheck(session, req); errdata != nil { return } @@ -70,7 +70,7 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe } if conf, ok := rewardCnf.GetDataMap()[req.TaskType]; ok { - if code := this.module.DispenseRes(session, conf.Allreward, true); code != pb.ErrorCode_Success { + if code := this.module.DispenseRes(session, conf.Allreward, true); errdata != nil { this.module.Errorf("进阶奖励发放失败 taskType:%v uid:%v", req.TaskType, uid) } } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index 3967d4b5d..b8f652d91 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); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } @@ -42,7 +42,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR } if conf, ok := ggt.GetDataMap()[req.TaskId]; ok { - if code := this.module.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { + if code := this.module.DispenseRes(session, conf.Reward, true); errdata != nil { this.module.Errorf("子任务奖励发放失败 taskId:%v uid:%v", req.TaskId, uid) } } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index e838bc61c..09b9055c3 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -34,11 +34,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e _heroMap = make(map[string]interface{}, 0) chanegCard = make([]*pb.DBHero, 0) code = this.AwakenCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) - if code != pb.ErrorCode_Success { + if errdata != nil { return } @@ -63,7 +63,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e } // 消耗校验 code = this.module.ConsumeRes(session, awakenData.Phaseneed, true) - if code != pb.ErrorCode_Success { + if errdata != nil { return } diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index 278e43f33..8309b4377 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); code != pb.ErrorCode_Success { + if code = this.BuyCheck(session, req); errdata != nil { return } if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil { @@ -98,7 +98,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata } } // 消耗 - if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, need, true); errdata != nil { return } give = make([]*cfg.Gameatn, len(conf.Iteminfo)) @@ -110,7 +110,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata } } // 获得的道具 - if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, give, true); errdata != nil { return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 8604153a4..ab0def74b 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -42,7 +42,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq return } code = this.DrawCardCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return } szCards = make([]string, 0) @@ -60,7 +60,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } costRes = append(costRes, costAtn) code = this.module.CheckRes(session, costRes) - if code != pb.ErrorCode_Success { // 消耗数量不足直接返回 + if errdata != nil { // 消耗数量不足直接返回 return } @@ -246,7 +246,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq //阵营消耗 code = this.module.CheckRes(session, costRes) - if code != pb.ErrorCode_Success { // 消耗数量不足直接返回 + if errdata != nil { // 消耗数量不足直接返回 return } for { @@ -311,7 +311,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq // 消耗道具 code = this.module.ConsumeRes(session, costRes, true) - if code != pb.ErrorCode_Success { + if errdata != nil { return } heroRecord.Totalcount += req.DrawCount diff --git a/modules/hero/api_fusion.go b/modules/hero/api_fusion.go index 44b79faf4..6365a8271 100644 --- a/modules/hero/api_fusion.go +++ b/modules/hero/api_fusion.go @@ -28,7 +28,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.FusionCheck(session, req); errdata != nil { return } conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId) @@ -82,7 +82,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e for k, v := range req.Heros { //mapHero[_costMaphero[k].HeroID] code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v) - if code != pb.ErrorCode_Success { + if errdata != nil { return } ChangeList = append(ChangeList, _costMaphero[k]) @@ -94,7 +94,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); code != pb.ErrorCode_Success { + if code = 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 2ec1cfb32..c2d2ac0d2 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); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } rsp := &pb.HeroInfoResp{} diff --git a/modules/hero/api_lock.go b/modules/hero/api_lock.go index a9d868297..1da791655 100644 --- a/modules/hero/api_lock.go +++ b/modules/hero/api_lock.go @@ -25,11 +25,11 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (errda _hero *pb.DBHero ) code = this.LockCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.Heroid) - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero.Block = !_hero.Block // 修改是否锁定状态 diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go index eea560dfd..aa87a83ec 100644 --- a/modules/hero/api_specified.go +++ b/modules/hero/api_specified.go @@ -23,7 +23,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (errdata *pb.ErrorData) { code = this.GetSpecifiedCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } hero, err := this.module.modelHero.createSpecialHero(session.GetUserId(), req.HeroCoinfigID) diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 864325d5a..8060b87d3 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -29,11 +29,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt lvUpCount int32 // 技能升级的次数 ) code = this.StrengthenUpSkillCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if code != pb.ErrorCode_Success { + if errdata != nil { return } // 查询配置表 找出原始品质 @@ -69,7 +69,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt } // 检查消耗 - if code = this.module.CheckRes(session, cost); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, cost); errdata != nil { return } for i := 0; i < int(lvUpCount); i++ { // 升级技能 @@ -100,7 +100,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt _hero.NormalSkill[szIndex[upSkillPos]].SkillLv += 1 } - if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, cost, true); errdata != nil { return } diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 0109f73a0..a03c814a9 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -27,11 +27,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr err error ) code = this.StrengthenUpStarCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) - if code != pb.ErrorCode_Success { + if errdata != nil { return } @@ -60,13 +60,13 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr return } - if code = this.module.ConsumeRes(session, starConf.Needrace, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, starConf.Needrace, true); errdata != nil { return } // 加对应的天赋点数 if len(starConf.Starup) > 0 { - if code = this.module.DispenseRes(session, starConf.Starup, true); code != pb.ErrorCode_Success { // 加天赋点{ + if code = 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 8c15dbb00..3621caa01 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -29,12 +29,12 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren cost []*cfg.Gameatn // 消耗的道具 ) code = this.StrengthenUplvCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) - if code != pb.ErrorCode_Success { + if errdata != nil { return } for k, v := range req.Item { @@ -65,7 +65,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren N: costGold, }) // 金币消耗判断 - if code = this.module.CheckRes(session, cost); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, cost); errdata != nil { return } @@ -80,11 +80,11 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren } // 执行升级逻辑 _, code = this.module.modelHero.AddCardExp(session, _hero, addExp, nil) // 加经验 - if code != pb.ErrorCode_Success { + if errdata != nil { return } // 消耗金币 - if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success { //道具扣除 + if code = 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 24894bb83..f221ce017 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); code != pb.ErrorCode_Success { + if code = this.TalentLearnCheck(session, req); errdata != nil { return } if req.ObjId != "" { @@ -119,7 +119,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}); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, []*cfg.Gameatn{fp}); errdata != nil { code = pb.ErrorCode_ItemsNoEnough return } @@ -134,7 +134,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe res = append(res, point) } } - if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, res, true); errdata != nil { return } diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index 35ac0b316..d1298492b 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); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, this.module.ModuleTools.GetGlobalConf().TalentReset, true); errdata != nil { return } @@ -63,7 +63,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); code != pb.ErrorCode_Success { + if code = 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/hero/module.go b/modules/hero/module.go index 7fbc17924..a12d63969 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -281,7 +281,7 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] if num == 0 { // 数量为0 不做处理 continue } - if hero, bFirst, atno, code = this.createRepeatHero(session, heroCfgId, num); code != pb.ErrorCode_Success { + if hero, bFirst, atno, code = this.createRepeatHero(session, heroCfgId, num); errdata != nil { this.Errorf("create hero %s failed", heroCfgId) continue } @@ -324,18 +324,18 @@ func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp in return } curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp, model) - if code != pb.ErrorCode_Success { + if errdata != nil { return } } } else { _hero, code = this.GetHeroByObjID(session.GetUserId(), heroObjID) - if code != pb.ErrorCode_Success { + if errdata != nil { return } curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp, nil) - if code != pb.ErrorCode_Success { + if errdata != nil { return } } @@ -364,7 +364,7 @@ func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongf } } else { _hero, code = this.GetHeroByObjID(session.GetUserId(), heroObjID) - if code != pb.ErrorCode_Success { + if errdata != nil { return } } diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go index 5e6e8ea05..699d90c1f 100644 --- a/modules/horoscope/api_info.go +++ b/modules/horoscope/api_info.go @@ -17,7 +17,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) ( info *pb.DBHoroscope err error ) - if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index 8a532573e..e8fac62de 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -21,7 +21,7 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) conf *cfg.GameGlobalData err error ) - if code = this.ResetCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ResetCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { @@ -36,7 +36,7 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) } } - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); errdata != nil { return } info.Nodes = make(map[int32]int32) diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index 65614c0d0..923383419 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -20,7 +20,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade front *cfg.GameHoroscopeData err error ) - if code = this.UpgradeCheck(session, req); code != pb.ErrorCode_Success { + if code = this.UpgradeCheck(session, req); errdata != nil { return } if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil { @@ -51,7 +51,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade } return } - if code = this.module.ConsumeRes(session, conf.CostItem, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil { return } info.Nodes[conf.NodeId] = conf.Lv + 1 diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index b9cefdcec..d199d86be 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -24,7 +24,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen ps int32 ) code = this.ChallengeCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -44,7 +44,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); code != pb.ErrorCode_Success { // 扣1点 + if code = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 return } @@ -64,7 +64,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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } @@ -75,7 +75,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen "ps": hunting.Ps, }) } - // if code = this.module.CheckRes(session, cfgData.PsConsume); code != pb.ErrorCode_Success { + // if code = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { // if req.AutoBuy { // 不够的时候看是否能自动购买 // var count int32 // for _, v := range cfgData.PsConsume { @@ -83,7 +83,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen // count += v.N // } // } - // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); code != pb.ErrorCode_Success { + // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { // return // } // } else { @@ -107,7 +107,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen Format: req.Battle, Mformat: cfgData.Boss, }) - if code != pb.ErrorCode_Success { + if errdata != nil { return } session.SendMsg(string(this.module.GetType()), HuntingChallengeResp, &pb.HuntingChallengeResp{ diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index a59ea46e0..9b8b9fe50 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -34,7 +34,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha mapData = make(map[string]interface{}, 0) reward = make([]*cfg.Gameatn, 0) code = this.ChallengeOverCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -76,12 +76,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); code != pb.ErrorCode_Success { + // if code = 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); code != pb.ErrorCode_Success { // 返还预扣体力 + if code = this.module.DispenseRes(session, cfgHunting.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -91,13 +91,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); code != pb.ErrorCode_Success { + // if code = 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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { return } } @@ -132,11 +132,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha res = append(res, v) } } - if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success { + if code, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } if newChallenge && bWin { // 新关卡挑战通过 发放首通奖励 - if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); code != pb.ErrorCode_Success { + if code = 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 40494844f..d27ad55d2 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -14,11 +14,11 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.HuntingGetL func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } // 刷新挑战卷 - // if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success { + // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } list, _ := this.module.modelHunting.getHuntingList(session.GetUserId()) diff --git a/modules/hunting/api_ranklist.go b/modules/hunting/api_ranklist.go index 767d79fe0..3affa785d 100644 --- a/modules/hunting/api_ranklist.go +++ b/modules/hunting/api_ranklist.go @@ -23,7 +23,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankList rd *redis.StringSliceCmd ) code = this.RankListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } conn, _ := db.Local() diff --git a/modules/items/api_buyphysical.go b/modules/items/api_buyphysical.go index 98fc04510..40c32b0a4 100644 --- a/modules/items/api_buyphysical.go +++ b/modules/items/api_buyphysical.go @@ -28,37 +28,30 @@ func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhys haveneeds []*cfg.Gameatn sale []*cfg.Gameatn ) - if code = this.BuyPhysicalCheck(session, req); code != pb.ErrorCode_Success { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.BuyPhysicalCheck(session, req); errdata != nil { return } if user, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); 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: req.String(), } return } if needs = this.module.ModuleTools.GetGlobalConf().PsBuy; needs == nil && len(needs) == 0 { - 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(modelName, "global.json", "PsBuy").Error(), } return } if psitem = this.module.ModuleTools.GetGlobalConf().PsItem; psitem == 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(modelName, "global.json", "PsItem").Error(), } return @@ -68,9 +61,9 @@ func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhys } if req.Amount+uint32(user.Physicalbuynum) > uint32(len(needs)) { - code = pb.ErrorCode_ItemsBuyPsUpperLimit - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ItemsBuyPsUpperLimit, + Title: pb.ErrorCode_ItemsBuyPsUpperLimit.ToString(), } return } @@ -80,13 +73,13 @@ func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhys haveneeds = append(haveneeds, needs[int(int32(i)+user.Physicalbuynum)]) } - if code = this.module.ConsumeRes(session, haveneeds, true); code != pb.ErrorCode_Success { + if errdata = this.module.ConsumeRes(session, haveneeds, true); errdata != nil { return } sale = []*cfg.Gameatn{{A: psitem.A, T: psitem.T, N: int32(req.Amount)}} - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, sale, true); errdata != nil { return } user.Physicalbuynum += int32(req.Amount) diff --git a/modules/items/api_buyunifiedticket.go b/modules/items/api_buyunifiedticket.go index 908728d5c..7891f1151 100644 --- a/modules/items/api_buyunifiedticket.go +++ b/modules/items/api_buyunifiedticket.go @@ -21,14 +21,10 @@ func (this *apiComp) BuyUnifiedTicket(session comm.IUserSession, req *pb.ItemsBu var ( info *pb.DBUserExpand ) - if code = this.BuyUnifiedTicketCheck(session, req); code != pb.ErrorCode_Success { - data = &pb.ErrorData{ - Title: code.ToString(), - Message: req.String(), - } + if errdata = this.BuyUnifiedTicketCheck(session, req); errdata != nil { return } - if info, code = this.module.modelItems.buyTicket(session, req.BuyNum); code != pb.ErrorCode_Success { + if info, errdata = this.module.modelItems.buyTicket(session, req.BuyNum); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "buyunifiedticket", &pb.ItemsBuyUnifiedTicketResp{Issucc: true, Buyunifiedticket: info.Buyunifiedticket, Recovertimeunifiedticket: info.Recovertimeunifiedticket}) diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index c44c103cf..66c49fa9e 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -26,36 +26,30 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose itemcf *cfg.GameItemData sale []*cfg.Gameatn ) - if code = this.DecomposeCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.DecomposeCheck(session, req); errdata != nil { return } if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); 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 } if itemcf, err = this.module.configure.GetItemConfigure(item.ItemId); err != nil { - code = pb.ErrorCode_ConfigurationException + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigurationException, + Title: pb.ErrorCode_ConfigurationException.ToString(), + Message: err.Error(), + } return } - // if itemcf.Sale == nil || len(itemcf.Sale) == 0 { - // code = pb.ErrorCode_ItemsUseNoCanSell - // data = &pb.ErrorData{ - // Title: code.ToString(), - // Message: fmt.Sprintf("道具未配置"), - // } - // return - // } + if itemcf.DecomposeDeplete == nil || len(itemcf.DecomposeDeplete) == 0 { - code = pb.ErrorCode_ItemsUseNoCanSell - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ItemsUseNoCanSell, + Title: pb.ErrorCode_ItemsUseNoCanSell.ToString(), Message: fmt.Sprintf("道具分解配置未配置! 道具id:%s", itemcf.Id), } return @@ -68,18 +62,15 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose N: v.N * int32(req.Amount), }) } - if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success { + if errdata = this.module.ConsumeRes(session, sale, true); errdata != nil { return } if req.Amount > item.Amount { this.module.Errorf("SellItemCheck over all amount:[%d:%d]", req.Amount, item.Amount) 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: fmt.Sprintf("道具数量不足! 道具数量:%s", item.Amount), } return @@ -90,11 +81,11 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose sale[i] = &temp sale[i].N = v.N * int32(req.Amount) } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, sale, true); errdata != nil { return } item.Amount = item.Amount - req.Amount - if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + if errdata = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "decompose", &pb.ItemsDecomposeResp{GridId: req.GridId, Amount: req.Amount, Issucc: true}) diff --git a/modules/items/api_getlist.go b/modules/items/api_getlist.go index 018c16302..fc7374de3 100644 --- a/modules/items/api_getlist.go +++ b/modules/items/api_getlist.go @@ -24,7 +24,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) dels []*pb.DB_UserItemData ) defer func() { - if code == pb.ErrorCode_Success { + if errdata == nil { if len(modifys) > 0 { this.module.modelItems.UpdateUserPack(session.GetUserId(), modifys...) } @@ -36,9 +36,9 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) if items, err = this.module.modelItems.QueryUserPack(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/items/api_potionsynthesis.go b/modules/items/api_potionsynthesis.go index 842aeb03b..4a961dfc6 100644 --- a/modules/items/api_potionsynthesis.go +++ b/modules/items/api_potionsynthesis.go @@ -21,9 +21,9 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot err error ) if configure, err = this.module.configure.GetMaterialConfigure(req.Id); 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 @@ -36,7 +36,7 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot N: v.N * req.Num, } } - if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { return } give = make([]*cfg.Gameatn, 0) @@ -65,7 +65,7 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot }) } } - if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, give, true); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "potionsynthesis", &pb.ItemsPotionSynthesisResp{Succ: true, Id: req.Id, Num: req.Num}) diff --git a/modules/items/api_refreshunifiedticket.go b/modules/items/api_refreshunifiedticket.go index 0c24302a7..474788b6b 100644 --- a/modules/items/api_refreshunifiedticket.go +++ b/modules/items/api_refreshunifiedticket.go @@ -13,10 +13,10 @@ func (this *apiComp) RefreshUnifiedTicketCheck(session comm.IUserSession, req *p //购买 func (this *apiComp) RefreshUnifiedTicket(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (errdata *pb.ErrorData) { - if code = this.RefreshUnifiedTicketCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.RefreshUnifiedTicketCheck(session, req); errdata != nil { return } - if code = this.module.modelItems.recoverTicket(session); code != pb.ErrorCode_Success { + if errdata = this.module.modelItems.recoverTicket(session); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "refreshunifiedticket", &pb.ItemsRefreshUnifiedTicketResp{}) diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index b8d96d1bf..29c614a7e 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -25,7 +25,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe itemcf *cfg.GameItemData sale []*cfg.Gameatn ) - if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { + if code = this.SellItemCheck(session, req); errdata != nil { return } if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil { @@ -57,11 +57,11 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe sale[i] = &temp sale[i].N = v.N * int32(req.Amount) } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } item.Amount = item.Amount - req.Amount - if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true}) diff --git a/modules/items/api_sellinbulk.go b/modules/items/api_sellinbulk.go index 1930252fd..04c7c21a9 100644 --- a/modules/items/api_sellinbulk.go +++ b/modules/items/api_sellinbulk.go @@ -27,7 +27,7 @@ func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbu issucc []bool sale []*cfg.Gameatn ) - if code = this.SellinbulkCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.SellinbulkCheck(session, req); errdata != nil { return } if items, err = this.module.modelItems.QueryUserPackByGridIds(session.GetUserId(), req.Grids); err != nil { @@ -71,7 +71,7 @@ func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbu items[i].Amount = items[i].Amount - req.Amount[i] } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index dee5e3aa3..ae7b66973 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -25,7 +25,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) itemcf *cfg.GameItemData prop []*cfg.GameDropData ) - if code = this.UseitemCheck(session, req); code != pb.ErrorCode_Success { + if code = this.UseitemCheck(session, req); errdata != nil { return } if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil { @@ -50,10 +50,10 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) }) } - if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil { return } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } break @@ -62,7 +62,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil { return } var sale []*cfg.Gameatn @@ -86,7 +86,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) return } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } case itemuse_randombox: //宝箱 @@ -98,10 +98,10 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) for i := uint32(0); i < req.Amount; i++ { sale = append(sale, RandomProps(prop).Prize...) } - if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil { return } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } case itemuse_synthesis: //合成 @@ -123,11 +123,11 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) N: v.N * int32(req.Amount), }) } - if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, sale, true); errdata != nil { return } - if code = this.module.AddItemforGrid(session, req.GridId, -1*itemcf.SynthetizeNum*int32(req.Amount), true); code != pb.ErrorCode_Success { + if code = this.module.AddItemforGrid(session, req.GridId, -1*itemcf.SynthetizeNum*int32(req.Amount), true); errdata != nil { return } sale = make([]*cfg.Gameatn, 0, len(prop)) @@ -138,7 +138,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) N: v1.N * int32(req.Amount), }) } - if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, sale, true); errdata != nil { return } diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 0f3330840..ce3d8c551 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -471,7 +471,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte } //购买门票 -func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (info *pb.DBUserExpand, code pb.ErrorCode) { +func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (info *pb.DBUserExpand, errdata *pb.ErrorData) { var ( need *cfg.Gameatn needs []*cfg.Gameatn @@ -479,12 +479,19 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf err error ) if info, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { - code = pb.ErrorCode_CacheReadError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_CacheReadError, + Title: pb.ErrorCode_CacheReadError.ToString(), + } return } this.module.modelItems.recoverTicket(session) 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.PrivilegeType3)) @@ -492,17 +499,23 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf needs = make([]*cfg.Gameatn, 0) for i := int32(0); i < buy; i++ { if int(info.Buyunifiedticket+i+1) > maxbuy+vipbuy { - code = pb.ErrorCode_ArenaTicketBuyUp + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ArenaTicketBuyUp, + Title: pb.ErrorCode_ArenaTicketBuyUp.ToString(), + } return } if need = this.module.configure.GetchallengeData(int(info.Buyunifiedticket + i + 1)); err != nil || need == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + } return } needs = append(needs, need) } - if code = this.module.ConsumeRes(session, needs, true); code != pb.ErrorCode_Success { + if errdata = this.module.ConsumeRes(session, needs, true); errdata != nil { return } @@ -514,7 +527,7 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf N: atn.N * buy, } info.Buyunifiedticket += buy - if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil { return } this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ @@ -538,20 +551,26 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p ) if ticketitem = this.module.ModuleTools.GetGlobalConf().CopsBuyGet; ticketitem == nil { - code = pb.ErrorCode_ConfigNoFound - // data = &pb.ErrorData{ - // Title: code.ToString(), - // Message: comm.NewNotFoundConfErr(modelName, "global.json", "PsItem").Error(), - // } + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: comm.NewNotFoundConfErr(modelName, "global.json", "CopsBuyGet").Error(), + } return } if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil { - code = pb.ErrorCode_CacheReadError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_CacheReadError, + Title: pb.ErrorCode_CacheReadError.ToString(), + } return } if info, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { - code = pb.ErrorCode_CacheReadError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_CacheReadError, + Title: pb.ErrorCode_CacheReadError.ToString(), + } return } if time.Unix(info.Lasttimeunifiedticket, 0).Day() < configure.Now().Day() { diff --git a/modules/items/module.go b/modules/items/module.go index 58e3eafa1..dc3c12f6a 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -259,7 +259,7 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b } } - if code, atno = this.DispenseAtno(session, sale, bPush); code != pb.ErrorCode_Success { + if code, atno = this.DispenseAtno(session, sale, bPush); errdata != nil { return } if len(change) > 0 && bPush { diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index 8cf4fa33f..693288575 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -19,7 +19,7 @@ func (this *apiComp) ActivationFetterCheck(session comm.IUserSession, req *pb.Li func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (errdata *pb.ErrorData) { code = this.ActivationFetterCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } rsp := &pb.LibraryActivationFetterResp{} diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index d03e9a024..17f1136c0 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); code != pb.ErrorCode_Success { + if code = this.GetFetterListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } rsp := &pb.LibraryGetFetterListResp{} diff --git a/modules/library/api_getlist.go b/modules/library/api_getlist.go index c815361e2..b18a425a9 100644 --- a/modules/library/api_getlist.go +++ b/modules/library/api_getlist.go @@ -14,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.LibraryGetL func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } rsp := &pb.LibraryGetListResp{} diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index e471a9dbd..8a7de1d59 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -28,7 +28,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe update = make(map[string]interface{}, 0) resp := &pb.LibraryGetStoryRewardResp{} code = this.GetStoryRewardCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } _heroFetter := this.module.modelFetter.getOneHeroFetter(session.GetUserId(), req.Oid) @@ -76,7 +76,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe } if len(res) > 0 { - if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, res, true); errdata != nil { return } } else { diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 69f1b274d..a91c78afa 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -25,7 +25,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward resp := &pb.LibraryLvRewardResp{} code = this.LvRewardCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } _heroFetter := this.module.modelFetter.getOneHeroFetter(session.GetUserId(), req.Oid) @@ -60,7 +60,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward _heroFetter.Lvprize[req.Lv] = 1 // 发奖 code = this.module.DispenseRes(session, confData.ReturnReward, true) - if code != pb.ErrorCode_Success { + if errdata != nil { this.module.Errorf("GetStoryReward err:add item : %v", confData.ReturnReward) } mapData := make(map[string]interface{}, 0) diff --git a/modules/library/api_lvup.go b/modules/library/api_lvup.go index c2768467d..1e7029987 100644 --- a/modules/library/api_lvup.go +++ b/modules/library/api_lvup.go @@ -24,7 +24,7 @@ func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetter totalFetterLv int32 //羁绊总等级 ) code = this.FetterLvUpCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } // 配置校验 diff --git a/modules/library/api_maintask.go b/modules/library/api_maintask.go index b0fb891e2..794d40ed0 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); code != pb.ErrorCode_Success { + if code = this.FetterstoryTaskCheck(session, req); errdata != nil { return } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 05b486e70..94e96c446 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -32,7 +32,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe ) attenuation = make(map[int32]int32, 0) code = this.UseGiftCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } rsp := &pb.LibraryUseGiftResp{} @@ -109,7 +109,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe N: req.Counts, }) - if code = this.module.CheckRes(session, res); code != pb.ErrorCode_Success { // 道具不够直接返回 + if code = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回 return } itemConf, err1 := this.module.configure.GetItemConfigureData(req.Items) // 获取食物的 @@ -135,7 +135,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe break } } - if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { //真正消耗 + if code = this.module.ConsumeRes(session, res, true); errdata != nil { //真正消耗 return } // 修改信息 diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index 03fb90fde..bbd8300ca 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); code != pb.ErrorCode_Success { + if code = this.MaintaskCheck(session, req); errdata != nil { return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index d3d1c9a51..d2adbe2b4 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -21,7 +21,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -44,7 +44,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive } //发奖 - if code = this.module.DispenseRes(session, conf.Reward, true); code != pb.ErrorCode_Success { + if code = 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_delallmail.go b/modules/mail/api_delallmail.go index 5f4eceb38..d9fcad296 100644 --- a/modules/mail/api_delallmail.go +++ b/modules/mail/api_delallmail.go @@ -25,7 +25,7 @@ func (this *apiComp) DelAllMail(session comm.IUserSession, req *pb.MailDelAllMai mailData []*pb.DBMailData ) code = this.DelAllMailCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } mailinfo, err = this.module.modelMail.MailQueryUserMail(session.GetUserId()) diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index 408917d0b..78a6a9a0f 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -20,7 +20,7 @@ func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMail // 删除邮件 func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (errdata *pb.ErrorData) { code = this.DelMailCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } bRet := this.module.modelMail.MailDelUserMail(req.ObjID) diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index d5c395ef3..c01e1fa28 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -17,7 +17,7 @@ func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req * func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (errdata *pb.ErrorData) { code = this.GetUserMailAttachmentCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } mail, err := this.module.modelMail.MailGetMailAttachmentState(req.ObjID) @@ -64,7 +64,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai mailIds []string ) code = this.GetAllMailAttachmentCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } mails, err := this.module.modelMail.MailQueryUserMailByReard(session.GetUserId()) diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go index 20e8c72a2..d17d2f648 100644 --- a/modules/mail/api_getmail.go +++ b/modules/mail/api_getmail.go @@ -18,7 +18,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) session.SendMsg(string(this.module.GetType()), "getlist", &pb.MailGetListResp{Mails: mailinfo}) }() code = this.GetListCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { return } if mailinfo, err = this.module.modelMail.MailQueryUserMail(session.GetUserId()); err != nil { diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 2384194f8..7c678fbbd 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -24,7 +24,7 @@ func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq ) code = this.ReadMailCheck(session, req) // check - if code != pb.ErrorCode_Success { + if errdata != nil { this.module.Debugf("read mail failed%d", code) return } diff --git a/modules/mline/api_challenge.go b/modules/mline/api_challenge.go index 6742bdd68..b64305dd8 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); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { // 扣1点 + if code = 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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } @@ -112,7 +112,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge Format: req.Battle, Mformat: stageConf.FormatList, }) - if code != pb.ErrorCode_Success { + if errdata != nil { return } session.SendMsg(string(this.module.GetType()), MlineChallengeResp, &pb.MlineChallengeResp{ diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index d4405d150..0b43953e1 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -35,7 +35,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall rsp = &pb.MlineChallengeOverResp{} update = make(map[string]interface{}) code = this.ChallengeOverCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } if stageConf = this.module.configure.GetMainStageConf(req.StageId); stageConf == nil { // 配置文件校验 @@ -56,13 +56,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall } // 校验通过 code, isWin = this.module.battle.CheckBattleReport(session, req.Report) - if code != pb.ErrorCode_Success { + if errdata != nil { return } if !isWin { // 战斗失败返还扣除的体力 if v, ok := curChapter.Ps[req.StageId]; ok && v > 0 { - if code = this.module.DispenseRes(session, stageConf.PsConsume, true); code != pb.ErrorCode_Success { // 返还预扣体力 + if code = this.module.DispenseRes(session, stageConf.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -148,7 +148,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall }) } - if code = this.module.DispenseRes(session, stageConf.Firstaward, true); code != pb.ErrorCode_Success { + if code = 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 +159,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall }) } } else { - if code = this.module.DispenseRes(session, stageConf.Commonaward, true); code != pb.ErrorCode_Success { + if code = 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 85c815bec..411d017f8 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); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = 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 416d550cd..9f6db1fa4 100644 --- a/modules/mline/api_getReward.go +++ b/modules/mline/api_getReward.go @@ -25,7 +25,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetReward ) rsp = &pb.MlineGetRewardResp{} update = make(map[string]interface{}) - if code = this.GetRewardCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetRewardCheck(session, req); errdata != nil { return } @@ -55,7 +55,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); code != pb.ErrorCode_Success { + if code = 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 bcea6ce6f..6feb939af 100644 --- a/modules/mline/api_getlist.go +++ b/modules/mline/api_getlist.go @@ -23,7 +23,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) rsp := &pb.MlineGetListResp{} code = this.GetListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } diff --git a/modules/modulebase.go b/modules/modulebase.go index bbb51d0f9..416144db1 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -378,7 +378,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn // 真正消耗 if len(attrs) > 0 { code = this.ModuleUser.AddAttributeValues(session, attrs, bPush) - if code != pb.ErrorCode_Success { + if errdata != nil { return } this.Debug("消耗玩家资源", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "attrs", Value: attrs}) @@ -389,7 +389,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn } if len(items) > 0 { _, code = this.ModuleItems.AddItems(session, items, bPush) - if code != pb.ErrorCode_Success { + if errdata != nil { return } this.Debug("消耗玩家资源", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "items", Value: items}) diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index 6be63d6d7..5ea4f6996 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -28,7 +28,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( maxbuy, vipbuy int err error ) - if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { + if code = this.BuyCheck(session, req); errdata != nil { return } @@ -66,12 +66,12 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( need = append(need, challengeD.Need...) } - if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = 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_receive.go b/modules/moonfantasy/api_receive.go index 3f0bd7d6c..2cabeaa03 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -25,23 +25,23 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei err error ) - if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } if boss, err = this.module.configure.GetMonsterById(req.Mid); err != nil { code = pb.ErrorCode_ConfigNoFound return } - if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } if !iswin { - if code = this.module.ConsumeRes(session, boss.PsMg, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, boss.PsMg, true); errdata != nil { return } return } else { - if code = this.module.ConsumeRes(session, boss.PsConsume, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, boss.PsConsume, true); errdata != nil { return } this.module.DispenseRes(session, boss.Prize, true) diff --git a/modules/oldtimes/api_receive.go b/modules/oldtimes/api_receive.go index 2546fb37f..b1cd35de7 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); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go index a9057cf21..ed6430dd3 100644 --- a/modules/pagoda/api_challenge.go +++ b/modules/pagoda/api_challenge.go @@ -24,7 +24,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng err error ) code = this.ChallengeCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -67,7 +67,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng Format: req.Battle, Mformat: conf.MonsterId, }) - if code != pb.ErrorCode_Success { + if errdata != nil { return } session.SendMsg(string(this.module.GetType()), PagodaChallengeResp, &pb.PagodaChallengeResp{ diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 5ace083d3..50791b40c 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -33,7 +33,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal ) mapData = make(map[string]interface{}, 0) code = this.ChallengeOverCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -70,7 +70,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal } // 校验通过 code, isWin = this.module.battle.CheckBattleReport(session, req.Report) - if code != pb.ErrorCode_Success { + if errdata != nil { return } if !isWin { // 战斗失败直接返回 @@ -143,7 +143,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal // 通关奖励 code = this.module.DispenseRes(session, conf.Reward, true) - if code != pb.ErrorCode_Success { + if errdata != nil { return } // 任务相关 diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index 5b137ba25..c3cf41714 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -19,7 +19,7 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGet func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (errdata *pb.ErrorData) { code = this.GetRewardCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -43,7 +43,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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, _cfg.Reward, true); errdata != nil { return } pagoda.Reward[req.Id] = true diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go index 08bdd1736..5ccd9ca79 100644 --- a/modules/pagoda/api_ranklist.go +++ b/modules/pagoda/api_ranklist.go @@ -22,7 +22,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListR rd *redis.StringSliceCmd ) code = this.RankListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return } if !req.Friend { diff --git a/modules/pagoda/api_warorder.go b/modules/pagoda/api_warorder.go index 9dfe1ba94..0577a0888 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); code != pb.ErrorCode_Success { // 发放奖励 + if code = this.module.DispenseRes(session, totalRes, true); errdata != nil { // 发放奖励 return } } diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go index e3d880f70..b96a91066 100644 --- a/modules/parkour/api_Info.go +++ b/modules/parkour/api_Info.go @@ -18,7 +18,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er recommend []*pb.DBRaceMember err error ) - if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } // isopen = this.module.configure.isopen() diff --git a/modules/parkour/api_avoid.go b/modules/parkour/api_avoid.go index 42198c4b7..f2c69b272 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); code != pb.ErrorCode_Success { + if code = 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 116bf073a..4a80668cd 100644 --- a/modules/parkour/api_changemts.go +++ b/modules/parkour/api_changemts.go @@ -19,7 +19,7 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM mount *cfg.GameBuzkashiMountData err error ) - if code = this.ChangeMtsCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ChangeMtsCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_getreward.go b/modules/parkour/api_getreward.go index dcfbce002..f9cdf8465 100644 --- a/modules/parkour/api_getreward.go +++ b/modules/parkour/api_getreward.go @@ -16,7 +16,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewa info *pb.DBParkour err error ) - if code = this.GetRewardCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetRewardCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go index 3ae852c78..d779cd986 100644 --- a/modules/parkour/api_invite.go +++ b/modules/parkour/api_invite.go @@ -31,7 +31,7 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) ok bool err error ) - if code = this.InviteCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InviteCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index 9923744aa..6b7d91fad 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -26,7 +26,7 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi index int32 err error ) - if code = this.InviteHandleCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InviteHandleCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go index 5fa2b46bf..27421ebac 100644 --- a/modules/parkour/api_jointeam.go +++ b/modules/parkour/api_jointeam.go @@ -29,7 +29,7 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam err error ) - if code = this.JoinTeamCheck(session, req); code != pb.ErrorCode_Success { + if code = this.JoinTeamCheck(session, req); errdata != nil { return } if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_quitteam.go b/modules/parkour/api_quitteam.go index 3081e3b0c..4a1d37319 100644 --- a/modules/parkour/api_quitteam.go +++ b/modules/parkour/api_quitteam.go @@ -20,7 +20,7 @@ func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeam ok bool err error ) - if code = this.QuitTeamCheck(session, req); code != pb.ErrorCode_Success { + if code = this.QuitTeamCheck(session, req); errdata != nil { return } if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil { diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go index 3a9a3334f..1d158c063 100644 --- a/modules/parkour/api_racematch.go +++ b/modules/parkour/api_racematch.go @@ -26,7 +26,7 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat users []string err error ) - if code = this.RaceMatchCheck(session, req); code != pb.ErrorCode_Success { + if code = this.RaceMatchCheck(session, req); errdata != nil { return } if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_racematchcancel.go b/modules/parkour/api_racematchcancel.go index 6e276f909..4efb17665 100644 --- a/modules/parkour/api_racematchcancel.go +++ b/modules/parkour/api_racematchcancel.go @@ -23,7 +23,7 @@ func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourR users []string err error ) - if code = this.RaceMatchCancelCheck(session, req); code != pb.ErrorCode_Success { + if code = this.RaceMatchCancelCheck(session, req); errdata != nil { return } if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { diff --git a/modules/parkour/api_ready.go b/modules/parkour/api_ready.go index dfde9d68f..767e1d7c0 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); code != pb.ErrorCode_Success { + if code = 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 b39d287e2..8972658e6 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); code != pb.ErrorCode_Success { + if code = 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 b7fd9a65e..3e2b69b06 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); code != pb.ErrorCode_Success { + if code = 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 576189f8b..1b33e2be3 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); code != pb.ErrorCode_Success { + if code = this.ViewPlayerCheck(session, req); errdata != nil { return } resp = &pb.ParkourViewPlayerResp{ diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index ef865ee60..acf75703f 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -26,7 +26,7 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) items []*pb.UserAssets err error ) - if code = this.DailyBuyCheck(session, req); code != pb.ErrorCode_Success { + if code = this.DailyBuyCheck(session, req); errdata != nil { return } if conf, err = this.module.configure.getPayPackageData(req.Id); err != nil { @@ -45,12 +45,12 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) } if len(conf.Costitem) > 0 { - if code = this.module.ConsumeRes(session, conf.Costitem, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, conf.Costitem, true); errdata != nil { return } } - if code, items = this.module.modelDaily.delivery(session, conf.Packagetype); code != pb.ErrorCode_Success { + if code, items = this.module.modelDaily.delivery(session, conf.Packagetype); errdata != nil { return } diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index 0de0d651c..f2cc140d9 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); code != pb.ErrorCode_Success { + if code = 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 88c502eeb..409c6ea4a 100644 --- a/modules/pay/api_info.go +++ b/modules/pay/api_info.go @@ -22,7 +22,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (errdat conf *cfg.GamePayPackageData err error ) - if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } if info, err = this.module.modelDaily.queryUserDaily(session.GetUserId()); err != nil { diff --git a/modules/pay/api_record.go b/modules/pay/api_record.go index 31a346ef7..368b122c4 100644 --- a/modules/pay/api_record.go +++ b/modules/pay/api_record.go @@ -17,7 +17,7 @@ func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (er info *pb.DBUserPay err error ) - if code = this.RecordCheck(session, req); code != pb.ErrorCode_Success { + if code = this.RecordCheck(session, req); errdata != nil { return } if info, err = this.module.modelPayUser.queryUserPay(session.GetUserId()); err != nil { diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index 62026213f..7a8178155 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -91,7 +91,7 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (err N: v.N, } } - if code = this.module.DispenseRes(session, conf.Item, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, conf.Item, true); errdata != nil { return } return diff --git a/modules/pay/module.go b/modules/pay/module.go index d61fdc9f4..4f73c0ae5 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -173,7 +173,7 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, } info.Record[Productid]++ - if code = this.DispenseRes(session, res, true); code != pb.ErrorCode_Success { + if code = this.DispenseRes(session, res, true); errdata != nil { return } orderid := primitive.NewObjectID().Hex() diff --git a/modules/practice/api_accept.go b/modules/practice/api_accept.go index e5ba3463f..2dc31ecab 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); code != pb.ErrorCode_Success { + if code = this.AcceptCheck(session, req); errdata != nil { return } var ( @@ -79,7 +79,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq &pb.PvpUserInfo{Uid: red.Uid, Name: red.Name, Avatar: red.Avatar, Lv: red.Lv}, &pb.PvpUserInfo{Uid: blue.Uid, Name: blue.Name, Avatar: blue.Avatar, Lv: blue.Lv}, pb.PvpType_friends, - ); code != pb.ErrorCode_Success { + ); errdata != nil { this.module.Error("CreatePvp", log.Field{Key: "code", Value: code}) return } diff --git a/modules/practice/api_enrolled.go b/modules/practice/api_enrolled.go index 8b9810d96..3bdcef164 100644 --- a/modules/practice/api_enrolled.go +++ b/modules/practice/api_enrolled.go @@ -25,7 +25,7 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle return } if req.Group != 0 { - if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { + if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); errdata != nil { return } for i := 0; i < len(req.Hero); i++ { @@ -41,7 +41,7 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle return } - if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { + if code = 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 a3b755dfd..2708a5ada 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -176,10 +176,10 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls } } _session, ok = this.module.GetUserSession(pillar.Uid) - if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success { + if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); errdata != nil { return } - if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { + if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false, ""); errdata != nil { return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 6ac6d0f34..2608958f2 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -40,7 +40,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{atn}, true); errdata != nil { return } if confs, err = this.module.configure.getGamePandamasMryls(); err != nil { diff --git a/modules/practice/api_loot.go b/modules/practice/api_loot.go index 6e8110de3..98df1db4c 100644 --- a/modules/practice/api_loot.go +++ b/modules/practice/api_loot.go @@ -43,7 +43,7 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (e code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, req.Friend); code != pb.ErrorCode_Success { + if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, req.Friend); errdata != nil { return } if req.Teacher != "" { diff --git a/modules/practice/api_npcbattkle.go b/modules/practice/api_npcbattkle.go index 9f4311bbc..f9845f506 100644 --- a/modules/practice/api_npcbattkle.go +++ b/modules/practice/api_npcbattkle.go @@ -28,7 +28,7 @@ func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBa Format: req.Formation, Monsterleadpos: room.Captain, Monsters: room.Formation, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return } session.SendMsg(string(this.module.GetType()), "npcbattkle", &pb.PracticeNPCBattkleResp{ diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index a8e500d73..f12e82430 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -32,7 +32,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic return } - if code, _ = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success { + if code, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { return } @@ -42,7 +42,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic code = pb.ErrorCode_ConfigNoFound return } - if code = this.module.DispenseRes(session, conf.Award, true); code != pb.ErrorCode_Success { + if code = 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 81ebb95a7..c721c26f2 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -33,7 +33,7 @@ func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDia // // code = pb.ErrorCode_ConfigNoFound // // return // // } - // // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { + // // if code = 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 cd558e9b2..f8c49bed3 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -95,7 +95,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic pillar.Prop = req.Prop } pillar.Hero = req.Hero - if code = this.module.ModuleHero.KungFuHero(session, req.Hero, true, ""); code != pb.ErrorCode_Success { + if code = 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 314dfcc6d..b4da49f3c 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); code != pb.ErrorCode_Success { + if code = this.QiecuoCheck(session, req); errdata != nil { return } var ( diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 3591b7773..68d4739c3 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -91,7 +91,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR return } } - if code = this.module.ModuleHero.KungFuHero(session, pillar.Hero, false, ""); code != pb.ErrorCode_Success { + if code = this.module.ModuleHero.KungFuHero(session, pillar.Hero, false, ""); errdata != nil { return } //计算经验收益 @@ -211,10 +211,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR } } this.module.Debug("最终经验加成", log.Field{Key: "exp", Value: exp}, log.Field{Key: "exp1", Value: exp1}) - if _, code = this.module.ModuleHero.AddHeroExp(session, pillar.Hero, exp1); code != pb.ErrorCode_Success { + if _, code = this.module.ModuleHero.AddHeroExp(session, pillar.Hero, exp1); errdata != nil { return } - if code = this.module.DispenseRes(session, append(ants1, ants2...), true); code != pb.ErrorCode_Success { + if code = 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 5af488ab1..d03bc321e 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); code != pb.ErrorCode_Success { + if code = this.RefuseCheck(session, req); errdata != nil { return } var ( diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index c17328394..7dd87d883 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -56,7 +56,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq code = pb.ErrorCode_ConfigNoFound return } else { - if code = this.module.DispenseRes(session, pillarconfigure.PhotoGuideUnlocking, true); code != pb.ErrorCode_Success { + if code = 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 f4497f56d..c2207e4d7 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -55,7 +55,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR return } - if code = this.module.ConsumeRes(session, pillarconfigure.UpLvConsume, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, pillarconfigure.UpLvConsume, true); errdata != nil { return } pillar.Lv++ diff --git a/modules/practice/modelPandata.go b/modules/practice/modelPandata.go index a7b341bfd..fb36e0208 100644 --- a/modules/practice/modelPandata.go +++ b/modules/practice/modelPandata.go @@ -134,7 +134,7 @@ func (this *modelPandata) refreshnpc(room *pb.DBPracticeRoom) (err error) { room.Currnpc = npcs[index].Id room.Npcstate = 0 room.Battlenum = 0 - if room.Captain, room.Formation, code = this.module.battle.CreateRolesByFormat(npcs[index].MonsterformatId); code != pb.ErrorCode_Success { + if room.Captain, room.Formation, code = this.module.battle.CreateRolesByFormat(npcs[index].MonsterformatId); errdata != nil { err = fmt.Errorf("CreateRolesByFormat fail:%d", code) return } diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index c19284421..89ef7e6fd 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); code != pb.ErrorCode_Success { + if code = this.BuyGiftCheck(session, req); errdata != nil { return } @@ -45,12 +45,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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.PriceDiscount}, true); errdata != nil { return } } // 加资源 - if code = this.module.DispenseRes(session, conf.Giftinfo, true); code != pb.ErrorCode_Success { + if code = 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 859550e58..44bc3f2a6 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); code != pb.ErrorCode_Success { + if code = 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 f640608c6..68c3f432d 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -166,7 +166,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); code != pb.ErrorCode_Success { + if code = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil { return } for _, v := range conf.DisposableReward { @@ -200,7 +200,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); code != pb.ErrorCode_Success { + if code = 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 a7831fa99..0428f8a78 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); code != pb.ErrorCode_Success { + if code = 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 0d8884bad..4bc45e603 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); code != pb.ErrorCode_Success { + if code = 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 4c7e4a516..274fe5d8a 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); code != pb.ErrorCode_Success { + if code = 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 94a865d77..54c41fb87 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); code != pb.ErrorCode_Success { + if code = this.ListCheck(session, req); errdata != nil { return } diff --git a/modules/pvp/api_loadcomplete.go b/modules/pvp/api_loadcomplete.go index a1ccd20ac..a0204035b 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); code != pb.ErrorCode_Success { + if code = this.LoadCompleteCheck(session, req); errdata != nil { return } this.module.lock.RLock() diff --git a/modules/pvp/module.go b/modules/pvp/module.go index 39706d9ec..917161ca2 100644 --- a/modules/pvp/module.go +++ b/modules/pvp/module.go @@ -160,7 +160,7 @@ func (this *Pvp) PvpOutCmdPush(out *pb.PvpOutCmdPush) { Cmdtype: "ComWaitInputSkill", Value: data, }, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return } return @@ -175,7 +175,7 @@ func (this *Pvp) PvpOutCmdPush(out *pb.PvpOutCmdPush) { Cmdtype: "ComWaitInputSkill", Value: data, }, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return } return @@ -283,7 +283,7 @@ func (this *Pvp) operateTimeOut(task *timewheel.Task, args ...interface{}) { Cmdtype: "ComWaitInputSkill", Value: data, }, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return } @@ -306,7 +306,7 @@ func (this *Pvp) startBattle(battle *BattleItem) { Redformat: []*pb.BattleFormation{battle.Redformation}, BlueCompId: battle.Blue.Uid, Bulefformat: []*pb.BattleFormation{battle.Blueformation}, - }); code != pb.ErrorCode_Success { + }); errdata != nil { this.lock.Lock() delete(this.battles, battle.Id) this.lock.Unlock() @@ -329,7 +329,7 @@ func (this *Pvp) startBattle(battle *BattleItem) { BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, } - if code = this.battle.CreateBattleServer(info); code != pb.ErrorCode_Success { + if code = this.battle.CreateBattleServer(info); errdata != nil { this.lock.Lock() delete(this.battles, battle.Id) this.lock.Unlock() @@ -474,7 +474,7 @@ func (this *Pvp) trusteeship(ctx context.Context, req *pb.RPC_PVPTrusteeshipReq, Cmdtype: "ComWaitInputSkill", Value: data, }, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return } } diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index d0aabbade..5374459c6 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); code != pb.ErrorCode_Success { + if code = 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 a9567f69b..dd73d0995 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); code != pb.ErrorCode_Success { + if code = 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_upgrade.go b/modules/reputation/api_upgrade.go index 1259f85bc..39ba1378d 100644 --- a/modules/reputation/api_upgrade.go +++ b/modules/reputation/api_upgrade.go @@ -44,7 +44,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgrad return } - if code = this.module.CheckRes(session, talentCfg.IconCos); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, talentCfg.IconCos); errdata != nil { return } diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go index 25331b98a..6605ba543 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); code != pb.ErrorCode_Success { + if code = this.RtestCheck(session, req); errdata != nil { return } rsp := &pb.RtaskTestResp{Flag: true, RtaskType: req.RtaskType} diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 13123d892..e4504b205 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); code != pb.ErrorCode_Success { + if code = this.BuyCheck(session, req); errdata != nil { return } @@ -107,16 +107,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); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, give, true); errdata != nil { return } } else { - if code = this.module.equip.AddEquipment(session, record.Preview[req.GoodsId]); code != pb.ErrorCode_Success { + if code = 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 0eee20249..8bfe9526c 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -35,7 +35,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) ltime time.Duration leftrefnum int32 ) - if code = this.GetlistCheck(session, req); code != pb.ErrorCode_Success { + if code = this.GetlistCheck(session, req); errdata != nil { return } if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil { @@ -135,7 +135,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) leftrefnum-- } - if code = this.module.ConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, shopconf.Rneed, true); errdata != nil { return } } @@ -161,7 +161,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) for i, v := range items { sdata.Items[i] = v.Key if v.Preview { //是否预览 - if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); code != pb.ErrorCode_Success { + if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil { return } } @@ -202,7 +202,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) for i, v := range items { sdata.Items[i] = v.Key if v.Preview { //是否预览 - if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); code != pb.ErrorCode_Success { + if code, sdata.Preview[v.Key] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil { return } } diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 57355ddea..7a1b82856 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -23,7 +23,7 @@ func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtla szTask []*pb.BuriedParam ) code = this.AtlasActivateCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId()) diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index 292e1a586..b7b0846d4 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -19,7 +19,7 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw respRes []*pb.UserAssets ) code = this.AtlasAwardCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId()) diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index ced0ead11..ff4a1e478 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -41,7 +41,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq rsp = &pb.SmithyForgeEquipResp{} update = make(map[string]interface{}) code = this.ForgeEquipCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } stove, err = this.module.modelStove.getSmithyStoveList(session.GetUserId()) @@ -75,12 +75,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}); code != pb.ErrorCode_Success { + if code = 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}); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); errdata != nil { return } costRes = append(costRes, reelcfg.CustomizedCos2) @@ -122,7 +122,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}); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, []*cfg.Gameatn{lava}); errdata != nil { return } } @@ -146,7 +146,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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, this.module.FormatRes(_costRes), true); errdata != nil { return } // 玩小游戏增加双倍产出校验 diff --git a/modules/smithy/api_getatlas.go b/modules/smithy/api_getatlas.go index 5ccba2613..8a2159690 100644 --- a/modules/smithy/api_getatlas.go +++ b/modules/smithy/api_getatlas.go @@ -15,7 +15,7 @@ func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtl func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (errdata *pb.ErrorData) { code = this.AtlasListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } atlas, err := this.module.modelAtlas.getSmithyAtlasList(session.GetUserId()) diff --git a/modules/smithy/api_getstoveinfo.go b/modules/smithy/api_getstoveinfo.go index de440b202..a15d5da1e 100644 --- a/modules/smithy/api_getstoveinfo.go +++ b/modules/smithy/api_getstoveinfo.go @@ -15,7 +15,7 @@ func (this *apiComp) GetStoveInfoCheck(session comm.IUserSession, req *pb.Smithy func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (errdata *pb.ErrorData) { code = this.GetStoveInfoCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } _smithy, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index eff6029df..e66490d86 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); code != pb.ErrorCode_Success { + if code = this.TaskAwardCheck(session, req); errdata != nil { return } @@ -39,7 +39,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwar } return } else { - if code = this.module.DispenseRes(session, conf.Reword, true); code != pb.ErrorCode_Success { + if code = 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 40575dc74..269025d6e 100644 --- a/modules/smithy/api_refuse.go +++ b/modules/smithy/api_refuse.go @@ -16,7 +16,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.RefuseCheck(session, req); errdata != nil { return } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 36f580f22..65484c0b9 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -24,7 +24,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err ) code = this.RiseCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) @@ -49,7 +49,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); code != pb.ErrorCode_Success { + if code = 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 659474268..22150373c 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -15,7 +15,7 @@ func (this *apiComp) StoveUpCheck(session comm.IUserSession, req *pb.SmithyStove // 炉子升级 func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (errdata *pb.ErrorData) { code = this.StoveUpCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) @@ -41,7 +41,7 @@ func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq } return } - if code = this.module.ConsumeRes(session, conf.UpMaterial, true); code != pb.ErrorCode_Success { + if code = 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 ad5ec9ef8..80184e80e 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); code != pb.ErrorCode_Success { + if code = 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 b9d49a606..fe3dc63d3 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -20,7 +20,7 @@ func (this *apiComp) ToolsUpCheck(session comm.IUserSession, req *pb.SmithyTools // 工具升级 func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq) (errdata *pb.ErrorData) { code = this.ToolsUpCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } stove, err := this.module.modelStove.getSmithyStoveList(session.GetUserId()) @@ -62,7 +62,7 @@ func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq } } stove.Skill[conf.SkillType] = conf.SkillLv - if this.module.ConsumeRes(session, conf.UpMaterial, true); code != pb.ErrorCode_Success { + if this.module.ConsumeRes(session, conf.UpMaterial, true); errdata != nil { return } diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index c4c35c050..128d0197c 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); code != pb.ErrorCode_Success { + if code = this.SellCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_Formation.go b/modules/sociaty/api_cross_Formation.go index 562bb6b03..3a15ba218 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); code != pb.ErrorCode_Success { + if code = this.FormationCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index 210ec2477..50c526baf 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); code != pb.ErrorCode_Success { + if code = this.AccuseCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 8cf2b32bd..44d668667 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); code != pb.ErrorCode_Success { + if code = this.ActivityreceiveCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 6c3e57dcb..ebef89e2e 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); code != pb.ErrorCode_Success { + if code = this.AgreeCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 6e06be62e..a970ca025 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); code != pb.ErrorCode_Success { + if code = this.ApplyCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index 57a04aec2..c66b80e4c 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); code != pb.ErrorCode_Success { + if code = this.ApplyCancelCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index dae078e8d..0c39ad680 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); code != pb.ErrorCode_Success { + if code = 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 df0202f3e..d8463c3c9 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); code != pb.ErrorCode_Success { + if code = this.AssignCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_bossrank.go b/modules/sociaty/api_cross_bossrank.go index 806c332c5..cfa8331af 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); code != pb.ErrorCode_Success { + if code = 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 c3045901e..d0f9d56fe 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); code != pb.ErrorCode_Success { + if code = this.BreceiveCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -66,7 +66,7 @@ func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceive } // 奖励 - if code := this.module.DispenseRes(session, taskConf.Reward, true); code != pb.ErrorCode_Success { + if code := this.module.DispenseRes(session, taskConf.Reward, true); errdata != nil { this.module.Error("积分任务奖励领取", log.Field{Key: "uid", Value: uid}, log.Field{Key: "taskId", Value: taskId}, diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index 35733e7c4..b6a31c733 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -18,7 +18,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.BuyCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -54,7 +54,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); code != pb.ErrorCode_Success { + if code = this.module.CheckRes(session, atn); errdata != nil { return } @@ -79,7 +79,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd } //扣除资源 - if code = this.module.DispenseRes(session, atn, true); code != pb.ErrorCode_Success { + if code = 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 d83203ad5..b3b590be0 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); code != pb.ErrorCode_Success { + if code = 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 03544b595..28140554e 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); code != pb.ErrorCode_Success { + if code = 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 0bd3a80db..c419b689e 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); code != pb.ErrorCode_Success { + if code = this.CreateCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} @@ -70,7 +70,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) } //检查钻石 - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.globalConf.GuildBuildCos}, true); code != pb.ErrorCode_Success { + if code = 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}, diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 48f66e98d..59f6dd7ef 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); code != pb.ErrorCode_Success { + if code = this.DischargeCheck(session, req); errdata != nil { return } data = &pb.ErrorData{} diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index c08072a08..9b519ab6b 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); code != pb.ErrorCode_Success { + if code = this.DismissCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go index 2f56ad29c..bb7dc2ee1 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); code != pb.ErrorCode_Success { + if code = this.ListCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index 5c247228a..73aa7d0c6 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); code != pb.ErrorCode_Success { + if code = 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); code != pb.ErrorCode_Success { + if code = 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 d752471b4..09920d858 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); code != pb.ErrorCode_Success { + if code = this.RecommendCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_refuse.go b/modules/sociaty/api_cross_refuse.go index 16aa61ac2..112608cbb 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); code != pb.ErrorCode_Success { + if code = this.RefuseCheck(session, req); errdata != nil { return } diff --git a/modules/sociaty/api_cross_search.go b/modules/sociaty/api_cross_search.go index f6f5bd6da..32fa6e06e 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); code != pb.ErrorCode_Success { + if code = 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 9d4255e89..d843c3d30 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); code != pb.ErrorCode_Success { + if code = 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 9bcda020f..de48ef94e 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); code != pb.ErrorCode_Success { + if code = 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 e859aca28..2ea911517 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); code != pb.ErrorCode_Success { + if code = this.SignCheck(session, req); errdata != nil { return } uid := session.GetUserId() diff --git a/modules/sociaty/model_sociatyboss.go b/modules/sociaty/model_sociatyboss.go index 32dc213d0..5af77aa81 100644 --- a/modules/sociaty/model_sociatyboss.go +++ b/modules/sociaty/model_sociatyboss.go @@ -195,7 +195,7 @@ func (s *ModelSociatyBoss) challengestart(session comm.IUserSession, sociaty *pb Ptype: pb.PlayType_sociaty, Title: "公会BOSS", Format: formations, - }); code != pb.ErrorCode_Success { + }); errdata != nil { return comm.NewCustomError(code) } } diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 5ab37fbe3..635b8eaf1 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); code != pb.ErrorCode_Success { + if code = this.ActiveListCheck(session, req); errdata != nil { return } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 6da68f74a..49df5f04a 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -18,7 +18,7 @@ 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); code != pb.ErrorCode_Success { + if code = this.ActiveReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -80,7 +80,7 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive if len(rewards) > 0 { //派发奖励 - if code = this.module.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success { + if code = 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 57717a83b..9c05f6d0c 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); code != pb.ErrorCode_Success { + if code = 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 241c869be..314305507 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); code != pb.ErrorCode_Success { + if code = this.ReceiveCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -119,7 +119,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) return } //派发奖励 - if code = this.module.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, rewards, true); errdata != nil { this.module.Error("活跃度奖励", log.Field{Key: "uid", Value: uid}, log.Field{Key: "rewards", Value: rewards}, @@ -148,7 +148,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) } //奖励 - if code = this.module.DispenseRes(session, conf.Reword, true); code != pb.ErrorCode_Success { + if code = 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}, diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 27b5e5c28..828bb45ad 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -19,7 +19,7 @@ func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTip if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { if conf := this.module.ModuleTools.GetGlobalConf().DailyTips; conf.N > 0 { - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil { return } } diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 714529b4e..de6db076b 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -23,7 +23,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateRe // 创角 func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData, edata *pb.ErrorData) { - if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { + if code = this.CreateCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_getsetting.go b/modules/user/api_getsetting.go index 529099dbb..8011a5757 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); code != pb.ErrorCode_Success { + if code = this.GetsettingCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go index 81798c4db..11aa90f09 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); code != pb.ErrorCode_Success { + if code = this.GetTujianCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_info.go b/modules/user/api_info.go index f662cb9f6..c86838829 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); code != pb.ErrorCode_Success { + if code = this.InfoCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_initdata.go b/modules/user/api_initdata.go index 4bb8c11da..5362455dd 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); code != pb.ErrorCode_Success { + if code = this.InitdataCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index c330c6a32..aeee29388 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); code != pb.ErrorCode_Success { + if code = this.LoginCheck(session, req); errdata != nil { return } var ( diff --git a/modules/user/api_modifyavatar.go b/modules/user/api_modifyavatar.go index e8384efd8..34cc580a9 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); code != pb.ErrorCode_Success { + if code = this.ModifyavatarCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_modifybgp.go b/modules/user/api_modifybgp.go index 10e4f958e..1a3d0c50e 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); code != pb.ErrorCode_Success { + if code = this.ModifybgpCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_modifyfigure.go b/modules/user/api_modifyfigure.go index 6882a030b..8aa5dce20 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); code != pb.ErrorCode_Success { + if code = this.ModifyfigureCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index 896154ee9..d8cd366be 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); code != pb.ErrorCode_Success { + if code = this.ModifynameCheck(session, req); errdata != nil { return } uid := session.GetUserId() @@ -39,7 +39,7 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam //校验名称修改次数 if expand.ModifynameCount <= 0 { code = this.module.ConsumeRes(session, this.module.globalConf.HeroName, true) - if code != pb.ErrorCode_Success { + if errdata != nil { return } this.module.Infof("修改昵称 uid:%v 消耗:%v code:%v", uid, this.module.globalConf.HeroName, code) @@ -60,7 +60,7 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam } // 修改名称 - if code = this.module.modelUser.modifyName(uid, name); code != pb.ErrorCode_Success { + if code = this.module.modelUser.modifyName(uid, name); errdata != nil { return } diff --git a/modules/user/api_modifysign.go b/modules/user/api_modifysign.go index a1e01c816..88fdbe189 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); code != pb.ErrorCode_Success { + if code = this.ModifysignCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index b10662a20..8ddb4ac05 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -31,7 +31,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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, _data.Gamegift, true); errdata != nil { return } } diff --git a/modules/user/api_sellres.go b/modules/user/api_sellres.go index 36e3afe10..90dab7557 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); code != pb.ErrorCode_Success { + if code = 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 c0ca967db..8d39b0ece 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); code != pb.ErrorCode_Success { + if code = this.SettingteamCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index a64dfdf7d..1a40002b2 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); code != pb.ErrorCode_Success { + if code = this.SwitchDefPerCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_updatesetting.go b/modules/user/api_updatesetting.go index c8d12240c..9077ebb6a 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); code != pb.ErrorCode_Success { + if code = this.UpdatesettingCheck(session, req); errdata != nil { return } diff --git a/modules/user/api_vericode.go b/modules/user/api_vericode.go index 9af4f7b3c..b000c8a5b 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); code != pb.ErrorCode_Success { + if code = this.VericodeCheck(session, req); errdata != nil { return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 27dc74c70..c51875f86 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -304,7 +304,7 @@ func (this *ModelUser) ChangeLevel(event interface{}, next func(event interface{ log.Field{Key: "lv", Value: curLv}, ) } - if code := this.module.DispenseRes(ul.session, rewards, true); code != pb.ErrorCode_Success { + if code := this.module.DispenseRes(ul.session, rewards, true); errdata != nil { this.module.Error("资源发放", log.Field{Key: "uid", Value: ul.session.GetUserId()}, log.Field{Key: "rewards", Value: rewards}, diff --git a/modules/user/module.go b/modules/user/module.go index 7bab7cf6f..57f12eb40 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -590,7 +590,7 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add var _change *pb.UserResChangedPush _change, code = this.change(session, attr, add) - if code != pb.ErrorCode_Success { + if errdata != nil { return } @@ -609,7 +609,7 @@ func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string for key, add := range attrs { var _change *pb.UserResChangedPush _change, code = this.change(session, key, add) - if code != pb.ErrorCode_Success { + if errdata != nil { return } diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index a6cc75d1c..06e0c61a9 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -24,7 +24,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng ps int32 ) code = this.ChallengeCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } viking, _ := this.module.modelViking.getVikingList(session.GetUserId()) @@ -40,7 +40,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); code != pb.ErrorCode_Success { // 扣1点 + if code = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 return } } else { @@ -59,7 +59,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); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil { return } @@ -70,7 +70,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng }) } - // if code = this.module.CheckRes(session, cfgData.PsConsume); code != pb.ErrorCode_Success { + // if code = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil { // if req.AutoBuy { // 不够的时候自动使用 // var count int32 // for _, v := range cfgData.PsConsume { @@ -78,7 +78,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng // count += v.N // } // } - // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); code != pb.ErrorCode_Success { + // if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil { // return // } // } else { @@ -106,7 +106,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng Format: req.Battle, Mformat: cfgData.Boss, }) - if code != pb.ErrorCode_Success { + if errdata != nil { return } session.SendMsg(string(this.module.GetType()), VikingChallengeResp, &pb.VikingChallengeResp{ diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index d42cc1c94..7f3f6166a 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -35,7 +35,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData = make(map[string]interface{}, 0) reward = make([]*cfg.Gameatn, 0) code = this.ChallengeOverCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } @@ -80,12 +80,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); code != pb.ErrorCode_Success { + // if code = 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); code != pb.ErrorCode_Success { // 返还预扣体力 + if code = this.module.DispenseRes(session, vikingCfg.PsConsume, true); errdata != nil { // 返还预扣体力 return } } @@ -98,14 +98,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal return } - // if code = this.module.ConsumeRes(session, vikingCfg.PsConsume, true); code != pb.ErrorCode_Success { + // if code = 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); code != pb.ErrorCode_Success { + if code = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { return } } @@ -147,7 +147,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal } } res = append(res, vikingCfg.Manexp) //给玩家加经验 - if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success { + if code, atno = this.module.DispenseAtno(session, res, true); errdata != nil { return } diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index f35d6af4d..66fbc124f 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -13,11 +13,11 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.VikingGetLi func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } // 刷新挑战卷 - // if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success { + // if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil { // return // } list, _ := this.module.modelViking.getVikingList(session.GetUserId()) diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go index 2bde1ff24..e08c8a798 100644 --- a/modules/viking/api_ranklist.go +++ b/modules/viking/api_ranklist.go @@ -28,7 +28,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListR rd *redis.StringSliceCmd ) code = this.RankListCheck(session, req) - if code != pb.ErrorCode_Success { + if errdata != nil { return // 参数校验失败直接返回 } conn, _ := db.Local() diff --git a/modules/viking/module.go b/modules/viking/module.go index 71e22d1d7..9ff9bb479 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -208,7 +208,7 @@ func (this *Viking) CompleteAllLevel(session comm.IUserSession) (errdata *pb.Err func (this *Viking) AutoBuyTicket(session comm.IUserSession, bossId, difficulty int32) (errdata *pb.ErrorData) { conf, _ := this.configure.GetVikingBossConfigData(bossId, difficulty) - if code := this.CheckRes(session, conf.PsConsume); code != pb.ErrorCode_Success { + if code := this.CheckRes(session, conf.PsConsume); errdata != nil { amount := int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), conf.PsConsume[0].T)) // 获取当前数量 if amount < conf.PsConsume[0].N { // 数量不足直接购买 code, _ = this.api.Buy(session, &pb.VikingBuyReq{ @@ -261,7 +261,7 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR // code = pb.ErrorCode_ConfigNoFound // return // } - if code = this.ConsumeRes(session, conf.PsConsume, true); code != pb.ErrorCode_Success { + if code = this.ConsumeRes(session, conf.PsConsume, true); errdata != nil { return } viking, err := this.modelViking.getVikingList(session.GetUserId()) diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go index c7c9ac50a..6c2200d42 100644 --- a/modules/worldtask/api_chapterreward.go +++ b/modules/worldtask/api_chapterreward.go @@ -1,6 +1,7 @@ package worldtask import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" ) @@ -16,43 +17,57 @@ func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.World } func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (errdata *pb.ErrorData) { - if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.ChapterrewardCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} + uid := session.GetUserId() rsp := &pb.WorldtaskChapterrewardResp{} myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { - code = pb.ErrorCode_DBError - data.Title = code.String() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if stats, ok := myWorldtask.Chapters[req.GroupId]; !ok { - code = pb.ErrorCode_WorldtaskChapterUnFinished - data.Title = code.String() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskChapterUnFinished, + Title: pb.ErrorCode_WorldtaskChapterUnFinished.ToString(), + Message: err.Error(), + } return } else { if stats == 2 { - code = pb.ErrorCode_WorldtaskChapterReceived - data.Title = code.String() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskChapterReceived, + Title: pb.ErrorCode_WorldtaskChapterReceived.ToString(), + Message: err.Error(), + } return } } gwa, err := this.module.configure.getWorldAllCfg() if err != nil || gwa == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.String() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } rewardCnf := gwa.GetDataMap()[req.GroupId] if rewardCnf == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.String() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: fmt.Sprintf("未找到组%v配置", req.GroupId), + } return } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 43a35ea64..d545db340 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -8,48 +8,61 @@ import ( // 任务完成条件 func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { if req.GroupId <= 0 || req.TaskId <= 0 || req.CondiId <= 0 { - code = *pb.ErrorCode_ReqParameterError.Enum() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } } return } func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { - if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.CompleteCondiCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} + rsp := &pb.WorldtaskCompleteCondiResp{} uid := session.GetUserId() // 当前任务配置 curTaskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || curTaskConf == nil { - code = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if (len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0 { - code = pb.ErrorCode_WorldtaskNoProcess - data.Title = code.ToString() - data.Message = "无完成条件" + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskNoProcess, + Title: pb.ErrorCode_WorldtaskNoProcess.ToString(), + Message: "无完成条件", + } return } myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { - code = pb.ErrorCode_DBError - data.Title = code.ToString() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } - myWorldtask.Uid = uid wt := myWorldtask.CurrentTask[req.GroupId] conds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) if err != nil { - code = pb.ErrorCode_ExternalModule - data.Title = code.ToString() - data.Message = comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(), + } } for _, cond := range conds { if cond.State == pb.BuriedItemFinishState_buried_finish { @@ -63,7 +76,11 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC "currentTask": myWorldtask.CurrentTask, } if err := this.module.modelWorldtask.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/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 36d5b960b..cf0574170 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -23,10 +23,9 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFin } func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) { - if code = this.FinishCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.FinishCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} uid := session.GetUserId() rsp := &pb.WorldtaskFinishResp{} @@ -34,47 +33,61 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe // 获取用户信息 user := this.module.ModuleUser.GetUser(uid) if user == nil { - code = pb.ErrorCode_UserSessionNobeing + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Datastring: uid, + } return } // 当前任务配置 curTaskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || curTaskConf == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } if curTaskConf.Group != req.GroupId { - code = pb.ErrorCode_WorldtaskGroupIdNosame - data.Title = code.ToString() - data.Message = fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskGroupIdNosame, + Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(), + Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId), + } return } if curTaskConf.DeliverNpc == 0 { - code = pb.ErrorCode_WorldtaskNoProcess - data.Title = code.ToString() - data.Message = "配置DeliverNpc字段是0" + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskNoProcess, + Title: pb.ErrorCode_WorldtaskNoProcess.ToString(), + Message: "配置DeliverNpc字段是0", + } return } // 判断玩家等级要求 if user.Lv < curTaskConf.Lock { - code = pb.ErrorCode_WorldtaskLvNotEnough - data.Title = code.ToString() - data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskLvNotEnough, + Title: pb.ErrorCode_WorldtaskLvNotEnough.ToString(), + Message: fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock), + } return } // 当前玩家世界任务 userTask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { - code = pb.ErrorCode_DBError - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } if userTask.Uid == "" { @@ -83,9 +96,11 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe // 前置任务ID 只有世界任务才校验前置 if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { - code = pb.ErrorCode_WorldtaskLastUnFinished - data.Title = code.ToString() - data.Message = fmt.Sprintf("任务[%v]的前置任务 [%v] 未完成", curTaskConf.Key, curTaskConf.Ontxe) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskLastUnFinished, + Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), + Message: fmt.Sprintf("任务[%v]的前置任务 [%v] 未完成", curTaskConf.Key, curTaskConf.Ontxe), + } return } @@ -109,9 +124,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if _, ok := utils.Findx(v.CondiIds, condId); !ok { conds, err := this.module.ModuleBuried.CheckCondition(uid, condId) if err != nil { - code = pb.ErrorCode_ExternalModule - data = &pb.ErrorData{ - Title: code.ToString(), + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, condId).Error(), } return @@ -128,26 +143,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } if !condiFlag { - code = pb.ErrorCode_RtaskCondiNoReach - data.Title = code.ToString() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_RtaskCondiNoReach, + Title: pb.ErrorCode_RtaskCondiNoReach.ToString(), + } return } // 完成任务 if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { - code = pb.ErrorCode_WorldtaskFinish - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskFinish, + Title: pb.ErrorCode_WorldtaskFinish.ToString(), + Message: err.Error(), + } return } // 发奖 - if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, curTaskConf.Reword, true); errdata != nil { this.module.Error("资源发放", log.Field{Key: "uid", Value: uid}, log.Field{Key: "groupId", Value: req.GroupId}, log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "reword", Value: curTaskConf.Reword}, - log.Field{Key: "code", Value: code}, + log.Field{Key: "errdata", Value: errdata}, ) }