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

modules/gm/module.go

@@ -331,12 +331,13 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 				)
 				data := this.configure.GetHeroConfigData()
 				for _, v := range data {
-					res = append(res, &cfg.Gameatn{
-						A: "hero",
-						T: v.Hid,
-						N: 1,
-					})
-
+					if v.Handbook != -1 {
+						res = append(res, &cfg.Gameatn{
+							A: "hero",
+							T: v.Hid,
+							N: 1,
+						})
+					}
 				}
 				errdata = this.DispenseRes(session, res, true)
 				if errdata != nil {

modules/user/api_login.go

@@ -105,6 +105,13 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		return
 	}
 
+	// 在logintime更新前判断是否是昨天
+	if utils.IsYestoday(user.Logintime) {
+		go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype9, 1))
+	} else {
+		this.module.ModuleBuried.ResetBuriedByType(user.Uid, comm.Rtype9)
+	}
+
 	//不是新账号
 	if !isNewUser {
 		lastLoginTime = user.Logintime
@@ -129,13 +136,14 @@ 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))
-			go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype9, 1))
 			this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime)
 			// 清理点赞
 			this.module.ModuleFriend.ResetFriend(user.Uid)
 			this.module.modelSign.UserSign(session)
 		}
 
+		// 判断昨日是否登录
+
 		rsp.Data = user
 
 		// 查询玩家扩展数据