liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
meixiongfeng 2023-08-15 20:44:01 +08:00
commit 50c9ac7ab0
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/battle/modelBattle.go
View File

@ -56,17 +56,17 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
Tasks: conf.BattleEvents, Tasks: conf.BattleEvents,
} }
var ( var (
battletas *cfg.GameBattletasktestingData // battletas *cfg.GameBattletasktestingData
captain int32 captain int32
masters []*pb.BattleRole masters []*pb.BattleRole
user *pb.DBUserExpand user *pb.DBUserExpand
err error err error
// buff *cfg.GamePandamasBuffData // buff *cfg.GamePandamasBuffData
) )
// buff, _ = this.getGlobalBuff(session.GetUserId()) // buff, _ = this.getGlobalBuff(session.GetUserId())
if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil { // if battletas, _ = this.module.configure.GetBattleTask(int32(req.Ptype)); battletas != nil {
record.Tasks = battletas.BattletaskTestingId // record.Tasks = battletas.BattletaskTestingId
} // }
if user, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil { if user, err = this.module.ModuleUser.GetUserExpand(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
@ -153,8 +153,8 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
record.Redflist[0].Leadpos = captain record.Redflist[0].Leadpos = captain
} }
} }
if conf.AssistTeam != 0 { if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil {
return return
} }
record.Redflist[0].Backupteam = masters record.Redflist[0].Backupteam = masters
@ -297,8 +297,8 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
record.Redflist[0].Leadpos = captain record.Redflist[0].Leadpos = captain
} }
} }
if conf.AssistTeam != 0 { if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil { if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil {
return return
} }
record.Redflist[0].Backupteam = masters 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 return
} }

1
modules/mainline/api_challenge.go
View File

@ -98,6 +98,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
Redflist: record.Redflist, Redflist: record.Redflist,
BlueCompId: record.BlueCompId, BlueCompId: record.BlueCompId,
Buleflist: record.Buleflist, Buleflist: record.Buleflist,
Tasks: record.Tasks,
}, },
Level: req.Level, Level: req.Level,
}) })