修改推送顺序

This commit is contained in:
wh_zcy 2023-06-14 10:35:35 +08:00
parent 5cdac676ad
commit b50497a9e8

View File

@ -126,7 +126,7 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
for _, cfg := range worldtaskConf.GetDataList() {
for _, condId := range cfg.Completetask {
for _, cond := range conds {
if condId == cond.Conid && cond.State == pb.BuriedItemFinishState_buried_finish {
if condId == cond.Conid { //&& cond.State == pb.BuriedItemFinishState_buried_finish {
//校验任务是否是当前任务
if task, ok := userTask.CurrentTasks[cfg.Group]; ok {
var currentTasks []*pb.CurrentTask
@ -160,8 +160,10 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
return
}
if curTaskConf.DeliverNpc == 0 {
this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
defer func() {
this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
}()
}
currentTasks = append(currentTasks, t)
}