diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index c27414f47..f8cadd949 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -56,17 +56,17 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon Tasks: conf.BattleEvents, } var ( - battletas *cfg.GameBattletasktestingData - captain int32 - masters []*pb.BattleRole - user *pb.DBUserExpand - err error + // battletas *cfg.GameBattletasktestingData + captain int32 + masters []*pb.BattleRole + user *pb.DBUserExpand + err error // buff *cfg.GamePandamasBuffData ) // buff, _ = this.getGlobalBuff(session.GetUserId()) - if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil { - record.Tasks = battletas.BattletaskTestingId - } + // if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil { + // record.Tasks = battletas.BattletaskTestingId + // } if user, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -153,8 +153,8 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon record.Redflist[0].Leadpos = captain } } - if conf.AssistTeam != 0 { - if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { + if conf.RedAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { return } record.Redflist[0].Backupteam = masters @@ -297,8 +297,8 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon record.Redflist[0].Leadpos = captain } } - if conf.AssistTeam != 0 { - if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { + if conf.RedAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { return } record.Redflist[0].Backupteam = masters @@ -322,6 +322,13 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon } } + if conf.BlueAssistTeam != 0 { + if captain, masters, errdata = this.createMasterRoles(200, 0, conf.BlueAssistTeam); errdata != nil { + return + } + record.Buleflist[0].Backupteam = masters + } + return } diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 2e97fbdcf..c7c9c26e6 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -98,6 +98,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist, + Tasks: record.Tasks, }, Level: req.Level, })