diff --git a/modules/practice/api_enrolled.go b/modules/practice/api_enrolled.go index fe841c719..5e4a96572 100644 --- a/modules/practice/api_enrolled.go +++ b/modules/practice/api_enrolled.go @@ -18,17 +18,31 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle var ( err error + hero *pb.DBHero room *pb.DBPracticeRoom ) - if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { - return - } if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError return } - room.Full[req.Group]++ + if req.Group != 0 { + if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { + return + } + room.Full[req.Group]++ + } else { + if hero, err = this.module.ModuleHero.QueryCrossHeroinfo(req.Hero); err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + + if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { + return + } + room.Full[hero.Fulllvenr]-- + } + this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ "full": room.Full, }) diff --git a/modules/practice/configure.go b/modules/practice/configure.go index b83b28075..511c1b513 100644 --- a/modules/practice/configure.go +++ b/modules/practice/configure.go @@ -112,7 +112,7 @@ func (this *configureComp) getGamePandamasYxjx(id int32) (configure *cfg.GamePan v interface{} ok bool ) - if v, err = this.GetConfigure(game_pandamasjx); err != nil { + if v, err = this.GetConfigure(game_pandamasyxjx); err != nil { this.module.Errorln(err) return } else {