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

处理err

Browse Source
This commit is contained in:
wh_zcy 2023-05-29 18:14:36 +08:00
parent 53387bbd0b
commit 7004aa13a4
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/worldtask/api_accept.go
View File

@ -87,10 +87,13 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
} else { } else {
// 已完成的任务条件 // 已完成的任务条件
rsp.CondiIds = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) rsp.CondiIds, err = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
if err == nil {
a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, curTaskConf.Completetask)...) a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, curTaskConf.Completetask)...)
} }
}
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
return return

4
modules/worldtask/api_completetask.go
View File

@ -64,8 +64,8 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
// } // }
// } // }
// } // }
condIds := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) condIds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId)
if len(condIds) > 0 { if err == nil && len(condIds) > 0 {
wt.CondiIds = append(wt.CondiIds, condIds...) wt.CondiIds = append(wt.CondiIds, condIds...)
} }

8
modules/worldtask/api_finish.go
View File

@ -95,9 +95,9 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
condiFlag bool condiFlag bool
) )
for _, condId := range curTaskConf.Completetask { for _, condId := range curTaskConf.Completetask {
conIds := this.module.ModuleBuried.CheckCondition(uid, condId) conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
// if this.module.modelWorldtask.checkCondi(uid, condId) { // if this.module.modelWorldtask.checkCondi(uid, condId) {
if len(conIds) > 0 { if err == nil && len(conIds) > 0 {
condiFlag = true condiFlag = true
} else { } else {
condiFlag = false condiFlag = false
@ -215,8 +215,8 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT
// } // }
// } // }
// } // }
condIds := this.module.ModuleBuried.CheckCondition(uid, condiId) condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId)
if len(condIds) > 0 { if err == nil && len(condIds) > 0 {
nwt.CondiIds = condIds nwt.CondiIds = condIds
userTask.CurrentTask[nextTaskConf.Group] = nwt userTask.CurrentTask[nextTaskConf.Group] = nwt
update["currentTask"] = userTask.CurrentTask update["currentTask"] = userTask.CurrentTask

4
modules/worldtask/model_worldtask.go
View File

@ -227,8 +227,8 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask *
// } // }
// } // }
// } // }
condIds := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId) condIds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId)
if len(condIds) > 0 { if err == nil && len(condIds) > 0 {
nwt.CondiIds = condIds nwt.CondiIds = condIds
userTask.CurrentTask[nextTaskConf.Group] = nwt userTask.CurrentTask[nextTaskConf.Group] = nwt
update["currentTask"] = userTask.CurrentTask update["currentTask"] = userTask.CurrentTask