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

更改消息顺序

Browse Source
This commit is contained in:
wh_zcy 2023-06-02 20:00:50 +08:00
parent 4a7b6cb7cc
commit db4fb9bcae
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/worldtask/api_accept.go
View File

@ -84,13 +84,14 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
//判断是否要结束任务 //判断是否要结束任务
if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0) && if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0) &&
curTaskConf.DeliverNpc == 0 { curTaskConf.DeliverNpc == 0 {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
//结束任务 //结束任务
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
} else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 { } else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 {
var flag bool
conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
if err == nil { if err == nil {
var flag bool
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
flag = true flag = true
@ -100,11 +101,15 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
break break
} }
} }
if flag {
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
}
} }
if flag {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
return
}
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
} else { } else {
// 已完成的任务条件 // 已完成的任务条件
conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
@ -119,9 +124,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} }
a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...) a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...)
} }
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
} }
a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
return return
} }

5
modules/worldtask/api_finish.go
View File

@ -93,8 +93,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
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},
) )
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
return return
} }
} }
@ -160,9 +160,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
ic.TaskComplete(session, req.TaskId) ic.TaskComplete(session, req.TaskId)
} }
} }
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
return return
} }