Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
a936e2eddc
@ -291,9 +291,10 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid int32) {
|
||||
resp *pb.CaravanTaskCompletePush
|
||||
)
|
||||
if !this.IsCross() {
|
||||
if conf, err := this.configure.GetCaravanEventById(taskid); err == nil {
|
||||
list, _ := this.modelCaravan.getCaravanList(session.GetUserId())
|
||||
if list.Taskid == taskid {
|
||||
|
||||
list, _ := this.modelCaravan.getCaravanList(session.GetUserId())
|
||||
if list.Taskid == taskid {
|
||||
if conf, err := this.configure.GetCaravanEventById(list.Eventid); err == nil {
|
||||
this.CleanCaravanTask(session.GetUserId(), list) //任务完成 清理任务数据
|
||||
resp = &pb.CaravanTaskCompletePush{}
|
||||
resp.Data = list
|
||||
|
Loading…
Reference in New Issue
Block a user