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

modules/arena/api_challenge.go

@@ -36,6 +36,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
 		heros  []*pb.DBHero
 		record *pb.DBBattleRecord
 		change bool
+		ok     bool
 		err    error
 	)
 	if errdata = this.ChallengeCheck(session, req); errdata != nil {
@@ -72,6 +73,22 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
 			}
 			return
 		}
+		ok = false
+		for _, v := range heros {
+			if v.Id != "" {
+				ok = true
+			}
+		}
+
+		if !ok {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_DBError,
+				Title:   pb.ErrorCode_DBError.ToString(),
+				Message: "no found any hero",
+			}
+			return
+		}
+
 		if red.Defend == nil {
 			red.Defend = &pb.DBPlayerBattleFormt{
 				Leadpos: req.Battle.Leadpos,

modules/arena/api_challengereward.go

@@ -222,14 +222,6 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
 			}
 			return
 		}
-		if err = this.module.modelArena.updateArenaUserInfo(rival); err != nil {
-			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_DBError,
-				Title:   pb.ErrorCode_DBError.ToString(),
-				Message: err.Error(),
-			}
-			return
-		}
 	} else {
 		this.module.modelRank.updateArenaRank(red)
 		info.Integral = red.Integral

modules/arena/api_setdattformt.go

@@ -1,56 +0,0 @@
-package arena
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/pb"
-)
-
-//参数校验
-func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) {
-
-	return
-}
-
-///设置防守阵型
-func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) {
-	var (
-		info  *pb.DBArenaUser
-		heros []*pb.DBHero
-		err   error
-	)
-	if errdata = this.SetAttFormtCheck(session, req); errdata != nil {
-		return
-	}
-	if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
-
-		return
-	}
-	if heros, err = this.module.modelArena.queryUserHeros(session.GetUserId(), req.Formt); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
-		return
-	}
-	info.Attack = &pb.DBPlayerBattleFormt{
-		Leadpos: req.Leadpos,
-		Formt:   heros,
-	}
-
-	if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
-		return
-	}
-	session.SendMsg(string(this.module.GetType()), "setattformt", &pb.ArenaSetAttFormtResp{Issucc: true})
-	return
-}

modules/arena/api_setdefformt.go

@@ -32,6 +32,7 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
 	var (
 		info  *pb.DBArenaUser
 		heros []*pb.DBHero
+		ok    bool
 		err   error
 	)
 	if errdata = this.SetDefFormtCheck(session, req); errdata != nil {
@@ -56,6 +57,21 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
 
 		return
 	}
+	ok = false
+	for _, v := range heros {
+		if v.Id != "" {
+			ok = true
+		}
+	}
+
+	if !ok {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: "no found any hero",
+		}
+		return
+	}
 	info.Defend = &pb.DBPlayerBattleFormt{
 		Leadpos: req.Leadpos,
 		Formt:   heros,

modules/hero/model_hero.go

@@ -597,7 +597,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype118, hero.Lv, hero.JuexingLv))
 
 		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
-			this.module.passon.HeroUpLv(session.Clone(), hero.HeroID, curLv)
+			this.module.passon.HeroUpLv(session, hero.HeroID, curLv)
 			this.module.ModuleBuried.TriggerBuried(session, tasks...)
 		})
 	}

modules/passon/api_inroom.go

@@ -81,7 +81,7 @@ func (this *apiComp) InRoom(session comm.IUserSession, req *pb.PassonInRoomReq)
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ReqParameterError,
 			Title:   pb.ErrorCode_ReqParameterError.ToString(),
-			Message: fmt.Sprintf("hero lv greater or equal to Passonlv:%d", passon.Passonlv),
+			Message: fmt.Sprintf("hero lv greater Passonlv:%d", passon.Passonlv),
 		}
 		return
 	}

modules/passon/module.go

@@ -125,11 +125,6 @@ func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32)
 		passon.Teacher[i] = heros[i].Id
 	}
 
-	defer func() {
-		session.Push()
-		this.PutUserSession(session)
-	}()
-
 	if len(change) > 0 {
 		if errdata = this.ModuleHero.PassonHero(session, change); errdata != nil {
 			this.Errorln(errdata)