diff --git a/modules/stonehenge/api_challenge.go b/modules/stonehenge/api_challenge.go index d6923125a..b57e1a6c1 100644 --- a/modules/stonehenge/api_challenge.go +++ b/modules/stonehenge/api_challenge.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.StonehengeBattleReq) (errdata *pb.ErrorData) { +func (this *apiComp) BattleCheck(session comm.IUserSession, req *pb.StonehengeBattleReq) (errdata *pb.ErrorData) { if req.Eventid == 0 { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, @@ -19,7 +19,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.Stoneheng } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StonehengeBattleReq) (errdata *pb.ErrorData) { +func (this *apiComp) Battle(session comm.IUserSession, req *pb.StonehengeBattleReq) (errdata *pb.ErrorData) { var ( stone *pb.DBStonehenge conf *cfg.GameStoneEventData @@ -52,7 +52,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StonehengeBatt } return } - if errdata = this.ChallengeCheck(session, req); errdata != nil { + if errdata = this.BattleCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } // diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go index 9850577a5..6876d0638 100644 --- a/modules/stonehenge/api_enterlevel.go +++ b/modules/stonehenge/api_enterlevel.go @@ -56,6 +56,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt } return } + stone.Hero = make(map[string]*pb.BattleRole) // 查库 for _, hid := range req.Hid { if hero, err := this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), hid); err != nil { diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go index 59c389adf..e2365770f 100644 --- a/modules/stonehenge/modelStonehenge.go +++ b/modules/stonehenge/modelStonehenge.go @@ -60,6 +60,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) *pb.DBStonehenge { stone.Reward = make(map[int32]bool, 0) stone.Addweight = make(map[int32]int32, 0) stone.Etime = utils.WeekIntervalTime(0) + stone.Hero = make(map[string]*pb.BattleRole) this.Add(uid, stone) }