diff --git a/modules/library/api_lvup.go b/modules/library/api_lvup.go index 6eb7f8bef..9bc6bd7f7 100644 --- a/modules/library/api_lvup.go +++ b/modules/library/api_lvup.go @@ -37,26 +37,25 @@ func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetter totalFetterLv += _d.Favorlv } } - totalFetterLv = 0 - conf := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv+1) + fetter.Fidlv += 1 + conf := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv) if len(conf) == 0 { code = pb.ErrorCode_ConfigNoFound return - } else { - fetter.Fidlv += 1 - if conf[0].FavorabilityLv > totalFetterLv { - code = pb.ErrorCode_LibraryLvReward - return - } } - if _, ok := fetter.Prize[fetter.Fidlv]; ok { + + if conf[0].FavorabilityLv > totalFetterLv { + code = pb.ErrorCode_LibraryLvReward + return + } + + if _, ok := fetter.Prize[fetter.Fidlv]; !ok { code = pb.ErrorCode_LibraryReward return } fetter.Prize[fetter.Fidlv] = 1 // 发奖 - hProperty := make(map[string][]*cfg.Gameatr, 0) for _, v := range conf { var sz []*cfg.Gameatr diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 3879be8f4..b2fa46fbe 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -3,6 +3,7 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" ) @@ -64,10 +65,10 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe } } for i := sCount + 1; i <= sCount+req.Counts; i++ { - _heroObj.Givecount += 1 + addExp += attenuation[i] } - + _heroObj.Givecount += req.Counts // 校验是否是自己喜欢的食物 _c := this.module.configure.GetFavorability(_heroObj.Heroid, _heroObj.Favorlv) if _c == nil { @@ -133,6 +134,10 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe mapData["favorexp"] = _heroObj.Favorexp mapData["favorlv"] = _heroObj.Favorlv mapData["givecount"] = _heroObj.Givecount + if _heroObj.Ctime == 0 { // 记录刷新的时间 + _heroObj.Ctime = configure.Now().Unix() + mapData["ctime"] = _heroObj.Ctime + } this.module.modelFetter.modifyHeroFetterDataByObjId(session.GetUserId(), _heroObj.Id, mapData) rsp.Data = _heroObj session.SendMsg(string(this.module.GetType()), LibraryUseGiftResp, rsp)