git Merge branch 'online' into dev
This commit is contained in:
commit
f93847711d
@ -2545,7 +2545,7 @@ void Creature::OnLand()
|
|||||||
//着陆
|
//着陆
|
||||||
RemoveBuffByEffectId(kBET_Jump);
|
RemoveBuffByEffectId(kBET_Jump);
|
||||||
RemoveBuffByEffectId(kBET_ThroughWall);
|
RemoveBuffByEffectId(kBET_ThroughWall);
|
||||||
#if 0
|
#if 1
|
||||||
if (IsAndroid() && AsHuman()->team_uuid.empty() && !GetTeam()->HasPlayer()) {
|
if (IsAndroid() && AsHuman()->team_uuid.empty() && !GetTeam()->HasPlayer()) {
|
||||||
MustBeAddBuff(this, kBeRecycleBuffId);
|
MustBeAddBuff(this, kBeRecycleBuffId);
|
||||||
}
|
}
|
||||||
|
2
third_party/f8
vendored
2
third_party/f8
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 603e16fbc45ff0b67e8d1080c895016d784d38c2
|
Subproject commit f856de73d2a3087289495690e3ea9bd7b1aa79ef
|
Loading…
x
Reference in New Issue
Block a user