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

modules/user/api_login.go

@@ -129,6 +129,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))
+			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)

modules/user/module.go

@@ -536,10 +536,12 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 				}
 				return
 			}
+			change.Ps += add
+		} else {
+			if change.Ps+add > ggd.PsUl {
+				change.Ps = ggd.PsUl
 			} else {
 				change.Ps += add
-			if change.Ps > ggd.PsUl {
-				change.Ps = ggd.PsUl
 			}
 		}