diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index 13bab8cc3..1e2e4f7c1 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -190,12 +190,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq // 次数校验 if stone.Rooms.Box[req.Eventid] < eventConf.Value2 { user := this.module.ModuleUser.GetUser(session.GetUserId()) - // 校验消耗是否 - // if len(eventConf.CostItem) > 0 { - // if errdata = this.module.ConsumeRes(session, eventConf.CostItem, true); errdata != nil { - // return - // } - // } + if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(eventConf.Value1, user.Vip, user.Lv); len(lotteryward) > 0 { if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) @@ -376,8 +371,8 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq for _, v := range roomConf.Condition { for k, ok := range stone.Rooms.Eventid { if !ok { - if eventConf, err = this.module.configure.GetStoneEventDataById(k); err == nil { - if eventConf.EventType == v { + if tmp, err := this.module.configure.GetStoneEventDataById(k); err == nil { + if tmp.EventType == v { stone.Rooms.Complete = false break } @@ -399,8 +394,10 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq } } - if errdata = this.module.ConsumeRes(session, eventConf.CostItem, true); errdata != nil { //真正的消耗 - return + if len(eventConf.CostItem) > 0 { + if errdata = this.module.ConsumeRes(session, eventConf.CostItem, true); errdata != nil { //真正的消耗 + return + } } update["rooms"] = stone.Rooms this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)