Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
cf6f80a7d1
@ -699,6 +699,7 @@ const (
|
|||||||
Rtype188 TaskType = 188 //玩家创建1个工会
|
Rtype188 TaskType = 188 //玩家创建1个工会
|
||||||
Rtype189 TaskType = 189 //铁匠铺进行一次定制
|
Rtype189 TaskType = 189 //铁匠铺进行一次定制
|
||||||
Rtype199 TaskType = 199 //回想多少次
|
Rtype199 TaskType = 199 //回想多少次
|
||||||
|
Rtype200 TaskType = 200 //在狩猎内战斗X次
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -935,13 +935,13 @@ func (this *ModelHero) SetHeroFetterProperty(hero *pb.DBHero, attr []*cfg.Gameat
|
|||||||
value := key.N
|
value := key.N
|
||||||
switch key.A {
|
switch key.A {
|
||||||
case comm.Hp:
|
case comm.Hp:
|
||||||
hero.Fetters[comm.Hp] += int32(value)
|
hero.Fetters[comm.Hp] += value
|
||||||
case comm.Def:
|
case comm.Def:
|
||||||
hero.Fetters[comm.Def] += int32(value)
|
hero.Fetters[comm.Def] += value
|
||||||
case comm.Atk:
|
case comm.Atk:
|
||||||
hero.Fetters[comm.Atk] += int32(value)
|
hero.Fetters[comm.Atk] += value
|
||||||
case comm.Speed:
|
case comm.Speed:
|
||||||
hero.Fetters[comm.Speed] += int32(value)
|
hero.Fetters[comm.Speed] += value
|
||||||
case comm.HpPro:
|
case comm.HpPro:
|
||||||
hero.Fetters[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
|
hero.Fetters[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
|
||||||
case comm.AtkPro:
|
case comm.AtkPro:
|
||||||
|
@ -168,6 +168,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
|||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype172, 1))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype172, 1))
|
||||||
}
|
}
|
||||||
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype83, 1, req.BossType, req.Difficulty))
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype83, 1, req.BossType, req.Difficulty))
|
||||||
|
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1))
|
||||||
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
|
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user