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

modules/user/module.go

@@ -536,23 +536,13 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 				}
 				return
 			}
-			//体力消耗，增加玩家经验
-			// exp := int32(math.Abs(float64(add))) * ggd.FightPs
-			// user.Exp += int64(exp)
-		}
-
-		if change.Ps >= ggd.PsUl {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_UserVitLimit,
-				Title: pb.ErrorCode_UserVitLimit.ToString(),
+		} else {
+			change.Ps += add
+			if change.Ps > ggd.PsUl {
+				change.Ps = ggd.PsUl
 			}
+		}
 
-			return
-		}
-		change.Ps += add
-		if change.Ps > ggd.PsUl {
-			change.Ps = ggd.PsUl
-		}
 	case comm.Talent1:
 		if add < 0 {
 			if user.Talent1+add < 0 {