diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index b20a6aec7..657f9defa 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -127,12 +127,12 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e bManAwaken = true } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype121, 1, cfg.Race)) - tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)) + tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color)) _, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if err != nil { // 达到满级觉醒 if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) && bManAwaken { tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID)) - tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color)) + tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv)) } } diff --git a/modules/monkey/api_award.go b/modules/monkey/api_award.go index 09818672f..d9cc6b25c 100644 --- a/modules/monkey/api_award.go +++ b/modules/monkey/api_award.go @@ -12,12 +12,12 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.MonkeyAwardRe func (this *apiComp) Award(session comm.IUserSession, req *pb.MonkeyAwardReq) (errdata *pb.ErrorData) { var ( - err error - info *pb.DBMonkey - conf []*cfg.GameMonkeyRewardData - res []*cfg.Gameatn - atno []*pb.UserAtno - totalstar int32 // + err error + info *pb.DBMonkey + conf []*cfg.GameMonkeyRewardData + res []*cfg.Gameatn + atno []*pb.UserAtno + //totalstar int32 // ) if errdata = this.AwardCheck(session, req); errdata != nil { return @@ -45,16 +45,16 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MonkeyAwardReq) (e } return } - for _, v := range info.Data[req.ChapterId].Award { - totalstar += v - } - if totalstar < req.Starnum { // 星级不够 不能领奖 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_UserNoReward, - Title: pb.ErrorCode_UserNoReward.ToString(), - } - return - } + // for _, v := range info.Data[req.ChapterId].Award { + // totalstar += v + // } + // if totalstar < req.Starnum { // 星级不够 不能领奖 + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_UserNoReward, + // Title: pb.ErrorCode_UserNoReward.ToString(), + // } + // return + // } if conf, err = this.module.configure.getGameMonkeyRewardData(req.ChapterId); err == nil { for _, v := range conf { if v.Starnum > info.Reward[req.ChapterId] && v.Starnum <= req.Starnum { diff --git a/modules/monkey/api_updatestar.go b/modules/monkey/api_updatestar.go index 2b28c5581..1a8033bdc 100644 --- a/modules/monkey/api_updatestar.go +++ b/modules/monkey/api_updatestar.go @@ -55,7 +55,7 @@ func (this *apiComp) UpdateStar(session comm.IUserSession, req *pb.MonkeyUpdateS update["data"] = info.Data } else { - if info.Data[conf.Chapter].Award[req.Stage] < req.Star { + if info.Data[conf.Chapter].Award[req.Stage] != req.Star { info.Data[conf.Chapter].Award[req.Stage] = req.Star update["data"] = info.Data }