Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/smithy/model_task.go

@@ -126,10 +126,14 @@ func (this *modelTask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 				task.Received = 1
 			}
 		} else {
-			newTask = append(newTask, &pb.TujianTask{
+			nt := &pb.TujianTask{
 				TaskId: k,
 				Cond:   v,
-			})
+			}
+			if v.State == pb.BuriedItemFinishState_buried_finish {
+				nt.Received = 1
+			}
+			newTask = append(newTask, nt)
 		}
 	}
 	dt.Tasks = append(dt.Tasks, newTask...)

modules/user/api_login.go

@@ -128,7 +128,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 
 		if this.module.modelUser.isLoginFirst(lastLoginTime) {
 			this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix())))
-
+			go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
 			this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime)
 			// 清理点赞
 			this.module.ModuleFriend.ResetFriend(user.Uid)
@@ -150,14 +150,15 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		} else {
 			rsp.Ex = expand
 		}
-	} else {
+	} else {  //新号
 		rsp.Ex = &pb.DBUserExpand{}
 		this.module.modelSign.UserSign(session)
+		go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
 	}
 
 	this.module.RecoverUserPsStart(user.Uid)
 	// 日常登录任务
-	go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype8, 1))
+	go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype7, 1))
 	this.module.ModulePrivilege.CheckDailyPrivilegeMail(session)
 
 	rsp.Data = user