liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

批量调整代码规范

Browse Source
This commit is contained in:
liwei1dao 2023-06-06 11:08:14 +08:00
parent 210813d7f1
commit 42becbca4e
235 changed files with 2339 additions and 896 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/v2/service/connService.go
View File

@ -153,7 +153,7 @@ func (c *ConnServiceImpl) ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessa
return
}
if code = c.handleNotify(msg); errdata != nil {
if errdata = c.handleNotify(msg); errdata != nil {
return
}

8
modules/academy/api_info.go
View File

@ -17,11 +17,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (er
info *pb.DBAcademy
err error
)
if code = this.InfoCheck(session, req); errdata != nil {
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

20
modules/academy/api_receive.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
// group []*cfg.GameTeachingData
err error
)
if code = this.ReceiveCheck(session, req); errdata != nil {
if errdata = this.ReceiveCheck(session, req); errdata != nil {
return
}
if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
@ -29,7 +29,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
}
if iswin {
if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -37,7 +41,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
return
}
if level, err = this.module.configure.getGameTeaching(req.Level); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -53,7 +61,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe
info.Level[req.Level] = true
}
if err = this.module.modelAcademy.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

20
modules/academy/api_teachingreceive.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT
info *pb.DBAcademy
err error
)
if code = this.TeachingReceiveCheck(session, req); errdata != nil {
if errdata = this.TeachingReceiveCheck(session, req); errdata != nil {
return
}
if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
@ -29,7 +29,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT
}
if iswin {
if info, err = this.module.modelAcademy.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -37,7 +41,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT
return
}
if level, err = this.module.configure.getGameHeroTeaching(req.HeroId); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -56,7 +64,11 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT
info.Hero[req.HeroId] = true
}
if err = this.module.modelAcademy.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

46
modules/arena/api_buy.go
View File

@ -1,7 +1,6 @@
package arena
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb"
@ -29,26 +28,22 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat
maxbuy, vipbuy int32
err error
)
if code = this.BuyCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: fmt.Sprintf("请求参数:%+v", req),
}
if errdata = this.BuyCheck(session, req); errdata != nil {
return
}
if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil {
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(),
}
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_CacheReadError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_CacheReadError.ToString(),
Message: err.Error(),
}
return
@ -56,9 +51,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat
this.module.modelArena.recoverTicket(session, info)
if maxbuy, err = this.module.ModuleTools.GetPriceGroupLen(comm.ArenaBuyType); err != nil {
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_CacheReadError.ToString(),
Message: err.Error(),
}
return
@ -67,33 +62,36 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat
need = make([]*cfg.Gameatn, 0)
for i := int32(0); i < req.BuyNum; i++ {
if info.Buynum+i+1 > maxbuy+vipbuy {
code = pb.ErrorCode_ArenaTicketBuyUp
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ArenaTicketBuyUp,
Title: pb.ErrorCode_ArenaTicketBuyUp.ToString(),
}
return
}
if res, err := this.module.ModuleTools.GetPriceGroupCost(comm.ArenaBuyType, info.Buynum+i+1); len(res) > 0 {
need = append(need, res...)
} else {
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
}
if code = this.module.ConsumeRes(session, need, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
info.Buynum += req.BuyNum
if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil {
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}, true); errdata != nil {
return
}
// info.Ticket += req.BuyNum
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return

74
modules/arena/api_challenge.go
View File

@ -24,43 +24,22 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
bule *pb.ArenaPlayer
heros []*pb.DBHero
record *pb.DBBattleRecord
cd pb.ErrorCode
change bool
err error
)
defer func() {
if cd == pb.ErrorCode_Success {
session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Code: cd, Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Rulesid: 105,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
Tasks: record.Tasks,
}})
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype130, 1)
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype130, 1))
} else {
session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Code: cd, Info: nil})
}
}()
if cd = this.ChallengeCheck(session, req); cd != pb.ErrorCode_Success {
if errdata = this.ChallengeCheck(session, req); errdata != nil {
return
}
if red, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
cd = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
this.module.modelArena.recoverTicket(session, red)
if cd = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.ModuleTools.GetGlobalConf().ArenaTicketCos}, true); cd != pb.ErrorCode_Success {
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.ModuleTools.GetGlobalConf().ArenaTicketCos}, true); errdata != nil {
return
}
if red.Attack != nil {
@ -75,9 +54,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
if red.Defend == nil || change {
if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Battle.Format); err != nil {
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
@ -99,18 +78,18 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
if !req.Isai {
if bule, err = this.module.modelArena.queryArenaPlayer(req.Playerid); err != nil {
cd = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
} else {
if bule, err = this.module.modelArena.getAI(req.MformatId); err != nil {
cd = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
@ -129,17 +108,32 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
red.Integral = redplay.Integral
red.Prededuction = -1 * redplay.Changeintegral
if err = this.module.modelArena.updateArenaUserInfo(red); err != nil {
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
cd, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{
if errdata, record = this.module.battle.CreatePvpBattle(session, &pb.BattlePVPReq{
Ptype: pb.PlayType_arena,
Redformat: &pb.PVPFormation{Uid: red.Uid, Leadpos: red.Attack.Leadpos, Format: red.Attack.Formt},
Buleformat: &pb.PVPFormation{Uid: bule.Uid, Leadpos: bule.Defend.Leadpos, Format: bule.Defend.Formt},
})
}); errdata != nil {
return
}
session.SendMsg(string(this.module.GetType()), "challenge", &pb.ArenaChallengeResp{Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Rulesid: 105,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
Tasks: record.Tasks,
}})
return
}

63
modules/arena/api_challengereward.go
View File

@ -27,36 +27,40 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
err error
iswin bool
)
if code = this.ChallengeRewardCheck(session, req); errdata != nil {
if errdata = this.ChallengeRewardCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if req.Iswin {
if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
if errdata, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
return
}
if !iswin {
code = pb.ErrorCode_BattleValidationFailed
return
}
info.Streak++
if reward, err = this.module.configure.getActiveRewardById(info.Dan); err != nil {
code = pb.ErrorCode_ConfigNoFound
this.module.Errorln(err)
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_BattleValidationFailed,
Title: pb.ErrorCode_BattleValidationFailed.ToString(),
Message: err.Error(),
}
return
}
if code = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil {
info.Streak++
if reward, err = this.module.configure.getActiveRewardById(info.Dan); err != nil {
this.module.Errorln(err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if errdata = this.module.DispenseRes(session, reward.WinReward, true); errdata != nil {
return
}
if req.Revengeid != "" {
@ -104,7 +108,11 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
if !req.Isai {
if rival, err = this.module.modelArena.queryPlayerInfo(req.Report.Info.BlueCompId); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
bule = &pb.ArenaPlayer{
@ -206,10 +214,20 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
}
rival.Record = append(rival.Record, buleRecord)
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if err = this.module.modelArena.updateArenaUserInfo(rival); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
} else {
this.module.modelRank.updateArenaRank(red)
@ -261,13 +279,16 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
}
info.Record = append(info.Record, redrecord)
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}
session.SendMsg(string(this.module.GetType()), "challengereward", &pb.ArenaChallengeRewardResp{Issucc: true, Integral: info.Integral, Dan: info.Dan})
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype128, red.Integral), comm.GetBuriedParam(comm.Rtype129, red.Dan))
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype128, red.Integral)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype129, red.Dan)
return
}

14
modules/arena/api_delreward.go
View File

@ -23,11 +23,15 @@ func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelReward
info *pb.DBArenaUser
err error
)
if code = this.DelRewardCheck(session, req); errdata != nil {
if errdata = this.DelRewardCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if info.Record != nil {
@ -39,7 +43,11 @@ func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelReward
}
}
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "delreward", &pb.ArenaDelRewardResp{Issucc: true, Bid: req.Bid})

34
modules/arena/api_info.go
View File

@ -26,22 +26,32 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
err error
)
if code = this.InfoCheck(session, req); errdata != nil {
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
if model, err = this.module.GetDBNodule(session, comm.TableUser, time.Hour); err != nil {
code = pb.ErrorCode_DBError
this.module.Errorln(err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
user = &pb.DBUser{}
if err = model.Get(session.GetUserId(), user); err != nil {
code = pb.ErrorCode_DBError
this.module.Errorln(err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if err == mgo.MongodbNil {
@ -59,7 +69,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
Npc: make(map[int32]*pb.DBNpc),
}
if info.Dan, err = this.module.modelArena.computedan(info.Integral); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
info.Loc = []float64{float64(info.Dan), float64(rand.Int31n(100)) / 1000.0}
@ -70,7 +84,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
info.Lv = user.Lv
this.module.modelArena.recoverTicket(session, info)
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}

20
modules/arena/api_matche.go
View File

@ -22,11 +22,15 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (
ai []*pb.ArenaPlayer
err error
)
if code = this.MatcheCheck(session, req); errdata != nil {
if errdata = this.MatcheCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if active, err = this.module.configure.getActiveReward(info.Integral); err != nil {
@ -34,13 +38,21 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (
return
}
if players, err = this.module.modelArena.matchePlayer(info.Uid, info.Dan, active.HumanNum); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if len(players) < 5 {
num := 5 - len(players)
if ai, err = this.module.modelArena.matcheAI(info.Dan, int32(num)); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
players = append(players, ai...)

8
modules/arena/api_otherinfo.go
View File

@ -23,11 +23,15 @@ func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfo
info *pb.DBArenaUser
err error
)
if code = this.OtherInfoCheck(session, req); errdata != nil {
if errdata = this.OtherInfoCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(req.OtherId); err != nil && err != mgo.MongodbNil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

44
modules/arena/api_plot.go
View File

@ -21,30 +21,8 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd
info *pb.DBArenaUser
record *pb.DBBattleRecord
index int32
cd pb.ErrorCode
err error
)
defer func() {
if cd == pb.ErrorCode_Success {
session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{
Code: cd,
Pid: req.Pid,
Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Rulesid: npc.BattleReadyID,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
},
})
} else {
session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{Code: cd})
}
}()
if cd = this.PlotCheck(session, req); cd != pb.ErrorCode_Success {
return
}
@ -91,12 +69,32 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd
Mformat: []int32{npc.MonsterformatId[index]},
}); cd == pb.ErrorCode_Success {
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
}
return
}
}
session.SendMsg(string(this.module.GetType()), "plot", &pb.ArenaPlotResp{
Pid: req.Pid,
Info: &pb.BattleInfo{
Id: record.Id,
Title: record.Title,
Rulesid: npc.BattleReadyID,
Btype: record.Btype,
Ptype: record.Ptype,
RedCompId: record.RedCompId,
Redflist: record.Redflist,
BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist,
},
})
return
}

20
modules/arena/api_plotreward.go
View File

@ -28,11 +28,15 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
err error
)
if code = this.PlotRewardCheck(session, req); errdata != nil {
if errdata = this.PlotRewardCheck(session, req); errdata != nil {
return
}
if npc, err = this.module.configure.getChallengenpc(req.Pid); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -51,7 +55,11 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -72,7 +80,11 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
"npc": info.Npc,
}); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

26
modules/arena/api_rank.go
View File

@ -21,11 +21,15 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
err error
)
if code = this.RankCheck(session, req); errdata != nil {
if errdata = this.RankCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -33,7 +37,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
return
}
if uids, err = this.module.modelRank.queryRankUser(); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -41,7 +49,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
return
}
if ranks, err = this.module.modelArena.queryPlayers(uids); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -64,7 +76,11 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
if session.GetUserId() == v.Uid && info.Rank != v.Rank {
info.Rank = v.Rank
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
}
}

20
modules/arena/api_setdattformt.go
View File

@ -18,11 +18,15 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF
heros []*pb.DBHero
err error
)
if code = this.SetAttFormtCheck(session, req); errdata != nil {
if errdata = this.SetAttFormtCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -30,7 +34,11 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF
return
}
if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -43,7 +51,11 @@ func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttF
}
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

20
modules/arena/api_setdefformt.go
View File

@ -18,11 +18,15 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
heros []*pb.DBHero
err error
)
if code = this.SetDefFormtCheck(session, req); errdata != nil {
if errdata = this.SetDefFormtCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -31,7 +35,11 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
}
if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -44,7 +52,11 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
}
info.Isdef = true
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

12
modules/arena/modelarena.go
View File

@ -404,7 +404,11 @@ func (this *modelArena) recoverTicket(session comm.IUserSession, info *pb.DBAren
)
if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil {
// code = pb.ErrorCode_ConfigNoFound
// errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
// data = &pb.ErrorData{
// Title: code.ToString(),
// Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(),
@ -449,7 +453,11 @@ func (this *modelArena) reddot(session comm.IUserSession) bool {
return false
}
if ticketitem = this.module.ModuleTools.GetGlobalConf().ArenaTicketCos; ticketitem == nil {
// code = pb.ErrorCode_ConfigNoFound
// errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
// data = &pb.ErrorData{
// Title: code.ToString(),
// Message: comm.NewNotFoundConfErr(moduleName, "global.json", "ArenaTicketCos").Error(),

36
modules/battle/modelBattle.go
View File

@ -706,7 +706,11 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro
}
if hero.SuiteId != 0 { //主套装
if suit, err := this.module.configure.Getequipsuit(hero.SuiteId); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else {
role.MainSuitSkill = suit.Skill
@ -714,7 +718,11 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro
}
if hero.SuiteExtId != 0 { //副套装
if suit, err := this.module.configure.Getequipsuit(hero.SuiteExtId); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else {
role.SubSuitSkill = suit.Skill
@ -730,7 +738,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
err error
)
if result, err = this.module.configure.GetMonsterFormat(fid); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
captain = -1
@ -741,7 +753,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
captain = int32(i)
}
// if monst, err := this.module.configure.GetMonster(v.Monster); err != nil {
// code = pb.ErrorCode_ConfigNoFound
// errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
// } else {
hero := &pb.DBHero{}
if hero = this.module.ModuleHero.CreateMonster(fmt.Sprintf("%d", v.Heroid), v.Star, v.Lv); hero == nil {
@ -786,7 +802,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
}
if v.Equip4 != 0 {
if suit, err := this.module.configure.Getequipsuit(v.Equip4); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else {
roles[i].MainSuitSkill = suit.Skill
@ -794,7 +814,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
}
if v.Equip2 != 0 {
if suit, err := this.module.configure.Getequipsuit(v.Equip2); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else {
roles[i].SubSuitSkill = suit.Skill

42
modules/battle/module.go
View File

@ -102,7 +102,11 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE
conn, err = db.ServerDBConn(session.GetServiecTag())
}
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.Errorf("session:%v err:", session, err)
return
}
@ -125,7 +129,11 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
conn, err = db.ServerDBConn(session.GetServiecTag())
}
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.Errorf("session:%v err:", session, err)
return
}
@ -171,7 +179,11 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB
conn, err = db.ServerDBConn(session.GetServiecTag())
}
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.Errorf("session:%v err:", session, err)
return
}
@ -200,7 +212,11 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP
conn, err = db.ServerDBConn(session.GetServiecTag())
}
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.Errorf("session:%v err:", session, err)
return
}
@ -222,11 +238,19 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.Error
return
}
if redmodel, err = this.GetDBModelByUid(req.RedCompId, comm.TableHero); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if bluemodel, err = this.GetDBModelByUid(req.BlueCompId, comm.TableHero); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if record, code = this.modelBattle.creatertpvp(redmodel, bluemodel, pb.BattleType_rtpvp, req); errdata != nil {
@ -247,7 +271,11 @@ func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLP
conn, err = db.ServerDBConn(session.GetServiecTag())
}
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.Errorf("session:%v err:", session, err)
return
}

8
modules/buried/api_send.go
View File

@ -23,13 +23,17 @@ func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedIn
condis []*pb.ConIProgress
err error
)
if code = this.SendCheck(session, req); errdata != nil {
if errdata = this.SendCheck(session, req); errdata != nil {
return
}
if condis, err = this.module.CheckCondition(session.GetUserId(), req.Conditions...); err != nil {
this.module.Error("查询埋点进度错误!", log.Field{Key: "err", Value: err.Error()})
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

2
modules/caravan/api_ranklist.go
View File

@ -17,7 +17,7 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankList
rankid int32
)
resp := &pb.CaravanRankListResp{}
if code = this.RankListCheck(session, req); errdata != nil {
if errdata = this.RankListCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
resp.List, rankid = this.module.modelCaravan.GetRankListData(comm.MaxRankList, session.GetUserId())

2
modules/caravan/api_refreshcity.go
View File

@ -17,7 +17,7 @@ func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefre
resp *pb.CaravanRefreshCityResp
)
resp = &pb.CaravanRefreshCityResp{}
if code = this.RefreshCityCheck(session, req); errdata != nil {
if errdata = this.RefreshCityCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId())

12
modules/chat/api_chanagechannel.go
View File

@ -24,7 +24,11 @@ func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChana
)
if err, ok = this.module.modelChat.chanageChannel(session, req.ChannelId); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -33,7 +37,11 @@ func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChana
}
if ok {
if err = this.module.modelChat.removeCrossChannelMember(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

8
modules/chat/api_crosschannel.go
View File

@ -17,11 +17,15 @@ func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossCh
channel int32
err error
)
if code = this.CrossChannelCheck(session, req); errdata != nil {
if errdata = this.CrossChannelCheck(session, req); errdata != nil {
return
}
if channel, err = this.module.modelChat.addCrossChannelMember(session); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

38
modules/chat/api_getlist.go
View File

@ -25,14 +25,18 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
list []*pb.DBChat
)
if code = this.GetListCheck(session, req); errdata != nil {
if errdata = this.GetListCheck(session, req); errdata != nil {
return
}
switch req.Channel {
case pb.ChatChannel_World:
if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -42,7 +46,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
break
case pb.ChatChannel_Union:
if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), req.UnionId, 0); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -52,7 +60,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
break
case pb.ChatChannel_Private:
if list, err = this.module.modelChat.queryUserMsg(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -63,7 +75,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
case pb.ChatChannel_CrossServer:
if result, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
this.module.Errorf("err:%v", err)
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -82,7 +98,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
return
}
if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", req.ChannelId); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -92,7 +112,11 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq)
break
case pb.ChatChannel_System:
if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

20
modules/chat/api_send.go
View File

@ -30,7 +30,7 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda
userexpand *pb.DBUserExpand
max_chat int32
)
if code = this.SendCheck(session, req); errdata != nil {
if errdata = this.SendCheck(session, req); errdata != nil {
return
}
@ -52,7 +52,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda
}
if max_chat, err = this.module.configure.GetChannelRecordMax(); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -98,7 +102,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda
}
msg.Ruid = req.TargetId
if err = this.module.modelChat.sendChatToPrivate(msg); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "message", &pb.ChatMessagePush{Chat: msg})
@ -108,7 +116,11 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errda
msg.Content = wordfilter.Replace(msg.Content, '*')
}
if userexpand, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
msg.ChannelId = userexpand.Chatchannel //指定频道

12
modules/chat/modelChat.go
View File

@ -241,11 +241,19 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) {
// max int32
// )
// if max, err = this.module.configure.GetChannelRecordMax(); err != nil {
// code = pb.ErrorCode_ConfigNoFound
// errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
// return
// }
// if err = this.module.modelChat.addChatMsg(fmt.Sprintf("%s-%s", worldchatkey, msg.Stag), int64(max), msg); err != nil {
// code = pb.ErrorCode_DBError
// errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
// return
// }
// data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg})

18
modules/chat/module.go
View File

@ -141,7 +141,11 @@ func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
err error
)
if max_chat, err = this.configure.GetChannelRecordMax(); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
this.Errorln(err)
return
}
@ -172,7 +176,11 @@ func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
err error
)
if max_chat, err = this.configure.GetChannelRecordMax(); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
this.Errorln(err)
return
}
@ -215,7 +223,11 @@ func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) {
}
} else {
if err = this.modelChat.saveUserMsg(msg); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}

20
modules/combat/api_ask.go
View File

@ -24,16 +24,24 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
ok bool
err error
)
if code = this.AskCheck(session, req); errdata != nil {
if errdata = this.AskCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
@ -133,7 +141,11 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda
info.Level[req.Level] = level
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
pitem.Progress = level.Progress

8
modules/combat/api_challenge.go
View File

@ -19,7 +19,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng
record *pb.DBBattleRecord
err error
)
if code = this.ChallengeCheck(session, req); errdata != nil {
if errdata = this.ChallengeCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
@ -28,7 +28,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng
}
if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

26
modules/combat/api_challengereceive.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
err error
)
if code = this.ChallengeReceiveCheck(session, req); errdata != nil {
if errdata = this.ChallengeReceiveCheck(session, req); errdata != nil {
return
}
if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
@ -33,7 +33,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
}
if iswin {
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -54,7 +58,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
return
}
if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -77,7 +85,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
lv.Passmanster = append(lv.Passmanster, req.Manster)
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),
@ -95,7 +107,11 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
}
}
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Message: err.Error(),

26
modules/combat/api_drop.go
View File

@ -22,12 +22,16 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
ok bool
err error
)
if code = this.DropCheck(session, req); errdata != nil {
if errdata = this.DropCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if lv, ok = info.Level[req.Level]; !ok {
@ -40,7 +44,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
}
if box, err = this.module.configure.getGameCombatbox(req.Drop); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
for _, v := range lv.Passdrop {
@ -55,7 +63,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
lv.Passdrop = append(lv.Passdrop, req.Drop)
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
reward := this.module.configure.GetDropReward(box.Drop)
@ -69,7 +81,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
}
}
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

14
modules/combat/api_in.go
View File

@ -19,11 +19,15 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata
ok bool
err error
)
if code = this.InCheck(session, req); errdata != nil {
if errdata = this.InCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if level, ok = info.Level[req.Level]; !ok {
@ -37,7 +41,11 @@ func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata
info.Level[req.Level] = level
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}

14
modules/combat/api_updatelevel.go
View File

@ -19,11 +19,15 @@ func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdate
ok bool
err error
)
if code = this.UpdateLevelCheck(session, req); errdata != nil {
if errdata = this.UpdateLevelCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if level, ok = info.Level[req.Level]; !ok {
@ -36,7 +40,11 @@ func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdate
}
level.Data = req.Data
if err = this.module.modelCombat.updateInfo(info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "updatelevel", &pb.CombatUpdateLevelResp{Level: req.Level})

16
modules/dispatch/api_do.go
View File

@ -32,7 +32,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (err
}
func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) {
if code = this.DoCheck(session, req); errdata != nil {
if errdata = this.DoCheck(session, req); errdata != nil {
return
}
@ -43,7 +43,11 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda
}
if dConf == nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
@ -61,7 +65,7 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda
//校验门票
ticketAtn := this.module.ModuleTools.GetGlobalConf().DispatchNumtools
if code = this.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); errdata != nil {
if errdata = this.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); errdata != nil {
code = pb.ErrorCode_DispatchTicketNoEnough
return
}
@ -73,7 +77,11 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda
if errors.As(err, &errCustom) {
code = errCustom.Code
} else {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
return
}

6
modules/dispatch/api_notice.go
View File

@ -45,7 +45,11 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (
"nb": nb,
}
if err := a.module.modelDispatch.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
d.Nb = nb

2
modules/dispatch/api_receive.go
View File

@ -19,7 +19,7 @@ func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiv
}
func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) {
if code = a.ReceiveCheck(session, req); errdata != nil {
if errdata = a.ReceiveCheck(session, req); errdata != nil {
return
}
d := a.module.modelDispatch.getDBDispatch(session.GetUserId())

16
modules/dispatch/api_refresh.go
View File

@ -29,7 +29,11 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq)
if errors.As(err, &customer) {
code = customer.Code
} else {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
return
}
@ -41,15 +45,19 @@ func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq)
}
//消耗金币
money := a.module.ModuleTools.GetGlobalConf().DispatchCheckmoney
if code = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil {
if errdata = a.module.CheckRes(session, []*cfg.Gameatn{money}); errdata != nil {
return
}
if code = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil {
if errdata = a.module.ConsumeRes(session, []*cfg.Gameatn{money}, true); errdata != nil {
return
}
if err := a.module.modelDispatch.updateRefreshCount(session.GetUserId(), d.Nb); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}

8
modules/dispatch/api_week.go
View File

@ -16,7 +16,7 @@ func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWee
}
func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) {
if code = a.WeekreciveCheck(session, req); errdata != nil {
if errdata = a.WeekreciveCheck(session, req); errdata != nil {
return
}
rsp := &pb.DispatchWeekReciveResp{}
@ -34,7 +34,11 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci
if d.Nb.WeekCount >= v.N {
//更新周任务状态
if err := a.module.modelDispatch.updateWeekstatus(session.GetUserId(), req.Idx, d.Nb); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
a.module.DispenseRes(session, v.G, true)

14
modules/equipment/api_ench.go
View File

@ -89,21 +89,15 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
if equip.HeroId != "" {
equipments = make([]*pb.DB_Equipment, 8)
if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); errdata != nil {
this.module.Errorf("Upgrade code:%d", code)
data = &pb.ErrorData{
Title: code.ToString(),
Message: fmt.Sprintf("英雄唯一 id:%s", equip.HeroId),
}
return
}
for i, v := range hero.EquipID {
if v != "" {
if v != equip.Id {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("装备唯一 id:%s", v),
}
return
@ -113,7 +107,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (
}
}
}
if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
return
}
}

61
modules/equipment/api_equip.go
View File

@ -38,11 +38,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
)
if code = this.EquipCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
}
if errdata = this.EquipCheck(session, req); errdata != nil {
return
}
//校验数据
@ -50,11 +46,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
equipments = make([]*pb.DB_Equipment, len(req.EquipmentId))
//获取英雄数据
if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), req.HeroCardId); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: fmt.Sprintf("获取英雄数据失败:%s", req.HeroCardId),
}
if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), req.HeroCardId); errdata != nil {
return
}
@ -63,13 +55,16 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
equipNum++
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
}
return
}
if equipments[i].HeroId != "" && hero.Id != equipments[i].HeroId { //装备已经有宿主了
code = pb.ErrorCode_EquipmentIsWorn
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentIsWorn,
Title: pb.ErrorCode_EquipmentIsWorn.ToString(),
Message: fmt.Sprintf("装备已穿戴 装备id:%s 英雄id:%s", hero.Id, equipments[i].HeroId),
}
return
@ -80,9 +75,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
// equipLv[equipments[i].Lv]++
if confs[i], err = this.module.configure.GetEquipmentConfigureById(equipments[i].CId); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
@ -119,9 +114,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
if equipments[i] != nil && v != equipments[i].Id {
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -132,9 +127,9 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
} else if equipments[i] == nil {
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -155,7 +150,11 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
if v != nil {
if i != int(confs[i].Pos) {
this.module.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i)
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
hero.EquipID[i] = v.Id
@ -196,20 +195,16 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
hero.Suite2Lv = 0
}
//更新装备数据加成
if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
this.module.Errorf("Equip ModuleHero UpdateEquipment code%v", code)
data = &pb.ErrorData{
Title: code.ToString(),
Message: comm.NewExternalModuleErr("ModuleHero", "UpdateEquipment", code).Error(),
}
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
this.module.Errorf("Equip ModuleHero UpdateEquipment code%v", errdata)
return
}
//同步数据
if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil {
this.module.Errorf("Equip err%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return

16
modules/equipment/api_forg.go
View File

@ -26,17 +26,13 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (
reward []*pb.UserAssets
err error
)
if code = this.ForgCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
}
if errdata = this.ForgCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.configure.GetEquipCompose(req.Forgid); err != nil {
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
@ -59,11 +55,11 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (
index := comm.GetRandW(conf.Probability)
equis[conf.Equip[index]]++
}
if code = this.module.ConsumeRes(session, need, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
if _, code = this.module.AddNewEquipments(session, equis, true); errdata != nil {
if _, errdata = this.module.AddNewEquipments(session, equis, true); errdata != nil {
return
}

6
modules/equipment/api_getlist.go
View File

@ -19,9 +19,9 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetList
)
if items, err = this.module.modelEquipment.QueryUserEquipments(session.GetUserId()); err != nil {
this.module.Errorf("QueryUserPackReq err:%v", err)
code = pb.ErrorCode_CacheReadError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_CacheReadError,
Title: pb.ErrorCode_CacheReadError.ToString(),
Message: err.Error(),
}
return

14
modules/equipment/api_lock.go
View File

@ -22,14 +22,14 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (
err error
equipment *pb.DB_Equipment
)
if code = this.LockCheck(session, req); errdata != nil {
if errdata = this.LockCheck(session, req); errdata != nil {
return
}
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: err.Error(),
}
return
@ -39,9 +39,9 @@ func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (
"islock": equipment.Islock,
}); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_DBError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return

31
modules/equipment/api_sellI.go
View File

@ -27,16 +27,13 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (
confs []*cfg.GameEquipData
sale [][]*cfg.Gameatn
)
if code = this.SellCheck(session, req); errdata != nil {
if errdata = this.SellCheck(session, req); errdata != nil {
return
}
if equipments, err = this.module.modelEquipment.QueryUserEquipmentsByIds(session.GetUserId(), req.EquipIds); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
data = &pb.ErrorData{
Title: code.ToString(),
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
@ -45,27 +42,27 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (
sale = make([][]*cfg.Gameatn, len(equipments))
for i, v := range equipments {
if v.HeroId != "" || v.Islock {
code = pb.ErrorCode_EquipmentNoCanSell
this.module.Errorf("NoCanSell %v", v)
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentNoCanSell,
Title: pb.ErrorCode_EquipmentNoCanSell.ToString(),
Message: fmt.Sprintf("装备已锁定! 装备id:%s", v),
}
return
}
if confs[i], err = this.module.configure.GetEquipmentConfigureById(v.CId); err != nil {
this.module.Errorln(err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: err.Error(),
}
return
}
if confs[i].Sale == nil || len(confs[i].Sale) == 0 {
code = pb.ErrorCode_EquipmentNoCanSell
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentNoCanSell,
Title: pb.ErrorCode_EquipmentNoCanSell.ToString(),
Message: fmt.Sprintf("装备出售配置为空! 装备id:%s", confs[i].Id),
}
return
@ -85,10 +82,10 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (
for _, v := range sale {
sales = append(sales, v...)
}
if code = this.module.DispenseRes(session, sales, true); errdata != nil {
if errdata = this.module.DispenseRes(session, sales, true); errdata != nil {
return
}
if code = this.module.DelEquipments(session, req.EquipIds, true); errdata != nil {
if errdata = this.module.DelEquipments(session, req.EquipIds, true); errdata != nil {
return
}
session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true})

88
modules/equipment/api_upgrade.go
View File

@ -2,6 +2,7 @@ package equipment
import (
"crypto/rand"
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
@ -40,27 +41,23 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
user *pb.DBUser
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
)
if code = this.UpgradeCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
}
if errdata = this.UpgradeCheck(session, req); errdata != nil {
return
}
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: err.Error(),
}
return
}
if conf, err = this.module.configure.GetEquipmentConfigureById(equipment.CId); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: err.Error(),
}
return
@ -68,14 +65,14 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
//找到下一个等级的相关配置
if intensify, err = this.module.configure.GetEquipmentIntensifyConfigureById(conf.EquipId, conf.Star, equipment.Lv); err != nil || intensify.Need == nil || len(intensify.Need) == 0 {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_EquipmentLvlimitReached
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentLvlimitReached,
Title: pb.ErrorCode_EquipmentLvlimitReached.ToString(),
Message: err.Error(),
}
return
}
if code = this.module.ConsumeRes(session, intensify.Need, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, intensify.Need, true); errdata != nil {
return
}
if equipment.KeepFailNum >= intensify.Num { //没有达到保底次数 根据概率随机成功失败
@ -92,9 +89,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
"keepFailNum": equipment.KeepFailNum,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -111,9 +108,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
"heroId": "",
}); err != nil {
this.module.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -125,9 +122,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
equipment.OverlayNum = 1
modifyequipments = append(modifyequipments, equipment)
if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil {
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
this.module.Errorf("Upgrade err:%v", err)
@ -135,9 +132,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
}
if err = this.module.modelEquipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil {
this.module.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -146,10 +143,10 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
equipment.IsInitialState = false
modifyequipments = append(modifyequipments, equipment)
if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil {
code = pb.ErrorCode_SystemError
this.module.Errorf("Upgrade err:%v", err)
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -163,9 +160,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
"isInitialState": false,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -175,18 +172,14 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
confs = make([]*cfg.GameEquipData, 8)
//已装备 重新计算属性
if equipment.HeroId != "" {
if hero, code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equipment.HeroId); errdata != nil {
this.module.Errorf("Upgrade code:%d", code)
data = &pb.ErrorData{
Title: code.ToString(),
}
if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equipment.HeroId); errdata != nil {
return
}
if conf.Pos >= 8 {
code = pb.ErrorCode_ConfigurationException
this.module.Errorf("Upgrade equipment Pos:%d", conf.Pos)
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigurationException,
Title: pb.ErrorCode_ConfigurationException.ToString(),
Message: fmt.Sprintf("装备配置异常 id:%s pos:%d", conf.Id, conf.Pos),
}
return
}
@ -195,8 +188,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
if v != "" {
if v != equipment.Id {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("未找到装备 uid:%s id:%d", session.GetUserId(), v),
}
return
}
confs[i], _ = this.module.configure.GetEquipmentConfigureById(equipments[i].CId)
@ -229,7 +225,9 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype93, 1, hero.SuiteExtId, suite2Lv))
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype45, equipment.Id, conf.Star, hero.SuiteExtId, hero.Suite2Lv))
}
code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments)
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
return
}
}
//随机任务触发
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv))

20
modules/equipment/api_wash.go
View File

@ -28,33 +28,29 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
adverbEntry []*pb.EquipmentAttributeEntry
err error
)
if code = this.WashCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
}
if errdata = this.WashCheck(session, req); errdata != nil {
return
}
if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil {
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
code = pb.ErrorCode_ConfigNoFound
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
gole := this.module.ModuleTools.GetGlobalConf().EquipmentConsumption[conf.Color-1]
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil {
return
}

27
modules/equipment/api_washconfirm.go
View File

@ -25,18 +25,14 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
attrlibrary *cfg.GameEquipAttrlibrarySData
err error
)
if code = this.WashConfirmCheck(session, req); errdata != nil {
data = &pb.ErrorData{
Title: code.ToString(),
Message: req.String(),
}
if errdata = this.WashConfirmCheck(session, req); errdata != nil {
return
}
if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil {
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), req.Eid, err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -46,17 +42,14 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
data = &pb.ErrorData{
Title: code.ToString(),
}
return
}
for i, v := range equip.AdverbEntry {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -74,9 +67,9 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
"adverbEntry": equip.AdverbEntry,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError
data = &pb.ErrorData{
Title: code.ToString(),
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return

145
modules/equipment/module.go
View File

@ -1,6 +1,7 @@
package equipment
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/event"
@ -87,9 +88,17 @@ func (this *Equipment) QueryEquipment(uid string, id string) (equipment *pb.DB_E
}
if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, id); err != nil {
if err == redis.Nil {
code = pb.ErrorCode_EquipmentOnFoundEquipment
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("未找到装备 uid:%s id:%s", uid, id),
}
} else {
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
}
}
return
@ -107,10 +116,12 @@ func (this *Equipment) QueryEquipments(uid string) (equipment []*pb.DB_Equipment
return
}
if equipment, err = this.modelEquipment.QueryUserEquipments(uid); err != nil {
if err == redis.Nil {
code = pb.ErrorCode_EquipmentOnFoundEquipment
} else {
code = pb.ErrorCode_SystemError
if err != redis.Nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
}
}
return
@ -129,7 +140,11 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri
)
if change, err = this.modelEquipment.AddEquipments(session, cIds); err != nil {
this.Errorf("err%v", err)
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
if len(change) > 0 && bPush {
@ -145,14 +160,18 @@ func (this *Equipment) AddAllEquipments(session comm.IUserSession) (errdata *pb.
err error
)
if configure, err = this.configure.GetEquipmentConfigure(); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
cIds = make(map[string]uint32)
for _, v := range configure.GetDataList() {
cIds[v.Id] = 1
}
_, code = this.AddNewEquipments(session, cIds, true)
_, errdata = this.AddNewEquipments(session, cIds, true)
return
}
@ -164,7 +183,11 @@ func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []strin
)
if change, err = this.modelEquipment.DelEquipments(session.GetUserId(), equipIds); err != nil {
this.Errorf("err%v", err)
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
if len(change) > 0 && bPush {
@ -180,11 +203,19 @@ func (this *Equipment) NewEquipment(uid, cid string) (errdata *pb.ErrorData, equ
err error
)
if conf, err = this.configure.GetEquipmentConfigureById(cid); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if equip, err = this.modelEquipment.newEquipment(uid, conf, nil); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
return
@ -197,11 +228,19 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi
configure *cfg.GameEquipData
)
if err = this.modelEquipment.addEquipment(equip); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if configure, err = this.configure.GetEquipmentConfigureById(equip.CId); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
tasks := make([]*pb.BuriedParam, 0)
@ -245,17 +284,29 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string)
sale = make([][]*cfg.Gameatn, len(equipments))
for i, v := range equipments {
if v.HeroId != "" || v.Islock {
code = pb.ErrorCode_EquipmentNoCanSell
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentNoCanSell,
Title: pb.ErrorCode_EquipmentNoCanSell.ToString(),
Message: fmt.Sprintf("装备锁定或者穿戴状态下 不可售卖!"),
}
this.Errorf("NoCanSell %v", v)
return
}
if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil {
this.Errorln(err)
code = pb.ErrorCode_EquipmentOnFoundEquipment
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if confs[i].Sale == nil || len(confs[i].Sale) == 0 {
code = pb.ErrorCode_EquipmentNoCanSell
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentNoCanSell,
Title: pb.ErrorCode_EquipmentNoCanSell.ToString(),
Message: err.Error(),
}
return
}
sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale))
@ -273,10 +324,10 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string)
for _, v := range sale {
sales = append(sales, v...)
}
if code, atno = this.DispenseAtno(session, sales, true); errdata != nil {
if errdata, atno = this.DispenseAtno(session, sales, true); errdata != nil {
return
}
if code = this.DelEquipments(session, equs, true); errdata != nil {
if errdata = this.DelEquipments(session, equs, true); errdata != nil {
return
}
return
@ -302,22 +353,35 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
sale = make([][]*cfg.Gameatn, len(equipments))
for i, v := range equipments {
if v.HeroId != "" || v.Islock {
code = pb.ErrorCode_EquipmentNoCanSell
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
this.Errorf("NoCanSell %v", v)
return
}
if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil {
this.Errorln(err)
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
}
return
}
if confs[i].SmithySale == nil || len(confs[i].SmithySale) == 0 {
code = pb.ErrorCode_EquipmentNoCanSell
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentNoCanSell,
Title: pb.ErrorCode_EquipmentNoCanSell.ToString(),
}
return
}
if sellconf, err = this.configure.getSellcoefficient(int32(len(v.AdverbEntry) + 1)); err != nil {
this.Errorln(err)
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale))
@ -335,10 +399,10 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin
for _, v := range sale {
sales = append(sales, v...)
}
if code, atno = this.DispenseAtno(session, sales, true); errdata != nil {
if errdata, atno = this.DispenseAtno(session, sales, true); errdata != nil {
return
}
if code = this.DelEquipments(session, equs, true); errdata != nil {
if errdata = this.DelEquipments(session, equs, true); errdata != nil {
return
}
return
@ -399,23 +463,34 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p
err error
)
if configures, err = this.configure.GetSuitEquipmentConfigure(suiteId); err != nil {
code = pb.ErrorCode_EquipmentSuiteNotFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentSuiteNotFound,
Title: pb.ErrorCode_EquipmentSuiteNotFound.ToString(),
Message: err.Error(),
}
return
}
if pos != -1 {
for _, v := range configures {
if v.Pos == pos && v.Star == lv {
if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), v, dyweight); err == nil {
code = pb.ErrorCode_Success
this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip})
return
}
this.Errorf("err%v", err)
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
}
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else {
lvs = make([]*cfg.GameEquipData, 0)
@ -425,18 +500,24 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p
}
}
if len(lvs) == 0 {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
}
return
}
r := rand.New(rand.NewSource(time.Now().Unix()))
index := r.Perm(len(lvs))[0]
if eruip, err = this.modelEquipment.newEquipment(session.GetUserId(), lvs[index], dyweight); err == nil {
code = pb.ErrorCode_Success
this.equipmentsChangePush(session, []*pb.DB_Equipment{eruip})
return
}
this.Errorf("err%v", err)
code = pb.ErrorCode_SystemError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
}

8
modules/forum/api_getlist.go
View File

@ -22,11 +22,15 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq)
err error
list []*pb.DBComment
)
if code = this.GetListCheck(session, req); errdata != nil {
if errdata = this.GetListCheck(session, req); errdata != nil {
return
}
if list, err = this.module.modelForum.getComment(req.Herocid); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ForumGetListResp{Comment: list})

6
modules/forum/api_like.go
View File

@ -23,7 +23,11 @@ func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (errd
)
if _, err = this.module.modelForum.like(req.Herocid, req.Cid, req.Islike); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
session.SendMsg(string(this.module.GetType()), "like", &pb.ForumLikeResp{Cid: req.Cid, Islike: req.Islike, Issucc: true})

8
modules/forum/api_releasecomment.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumRele
err error
comment *pb.DBComment
)
if code = this.ReleaseCommentCheck(session, req); errdata != nil {
if errdata = this.ReleaseCommentCheck(session, req); errdata != nil {
return
}
comment = &pb.DBComment{
@ -41,7 +41,11 @@ func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumRele
Content: req.Content,
}
if err = this.module.modelForum.releaseComment(comment); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "releasecomment", &pb.ForumReleaseCommentResp{Comment: comment})

2
modules/forum/api_watchhero.go
View File

@ -23,7 +23,7 @@ func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHero
err error
equip []*pb.DB_Equipment
)
if code = this.WatchHeroCheck(session, req); errdata != nil {
if errdata = this.WatchHeroCheck(session, req); errdata != nil {
return
}
if hero, err = this.module.modelForum.watchHero(req.Stag, req.Uid, req.HerocId); err != nil {

2
modules/friend/api_cross_accept.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAccept
}
func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) {
if code = this.AcceptCheck(session, req); errdata != nil {
if errdata = this.AcceptCheck(session, req); errdata != nil {
return
}

8
modules/friend/api_cross_addblack.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB
}
func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) {
if code = this.AddblackCheck(session, req); errdata != nil {
if errdata = this.AddblackCheck(session, req); errdata != nil {
return
}
@ -81,7 +81,11 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR
"friendIds": friendIds,
})
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("加入黑名单",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "目标人", Value: req.FriendId},

14
modules/friend/api_cross_agree.go
View File

@ -22,7 +22,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe
}
func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) {
if code = this.AgreeCheck(session, req); errdata != nil {
if errdata = this.AgreeCheck(session, req); errdata != nil {
return
}
var (
@ -102,7 +102,11 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
if err = this.module.modelFriend.Change(target.Uid, map[string]interface{}{
"friendIds": target.FriendIds,
}); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("好友审批同意",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: req.FriendIds},
@ -131,7 +135,11 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
"friendIds": self.FriendIds,
})
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
}

2
modules/friend/api_cross_apply.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe
}
func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) {
if code = this.ApplyCheck(session, req); errdata != nil {
if errdata = this.ApplyCheck(session, req); errdata != nil {
return
}

8
modules/friend/api_cross_assisthero.go
View File

@ -21,14 +21,18 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs
}
func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) {
if code = this.AssistheroCheck(session, req); errdata != nil {
if errdata = this.AssistheroCheck(session, req); errdata != nil {
return
}
uid := session.GetUserId()
// 获取英雄
hero, err := this.module.ModuleHero.QueryCrossHeroinfo(req.HeroObjId)
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("查询英雄数据 QueryCrossHeroinfo",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: req.HeroObjId},

2
modules/friend/api_cross_del.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (
}
func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) {
if code = this.DelCheck(session, req); errdata != nil {
if errdata = this.DelCheck(session, req); errdata != nil {
return
}

8
modules/friend/api_cross_delblack.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB
}
func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) {
if code = this.DelblackCheck(session, req); errdata != nil {
if errdata = this.DelblackCheck(session, req); errdata != nil {
return
}
var (
@ -40,7 +40,11 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR
if err = this.module.modelFriend.Change(self.Uid, map[string]interface{}{
"blackIds": self.BlackIds,
}); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("删除黑名单",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "err", Value: err.Error()},

2
modules/friend/api_cross_getrelation.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG
}
func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) {
if code = this.GetRelationCheck(session, req); errdata != nil {
if errdata = this.GetRelationCheck(session, req); errdata != nil {
return
}

2
modules/friend/api_cross_getreward.go
View File

@ -39,7 +39,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar
}
globalConf := this.module.ModuleTools.GetGlobalConf()
if code = this.module.DispenseRes(session, globalConf.FriendPeize, true); errdata != nil {
if errdata = this.module.DispenseRes(session, globalConf.FriendPeize, true); errdata != nil {
this.module.Error("好友领奖励",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "reward", Value: globalConf.FriendPeize},

8
modules/friend/api_cross_qiecuo.go
View File

@ -18,7 +18,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuo
}
func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) {
if code = this.QiecuoCheck(session, req); errdata != nil {
if errdata = this.QiecuoCheck(session, req); errdata != nil {
return
}
@ -34,7 +34,11 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq)
if errors.As(err, &customErr) {
code = customErr.Code
} else {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
return
}

6
modules/friend/api_cross_randlist.go
View File

@ -25,7 +25,11 @@ func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistR
//在线玩家列表
cuList, err := this.module.ModuleUser.UserOnlineList()
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

8
modules/friend/api_cross_refuse.go
View File

@ -22,7 +22,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse
// 单个/批量拒绝
func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) {
if code = this.RefuseCheck(session, req); errdata != nil {
if errdata = this.RefuseCheck(session, req); errdata != nil {
return
}
uid := session.GetUserId()
@ -57,7 +57,11 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq)
if err := this.module.modelFriend.Change(self.Uid, map[string]interface{}{
"applyIds": self.ApplyIds,
}); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("好友审批拒绝",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: req},

8
modules/friend/api_cross_search.go
View File

@ -18,7 +18,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch
}
func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) {
if code = this.SearchCheck(session, req); errdata != nil {
if errdata = this.SearchCheck(session, req); errdata != nil {
return
}
@ -27,7 +27,11 @@ func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq)
users, err := this.module.ModuleUser.SearchRmoteUser(req.NickName)
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("搜索玩家",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: req.NickName},

2
modules/friend/api_cross_stop.go
View File

@ -11,7 +11,7 @@ func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq)
}
func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) {
if code = this.StopCheck(session, req); errdata != nil {
if errdata = this.StopCheck(session, req); errdata != nil {
return
}

20
modules/friend/api_cross_zan.go
View File

@ -20,7 +20,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (
}
func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) {
if code = this.ZanCheck(session, req); errdata != nil {
if errdata = this.ZanCheck(session, req); errdata != nil {
return
}
@ -61,7 +61,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda
"zanIds": target.ZanIds,
"getZandIds": target.GetZandIds,
}); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
this.module.Error("点赞",
log.Field{Key: "uid", Value: uid},
log.Field{Key: "err", Value: err.Error()},
@ -74,7 +78,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda
//设置友情值
ue, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
@ -88,7 +96,11 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda
"friendPointOD": ue.FriendPointOD + pointTotal,
}
if err := this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

2
modules/friend/api_cross_zanlist.go
View File

@ -12,7 +12,7 @@ func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanli
// Deprecated:
func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) {
if code = this.ZanlistCheck(session, req); errdata != nil {
if errdata = this.ZanlistCheck(session, req); errdata != nil {
return
}

20
modules/friend/api_cross_zanreceive.go
View File

@ -21,7 +21,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa
}
func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) {
if code = this.ZanreceiveCheck(session, req); errdata != nil {
if errdata = this.ZanreceiveCheck(session, req); errdata != nil {
return
}
@ -52,14 +52,22 @@ func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanrece
if err = this.module.modelFriend.Change(self.Uid, map[string]interface{}{
"getZandIds": self.GetZandIds,
}); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
//设置自己的友情值
ue, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
@ -74,7 +82,11 @@ func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanrece
"friendPointID": ue.FriendPointID + pointTotal,
}
if err := this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

16
modules/gm/module.go
View File

@ -193,7 +193,11 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
log.Field{Key: "0", Value: datas[0]},
)
} else if len(datas) == 2 && (datas[0] == "season") { // 赛季塔跳转
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
} else if len(datas) == 1 && (datas[0] == "viking") { // 解锁远征所有难度
module1, err := this.service.GetModule(comm.ModuleViking)
@ -374,7 +378,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
return
}
for i := 0; i < num; i++ {
if code = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil {
if errdata = module1.(comm.IPay).ModulePayDelivery(session, "8", 64800); errdata != nil {
return
}
}
@ -390,7 +394,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
return
}
if code = module1.(comm.IItems).CleanItems(session); errdata != nil {
if errdata = module1.(comm.IItems).CleanItems(session); errdata != nil {
return
}
@ -404,7 +408,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
return
}
if code = module1.(comm.IEquipment).AddAllEquipments(session); errdata != nil {
if errdata = module1.(comm.IEquipment).AddAllEquipments(session); errdata != nil {
return
}
@ -422,7 +426,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
// return
// }
if module, err := this.service.GetModule(comm.ModuleChat); err == nil {
if code = module.(comm.IChat).SendSysChatToWorld(comm.ChatSystem10, nil, 5, 0, "xxx", "25001"); errdata != nil {
if errdata = module.(comm.IChat).SendSysChatToWorld(comm.ChatSystem10, nil, 5, 0, "xxx", "25001"); errdata != nil {
return
}
}
@ -455,7 +459,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
T: v.Id,
N: int32(num2),
}
if code = this.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
if errdata = this.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
this.Debugf("DispenseRes err :uid = %s,code = %d", datas[0], code)
}
}

26
modules/growtask/api_advreceive.go
View File

@ -18,14 +18,18 @@ func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.Growtask
}
func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (errdata *pb.ErrorData) {
if code = this.AdvreceiveCheck(session, req); errdata != nil {
if errdata = this.AdvreceiveCheck(session, req); errdata != nil {
return
}
uid := session.GetUserId()
gt, err := this.module.modelGrowtask.getUserGrowtask(uid)
if err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if gt.Uid == "" {
@ -52,11 +56,19 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe
//发奖
rewardCnf, err := this.module.configure.getGrowrewardCfg()
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if rewardCnf == nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
@ -65,7 +77,11 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe
"advReceive": req.TaskType,
}
if err := this.module.modelGrowtask.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}

14
modules/growtask/api_receive.go
View File

@ -18,7 +18,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskRec
}
func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (errdata *pb.ErrorData) {
if code = this.ReceiveCheck(session, req); errdata != nil {
if errdata = this.ReceiveCheck(session, req); errdata != nil {
return
}
@ -33,11 +33,19 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR
//发奖
ggt, err := this.module.configure.getGrowtaskCfg()
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if ggt == nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}

24
modules/hero/api_awaken.go
View File

@ -44,7 +44,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
awakenData, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -52,7 +56,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
return
}
if len(awakenData.Phasebonus) < 2 { // 配置校验
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
@ -69,7 +77,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
// 加属性 awakenData
if len(awakenData.Phasebonus) != 2 {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
_hero.JuexingLv += 1
@ -149,7 +161,11 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
}
} else {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

12
modules/hero/api_buy.go
View File

@ -35,7 +35,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
)
update = make(map[string]interface{})
if code = this.BuyCheck(session, req); errdata != nil {
if errdata = this.BuyCheck(session, req); errdata != nil {
return
}
if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil {
@ -44,7 +44,11 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata
}
if conf, err = this.module.configure.GetShopItemsConfigureByGroups(req.BuyType, udata); err != nil { // 找配置
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -98,7 +102,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata
}
}
// 消耗
if code = this.module.ConsumeRes(session, need, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
give = make([]*cfg.Gameatn, len(conf.Iteminfo))
@ -110,7 +114,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata
}
}
// 获得的道具
if code = this.module.DispenseRes(session, give, true); errdata != nil {
if errdata = this.module.DispenseRes(session, give, true); errdata != nil {
return
}

6
modules/hero/api_drawCard.go
View File

@ -271,7 +271,11 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
_data, err := this.module.configure.GetPollByType(strPool[index])
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

10
modules/hero/api_fusion.go
View File

@ -28,12 +28,16 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
ChangeList = make([]*pb.DBHero, 0)
_costMaphero = make(map[string]*pb.DBHero, 0)
mapHero = make(map[string]int32)
if code = this.FusionCheck(session, req); errdata != nil {
if errdata = this.FusionCheck(session, req); errdata != nil {
return
}
conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId)
if err != nil {
code = pb.ErrorCode_ConfigNoFound // 配置没找到
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
} // 配置没找到
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -94,7 +98,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
T: conf.Hero,
N: 1,
}
if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil {
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil {
this.module.Errorf("err:%v,create hero:%s,uid,%ss", code, conf.Hero, session.GetUserId())
code = pb.ErrorCode_HeroCreate // 创建新英雄失败

2
modules/hero/api_info.go
View File

@ -24,7 +24,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (errda
uid string
)
if code = this.InfoCheck(session, req); errdata != nil {
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
rsp := &pb.HeroInfoResp{}

14
modules/hero/api_strengthenUpSkill.go
View File

@ -39,7 +39,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
// 查询配置表 找出原始品质
heroCfg, err := this.module.configure.GetHeroConfig(_hero.HeroID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -69,7 +73,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
}
// 检查消耗
if code = this.module.CheckRes(session, cost); errdata != nil {
if errdata = this.module.CheckRes(session, cost); errdata != nil {
return
}
for i := 0; i < int(lvUpCount); i++ { // 升级技能
@ -80,7 +84,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
if skill.SkillLv < skillMaxLv { // 找到没有满级的技能id
skillData, err := this.module.configure.GetHeroSkillUpConfig(skill.SkillID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

16
modules/hero/api_strengthenUpStar.go
View File

@ -38,7 +38,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
// 校验指定英雄
starConf, err = this.module.configure.GetHeroStarupConfig(_hero.HeroID, _hero.Star)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -47,7 +51,11 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
}
heroConf, err := this.module.configure.GetHeroConfig(_hero.HeroID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -60,13 +68,13 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
return
}
if code = this.module.ConsumeRes(session, starConf.Needrace, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, starConf.Needrace, true); errdata != nil {
return
}
// 加对应的天赋点数
if len(starConf.Starup) > 0 {
if code = this.module.DispenseRes(session, starConf.Starup, true); errdata != nil { // 加天赋点{
if errdata = this.module.DispenseRes(session, starConf.Starup, true); errdata != nil { // 加天赋点{
this.module.Errorf("DispenseRes err:uid:%s,res:%v", session.GetUserId(), starConf.Starup)
}
}

10
modules/hero/api_strengthenUplv.go
View File

@ -51,7 +51,11 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
addExp += expConf.Exp * v
costGold += expConf.Needgold * v
} else {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -65,7 +69,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
N: costGold,
})
// 金币消耗判断
if code = this.module.CheckRes(session, cost); errdata != nil {
if errdata = this.module.CheckRes(session, cost); errdata != nil {
return
}
@ -84,7 +88,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
return
}
// 消耗金币
if code = this.module.ConsumeRes(session, cost, true); errdata != nil { //道具扣除
if errdata = this.module.ConsumeRes(session, cost, true); errdata != nil { //道具扣除
code = pb.ErrorCode_ItemsNoEnough
return
}

12
modules/hero/api_talentlearn.go
View File

@ -29,7 +29,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
)
chanegCard = make([]*pb.DBHero, 0)
if code = this.TalentLearnCheck(session, req); errdata != nil {
if errdata = this.TalentLearnCheck(session, req); errdata != nil {
return
}
if req.ObjId != "" {
@ -68,7 +68,11 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
talentConf, err := this.module.configure.GetHeroTalent(req.TalentID)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -119,7 +123,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
T: generaltp.T,
N: leftCount,
}
if code = this.module.CheckRes(session, []*cfg.Gameatn{fp}); errdata != nil {
if errdata = this.module.CheckRes(session, []*cfg.Gameatn{fp}); errdata != nil {
code = pb.ErrorCode_ItemsNoEnough
return
}
@ -134,7 +138,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
res = append(res, point)
}
}
if code = this.module.ConsumeRes(session, res, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, res, true); errdata != nil {
return
}

12
modules/hero/api_talentreset.go
View File

@ -23,7 +23,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
chanegCard []*pb.DBHero // 推送属性变化
talentPoint int32 // 已经消耗的天赋点数
)
if code = this.TalentResetCheck(session, req); errdata != nil {
if errdata = this.TalentResetCheck(session, req); errdata != nil {
return
}
@ -40,7 +40,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
chanegCard = make([]*pb.DBHero, 0)
// 检查消耗够不够
if code = this.module.ConsumeRes(session, this.module.ModuleTools.GetGlobalConf().TalentReset, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, this.module.ModuleTools.GetGlobalConf().TalentReset, true); errdata != nil {
return
}
@ -48,7 +48,11 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
if conf, err := this.module.configure.GetHeroTalent(k); err == nil {
talentPoint += conf.Point // 获取当前英雄的天赋点数
} else {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -63,7 +67,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe
N: talentPoint,
}
this.module.Debugf("返还天赋的点数%d,itemID=%s", talentPoint, t)
if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); errdata != nil {
this.module.Errorf("DispenseRes err,uid:%s,item:%v", session.GetUserId(), res)
} // 返还升级的天赋点数
}

8
modules/horoscope/api_info.go
View File

@ -17,11 +17,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (
info *pb.DBHoroscope
err error
)
if code = this.InfoCheck(session, req); errdata != nil {
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "info", &pb.HoroscopeInfoResp{Info: info})

16
modules/horoscope/api_rest.go
View File

@ -21,11 +21,15 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq)
conf *cfg.GameGlobalData
err error
)
if code = this.ResetCheck(session, req); errdata != nil {
if errdata = this.ResetCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
conf = this.module.ModuleTools.GetGlobalConf()
@ -36,13 +40,17 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq)
}
}
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.HoroscopeResetCost}, true); errdata != nil {
return
}
info.Nodes = make(map[int32]int32)
info.Lastrest = configure.Now().Unix()
if err = this.module.modelHoroscope.updateInfo(session, info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "reset", &pb.HoroscopeResetResp{Issucc: true, Info: info})

28
modules/horoscope/api_upgrade.go
View File

@ -20,22 +20,34 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade
front *cfg.GameHoroscopeData
err error
)
if code = this.UpgradeCheck(session, req); errdata != nil {
if errdata = this.UpgradeCheck(session, req); errdata != nil {
return
}
if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if conf, err = this.module.configure.getHoroscope(req.Nid); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if conf.CostItem != nil && len(conf.CostItem) > 0 { //可有升级
for _, _front := range conf.Front {
if _front > 0 {
if front, err = this.module.configure.getHoroscope(_front); err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if v, ok := info.Nodes[front.NodeId]; !ok || v < front.Lv {
@ -51,7 +63,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade
}
return
}
if code = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, conf.CostItem, true); errdata != nil {
return
}
info.Nodes[conf.NodeId] = conf.Lv + 1
@ -59,7 +71,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype173, 1))
}
if err = this.module.modelHoroscope.updateInfo(session, info); err != nil {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "upgrade", &pb.HoroscopeUpgradeResp{Nid: conf.NodeId, Lv: conf.Lv + 1})

2
modules/horoscope/modelhoroscope.go
View File

@ -155,7 +155,7 @@ func (this *modelHoroscope) reddot(session comm.IUserSession) bool {
for _, v := range horoscope.GetDataList() {
if lv, ok := info.Nodes[v.NodeId]; !ok && v.Lv > lv {
if code = this.module.CheckRes(session, v.CostItem); code == pb.ErrorCode_Success {
if errdata = this.module.CheckRes(session, v.CostItem); code == pb.ErrorCode_Success {
return true
}
}

14
modules/hunting/api_challenge.go
View File

@ -35,7 +35,11 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
}
cfgData, err := this.module.configure.GetHuntingBossConfigData(req.BossType, req.Difficulty)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -44,7 +48,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
}
if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 {
if code = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点
if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点
return
}
@ -64,7 +68,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
T: "ps",
N: ps,
}
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil {
return
}
@ -75,7 +79,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
"ps": hunting.Ps,
})
}
// if code = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil {
// if errdata = this.module.CheckRes(session, cfgData.PsConsume); errdata != nil {
// if req.AutoBuy { // 不够的时候看是否能自动购买
// var count int32
// for _, v := range cfgData.PsConsume {
@ -83,7 +87,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
// count += v.N
// }
// }
// if code = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil {
// if errdata = this.module.ModuleItems.BuyUnifiedTicket(session, count); errdata != nil {
// return
// }
// } else {

16
modules/hunting/api_challengeover.go
View File

@ -45,7 +45,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
}
cfgHunting, err := this.module.configure.GetHuntingBossConfigData(req.BossType, req.Difficulty)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -76,12 +80,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
}
mapData["boss"] = hunting.Boss
code, bWin = this.module.battle.CheckBattleReport(session, req.Report)
// if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil {
// if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil {
// return
// }
if !bWin { // 战斗失败了 直接返回
if v, ok := hunting.Ps[req.BossType]; ok && v > 0 {
if code = this.module.DispenseRes(session, cfgHunting.PsConsume, true); errdata != nil { // 返还预扣体力
if errdata = this.module.DispenseRes(session, cfgHunting.PsConsume, true); errdata != nil { // 返还预扣体力
return
}
}
@ -91,13 +95,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
session.SendMsg(string(this.module.GetType()), HuntingChallengeOverResp, &pb.HuntingChallengeOverResp{Data: hunting})
return
}
// if code = this.module.ConsumeRes(session, cfgHunting.PsConsume, true); errdata != nil {
// if errdata = this.module.ConsumeRes(session, cfgHunting.PsConsume, true); errdata != nil {
// return
// }
key := strconv.Itoa(int(req.BossType)) + "_" + strconv.Itoa(int(req.Difficulty))
if hunting.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
mapData["boss"] = hunting.Boss
if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
return
}
}
@ -136,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
return
}
if newChallenge && bWin { // 新关卡挑战通过 发放首通奖励
if code = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
return
}
hunting.Boss[req.BossType] += 1

2
modules/hunting/api_getlist.go
View File

@ -18,7 +18,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
return // 参数校验失败直接返回
}
// 刷新挑战卷
// if code = this.module.ModuleItems.RecoverTicket(session); errdata != nil {
// if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil {
// return
// }
list, _ := this.module.modelHunting.getHuntingList(session.GetUserId())

24
modules/items/module.go
View File

@ -172,13 +172,29 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err)
if err == ItemNotEnoughError {
code = pb.ErrorCode_ItemsNoEnough
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ItemsNoEnough,
Title: pb.ErrorCode_ItemsNoEnough.ToString(),
Message: err.Error(),
}
} else if err == PackGridNumUpper {
code = pb.ErrorCode_ItemsGridNumUpper
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ItemsGridNumUpper,
Title: pb.ErrorCode_ItemsGridNumUpper.ToString(),
Message: err.Error(),
}
} else if err == NoFoundItemConfig {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
} else {
code = pb.ErrorCode_Unknown
errdata = &pb.ErrorData{
Code: pb.ErrorCode_Unknown,
Title: pb.ErrorCode_Unknown.ToString(),
Message: err.Error(),
}
}
return
}

2
modules/library/api_getfetterlist.go
View File

@ -15,7 +15,7 @@ func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.Libra
func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (errdata *pb.ErrorData) {
if code = this.GetFetterListCheck(session, req); errdata != nil {
if errdata = this.GetFetterListCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
rsp := &pb.LibraryGetFetterListResp{}

8
modules/library/api_getstoryreward.go
View File

@ -41,7 +41,11 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
}
favorConf, err := this.module.configure.GetFavorability(_heroFetter.Heroid, 1) // 取1级的就可以
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -76,7 +80,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe
}
if len(res) > 0 {
if code = this.module.DispenseRes(session, res, true); errdata != nil {
if errdata = this.module.DispenseRes(session, res, true); errdata != nil {
return
}
} else {

6
modules/library/api_lvup.go
View File

@ -43,7 +43,11 @@ func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetter
fetter.Fidlv += 1
conf, e := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv)
if e != nil || len(conf) == 0 {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: e.Error(),

2
modules/library/api_maintask.go
View File

@ -19,7 +19,7 @@ func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.Lib
}
func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (errdata *pb.ErrorData) {
if code = this.FetterstoryTaskCheck(session, req); errdata != nil {
if errdata = this.FetterstoryTaskCheck(session, req); errdata != nil {
return
}

28
modules/library/api_usegift.go
View File

@ -44,7 +44,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
_exp, err := this.module.configure.GetFavorabilityExp(_heroObj.Heroid)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -79,7 +83,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
// 校验是否是自己喜欢的食物
_c, err := this.module.configure.GetFavorability(_heroObj.Heroid, _heroObj.Favorlv)
if err != nil {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),
@ -109,13 +117,17 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
N: req.Counts,
})
if code = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回
if errdata = this.module.CheckRes(session, res); errdata != nil { // 道具不够直接返回
return
}
itemConf, err1 := this.module.configure.GetItemConfigureData(req.Items) // 获取食物的
if err1 != nil {
this.module.Errorf("赠送菜品配置没找到：%s", req.Items)
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
addExp *= itemConf.SpecialType
@ -135,7 +147,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
break
}
}
if code = this.module.ConsumeRes(session, res, true); errdata != nil { //真正消耗
if errdata = this.module.ConsumeRes(session, res, true); errdata != nil { //真正消耗
return
}
// 修改信息
@ -165,7 +177,11 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
"race": rst.Race,
})
} else {
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
data = &pb.ErrorData{
Title: pb.GetErrorCodeMsg(code),
Message: err.Error(),

2
modules/linestory/api_maintask.go
View File

@ -19,7 +19,7 @@ func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryM
}
func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (errdata *pb.ErrorData) {
if code = this.MaintaskCheck(session, req); errdata != nil {
if errdata = this.MaintaskCheck(session, req); errdata != nil {
return
}

16
modules/linestory/api_receive.go
View File

@ -21,14 +21,18 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryRe
}
func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (errdata *pb.ErrorData) {
if code = this.ReceiveCheck(session, req); errdata != nil {
if errdata = this.ReceiveCheck(session, req); errdata != nil {
return
}
uid := session.GetUserId()
conf := this.module.configure.getChapterCfgById(req.ChapterId)
if conf == nil {
this.module.Error("配置未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId})
code = pb.ErrorCode_ConfigNoFound
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
@ -37,14 +41,18 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive
if errors.As(err, &customErr) {
code = customErr.Code
} else {
code = pb.ErrorCode_DBError
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
}
this.module.Error("章节奖励领取失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "code", Value: code})
return
}
//发奖
if code = this.module.DispenseRes(session, conf.Reward, true); errdata != nil {
if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil {
this.module.Error("奖励发放失败",
log.Field{Key: "uid", Value: uid}, log.Field{Key: "chapterId", Value: req.ChapterId}, log.Field{Key: "reward", Value: conf.Reward},
)

4
modules/mail/api_getAttachment.go
View File

@ -40,7 +40,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
}
res = append(res, d)
}
if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
if errdata = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
// 修改状态
this.module.modelMail.MailUpdateMailAttachmentState(req.ObjID)
mail.Reward = true
@ -89,7 +89,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai
fj = append(fj, v1)
res = append(res, d)
}
if code = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
if errdata = this.module.DispenseRes(session, res, true); code == pb.ErrorCode_Success {
this.module.modelMail.MailUpdateMailAttachmentState(v.ObjId)
v.Reward = true
v.Check = true

6
modules/mline/api_challenge.go
View File

@ -28,7 +28,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge
stageConf *cfg.GameMainStageData
)
if code = this.ChallengeCheck(session, req); errdata != nil {
if errdata = this.ChallengeCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}
if stageConf = this.module.configure.GetMainStageConf(req.StageId); stageConf == nil { // 配置文件校验
@ -77,7 +77,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge
}
if v1, ok := curChapter.Ps[req.StageId]; ok && v1 == 0 {
if code = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点
if errdata = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点
return
}
} else {
@ -96,7 +96,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge
T: "ps",
N: ps,
}
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil {
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); errdata != nil {
return
}

Some files were not shown because too many files have changed in this diff Show More