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

修改ErrorData

Browse Source
This commit is contained in:
wh_zcy 2023-06-06 10:16:59 +08:00
parent 885b4bbb50
commit 1fe4cd65a8
3 changed files with 90 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/worldtask/api_accept.go
View File

@ -19,50 +19,60 @@ func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAccept
} }
func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) {
if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success { if errdata = a.AcceptCheck(session, req); errdata != nil {
return return
} }
data = &pb.ErrorData{}
uid := session.GetUserId() uid := session.GetUserId()
user := a.module.ModuleUser.GetUser(uid) user := a.module.ModuleUser.GetUser(uid)
if user == nil { if user == nil {
code = pb.ErrorCode_UserSessionNobeing errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_UserSessionNobeing,
data.Datastring = uid Title: pb.ErrorCode_UserSessionNobeing.ToString(),
Datastring: uid,
}
return return
} }
rsp := &pb.WorldtaskAcceptResp{} rsp := &pb.WorldtaskAcceptResp{}
myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid) myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid)
if err != nil { if err != nil {
code = pb.ErrorCode_DBError errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_DBError,
data.Datastring = uid Title: pb.ErrorCode_DBError.ToString(),
Datastring: uid,
}
return return
} }
// 当前任务配置 // 当前任务配置
curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId) curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId)
if err != nil || curTaskConf == nil { if err != nil || curTaskConf == nil {
code = pb.ErrorCode_ConfigNoFound errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_ConfigNoFound,
data.Message = err.Error() Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return return
} }
// 判断玩家等级要求 // 判断玩家等级要求
if user.Lv < curTaskConf.Lock { if user.Lv < curTaskConf.Lock {
code = pb.ErrorCode_WorldtaskLvNotEnough errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_WorldtaskLvNotEnough,
data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock) Title: pb.ErrorCode_WorldtaskLvNotEnough.ToString(),
Message: fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock),
}
return return
} }
// 前置任务ID 只有世界任务才校验前置 // 前置任务ID 只有世界任务才校验前置
if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) { if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) {
code = pb.ErrorCode_WorldtaskLastUnFinished errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_WorldtaskLastUnFinished,
data.Message = fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe) Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(),
Message: fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe),
}
return return
} }
@ -80,7 +90,10 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} }
if err := a.module.modelWorldtask.Change(uid, update); err != nil { if err := a.module.modelWorldtask.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
}
return return
} }

53
modules/worldtask/api_battlefinish.go
View File

@ -25,23 +25,29 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt
} }
func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) {
if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success { if errdata = this.BattlefinishCheck(session, req); errdata != nil {
return return
} }
data = &pb.ErrorData{}
uid := session.GetUserId() uid := session.GetUserId()
taskConf, err := this.module.configure.getWorldtaskById(req.TaskId) taskConf, err := this.module.configure.getWorldtaskById(req.TaskId)
if err != nil || taskConf == nil { if err != nil || taskConf == nil {
code = pb.ErrorCode_ConfigNoFound errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_ConfigNoFound,
data.Message = err.Error() Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return return
} }
// 当前玩家世界任务 // 当前玩家世界任务
userTask, err := this.module.modelWorldtask.getWorldtask(uid) userTask, err := this.module.modelWorldtask.getWorldtask(uid)
if err != nil { if err != nil {
code = pb.ErrorCode_DBError errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return return
} }
@ -49,9 +55,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
if len(taskConf.Completetask) == 0 { if len(taskConf.Completetask) == 0 {
if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil { if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil {
code = pb.ErrorCode_DBError errdata = &pb.ErrorData{
data.Title = code.ToString() Code: pb.ErrorCode_DBError,
data.Message = err.Error() Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return return
} }
@ -61,16 +69,20 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
battleModule, err := this.module.service.GetModule(comm.ModuleBattle) battleModule, err := this.module.service.GetModule(comm.ModuleBattle)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return return
} }
if ibattle, ok := battleModule.(comm.IBattle); ok { if ibattle, ok := battleModule.(comm.IBattle); ok {
var isWin bool var isWin bool
if code, isWin = ibattle.CheckBattleReport(session, req.Report); code == pb.ErrorCode_Success { if errdata, isWin = ibattle.CheckBattleReport(session, req.Report); errdata == nil {
if isWin { if isWin {
if battleConf, ok := this.module.worldBattleConf.GetDataMap()[req.BattleConfId]; ok { if battleConf, ok := this.module.worldBattleConf.GetDataMap()[req.BattleConfId]; ok {
if code = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); code != pb.ErrorCode_Success { if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); errdata != nil {
this.module.Error("世界任务战斗玩家经验结算", this.module.Error("世界任务战斗玩家经验结算",
log.Field{Key: "uid", Value: uid}, log.Field{Key: "uid", Value: uid},
log.Field{Key: "playerExp", Value: battleConf.Playexp}, log.Field{Key: "playerExp", Value: battleConf.Playexp},
@ -91,7 +103,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
"currentTask": userTask.CurrentTask, "currentTask": userTask.CurrentTask,
} }
if err := this.module.modelWorldtask.Change(uid, update); err != nil { if err := this.module.modelWorldtask.Change(uid, update); err != nil {
code = pb.ErrorCode_DBError errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return return
} }
@ -100,20 +116,23 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
} }
} else { } else {
data.Title = code.ToString() errdata = &pb.ErrorData{
data.Message = "战报校验错误" Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: "战报校验错误",
}
return return
} }
//判断是否配置了通知module //判断是否配置了通知module
if len(taskConf.Module) == 0 { if len(taskConf.Module) == 0 {
// 发奖 // 发奖
if code = this.module.DispenseRes(session, taskConf.Reword, true); code != pb.ErrorCode_Success { if errdata = this.module.DispenseRes(session, taskConf.Reword, true); errdata != nil {
this.module.Error("资源发放", this.module.Error("资源发放",
log.Field{Key: "uid", Value: uid}, log.Field{Key: "uid", Value: uid},
log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "taskId", Value: req.TaskId},
log.Field{Key: "reword", Value: taskConf.Reword}, log.Field{Key: "reword", Value: taskConf.Reword},
log.Field{Key: "code", Value: code}, log.Field{Key: "errdata", Value: errdata},
) )
return return
} }

34
modules/worldtask/api_battlestart.go
View File

@ -23,23 +23,28 @@ func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.Worldta
} }
func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (errdata *pb.ErrorData) { func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (errdata *pb.ErrorData) {
if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { if errdata = this.BattlestartCheck(session, req); errdata != nil {
return return
} }
data = &pb.ErrorData{}
resp := &pb.WorldtaskBattleStartResp{} resp := &pb.WorldtaskBattleStartResp{}
battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId) battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId)
if err != nil || battleConf == nil { if err != nil || battleConf == nil {
code = pb.ErrorCode_ConfigNoFound errdata = &pb.ErrorData{
data.Title = code.String() Code: pb.ErrorCode_ConfigNoFound,
data.Message = fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId) Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId),
}
return return
} }
iBattle, err := this.module.service.GetModule(comm.ModuleBattle) iBattle, err := this.module.service.GetModule(comm.ModuleBattle)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return return
} }
@ -47,14 +52,18 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
var ( var (
record *pb.DBBattleRecord record *pb.DBBattleRecord
) )
code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{ errdata, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
Ptype: pb.PlayType_rtask, Ptype: pb.PlayType_rtask,
Format: req.Battle, Format: req.Battle,
Buleformat: battleConf.FormatList, Buleformat: battleConf.FormatList,
}) })
if code != pb.ErrorCode_Success { if errdata != nil {
data.Title = code.String() errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: "创建Eve战斗失败",
}
return return
} }
@ -73,8 +82,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
}, },
} }
} else { } else {
code = pb.ErrorCode_WorldtaskBattleCreate errdata = &pb.ErrorData{
data.Title = code.String() Code: pb.ErrorCode_WorldtaskBattleCreate,
Title: pb.ErrorCode_WorldtaskBattleCreate.ToString(),
Message: "战斗记录是空",
}
return return
} }