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

更新任务结束逻辑

Browse Source
This commit is contained in:
wh_zcy 2022-09-27 22:43:28 +08:00
parent a8f3add1a7
commit 50e376655c
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/rtask/api_battlefinish.go
View File

@ -22,16 +22,6 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
this.moduleRtask.Debugf("随机任务请求 rtaskID:%v 完成 subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId)
defer func() {
rsp := &pb.RtaskFinishPush{
RtaskId: req.RtaskId,
}
if err := session.SendMsg(string(this.moduleRtask.GetType()), "finish", rsp); err != nil {
code = pb.ErrorCode_SystemError
}
this.moduleRtask.Debugf("随机任务完成 rtaskID:%v subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId)
}()
// 获取当前任务配置
conf := this.moduleRtask.configure.getRtaskById(req.RtaskId)
if conf == nil {
@ -71,9 +61,6 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
// 校验完成条件
var checkCondi bool
for _, v := range sideConf.EndTid {
if v == -1 {
continue
}
if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), v); !ok {
if err != nil {
this.moduleRtask.Error(err.Error())
@ -124,5 +111,13 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
code = pb.ErrorCode_SystemError
}
rsp := &pb.RtaskFinishPush{
RtaskId: req.RtaskId,
}
if err := session.SendMsg(string(this.moduleRtask.GetType()), "finish", rsp); err != nil {
code = pb.ErrorCode_SystemError
}
this.moduleRtask.Debugf("随机任务完成 rtaskID:%v subtaskID:%v chooseID:%v", req.RtaskId, req.RtaskSubId, req.ChooseId)
return
}

4
modules/rtask/model_rtask.go
View File

@ -74,8 +74,8 @@ func (this *ModelRtask) checkHandle(uid string, frtaskIds []int32, conf *cfg.Gam
// 确定选项前的校验
func (this *ModelRtask) checkCondi(uid string, condiId int32) (err error, ok bool) {
if condiId == 0 {
return errors.New("condiId is nil"), true
if condiId <= 0 {
return nil, true
}
//验证限定条件
var condi *rtaskCondi