liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28

Browse Source
This commit is contained in:
liwei 2023-07-24 16:11:30 +08:00
commit 716d9585a4
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/hero/model_hero.go
View File

@ -209,24 +209,8 @@ func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) {
continue continue
} }
value, _ := strconv.Atoi(awakenData.Phasebonus[1]) value, _ := strconv.Atoi(awakenData.Phasebonus[1])
switch key { hero.JuexProperty[key] += int32(value)
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)
}
} }
} }

7
modules/hunting/api_challengeover.go
View File

@ -96,9 +96,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
//hunting.BossTime[key] = req.Report.Costtime //hunting.BossTime[key] = req.Report.Costtime
//mapData["bossTime"] = hunting.BossTime //mapData["bossTime"] = hunting.BossTime
if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil { // if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
return // return
} // }
res = append(res, cfgHunting.Firstprize...)
for _, v := range cfgHunting.Firstprize { for _, v := range cfgHunting.Firstprize {
if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil { if _conf, err := this.module.configure.GetItemConfigureData(v.T); err == nil {
if _conf.Usetype == comm.UseType8 { if _conf.Usetype == comm.UseType8 {

7
modules/viking/api_challengeover.go
View File

@ -100,9 +100,10 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
//viking.BossTime[key] = req.Report.Costtime //viking.BossTime[key] = req.Report.Costtime
//mapData["bossTime"] = viking.BossTime // 更新时间 //mapData["bossTime"] = viking.BossTime // 更新时间
if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil { // if errdata = this.module.DispenseRes(session, vikingCfg.Firstprize, true); errdata != nil {
return // return
} // }
res = append(res, vikingCfg.Firstprize...)
} }
if viking.BossTime[key] == 0 || viking.BossTime[key] > req.Report.Costtime { if viking.BossTime[key] == 0 || viking.BossTime[key] > req.Report.Costtime {