Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
aaaa9f56db
@ -298,7 +298,7 @@ func (this *Parkour) avoid(id string, uid string, dis float32) {
|
|||||||
|
|
||||||
if dis < 0 {
|
if dis < 0 {
|
||||||
member.Currhp--
|
member.Currhp--
|
||||||
if member.Currhp < 0 {
|
if member.Currhp <= 0 {
|
||||||
timewheel.Add(time.Second*10, this.resurrectiontimer, battle.Id, member.Uid)
|
timewheel.Add(time.Second*10, this.resurrectiontimer, battle.Id, member.Uid)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -691,5 +691,7 @@ func (this *Parkour) resurrectiontimer(task *timewheel.Task, args ...interface{}
|
|||||||
this.Errorln(err)
|
this.Errorln(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
this.Error("战斗结束 复活失效", log.Field{Key: "bid", Value: battleid})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user