diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 5bbed8fc5..0b6f284d5 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -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) }