diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 34110531b..9d5dc9db0 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -209,24 +209,8 @@ func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) { continue } value, _ := strconv.Atoi(awakenData.Phasebonus[1]) - switch key { - case comm.Hp: - hero.JuexProperty[comm.Hp] += int32(value) - case comm.Def: - hero.JuexProperty[comm.Def] += int32(value) - case comm.Atk: - hero.JuexProperty[comm.Atk] += int32(value) - case comm.Speed: - hero.JuexProperty[comm.Speed] += int32(value) - case comm.ResonanceHpPro: - hero.JuexProperty[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp]))) - case comm.ResonanceAtkPro: - hero.JuexProperty[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk]))) - case comm.ResonanceDefPro: - hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def]))) - default: - this.module.Errorf("unkonw Resonance property:%s", key) - } + hero.JuexProperty[key] += int32(value) + } } diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index a95e230a2..3347e520e 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -96,9 +96,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha //hunting.BossTime[key] = req.Report.Costtime //mapData["bossTime"] = hunting.BossTime - if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { - return - } + // if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { + // return + // } + res = append(res, cfgHunting.Firstprize...) for _, v := range cfgHunting.Firstprize { if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil { if _conf.Usetype == comm.UseType8 { diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 90f482084..2260774d4 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -100,9 +100,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 //viking.BossTime[key] = req.Report.Costtime //mapData["bossTime"] = viking.BossTime // 更新时间 - if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { - return - } + // if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { + // return + // } + res = append(res, vikingCfg.Firstprize...) } if viking.BossTime[key] == 0 || viking.BossTime[key] > req.Report.Costtime {